Merge pull request #17 from flathub/g4.4.0

GZDoom 4.4.0

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

@@ -0,0 +1,31 @@
+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
+

kde.patch

@@ -1,98 +0,0 @@
-diff --git a/src/posix/sdl/crashcatcher.c b/src/posix/sdl/crashcatcher.c
-index be0e8f599..e52e7f3c1 100644
---- a/src/posix/sdl/crashcatcher.c
-+++ b/src/posix/sdl/crashcatcher.c
-@@ -366,9 +366,7 @@ static void crash_handler(const char *logfile)
- 		const char *str;
- 		char buf[512];
- 
--		if((str=getenv("KDE_FULL_SESSION")) && strcmp(str, "true") == 0)
--			snprintf(buf, sizeof(buf), "kdialog --title \"Very Fatal Error\" --textbox \"%s\" 800 600", logfile);
--		else if((str=getenv("GNOME_DESKTOP_SESSION_ID")) && str[0] != '\0')
-+		if((str=getenv("GNOME_DESKTOP_SESSION_ID")) && str[0] != '\0')
- 			snprintf(buf, sizeof(buf), "gxmessage -buttons \"Okay:0\" -geometry 800x600 -title \"Very Fatal Error\" -center -file \"%s\"", logfile);
- 		else
- 			snprintf(buf, sizeof(buf), "xmessage -buttons \"Okay:0\" -center -file \"%s\"", logfile);
-diff --git a/src/posix/sdl/i_system.cpp b/src/posix/sdl/i_system.cpp
-index f96d15686..f70bd7587 100644
---- a/src/posix/sdl/i_system.cpp
-+++ b/src/posix/sdl/i_system.cpp
-@@ -113,16 +113,9 @@ void Linux_I_FatalError(const char* errortext)
- 	// Close window or exit fullscreen and release mouse capture
- 	SDL_Quit();
- 
--	const char *str;
--	if((str=getenv("KDE_FULL_SESSION")) && strcmp(str, "true") == 0)
--	{
--		FString cmd;
--		cmd << "kdialog --title \"" GAMENAME " " << GetVersionString()
--			<< "\" --msgbox \"" << errortext << "\"";
--		popen(cmd, "r");
--	}
-+
- #ifndef NO_GTK
--	else if (I_GtkAvailable())
-+	if (I_GtkAvailable())
- 	{
- 		I_ShowFatalError_Gtk(errortext);
- 	}
-@@ -196,59 +189,6 @@ int I_PickIWad (WadStuff *wads, int numwads, bool showwin, int defaultiwad)
- 		return defaultiwad;
- 	}
- 
--#ifndef __APPLE__
--	const char *str;
--	if((str=getenv("KDE_FULL_SESSION")) && strcmp(str, "true") == 0)
--	{
--		FString cmd("kdialog --title \"" GAMENAME " ");
--		cmd << GetVersionString() << ": Select an IWAD to use\""
--					" --menu \"" GAMENAME " found more than one IWAD\n"
--					"Select from the list below to determine which one to use:\"";
--
--		for(i = 0; i < numwads; ++i)
--		{
--			const char *filepart = strrchr(wads[i].Path, '/');
--			if(filepart == NULL)
--				filepart = wads[i].Path;
--			else
--				filepart++;
--			// Menu entries are specified in "tag" "item" pairs, where when a
--			// particular item is selected (and the Okay button clicked), its
--			// corresponding tag is printed to stdout for identification.
--			cmd.AppendFormat(" \"%d\" \"%s (%s)\"", i, wads[i].Name.GetChars(), filepart);
--		}
--
--		if(defaultiwad >= 0 && defaultiwad < numwads)
--		{
--			const char *filepart = strrchr(wads[defaultiwad].Path, '/');
--			if(filepart == NULL)
--				filepart = wads[defaultiwad].Path;
--			else
--				filepart++;
--			cmd.AppendFormat(" --default \"%s (%s)\"", wads[defaultiwad].Name.GetChars(), filepart);
--		}
--
--		FILE *f = popen(cmd, "r");
--		if(f != NULL)
--		{
--			char gotstr[16];
--
--			if(fgets(gotstr, sizeof(gotstr), f) == NULL ||
--			   sscanf(gotstr, "%d", &i) != 1)
--				i = -1;
--
--			// Exit status = 1 means the selection was canceled (either by
--			// Cancel/Esc or the X button), not that there was an error running
--			// the program. In that case, nothing was printed so fgets will
--			// have failed. Other values can indicate an error running the app,
--			// so fall back to whatever else can be used.
--			int status = pclose(f);
--			if(WIFEXITED(status) && (WEXITSTATUS(status) == 0 || WEXITSTATUS(status) == 1))
--				return i;
--		}
--	}
--#endif
--
- #ifndef NO_GTK
- 	if (I_GtkAvailable())
- 	{

org.zdoom.GZDoom.appdata.xml

@@ -9,7 +9,7 @@
   <project_license>GPL-3.0</project_license>
 
   <developer_name>ZDoom team</developer_name>
-  <update_contact>gnome@kevindegeling.nl</update_contact>
+  <update_contact>eonfge@kevindegeling.nl</update_contact>
 
   <url type="homepage">https://zdoom.org/index</url>
   <url type="bugtracker">https://github.com/coelckers/gzdoom</url>
@@ -70,6 +70,11 @@
   </screenshots>
 
   <releases>
+    <release version="4.4.0" date="2020-06-07">
+      <description>
+        <p>Updated release package to GZDoom 4.4.0</p>
+      </description>
+    </release>
     <release version="4.3.3" date="2020-01-20">
       <description>
         <p>Updated release package to GZDoom 4.3.3</p>

org.zdoom.GZDoom.yaml

@@ -18,6 +18,9 @@ finish-args:
 - --env=DOOMWADDIR=/app/share/games/doom
 - --persist=.config/gzdoom
 
+# Simpler way of preventing KDE related errors
+- --env=KDE_FULL_SESSION=false
+
 cleanup:
 - /app/include
 - /app/lib/*.a
@@ -36,6 +39,20 @@ modules:
     url: https://github.com/FluidSynth/fluidsynth/archive/v1.1.11.tar.gz
     sha256: da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8
 
+
+# Music library behind zdoom
+- name: zmusic
+  buildsystem: cmake-ninja
+  config-opts:
+  - -DCMAKE_BUILD_TYPE=RelWithDebInfo
+  # Required for 19.08 using GCC C++ 9.2
+  # Required for ARM targets
+  - -DCMAKE_CXX_FLAGS=-lrt -ldl
+  sources:
+  - type: archive
+    url: https://github.com/coelckers/ZMusic/archive/1.1.0.tar.gz
+    sha256: 69255ddb62ecb238474bc57e3f761a593006a22eef90c4e786ef613d9a643b3a
+
 # This builds both the application code and
 # the custom game data
 - name: gzdoom
@@ -48,8 +65,8 @@ modules:
   sources:
   - type: git
     url: https://github.com/coelckers/gzdoom.git
-    tag: g4.3.3
+    tag: g4.4.0
-    commit: a3b0f214a4ee42bb6ada82286bad8471f7f59798
+    commit: e98ef83837860c33720e827707d2cc0b4647ace6
   - type: file
     url: https://github.com/coelckers/gzdoom/raw/g4.3.3/soundfont/gzdoom.sf2
     sha256: fca3e514b635a21789d4224e84865d2954a2a914d46b64aa8219ddb565c44869
@@ -57,8 +74,9 @@ modules:
   # 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: kde.patch
+    path: fixed-compilation-of-non-x86-targets.patch
   - type: shell
     commands:
     - install -Dm 644 gzdoom.sf2 /app/share/sounds/sf2/gzdoom.sf2