From d6be13fb6c4f4ffd7f04e53a4aa80c8da1744289 Mon Sep 17 00:00:00 2001
From: Kevin Degeling <contact@kevindegeling.nl>
Date: Sat, 22 May 2021 20:54:51 +0200
Subject: [PATCH] GZDoom 4.6.0

---
 org.zdoom.GZDoom.yaml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/org.zdoom.GZDoom.yaml b/org.zdoom.GZDoom.yaml
index d924cbf..ea98bf2 100644
--- a/org.zdoom.GZDoom.yaml
+++ b/org.zdoom.GZDoom.yaml
@@ -46,13 +46,10 @@ modules:
   buildsystem: cmake-ninja
   config-opts:
   - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-  # Required with FluidSynth 2.2.x
-  # Should be fixed with ZMusic 1.1.8
-  - -DDYN_FLUIDSYNTH=OFF
   sources:
   - type: archive
-    url: https://github.com/coelckers/ZMusic/archive/1.1.7.tar.gz
-    sha256: 3800e40da5015fb3eee408b0639d69ece49cfd0d00466292e48b8ff94383d9f2
+    url: https://github.com/coelckers/ZMusic/archive/1.1.8.tar.gz
+    sha256: 73082f661b7b0bb33348d1d186c132deec9132a1613480348a00172b49c9fd68
 
 # This builds both the application code and
 # the custom game data
@@ -63,10 +60,10 @@ modules:
   sources:
   - type: git
     url: https://github.com/coelckers/gzdoom.git
-    tag: g4.5.0
-    commit: 3037c08840f209f9f6b6d7e6c2c69632472a5d54
+    tag: g4.6.0
+    commit: c320db66f4b31256d5ad400610a2e1fab028dfe7
   - type: file
-    url: https://github.com/coelckers/gzdoom/raw/g4.5.0/soundfont/gzdoom.sf2
+    url: https://github.com/coelckers/gzdoom/raw/g4.6.0/soundfont/gzdoom.sf2
     sha256: fca3e514b635a21789d4224e84865d2954a2a914d46b64aa8219ddb565c44869
   # I've discussed these patches upstream and a special -DFLATPAK_BUNDLE has been approved
   # https://forum.zdoom.org/viewtopic.php?f=15&t=68365&sid=884a41102b499f98ed9c76a62ee0e41d