Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gzdoom for openSUSE:Factory checked in at 2022-07-05 13:49:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gzdoom" Tue Jul 5 13:49:13 2022 rev:23 rq:986807 version:4.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes 2022-06-24 08:46:03.959189949 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.1548/gzdoom.changes 2022-07-05 13:49:14.802048161 +0200 @@ -1,0 +2,18 @@ +Tue Jul 5 00:26:11 UTC 2022 - Jan Engelhardt <jeng...@inai.de> + +- 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 <jeng...@inai.de> + +- 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 + +------------------------------------------------------------------- Old: ---- 0001-Resolve-build-failure-on-i686-linux.patch g4.8.0.tar.gz New: ---- 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch g4.8.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gzdoom.spec ++++++ --- /var/tmp/diff_new_pack.u1Qrft/_old 2022-07-05 13:49:15.662049088 +0200 +++ /var/tmp/diff_new_pack.u1Qrft/_new 2022-07-05 13:49:15.666049092 +0200 @@ -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 @@ 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(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 @@ 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 @@ # 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="" \ ++++++ 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch ++++++ >From eb9bb8fb2fd0599199d8c94ece7e3bda642683ec Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <jeng...@inai.de> 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 ++++++ g4.8.0.tar.gz -> g4.8.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/gzdoom/g4.8.0.tar.gz /work/SRC/openSUSE:Factory/.gzdoom.new.1548/g4.8.2.tar.gz differ: char 13, line 1 ++++++ gzdoom-discord.patch ++++++ --- /var/tmp/diff_new_pack.u1Qrft/_old 2022-07-05 13:49:15.738049170 +0200 +++ /var/tmp/diff_new_pack.u1Qrft/_new 2022-07-05 13:49:15.742049174 +0200 @@ -3,19 +3,18 @@ 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 @@ 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) ++++++ gzdoom-vulkan.patch ++++++ --- /var/tmp/diff_new_pack.u1Qrft/_old 2022-07-05 13:49:15.766049200 +0200 +++ /var/tmp/diff_new_pack.u1Qrft/_new 2022-07-05 13:49:15.770049204 +0200 @@ -6,13 +6,13 @@ --- 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 @@ + 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 @@ 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 <ShaderLang.h> @@ -49,14 +49,4 @@ 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,