zmusic: Update 1.1.14.tar.gz to 1.2.0 (#406)

flathubbot · Eonfge · web-flow · commit 1e722557a850 · 2025-09-14T07:36:52.000+02:00
* zmusic: Update 1.1.14.tar.gz to 1.2.0

* Remove upstreamed patch

* Resolve FreeDesktop 25.08 conflict

---------

Co-authored-by: Kevin Degeling &lt;contact@kevindegeling.nl&gt;
diff --git a/gzdoom/0001-Fix-libxmp-playback.patch b/gzdoom/0001-Fix-libxmp-playback.patch
diff --git a/gzdoom/gzdoom.json b/gzdoom/gzdoom.json
@@ -41,7 +41,10 @@
         "./zmusic.json",
         {
             "name": "libsndfile",
-            "buildsystem": "autotools",
+            "buildsystem": "cmake-ninja",
+            "config-opts": [
+                "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
+            ],
             "sources": [
                 {
                     "type": "archive",
diff --git a/gzdoom/zmusic.json b/gzdoom/zmusic.json
@@ -7,18 +7,14 @@
     "sources": [
         {
             "type": "archive",
-            "url": "https://github.com/zdoom/ZMusic/archive/1.1.14.tar.gz",
-            "sha256": "f04410fe4ea08136f37703e7715c27df4c8532ace1e721cf40c6f303a93acc54",
+            "url": "https://github.com/zdoom/ZMusic/archive/1.2.0.tar.gz",
+            "sha256": "fc8419a5fa80faa2363a57711e4ec4670b3628aecf1dc9b4306f4add0ce09d2b",
             "x-checker-data": {
                 "type": "anitya",
                 "project-id": 153600,
                 "stable-only": true,
                 "url-template": "https://github.com/zdoom/ZMusic/archive/$version.tar.gz"
-          }
-        },
-        {
-            "type": "patch",
-            "path": "0001-Fix-libxmp-playback.patch"
+            }
         }
     ]
 }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,10 @@`
`41`	`41`	`"./zmusic.json",`
`42`	`42`	`{`
`43`	`43`	`"name": "libsndfile",`
`44`		`- "buildsystem": "autotools",`
	`44`	`+ "buildsystem": "cmake-ninja",`
	`45`	`+ "config-opts": [`
	`46`	`+ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"`
	`47`	`+ ],`
`45`	`48`	`"sources": [`
`46`	`49`	`{`
`47`	`50`	`"type": "archive",`
Original file line number	Diff line number	Diff line change
`@@ -7,18 +7,14 @@`
`7`	`7`	`"sources": [`
`8`	`8`	`{`
`9`	`9`	`"type": "archive",`
`10`		`- "url": "https://github.com/zdoom/ZMusic/archive/1.1.14.tar.gz",`
`11`		`- "sha256": "f04410fe4ea08136f37703e7715c27df4c8532ace1e721cf40c6f303a93acc54",`
	`10`	`+ "url": "https://github.com/zdoom/ZMusic/archive/1.2.0.tar.gz",`
	`11`	`+ "sha256": "fc8419a5fa80faa2363a57711e4ec4670b3628aecf1dc9b4306f4add0ce09d2b",`
`12`	`12`	`"x-checker-data": {`
`13`	`13`	`"type": "anitya",`
`14`	`14`	`"project-id": 153600,`
`15`	`15`	`"stable-only": true,`
`16`	`16`	`"url-template": "https://github.com/zdoom/ZMusic/archive/$version.tar.gz"`
`17`		`- }`
`18`		`- },`
`19`		`- {`
`20`		`- "type": "patch",`
`21`		`- "path": "0001-Fix-libxmp-playback.patch"`
	`17`	`+ }`
`22`	`18`	`}`
`23`	`19`	`]`
`24`	`20`	`}`