diff --git a/0001-Revert-Switch-to-miniz-from-zlib.patch b/0001-Revert-Switch-to-miniz-from-zlib.patch index 5d37499..a285f6a 100644 --- a/0001-Revert-Switch-to-miniz-from-zlib.patch +++ b/0001-Revert-Switch-to-miniz-from-zlib.patch @@ -7,37 +7,37 @@ This reverts commit ba9ce0e83f6e25e3ddef5000bd51d53f2e3947a2. --- CMakeLists.txt | 13 ++++++++++++- src/CMakeLists.txt | 4 ++-- - src/common/audio/music/i_music.cpp | 2 +- - src/common/engine/serializer.cpp | 2 +- - src/common/filesystem/source/files_decompress.cpp | 2 +- - src/common/filesystem/source/filesystem.cpp | 2 +- - src/common/filesystem/source/resourcefile.cpp | 2 +- + src/common/audio/music/i_music.cpp | 3 ++- + src/common/engine/serializer.cpp | 3 ++- + src/common/filesystem/source/files_decompress.cpp | 3 ++- + src/common/filesystem/source/filesystem.cpp | 3 ++- + src/common/filesystem/source/resourcefile.cpp | 3 ++- src/common/models/model.cpp | 13 +++++++++++-- - src/common/platform/win32/i_crash.cpp | 2 +- - src/common/textures/m_png.cpp | 2 +- - src/common/thirdparty/m_crc32.h | 5 +++-- - src/g_pch.h | 2 +- - src/g_pch2.h | 2 +- - src/maploader/glnodes.cpp | 2 +- - src/serializer_doom.cpp | 2 +- + src/common/platform/win32/i_crash.cpp | 3 ++- + src/common/textures/m_png.cpp | 3 ++- + src/common/thirdparty/m_crc32.h | 6 ++++-- + src/g_pch.h | 3 ++- + src/g_pch2.h | 3 ++- + src/maploader/glnodes.cpp | 3 ++- + src/serializer_doom.cpp | 3 ++- tools/zipdir/CMakeLists.txt | 4 ++-- - tools/zipdir/zipdir.c | 2 +- + tools/zipdir/zipdir.c | 3 ++- vcpkg.json | 4 ++++ - 18 files changed, 46 insertions(+), 21 deletions(-) + 18 files changed, 59 insertions(+), 21 deletions(-) -Index: gzdoom-g4.11.3/CMakeLists.txt +Index: gzdoom-g4.12.2/CMakeLists.txt =================================================================== ---- gzdoom-g4.11.3.orig/CMakeLists.txt -+++ gzdoom-g4.11.3/CMakeLists.txt -@@ -216,6 +216,7 @@ option( NO_OPENAL "Disable OpenAL sound +--- gzdoom-g4.12.2.orig/CMakeLists.txt ++++ gzdoom-g4.12.2/CMakeLists.txt +@@ -215,6 +215,7 @@ option( NO_OPENAL "Disable OpenAL sound find_package( BZip2 ) find_package( VPX ) +find_package( ZLIB ) - find_package( WebP ) - if (NOT WebP_FOUND) - include(FindPkgConfig) -@@ -347,6 +348,7 @@ set( CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE + + include( TargetArch ) + +@@ -332,6 +333,7 @@ set( CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${REL_C_FLAGS}" ) set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${DEB_C_FLAGS} -D_DEBUG" ) @@ -45,7 +45,7 @@ Index: gzdoom-g4.11.3/CMakeLists.txt option(FORCE_INTERNAL_BZIP2 "Use internal bzip2") option(FORCE_INTERNAL_ASMJIT "Use internal asmjit" ON) mark_as_advanced( FORCE_INTERNAL_ASMJIT ) -@@ -360,6 +362,16 @@ set( DRPC_INCLUDE_DIR "-I/ignore" ) +@@ -348,6 +350,16 @@ set( DRPC_INCLUDE_DIR "-I/ignore" ) set( DRPC_LIBRARIES -ldiscord-rpc ) set( DRPC_LIBRARY -ldiscord-rpc ) @@ -62,19 +62,19 @@ Index: gzdoom-g4.11.3/CMakeLists.txt if( HAVE_VM_JIT AND UNIX ) check_symbol_exists( "backtrace" "execinfo.h" HAVE_BACKTRACE ) if( NOT HAVE_BACKTRACE ) -@@ -417,7 +429,6 @@ install(DIRECTORY docs/ - +@@ -406,7 +418,6 @@ install(DIRECTORY docs/ option( DYN_OPENAL "Dynamically load OpenAL" ON ) + add_subdirectory( libraries/lzma ) -add_subdirectory( libraries/miniz ) add_subdirectory( tools ) add_subdirectory( wadsrc ) add_subdirectory( wadsrc_bm ) -Index: gzdoom-g4.11.3/src/CMakeLists.txt +Index: gzdoom-g4.12.2/src/CMakeLists.txt =================================================================== ---- gzdoom-g4.11.3.orig/src/CMakeLists.txt -+++ gzdoom-g4.11.3/src/CMakeLists.txt -@@ -344,7 +344,7 @@ add_custom_target( revision_check ALL +--- gzdoom-g4.12.2.orig/src/CMakeLists.txt ++++ gzdoom-g4.12.2/src/CMakeLists.txt +@@ -319,7 +319,7 @@ add_custom_target( revision_check ALL # required libraries @@ -83,84 +83,89 @@ Index: gzdoom-g4.11.3/src/CMakeLists.txt if (HAVE_VULKAN) list( APPEND PROJECT_LIBRARIES "zvulkan" ) endif() -@@ -412,7 +412,7 @@ if (TARGET WebP::webp) - endif() +@@ -383,7 +383,7 @@ else() + message( SEND_ERROR "Could not find libvpx" ) endif() --include_directories( SYSTEM "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}") -+include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}") +-include_directories( SYSTEM "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}") ++include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}") if( ${HAVE_VM_JIT} ) add_definitions( -DHAVE_VM_JIT ) -Index: gzdoom-g4.11.3/src/common/audio/music/i_music.cpp +Index: gzdoom-g4.12.2/src/common/audio/music/i_music.cpp =================================================================== ---- gzdoom-g4.11.3.orig/src/common/audio/music/i_music.cpp -+++ gzdoom-g4.11.3/src/common/audio/music/i_music.cpp -@@ -37,7 +37,7 @@ +--- 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,8 @@ #include #endif -#include ++#include +#include #include #include "filesystem.h" -Index: gzdoom-g4.11.3/src/common/engine/serializer.cpp +Index: gzdoom-g4.12.2/src/common/engine/serializer.cpp =================================================================== ---- gzdoom-g4.11.3.orig/src/common/engine/serializer.cpp -+++ gzdoom-g4.11.3/src/common/engine/serializer.cpp -@@ -38,7 +38,7 @@ +--- gzdoom-g4.12.2.orig/src/common/engine/serializer.cpp ++++ gzdoom-g4.12.2/src/common/engine/serializer.cpp +@@ -37,7 +37,8 @@ #define RAPIDJSON_HAS_CXX11_RANGE_FOR 1 #define RAPIDJSON_PARSE_DEFAULT_FLAGS kParseFullPrecisionFlag -#include ++#include +#include #include "rapidjson/rapidjson.h" #include "rapidjson/writer.h" #include "rapidjson/prettywriter.h" -Index: gzdoom-g4.11.3/src/common/filesystem/source/files_decompress.cpp +Index: gzdoom-g4.12.2/src/common/filesystem/source/files_decompress.cpp =================================================================== ---- gzdoom-g4.11.3.orig/src/common/filesystem/source/files_decompress.cpp -+++ gzdoom-g4.11.3/src/common/filesystem/source/files_decompress.cpp -@@ -36,7 +36,7 @@ - // Caution: LzmaDec also pulls in windows.h! - #define NOMINMAX - #include "LzmaDec.h" +--- 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,8 @@ + #include "Xz.h" + // CRC table needs to be generated prior to reading XZ compressed files. + #include "7zCrc.h" -#include ++#include +#include #include #include #include -Index: gzdoom-g4.11.3/src/common/filesystem/source/filesystem.cpp +Index: gzdoom-g4.12.2/src/common/filesystem/source/filesystem.cpp =================================================================== ---- gzdoom-g4.11.3.orig/src/common/filesystem/source/filesystem.cpp -+++ gzdoom-g4.11.3/src/common/filesystem/source/filesystem.cpp -@@ -36,7 +36,7 @@ +--- gzdoom-g4.12.2.orig/src/common/filesystem/source/filesystem.cpp ++++ gzdoom-g4.12.2/src/common/filesystem/source/filesystem.cpp +@@ -36,7 +36,8 @@ // HEADER FILES ------------------------------------------------------------ -#include ++#include +#include #include #include #include -Index: gzdoom-g4.11.3/src/common/filesystem/source/resourcefile.cpp +Index: gzdoom-g4.12.2/src/common/filesystem/source/resourcefile.cpp =================================================================== ---- gzdoom-g4.11.3.orig/src/common/filesystem/source/resourcefile.cpp -+++ gzdoom-g4.11.3/src/common/filesystem/source/resourcefile.cpp -@@ -34,7 +34,7 @@ - ** +--- gzdoom-g4.12.2.orig/src/common/filesystem/source/resourcefile.cpp ++++ gzdoom-g4.12.2/src/common/filesystem/source/resourcefile.cpp +@@ -35,7 +35,8 @@ */ + #include -#include ++#include +#include - #include "resourcefile_internal.h" + #include "resourcefile.h" #include "md5.hpp" #include "fs_stringpool.h" -Index: gzdoom-g4.11.3/src/common/models/model.cpp +Index: gzdoom-g4.12.2/src/common/models/model.cpp =================================================================== ---- gzdoom-g4.11.3.orig/src/common/models/model.cpp -+++ gzdoom-g4.11.3/src/common/models/model.cpp +--- gzdoom-g4.12.2.orig/src/common/models/model.cpp ++++ gzdoom-g4.12.2/src/common/models/model.cpp @@ -25,7 +25,6 @@ ** General model handling code ** @@ -169,7 +174,7 @@ Index: gzdoom-g4.11.3/src/common/models/model.cpp #include "filesystem.h" #include "cmdlib.h" -@@ -133,7 +132,17 @@ FTextureID LoadSkin(const char * path, c +@@ -132,7 +131,17 @@ FTextureID LoadSkin(const char * path, c int ModelFrameHash(FSpriteModelFrame * smf) { @@ -188,41 +193,44 @@ Index: gzdoom-g4.11.3/src/common/models/model.cpp } //=========================================================================== -Index: gzdoom-g4.11.3/src/common/platform/win32/i_crash.cpp +Index: gzdoom-g4.12.2/src/common/platform/win32/i_crash.cpp =================================================================== ---- gzdoom-g4.11.3.orig/src/common/platform/win32/i_crash.cpp -+++ gzdoom-g4.11.3/src/common/platform/win32/i_crash.cpp -@@ -68,7 +68,7 @@ +--- 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,8 @@ #include "i_mainwindow.h" #include -#include ++#include +#include // MACROS ------------------------------------------------------------------ -Index: gzdoom-g4.11.3/src/common/textures/m_png.cpp +Index: gzdoom-g4.12.2/src/common/textures/m_png.cpp =================================================================== ---- gzdoom-g4.11.3.orig/src/common/textures/m_png.cpp -+++ gzdoom-g4.11.3/src/common/textures/m_png.cpp -@@ -36,7 +36,7 @@ +--- gzdoom-g4.12.2.orig/src/common/textures/m_png.cpp ++++ gzdoom-g4.12.2/src/common/textures/m_png.cpp +@@ -36,7 +36,8 @@ #include #include -#include ++#include +#include #include #ifdef _MSC_VER #include // for alloca() -Index: gzdoom-g4.11.3/src/common/thirdparty/m_crc32.h +Index: gzdoom-g4.12.2/src/common/thirdparty/m_crc32.h =================================================================== ---- gzdoom-g4.11.3.orig/src/common/thirdparty/m_crc32.h -+++ gzdoom-g4.11.3/src/common/thirdparty/m_crc32.h -@@ -32,11 +32,12 @@ +--- gzdoom-g4.12.2.orig/src/common/thirdparty/m_crc32.h ++++ gzdoom-g4.12.2/src/common/thirdparty/m_crc32.h +@@ -32,11 +32,13 @@ ** */ #pragma once -#include ++#include +#include #include @@ -233,91 +241,96 @@ Index: gzdoom-g4.11.3/src/common/thirdparty/m_crc32.h inline uint32_t CalcCRC32 (const uint8_t *buf, unsigned int len) { return crc32 (0, buf, len); -Index: gzdoom-g4.11.3/src/g_pch.h +Index: gzdoom-g4.12.2/src/g_pch.h =================================================================== ---- gzdoom-g4.11.3.orig/src/g_pch.h -+++ gzdoom-g4.11.3/src/g_pch.h -@@ -10,7 +10,7 @@ +--- gzdoom-g4.12.2.orig/src/g_pch.h ++++ gzdoom-g4.12.2/src/g_pch.h +@@ -10,7 +10,8 @@ #include #include #include -#include ++#include +#include #include #include #include -Index: gzdoom-g4.11.3/src/g_pch2.h +Index: gzdoom-g4.12.2/src/g_pch2.h =================================================================== ---- gzdoom-g4.11.3.orig/src/g_pch2.h -+++ gzdoom-g4.11.3/src/g_pch2.h -@@ -11,7 +11,7 @@ +--- gzdoom-g4.12.2.orig/src/g_pch2.h ++++ gzdoom-g4.12.2/src/g_pch2.h +@@ -11,7 +11,8 @@ #include #include #include -#include ++#include +#include #include #include #include -Index: gzdoom-g4.11.3/src/maploader/glnodes.cpp +Index: gzdoom-g4.12.2/src/maploader/glnodes.cpp =================================================================== ---- gzdoom-g4.11.3.orig/src/maploader/glnodes.cpp -+++ gzdoom-g4.11.3/src/maploader/glnodes.cpp -@@ -42,7 +42,7 @@ +--- gzdoom-g4.12.2.orig/src/maploader/glnodes.cpp ++++ gzdoom-g4.12.2/src/maploader/glnodes.cpp +@@ -42,7 +42,8 @@ #endif -#include ++#include +#include #include "m_argv.h" #include "c_dispatch.h" -Index: gzdoom-g4.11.3/src/serializer_doom.cpp +Index: gzdoom-g4.12.2/src/serializer_doom.cpp =================================================================== ---- gzdoom-g4.11.3.orig/src/serializer_doom.cpp -+++ gzdoom-g4.11.3/src/serializer_doom.cpp -@@ -38,7 +38,7 @@ +--- gzdoom-g4.12.2.orig/src/serializer_doom.cpp ++++ gzdoom-g4.12.2/src/serializer_doom.cpp +@@ -38,7 +38,8 @@ #define RAPIDJSON_HAS_CXX11_RANGE_FOR 1 #define RAPIDJSON_PARSE_DEFAULT_FLAGS kParseFullPrecisionFlag -#include ++#include +#include #include "rapidjson/rapidjson.h" #include "rapidjson/writer.h" #include "rapidjson/prettywriter.h" -Index: gzdoom-g4.11.3/tools/zipdir/CMakeLists.txt +Index: gzdoom-g4.12.2/tools/zipdir/CMakeLists.txt =================================================================== ---- gzdoom-g4.11.3.orig/tools/zipdir/CMakeLists.txt -+++ gzdoom-g4.11.3/tools/zipdir/CMakeLists.txt +--- gzdoom-g4.12.2.orig/tools/zipdir/CMakeLists.txt ++++ gzdoom-g4.12.2/tools/zipdir/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required( VERSION 3.16 ) if( NOT CMAKE_CROSSCOMPILING ) -- include_directories( SYSTEM "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" ) -+ include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" ) +- include_directories( SYSTEM "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) ++ include_directories( SYSTEM "${ZLIB_INCLUDE_DIR} ${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) add_executable( zipdir zipdir.c ) -- target_link_libraries( zipdir miniz ${BZIP2_LIBRARIES} ${LZMA_LDFLAGS} ) -+ target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${LZMA_LDFLAGS} ) +- target_link_libraries( zipdir miniz ${BZIP2_LIBRARIES} lzma ) ++ target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} lzma ) set( CROSS_EXPORTS ${CROSS_EXPORTS} zipdir PARENT_SCOPE ) endif() -Index: gzdoom-g4.11.3/tools/zipdir/zipdir.c +Index: gzdoom-g4.12.2/tools/zipdir/zipdir.c =================================================================== ---- gzdoom-g4.11.3.orig/tools/zipdir/zipdir.c -+++ gzdoom-g4.11.3/tools/zipdir/zipdir.c -@@ -46,7 +46,7 @@ +--- gzdoom-g4.12.2.orig/tools/zipdir/zipdir.c ++++ gzdoom-g4.12.2/tools/zipdir/zipdir.c +@@ -46,7 +46,8 @@ #include #include #include -#include -+#include "zlib.h" ++#include ++#include #include "bzlib.h" #include "LzmaEnc.h" #include "7zVersion.h" -Index: gzdoom-g4.11.3/vcpkg.json +Index: gzdoom-g4.12.2/vcpkg.json =================================================================== ---- gzdoom-g4.11.3.orig/vcpkg.json -+++ gzdoom-g4.11.3/vcpkg.json +--- gzdoom-g4.12.2.orig/vcpkg.json ++++ gzdoom-g4.12.2/vcpkg.json @@ -28,6 +28,10 @@ }, "dependencies": [ @@ -327,5 +340,5 @@ Index: gzdoom-g4.11.3/vcpkg.json + }, + { "name": "bzip2", - "platform": "!windows | (windows & static & staticcrt)" + "platform": "(!windows & static) | (windows & static & staticcrt)" }, diff --git a/g4.11.3.tar.gz b/g4.11.3.tar.gz deleted file mode 100644 index 7fa4ae2..0000000 --- a/g4.11.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5943dba50da20ff94f1fcc415132672d42a15917c571b1c2b7ceefe14935f5d5 -size 24354699 diff --git a/g4.12.2.tar.gz b/g4.12.2.tar.gz new file mode 100644 index 0000000..d672f57 --- /dev/null +++ b/g4.12.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:864c5a1ec976dd6068f9cd93f92c5404c662824996101f1411ddb25a54afc732 +size 25910359 diff --git a/gzdoom-discord.patch b/gzdoom-discord.patch index 548285b..5fd1856 100644 --- a/gzdoom-discord.patch +++ b/gzdoom-discord.patch @@ -7,12 +7,12 @@ Unbundle discord-rpc. libraries/discordrpc/src/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -Index: gzdoom-g4.11.3/CMakeLists.txt +Index: gzdoom-g4.12.2/CMakeLists.txt =================================================================== ---- gzdoom-g4.11.3.orig/CMakeLists.txt -+++ gzdoom-g4.11.3/CMakeLists.txt -@@ -356,9 +356,9 @@ if (HAVE_VULKAN) - endif() +--- gzdoom-g4.12.2.orig/CMakeLists.txt ++++ gzdoom-g4.12.2/CMakeLists.txt +@@ -345,9 +345,9 @@ add_subdirectory( libraries/ZWidget ) + add_subdirectory( libraries/webp ) add_subdirectory( libraries/discordrpc EXCLUDE_FROM_ALL ) -set( DRPC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/discordrpc/include" ) @@ -24,10 +24,10 @@ Index: gzdoom-g4.11.3/CMakeLists.txt if( HAVE_VM_JIT AND UNIX ) check_symbol_exists( "backtrace" "execinfo.h" HAVE_BACKTRACE ) -Index: gzdoom-g4.11.3/libraries/discordrpc/src/CMakeLists.txt +Index: gzdoom-g4.12.2/libraries/discordrpc/src/CMakeLists.txt =================================================================== ---- gzdoom-g4.11.3.orig/libraries/discordrpc/src/CMakeLists.txt -+++ gzdoom-g4.11.3/libraries/discordrpc/src/CMakeLists.txt +--- gzdoom-g4.12.2.orig/libraries/discordrpc/src/CMakeLists.txt ++++ gzdoom-g4.12.2/libraries/discordrpc/src/CMakeLists.txt @@ -28,7 +28,7 @@ endif(${BUILD_SHARED_LIBS}) if(WIN32) add_definitions(-DDISCORD_WINDOWS) diff --git a/gzdoom-lzma-simd.patch b/gzdoom-lzma-simd.patch new file mode 100644 index 0000000..f35e997 --- /dev/null +++ b/gzdoom-lzma-simd.patch @@ -0,0 +1,25 @@ +From: Jan Engelhardt +Date: 2024-05-01 00:14:04.625759204 +0200 +Subject: Fix build failures involving SIMD code + +Fix build failure on Leap 15.6/gcc-7 amd64: +[ 31s] C/SwapBytes.c:312:7: error: incompatible types when initializing type +'__m256i {aka const __vector(4) long long int}' using type 'int' + +--- + libraries/lzma/C/SwapBytes.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: gzdoom-g4.12.2/libraries/lzma/C/SwapBytes.c +=================================================================== +--- gzdoom-g4.12.2.orig/libraries/lzma/C/SwapBytes.c ++++ gzdoom-g4.12.2/libraries/lzma/C/SwapBytes.c +@@ -22,7 +22,7 @@ typedef UInt32 CSwapUInt32; + // #if defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1900) + #if defined(__clang__) && (__clang_major__ >= 4) \ + || defined(Z7_GCC_VERSION) && (Z7_GCC_VERSION >= 40701) +- #define k_SwapBytes_Mode_MAX k_SwapBytes_Mode_AVX2 ++ #define k_SwapBytes_Mode_MAX k_SwapBytes_Mode_SSE2 + #define SWAP_ATTRIB_SSE2 __attribute__((__target__("sse2"))) + #define SWAP_ATTRIB_SSSE3 __attribute__((__target__("ssse3"))) + #define SWAP_ATTRIB_AVX2 __attribute__((__target__("avx2"))) diff --git a/gzdoom-lzma.patch b/gzdoom-lzma.patch index fa37428..fc11195 100644 --- a/gzdoom-lzma.patch +++ b/gzdoom-lzma.patch @@ -9,10 +9,10 @@ Use LZMA system libraries instead of bundled code. tools/zipdir/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) -Index: gzdoom-g4.11.0/CMakeLists.txt +Index: gzdoom-g4.12.2/CMakeLists.txt =================================================================== ---- gzdoom-g4.11.0.orig/CMakeLists.txt -+++ gzdoom-g4.11.0/CMakeLists.txt +--- gzdoom-g4.12.2.orig/CMakeLists.txt ++++ gzdoom-g4.12.2/CMakeLists.txt @@ -50,6 +50,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) @@ -21,7 +21,7 @@ Index: gzdoom-g4.11.0/CMakeLists.txt # Support cross compiling option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO ) -@@ -396,7 +397,7 @@ else() +@@ -397,7 +398,7 @@ else() set( BZIP2_LIBRARY bz2 ) endif() @@ -30,28 +30,28 @@ Index: gzdoom-g4.11.0/CMakeLists.txt if( NOT CMAKE_CROSSCOMPILING ) if( NOT CROSS_EXPORTS ) -@@ -416,7 +417,6 @@ install(DIRECTORY docs/ +@@ -417,7 +418,6 @@ install(DIRECTORY docs/ option( DYN_OPENAL "Dynamically load OpenAL" ON ) -add_subdirectory( libraries/lzma ) - add_subdirectory( libraries/miniz ) add_subdirectory( tools ) add_subdirectory( wadsrc ) -Index: gzdoom-g4.11.0/src/CMakeLists.txt + add_subdirectory( wadsrc_bm ) +Index: gzdoom-g4.12.2/src/CMakeLists.txt =================================================================== ---- gzdoom-g4.11.0.orig/src/CMakeLists.txt -+++ gzdoom-g4.11.0/src/CMakeLists.txt -@@ -387,7 +387,7 @@ if (TARGET WebP::webp) - endif() +--- gzdoom-g4.12.2.orig/src/CMakeLists.txt ++++ gzdoom-g4.12.2/src/CMakeLists.txt +@@ -383,7 +383,7 @@ else() + message( SEND_ERROR "Could not find libvpx" ) endif() --include_directories( SYSTEM "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}") -+include_directories( SYSTEM "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}") +-include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}") ++include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}") if( ${HAVE_VM_JIT} ) add_definitions( -DHAVE_VM_JIT ) -@@ -1252,7 +1252,7 @@ if( UNIX ) +@@ -1267,7 +1267,7 @@ if( UNIX ) endif() endif() @@ -60,19 +60,19 @@ Index: gzdoom-g4.11.0/src/CMakeLists.txt include_directories( BEFORE -Index: gzdoom-g4.11.0/tools/zipdir/CMakeLists.txt +Index: gzdoom-g4.12.2/tools/zipdir/CMakeLists.txt =================================================================== ---- gzdoom-g4.11.0.orig/tools/zipdir/CMakeLists.txt -+++ gzdoom-g4.11.0/tools/zipdir/CMakeLists.txt +--- gzdoom-g4.12.2.orig/tools/zipdir/CMakeLists.txt ++++ gzdoom-g4.12.2/tools/zipdir/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required( VERSION 3.16 ) if( NOT CMAKE_CROSSCOMPILING ) -- include_directories( SYSTEM "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) -+ include_directories( SYSTEM "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" ) +- include_directories( SYSTEM "${ZLIB_INCLUDE_DIR} ${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) ++ include_directories( SYSTEM "${ZLIB_INCLUDE_DIR} ${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" ) add_executable( zipdir zipdir.c ) -- target_link_libraries( zipdir miniz ${BZIP2_LIBRARIES} lzma ) -+ target_link_libraries( zipdir miniz ${BZIP2_LIBRARIES} ${LZMA_LDFLAGS} ) +- target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} lzma ) ++ target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${LZMA_LDFLAGS} ) set( CROSS_EXPORTS ${CROSS_EXPORTS} zipdir PARENT_SCOPE ) endif() diff --git a/gzdoom.changes b/gzdoom.changes index 6e31743..9996c55 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Apr 30 10:40:25 UTC 2024 - Jan Engelhardt + +- Update to release 4.12.2 + * Set default backend to Vulkan, if Vulkan fails go GLES not OpenGL. + * Added a `mapinfo` console command. + * zscript: add `final` and `sealed` as class options. + * Always save a copy of the map in a savegame's metadata. + * Added wall texture skewing. + * Implemented dsda-doom's sector scrolling properties, added + UDMF wall scrolling properties from DSDA, added friction and + colormap related properties from DSDA, added DSDA's thrust + properties for UDMF, and added per-sector sky UDMF + properties. + * Allow defining zero gravity through MAPINFO + * Added rudimentary support for DSDA's COMPLVL lump. + * Added actor flag +BILLBOARDFACECAMERA. + * Added `sv_pistolstart` server flag. +- Add gzdoom-lzma-simd.patch + ------------------------------------------------------------------- Fri Oct 27 04:20:10 UTC 2023 - Jan Engelhardt diff --git a/gzdoom.spec b/gzdoom.spec index 9b93e84..68c05b0 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -1,7 +1,7 @@ # # spec file for package gzdoom # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gzdoom -Version: 4.11.3 +Version: 4.12.2 Release: 0 Summary: A DOOM source port with graphic and modding extensions License: GPL-3.0-only @@ -27,12 +27,13 @@ URL: https://zdoom.org/ #Git-Clone: https://github.com/zdoom/gzdoom Source: https://github.com/zdoom/gzdoom/archive/g%version.tar.gz Patch1: gzdoom-waddir.patch -Patch2: gzdoom-lzma.patch -Patch6: gzdoom-discord.patch -Patch8: 0001-removed-some-32bit-only-CMake-code.patch -Patch9: 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch -Patch10: 0001-Revert-Switch-to-miniz-from-zlib.patch -Patch11: more-32bit.patch +Patch2: gzdoom-discord.patch +Patch3: 0001-Revert-Switch-to-miniz-from-zlib.patch +Patch4: gzdoom-lzma-simd.patch +Patch5: gzdoom-lzma.patch +Patch6: 0001-removed-some-32bit-only-CMake-code.patch +Patch7: 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch +Patch8: more-32bit.patch BuildRequires: cmake >= 2.8.7 BuildRequires: discord-rpc-devel BuildRequires: gcc-c++ @@ -41,7 +42,6 @@ BuildRequires: pkg-config BuildRequires: unzip BuildRequires: zmusic-devel BuildRequires: pkgconfig(bzip2) -BuildRequires: pkgconfig(clzma) >= 17.01 BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(gtk+-3.0) @@ -50,14 +50,19 @@ BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(sdl2) >= 2.0.6 BuildRequires: pkgconfig(vpx) BuildRequires: pkgconfig(zlib) -Provides: bundled(glslang) = 11.10.0 -Provides: bundled(vulkan) = 1.2.189.1 -Suggests: freedoom +%if 0%{?suse_version} >= 1599 +BuildRequires: pkgconfig(clzma) >= 23.01 +%else +Provides: bundled(clzma) = 23.01 +%endif Provides: qzdoom = 1.3.0 Provides: zdoom = 2.8.1 Provides: bundled(gdtoa) +Provides: bundled(glslang) = 11.10.0 Provides: bundled(re2c) = 0.16.0 +Provides: bundled(vulkan) = 1.2.189.1 Provides: bundled(xbrz) = 1.8 +Suggests: freedoom %description GZDoom is a port (a modification) of the original Doom source code, featuring: @@ -69,10 +74,15 @@ GZDoom is a port (a modification) of the original Doom source code, featuring: ZScript, and various modding features regarding actors and scenery. * Demo record/playback of classic and Boom demos is not supported. -The executables hard-require SSE2 on i686 currently. +%ifarch %ix86 +SSE2 is a hard requirement even on 32-bit x86. +%endif %prep %autosetup -n %name-g%version -p1 +%if 0%{?suse_version} < 1599 +%patch -P 5 -R -p1 +%endif perl -i -pe 's{__DATE__}{"does not matter when"}g' src/common/platform/posix/sdl/i_main.cpp perl -i -pe 's{}{%version}g' tools/updaterevision/UpdateRevision.cmake