Merge pull request #18 from flathub/g4.4.1

GZDoom 4.4.1

fixed-compilation-of-non-x86-targets.patch

@@ -1,31 +0,0 @@
-From 4c3c32dca6c1009c050476fa72fd441058a0bc64 Mon Sep 17 00:00:00 2001
-From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
-Date: Sun, 7 Jun 2020 21:52:58 +0300
-Subject: [PATCH] - fixed compilation of non-x86 targets
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-src/common/utility/x86.cpp:48:6: error: ambiguating new declaration of ‘void DumpCPUInfo(const CPUInfo*)’
----
- src/common/utility/x86.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/common/utility/x86.cpp b/src/common/utility/x86.cpp
-index 983360c09..d674ea24d 100644
---- a/src/common/utility/x86.cpp
-+++ b/src/common/utility/x86.cpp
-@@ -45,8 +45,9 @@ void CheckCPUID(CPUInfo *cpu)
- 	cpu->DataL1LineSize = 32;	// Assume a 32-byte cache line
- }
- 
--void DumpCPUInfo(const CPUInfo *cpu)
-+FString DumpCPUInfo(const CPUInfo *cpu)
- {
-+	return FString();
- }
- #else
- 
--- 
-2.26.2
-

org.zdoom.GZDoom.appdata.xml

@@ -70,6 +70,11 @@
   </screenshots>
 
   <releases>
+    <release version="4.4.1" date="2020-06-10">
+      <description>
+        <p>Updated release package to GZDoom 4.4.1</p>
+      </description>
+    </release>
     <release version="4.4.0" date="2020-06-07">
       <description>
         <p>Updated release package to GZDoom 4.4.0</p>

org.zdoom.GZDoom.yaml

@@ -65,18 +65,15 @@ modules:
   sources:
   - type: git
     url: https://github.com/coelckers/gzdoom.git
-    tag: g4.4.0
+    tag: g4.4.1
-    commit: e98ef83837860c33720e827707d2cc0b4647ace6
+    commit: 5001f36f90d414dfada45b7197d25ac60404df7d
   - type: file
-    url: https://github.com/coelckers/gzdoom/raw/g4.3.3/soundfont/gzdoom.sf2
+    url: https://github.com/coelckers/gzdoom/raw/g4.4.1/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
   - type: patch
     path: description.patch
-  # Based on an upstream patch, that sadly didn't make it into the 4.4.0 release
-  - type: patch
-    path: fixed-compilation-of-non-x86-targets.patch
   - type: shell
     commands:
     - install -Dm 644 gzdoom.sf2 /app/share/sounds/sf2/gzdoom.sf2