GZDoom 4.8.x (#192)

* GZDoom 4.8.x
* Additional patch so we can publish 4.8.x

2 files changed, 48 insertions, 5 deletions

diff --git a/gzdoom/0001-fix-gzdoom.pk3-not-found-error.patch b/gzdoom/0001-fix-gzdoom.pk3-not-found-error.patch
new file mode 100644
index 0000000..0329f97
--- /dev/null
+++ b/gzdoom/0001-fix-gzdoom.pk3-not-found-error.patch
@@ -0,0 +1,39 @@
+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 1ab16bd..81f0d60 100644
--- a/gzdoom/gzdoom.json
+++ b/gzdoom/gzdoom.json
@@ -14,18 +14,22 @@
         {
             "type": "git",
             "url": "https://github.com/coelckers/gzdoom.git",
-            "tag": "g4.7.1",
-            "commit": "107ff702423686414680d6458fea63a2647692c4"
+            "tag": "g4.8.2",
+            "commit": "410a479505caa29b188d92f473174723771bf375"
         },
         {
             "type": "file",
-            "url": "https://github.com/coelckers/gzdoom/raw/g4.7.1/soundfont/gzdoom.sf2",
+            "url": "https://github.com/coelckers/gzdoom/raw/g4.8.2/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": [
@@ -41,8 +45,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/coelckers/ZMusic/archive/1.1.8.tar.gz",
-                    "sha256": "73082f661b7b0bb33348d1d186c132deec9132a1613480348a00172b49c9fd68"
+                    "url": "https://github.com/coelckers/ZMusic/archive/1.1.9.tar.gz",
+                    "sha256": "4bf39917028bbe2f382748b4400a1cbaeb8975157fe404cff53411297d6ac68c"
                 }
             ]
         }