diff --git a/0001-Resolve-build-failure-on-i686-linux.patch b/0001-Resolve-build-failure-on-i686-linux.patch deleted file mode 100644 index 31a88f2..0000000 --- a/0001-Resolve-build-failure-on-i686-linux.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 984839295b4160a5859273399254225b9967c570 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Sat, 18 Jun 2022 22:28:20 +0200 -Subject: [PATCH] Resolve build failure on i686-linux - -gcc had to say: -gzdoom-g4.8.0/src/common/engine/stats.h:83:13: error: 'CPU' was not declared in this scope - 83 | if (CPU.bRDTSC) ---- - src/common/engine/stats.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/common/engine/stats.h b/src/common/engine/stats.h -index d6e976ea5..0794455d2 100644 ---- a/src/common/engine/stats.h -+++ b/src/common/engine/stats.h -@@ -35,6 +35,9 @@ - #define __STATS_H__ - - #include "zstring.h" -+#if defined __i386__ -+#include "x86.h" -+#endif - - #if !defined _WIN32 && !defined __APPLE__ - --- -2.36.1 - diff --git a/0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch b/0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch new file mode 100644 index 0000000..cbc635d --- /dev/null +++ b/0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch @@ -0,0 +1,26 @@ +From eb9bb8fb2fd0599199d8c94ece7e3bda642683ec Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Mon, 4 Jul 2022 10:52:17 +0200 +Subject: [PATCH] Revert "- use static_assert to make 32 bit builds fail." + +This reverts commit 8c244f6f850eeb5a5dede7f887f3f1ba87b3d8bc. +--- + src/common/engine/i_interface.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/common/engine/i_interface.cpp b/src/common/engine/i_interface.cpp +index 13d35a3a9..217f9212f 100644 +--- a/src/common/engine/i_interface.cpp ++++ b/src/common/engine/i_interface.cpp +@@ -1,8 +1,6 @@ + #include "i_interface.h" + #include "st_start.h" + +-static_assert(sizeof(void*) == 8, "32 builds are not supported"); +- + // Some global engine variables taken out of the backend code. + FStartupScreen* StartWindow; + SystemCallbacks sysCallbacks; +-- +2.36.1 + diff --git a/g4.8.0.tar.gz b/g4.8.0.tar.gz deleted file mode 100644 index 8ed1f7f..0000000 --- a/g4.8.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f749120e8151bf3b4a9ac6cc923820cf9559a123bf60298e8f83e70e4cffc245 -size 24121381 diff --git a/g4.8.2.tar.gz b/g4.8.2.tar.gz new file mode 100644 index 0000000..ea05dd3 --- /dev/null +++ b/g4.8.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4edd60f8094c9dc3dfb7400bdbc0ebb0a5e574b0a6747eee4c8d9f1f6af77127 +size 24247668 diff --git a/gzdoom-discord.patch b/gzdoom-discord.patch index eed886d..094e99a 100644 --- a/gzdoom-discord.patch +++ b/gzdoom-discord.patch @@ -3,19 +3,18 @@ Date: 2022-06-12 10:37:00.984596068 +0200 Unbundle discord-rpc. --- - CMakeLists.txt | 7 +++---- + CMakeLists.txt | 6 +++--- libraries/discordrpc/src/CMakeLists.txt | 2 +- - 2 files changed, 4 insertions(+), 5 deletions(-) + 2 files changed, 4 insertions(+), 4 deletions(-) -Index: gzdoom-g4.8.0/CMakeLists.txt +Index: gzdoom-g4.8.1/CMakeLists.txt =================================================================== ---- gzdoom-g4.8.0.orig/CMakeLists.txt -+++ gzdoom-g4.8.0/CMakeLists.txt -@@ -328,10 +328,9 @@ if (HAVE_VULKAN) - include_directories(/usr/include/glslang/Public /usr/include/SPIRV) +--- gzdoom-g4.8.1.orig/CMakeLists.txt ++++ gzdoom-g4.8.1/CMakeLists.txt +@@ -329,9 +329,9 @@ if (HAVE_VULKAN) endif() --add_subdirectory( libraries/discordrpc ) + add_subdirectory( libraries/discordrpc EXCLUDE_FROM_ALL ) -set( DRPC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/discordrpc/include" ) -set( DRPC_LIBRARIES discord-rpc ) -set( DRPC_LIBRARY discord-rpc ) @@ -25,10 +24,10 @@ Index: gzdoom-g4.8.0/CMakeLists.txt if( ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB ) message( STATUS "Using system zlib, includes found at ${ZLIB_INCLUDE_DIR}" ) -Index: gzdoom-g4.8.0/libraries/discordrpc/src/CMakeLists.txt +Index: gzdoom-g4.8.1/libraries/discordrpc/src/CMakeLists.txt =================================================================== ---- gzdoom-g4.8.0.orig/libraries/discordrpc/src/CMakeLists.txt -+++ gzdoom-g4.8.0/libraries/discordrpc/src/CMakeLists.txt +--- gzdoom-g4.8.1.orig/libraries/discordrpc/src/CMakeLists.txt ++++ gzdoom-g4.8.1/libraries/discordrpc/src/CMakeLists.txt @@ -28,7 +28,7 @@ endif(${BUILD_SHARED_LIBS}) if(WIN32) add_definitions(-DDISCORD_WINDOWS) diff --git a/gzdoom-vulkan.patch b/gzdoom-vulkan.patch index 17bdf23..1197331 100644 --- a/gzdoom-vulkan.patch +++ b/gzdoom-vulkan.patch @@ -6,13 +6,13 @@ Use Vulkan/glslang/spirv system libraries instead of bundled code. --- CMakeLists.txt | 4 +--- src/CMakeLists.txt | 2 +- - src/common/rendering/vulkan/system/vk_builders.cpp | 4 ++++ - 3 files changed, 6 insertions(+), 4 deletions(-) + src/common/rendering/vulkan/system/vk_builders.cpp | 1 + + 3 files changed, 3 insertions(+), 4 deletions(-) -Index: gzdoom-g4.8.0/CMakeLists.txt +Index: gzdoom-g4.8.1/CMakeLists.txt =================================================================== ---- gzdoom-g4.8.0.orig/CMakeLists.txt -+++ gzdoom-g4.8.0/CMakeLists.txt +--- gzdoom-g4.8.1.orig/CMakeLists.txt ++++ gzdoom-g4.8.1/CMakeLists.txt @@ -325,9 +325,7 @@ option(FORCE_INTERNAL_ASMJIT "Use intern mark_as_advanced( FORCE_INTERNAL_ASMJIT ) @@ -23,11 +23,11 @@ Index: gzdoom-g4.8.0/CMakeLists.txt + include_directories(/usr/include/glslang/Public /usr/include/SPIRV) endif() - add_subdirectory( libraries/discordrpc ) -Index: gzdoom-g4.8.0/src/CMakeLists.txt + add_subdirectory( libraries/discordrpc EXCLUDE_FROM_ALL ) +Index: gzdoom-g4.8.1/src/CMakeLists.txt =================================================================== ---- gzdoom-g4.8.0.orig/src/CMakeLists.txt -+++ gzdoom-g4.8.0/src/CMakeLists.txt +--- gzdoom-g4.8.1.orig/src/CMakeLists.txt ++++ gzdoom-g4.8.1/src/CMakeLists.txt @@ -368,7 +368,7 @@ add_custom_target( revision_check ALL set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${CMAKE_DL_LIBS}" "${DRPC_LIBRARIES}") @@ -37,10 +37,10 @@ Index: gzdoom-g4.8.0/src/CMakeLists.txt endif() # ZMUSIC -Index: gzdoom-g4.8.0/src/common/rendering/vulkan/system/vk_builders.cpp +Index: gzdoom-g4.8.1/src/common/rendering/vulkan/system/vk_builders.cpp =================================================================== ---- gzdoom-g4.8.0.orig/src/common/rendering/vulkan/system/vk_builders.cpp -+++ gzdoom-g4.8.0/src/common/rendering/vulkan/system/vk_builders.cpp +--- gzdoom-g4.8.1.orig/src/common/rendering/vulkan/system/vk_builders.cpp ++++ gzdoom-g4.8.1/src/common/rendering/vulkan/system/vk_builders.cpp @@ -25,6 +25,7 @@ #include "renderstyle.h" #include @@ -49,13 +49,3 @@ Index: gzdoom-g4.8.0/src/common/rendering/vulkan/system/vk_builders.cpp static const TBuiltInResource DefaultTBuiltInResource = { /* .MaxLights = */ 32, -@@ -119,6 +120,9 @@ static const TBuiltInResource DefaultTBu - /* .maxTaskWorkGroupSizeY_NV = */ 1, - /* .maxTaskWorkGroupSizeZ_NV = */ 1, - /* .maxMeshViewCountNV = */ 4, -+#if defined(GLSLANG_VERSION_MAJOR) && GLSLANG_VERSION_MAJOR >= 11 -+ /* .maxDualSourceDrawBuffersEXT = */ 4, -+#endif - - /* .limits = */ { - /* .nonInductiveForLoops = */ 1, diff --git a/gzdoom.changes b/gzdoom.changes index c01ab40..15fcfb5 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Jul 5 00:26:11 UTC 2022 - Jan Engelhardt + +- Update to release 4.8.2 + * add a few maps to the rebuildnodes compatibility block + +------------------------------------------------------------------- +Sun Jun 26 13:02:04 UTC 2022 - Jan Engelhardt + +- Update to release 4.8.1 + * Bugfix for software mode mirrors not working + * Feature: Add +ONLYVISIBLEINMIRRORS and +INVISIBLEINMIRRORS + actor flags. The former makes the actor only visible in + reflections, while the latter makes the actor not cast + reflections in mirrors. +- Drop 0001-Resolve-build-failure-on-i686-linux.patch (merged) +- Add 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch + ------------------------------------------------------------------- Thu Jun 23 21:42:38 UTC 2022 - Jan Engelhardt diff --git a/gzdoom.spec b/gzdoom.spec index 732d46c..0c442f7 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -17,7 +17,7 @@ Name: gzdoom -Version: 4.8.0 +Version: 4.8.2 Release: 0 Summary: A DOOM source port with graphic and modding extensions License: GPL-3.0-only @@ -32,8 +32,8 @@ Patch3: gzdoom-asmjit.patch Patch4: gzdoom-sdlbug.patch Patch5: gzdoom-vulkan.patch Patch6: gzdoom-discord.patch -Patch7: 0001-Resolve-build-failure-on-i686-linux.patch Patch8: 0001-Revert-load-the-hex-font-as-early-as-possible.patch +Patch9: 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch BuildRequires: cmake >= 2.8.7 BuildRequires: discord-rpc-devel BuildRequires: gcc-c++ @@ -50,7 +50,7 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(sdl2) >= 2.0.6 BuildRequires: pkgconfig(vpx) -BuildRequires: pkgconfig(vulkan) +BuildRequires: pkgconfig(vulkan) >= 1.2.162 BuildRequires: pkgconfig(zlib) Suggests: freedoom Provides: qzdoom = 1.3.0 @@ -72,6 +72,8 @@ 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. + %prep %autosetup -n %name-g%version -p1 perl -i -pe 's{__DATE__}{"does not matter when"}g' src/common/platform/posix/sdl/i_main.cpp @@ -86,12 +88,6 @@ touch extra_include/glslang/build_info.h # There is handcrafted assembler, which LTO does not play nice with. %define _lto_cflags %nil -%ifarch %ix86 -# Allow sw to use intrinsics (functions like _mm_set_sd). -# Guarded by cpuid calls by sw. -export CFLAGS="%optflags -msse -msse2" -export CXXFLAGS="%optflags -msse -msse2" -%endif export CXXFLAGS="$CXXFLAGS -I$PWD/extra_include" %cmake -DNO_STRIP=1 \ -DCMAKE_SHARED_LINKER_FLAGS="" \