pool/gzdoom
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 0001-Revert-Switch-to-miniz-from-zlib.patch for dependency on implied assert.h and lzmasdk 23

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=107
This commit is contained in:
Jan Engelhardt 2024-04-30 21:49:13 +00:00 committed by Git OBS Bridge
parent 93a40355be
commit f76fa524cf
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
0001-Revert-Switch-to-miniz-from-zlib.patch
View File

@ -96,11 +96,12 @@ Index: gzdoom-g4.12.2/src/common/audio/music/i_music.cpp
===================================================================
--- gzdoom-g4.12.2.orig/src/common/audio/music/i_music.cpp
+++ gzdoom-g4.12.2/src/common/audio/music/i_music.cpp
@@ -37,7 +37,7 @@
@@ -37,7 +37,8 @@
#include <sys/wait.h>
#endif
-#include <miniz.h>
+#include <assert.h>
+#include <zlib.h>
#include <zmusic.h>
@ -109,11 +110,12 @@ Index: gzdoom-g4.12.2/src/common/engine/serializer.cpp
===================================================================
--- gzdoom-g4.12.2.orig/src/common/engine/serializer.cpp
+++ gzdoom-g4.12.2/src/common/engine/serializer.cpp
@@ -37,7 +37,7 @@
@@ -37,7 +37,8 @@
#define RAPIDJSON_HAS_CXX11_RANGE_FOR 1
#define RAPIDJSON_PARSE_DEFAULT_FLAGS kParseFullPrecisionFlag
-#include <miniz.h>
+#include <assert.h>
+#include <zlib.h>
#include "rapidjson/rapidjson.h"
#include "rapidjson/writer.h"
@ -122,11 +124,12 @@ Index: gzdoom-g4.12.2/src/common/filesystem/source/files_decompress.cpp
===================================================================
--- gzdoom-g4.12.2.orig/src/common/filesystem/source/files_decompress.cpp
+++ gzdoom-g4.12.2/src/common/filesystem/source/files_decompress.cpp
@@ -39,7 +39,7 @@
@@ -39,7 +39,8 @@
#include "Xz.h"
// CRC table needs to be generated prior to reading XZ compressed files.
#include "7zCrc.h"
-#include <miniz.h>
+#include <assert.h>
+#include <zlib.h>
#include <bzlib.h>
#include <algorithm>
@ -149,11 +152,12 @@ Index: gzdoom-g4.12.2/src/common/filesystem/source/resourcefile.cpp
===================================================================
--- gzdoom-g4.12.2.orig/src/common/filesystem/source/resourcefile.cpp
+++ gzdoom-g4.12.2/src/common/filesystem/source/resourcefile.cpp
@@ -35,7 +35,7 @@
@@ -35,7 +35,8 @@
*/
#include <algorithm>
-#include <miniz.h>
+#include <assert.h>
+#include <zlib.h>
#include "resourcefile.h"
#include "md5.hpp"
@ -193,11 +197,12 @@ Index: gzdoom-g4.12.2/src/common/platform/win32/i_crash.cpp
===================================================================
--- gzdoom-g4.12.2.orig/src/common/platform/win32/i_crash.cpp
+++ gzdoom-g4.12.2/src/common/platform/win32/i_crash.cpp
@@ -68,7 +68,7 @@
@@ -68,7 +68,8 @@
#include "i_mainwindow.h"
#include <time.h>
-#include <miniz.h>
+#include <assert.h>
+#include <zlib.h>
// MACROS ------------------------------------------------------------------
@ -206,11 +211,12 @@ Index: gzdoom-g4.12.2/src/common/textures/m_png.cpp
===================================================================
--- gzdoom-g4.12.2.orig/src/common/textures/m_png.cpp
+++ gzdoom-g4.12.2/src/common/textures/m_png.cpp
@@ -36,7 +36,7 @@
@@ -36,7 +36,8 @@
#include <algorithm>
#include <stdlib.h>
-#include <miniz.h>
+#include <assert.h>
+#include <zlib.h>
#include <stdint.h>
#ifdef _MSC_VER
@ -219,11 +225,12 @@ Index: gzdoom-g4.12.2/src/common/thirdparty/m_crc32.h
===================================================================
--- gzdoom-g4.12.2.orig/src/common/thirdparty/m_crc32.h
+++ gzdoom-g4.12.2/src/common/thirdparty/m_crc32.h
@@ -32,11 +32,12 @@
@@ -32,11 +32,13 @@
**
*/
#pragma once
-#include <miniz.h>
+#include <assert.h>
+#include <zlib.h>
#include <stdint.h>
@ -238,11 +245,12 @@ Index: gzdoom-g4.12.2/src/g_pch.h
===================================================================
--- gzdoom-g4.12.2.orig/src/g_pch.h
+++ gzdoom-g4.12.2/src/g_pch.h
@@ -10,7 +10,7 @@
@@ -10,7 +10,8 @@
#include <errno.h>
#include <ctype.h>
#include <stdint.h>
-#include <miniz.h>
+#include <assert.h>
+#include <zlib.h>
#include <new>
#include <algorithm>
@ -251,11 +259,12 @@ Index: gzdoom-g4.12.2/src/g_pch2.h
===================================================================
--- gzdoom-g4.12.2.orig/src/g_pch2.h
+++ gzdoom-g4.12.2/src/g_pch2.h
@@ -11,7 +11,7 @@
@@ -11,7 +11,8 @@
#include <errno.h>
#include <ctype.h>
#include <stdint.h>
-#include <miniz.h>
+#include <assert.h>
+#include <zlib.h>
#include <new>
#include <algorithm>
@ -264,11 +273,12 @@ Index: gzdoom-g4.12.2/src/maploader/glnodes.cpp
===================================================================
--- gzdoom-g4.12.2.orig/src/maploader/glnodes.cpp
+++ gzdoom-g4.12.2/src/maploader/glnodes.cpp
@@ -42,7 +42,7 @@
@@ -42,7 +42,8 @@
#endif
-#include <miniz.h>
+#include <assert.h>
+#include <zlib.h>
#include "m_argv.h"
@ -277,11 +287,12 @@ Index: gzdoom-g4.12.2/src/serializer_doom.cpp
===================================================================
--- gzdoom-g4.12.2.orig/src/serializer_doom.cpp
+++ gzdoom-g4.12.2/src/serializer_doom.cpp
@@ -38,7 +38,7 @@
@@ -38,7 +38,8 @@
#define RAPIDJSON_HAS_CXX11_RANGE_FOR 1
#define RAPIDJSON_PARSE_DEFAULT_FLAGS kParseFullPrecisionFlag
-#include <miniz.h>
+#include <assert.h>
+#include <zlib.h>
#include "rapidjson/rapidjson.h"
#include "rapidjson/writer.h"
@ -306,12 +317,13 @@ Index: gzdoom-g4.12.2/tools/zipdir/zipdir.c
===================================================================
--- gzdoom-g4.12.2.orig/tools/zipdir/zipdir.c
+++ gzdoom-g4.12.2/tools/zipdir/zipdir.c
@@ -46,7 +46,7 @@
@@ -46,7 +46,8 @@
#include <errno.h>
#include <stdlib.h>
#include <time.h>
-#include <miniz.h>
+#include "zlib.h"
+#include <assert.h>
+#include <zlib.h>
#include "bzlib.h"
#include "LzmaEnc.h"
#include "7zVersion.h"

2
gzdoom.spec
View File

@ -41,7 +41,7 @@ BuildRequires: pkg-config
BuildRequires: unzip
BuildRequires: zmusic-devel
BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(clzma) >= 17.01
BuildRequires: pkgconfig(clzma) >= 23.01
BuildRequires: pkgconfig(flac)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(gtk+-3.0)