Gzdoom update (#214)

* Update ZMusic and download locations

* Update GZDoom to 4.9.0

2 files changed, 7 insertions, 50 deletions

diff --git a/gzdoom/0001-fix-gzdoom.pk3-not-found-error.patch b/gzdoom/0001-fix-gzdoom.pk3-not-found-error.patch
deleted file mode 100644
index 0329f97..0000000
--- a/gzdoom/0001-fix-gzdoom.pk3-not-found-error.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0f0b4b7620557410e4969cec6119a7771b8acf35 Mon Sep 17 00:00:00 2001
-From: Omar Polo <op@omarpolo.com>
-Date: Mon, 11 Jul 2022 11:52:43 +0200
-Subject: [PATCH] fix gzdoom.pk3 not found error
-
-Move the initialization before BaseFileSearch is called, otherwise
-GameConfig is used not initialized and it doesn't find the gzdoom.pk3
-file.
-
-GameConfig used uninitalized was spotted by @LoneFox78.
----
- src/d_main.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/d_main.cpp b/src/d_main.cpp
-index 46dbe0f33..df1051af5 100644
---- a/src/d_main.cpp
-+++ b/src/d_main.cpp
-@@ -3534,6 +3534,8 @@ static int D_DoomMain_Internal (void)
- 	
- 	std::set_new_handler(NewFailure);
- 	const char *batchout = Args->CheckValue("-errorlog");
-+
-+	D_DoomInit();
- 	
- 	// [RH] Make sure zdoom.pk3 is always loaded,
- 	// as it contains magic stuff we need.
-@@ -3568,8 +3570,6 @@ static int D_DoomMain_Internal (void)
- 
- 	Printf("%s version %s\n", GAMENAME, GetVersionString());
- 
--	D_DoomInit();
--
- 	extern void D_ConfirmSendStats();
- 	D_ConfirmSendStats();
- 
--- 
-2.37.2
-
diff --git a/gzdoom/gzdoom.json b/gzdoom/gzdoom.json
index 335f913..af70fd7 100644
--- a/gzdoom/gzdoom.json
+++ b/gzdoom/gzdoom.json
@@ -13,9 +13,9 @@
     "sources": [
         {
             "type": "git",
-            "url": "https://github.com/coelckers/gzdoom.git",
-            "tag": "g4.8.2",
-            "commit": "410a479505caa29b188d92f473174723771bf375",
+            "url": "https://github.com/zdoom/gzdoom.git",
+            "tag": "g4.9.0a",
+            "commit": "9b2f2da93bbe9faae8c4dff33b89d4c011a2f08f",
             "x-checker-data": {
                 "type": "anitya",
                 "project-id": 17531,
@@ -25,17 +25,13 @@
         },
         {
             "type": "file",
-            "url": "https://github.com/coelckers/gzdoom/raw/g4.8.2/soundfont/gzdoom.sf2",
+            "url": "https://github.com/zdoom/gzdoom/raw/g4.9.0a/soundfont/gzdoom.sf2",
             "sha256": "fca3e514b635a21789d4224e84865d2954a2a914d46b64aa8219ddb565c44869"
         },
         /* I've discussed these patches upstream and a special -DFLATPAK_BUNDLE has been approved */
         {
             "type": "patch",
             "path": "description.patch"
-        },
-        {
-            "type": "patch",
-            "path": "0001-fix-gzdoom.pk3-not-found-error.patch"
         }
     ],
     "post-install": [
@@ -90,13 +86,13 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/coelckers/ZMusic/archive/1.1.10.tar.gz",
-                    "sha256": "378435b35f02a3123ee9e01b5e7990017f9bc1244b788e3bf54b37b34a2985ba",
+                    "url": "https://github.com/zdoom/ZMusic/archive/1.1.11.tar.gz",
+                    "sha256": "623c3d7edfcdbe1ba4e7a9dc9a4d834fb92a228881621247855ecd57447631dd",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 153600,
                         "stable-only": true,
-                        "url-template": "https://github.com/coelckers/ZMusic/archive/$version.tar.gz"
+                        "url-template": "https://github.com/zdoom/ZMusic/archive/$version.tar.gz"
                   }
                 }
             ]