commit gzdoom for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gzdoom for openSUSE:Factory checked in at 2024-07-02 18:16:43 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.18349 (New) Package is "gzdoom" Tue Jul 2 18:16:43 2024 rev:36 rq:1184209 version:4.12.2 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2024-05-27 12:02:36.800787278 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.18349/gzdoom.changes 2024-07-02 18:16:52.892367188 +0200 @@ -1,0 +2,5 @@ +Mon Jul 1 07:25:08 UTC 2024 - Jan Engelhardt + +- Resolve improper __DATE__ replacement [boo#1226829] + +--- Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.ZIhTpL/_old 2024-07-02 18:16:54.684432765 +0200 +++ /var/tmp/diff_new_pack.ZIhTpL/_new 2024-07-02 18:16:54.688432912 +0200 @@ -84,7 +84,7 @@ # osc/rpm always has the version identifier (only has an effect when snapshots are used via _service files) perl -i -pe "s{}{%version}g" tools/updaterevision/UpdateRevision.cmake # https://en.opensuse.org/openSUSE:Reproducible_Builds -perl -i -pe "s{__DATE__}{$SOURCE_DATE_EPOCH}g" src/common/platform/posix/sdl/i_main.cpp +perl -i -pe 's{__DATE__}{"'"$SOURCE_DATE_EPOCH"'"}g' src/common/platform/posix/sdl/i_main.cpp %build # Disable LTO, which does not like seeing handcrafted assembler
commit gzdoom for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gzdoom for openSUSE:Factory checked in at 2024-05-27 11:54:37 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.24587 (New) Package is "gzdoom" Mon May 27 11:54:37 2024 rev:35 rq:1176784 version:4.12.2 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2024-05-15 21:29:30.127901717 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.24587/gzdoom.changes 2024-05-27 12:02:36.800787278 +0200 @@ -1,0 +2,8 @@ +Fri May 17 22:04:47 UTC 2024 - Jan Engelhardt + +- Delete gzdoom-waddir.patch (substitute by logic in build recipe), + delete 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch + and 0001-removed-some-32bit-only-CMake-code.patch + (merged into more-32bit.patch) + +--- Old: 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch 0001-removed-some-32bit-only-CMake-code.patch gzdoom-waddir.patch BETA DEBUG BEGIN: Old:- Delete gzdoom-waddir.patch (substitute by logic in build recipe), delete 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch and 0001-removed-some-32bit-only-CMake-code.patch Old: delete 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch and 0001-removed-some-32bit-only-CMake-code.patch (merged into more-32bit.patch) Old: - Delete gzdoom-waddir.patch (substitute by logic in build recipe), delete 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch BETA DEBUG END: Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.3lvFqo/_old 2024-05-27 12:02:37.392809014 +0200 +++ /var/tmp/diff_new_pack.3lvFqo/_new 2024-05-27 12:02:37.392809014 +0200 @@ -26,13 +26,10 @@ #Git-Clone: https://github.com/zdoom/gzdoom Source: https://github.com/zdoom/gzdoom/archive/g%version.tar.gz -Patch1: gzdoom-waddir.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 @@ -81,16 +78,19 @@ %prep %autosetup -n %name-g%version -p1 %if 0%{?suse_version} < 1599 +# system lzma-sdk too old, use bundled copy %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 +# osc/rpm always has the version identifier (only has an effect when snapshots are used via _service files) +perl -i -pe "s{}{%version}g" tools/updaterevision/UpdateRevision.cmake +# https://en.opensuse.org/openSUSE:Reproducible_Builds +perl -i -pe "s{__DATE__}{$SOURCE_DATE_EPOCH}g" src/common/platform/posix/sdl/i_main.cpp %build -# There is handcrafted assembler, which LTO does not play nice with. +# Disable LTO, which does not like seeing handcrafted assembler %define _lto_cflags %nil -export CXXFLAGS="$CXXFLAGS -I$PWD/extra_include" +export CXXFLAGS="$CXXFLAGS -DSHARE_DIR=\\\"%_datadir/doom\\\"" %cmake -DNO_STRIP=1 \ -DCMAKE_SHARED_LINKER_FLAGS="" \ -DCMAKE_EXE_LINKER_FLAGS="" -DCMAKE_MODULE_LINKER_FLAGS="" \ ++ 0001-Revert-Switch-to-miniz-from-zlib.patch ++ --- /var/tmp/diff_new_pack.3lvFqo/_old 2024-05-27 12:02:37.412809748 +0200 +++ /var/tmp/diff_new_pack.3lvFqo/_new 2024-05-27 12:02:37.416809895 +0200 @@ -1,29 +1,33 @@ -From b0910739a3fe9ade92356f2ed510049ebbccbec9 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt +From: Jan Engelhardt Date: Fri, 27 Oct 2023 09:01:47 +0200 -Subject: [PATCH] Revert "Switch to miniz from zlib" -This reverts commit ba9ce0e83f6e25e3ddef5000bd51d53f2e3947a2. +Use system-provided zlib. Heed + +Heed +https://en.opensuse.org/openSUSE:Bundled_software_policy +https://docs.fedoraproject.org/en-US/fesco/Bundled_Software_policy/ + +(This reverts commit ba9ce0e83f6e25e3ddef5000bd51d53f2e3947a2.) + --- - CMakeLists.txt| 13 - + CMakeLists.txt|2 +- src/CMakeLists.txt|4 ++-- 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 ++-
commit gzdoom for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gzdoom for openSUSE:Factory checked in at 2024-05-15 21:29:07 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.1880 (New) Package is "gzdoom" Wed May 15 21:29:07 2024 rev:34 rq:1174235 version:4.12.2 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2024-05-03 10:29:07.875645844 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.1880/gzdoom.changes 2024-05-15 21:29:30.127901717 +0200 @@ -1,0 +2,5 @@ +Wed May 8 11:37:09 UTC 2024 - Jan Engelhardt + +- Update more-32bit.patch to fix i586/ILP32 FTBFS. + +--- Other differences: -- ++ more-32bit.patch ++ --- /var/tmp/diff_new_pack.jZC8ld/_old 2024-05-15 21:29:32.115973675 +0200 +++ /var/tmp/diff_new_pack.jZC8ld/_new 2024-05-15 21:29:32.119973820 +0200 @@ -8,15 +8,18 @@ 'VkSurfaceKHR' {aka 'long long unsigned int'} in initialization [ 88s] 294 | VkSurfaceKHR surfacehandle = nullptr; +static_assert for particle_t also failed, because it's 120 on ILP32. + --- src/common/platform/posix/sdl/sdlglvideo.cpp |2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/playsim/p_effect.h |7 +-- + 2 files changed, 6 insertions(+), 3 deletions(-) -Index: gzdoom-g4.11.3/src/common/platform/posix/sdl/sdlglvideo.cpp +Index: gzdoom-g4.12.2/src/common/platform/posix/sdl/sdlglvideo.cpp === gzdoom-g4.11.3.orig/src/common/platform/posix/sdl/sdlglvideo.cpp -+++ gzdoom-g4.11.3/src/common/platform/posix/sdl/sdlglvideo.cpp -@@ -291,7 +291,7 @@ DFrameBuffer *SDLVideo::CreateFrameBuffe +--- gzdoom-g4.12.2.orig/src/common/platform/posix/sdl/sdlglvideo.cpp gzdoom-g4.12.2/src/common/platform/posix/sdl/sdlglvideo.cpp +@@ -400,7 +400,7 @@ DFrameBuffer *SDLVideo::CreateFrameBuffe builder.RequireExtension(names[i]); auto instance = builder.Create(); @@ -25,4 +28,29 @@ if (!I_CreateVulkanSurface(instance->Instance, )) VulkanError("I_CreateVulkanSurface failed"); +Index: gzdoom-g4.12.2/src/playsim/p_effect.h +=== +--- gzdoom-g4.12.2.orig/src/playsim/p_effect.h gzdoom-g4.12.2/src/playsim/p_effect.h +@@ -70,7 +70,10 @@ enum EParticleFlags + class DVisualThinker; + struct particle_t + { +- subsector_t* subsector; //+8 = 8 ++ union { ++ subsector_t* subsector; ++ uint64_t _pad0; //+8 = 8 ++ }; + DVector3 Pos; //+24 = 32 + FVector3 Vel; //+12 = 44 + FVector3 Acc; //+12 = 56 +@@ -83,7 +86,7 @@ struct particle_t + float Roll, RollVel, RollAcc; //+12 = 100 + uint16_ttnext, snext, tprev; //+6 = 106 + uint16_t flags; //+2 = 108 +- // uint32_t padding; //+4 = 112 ++ uint32_t padding; //+4 = 112 + FStandaloneAnimation animData; //+16 = 128 + }; +
commit gzdoom for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gzdoom for openSUSE:Factory checked in at 2023-11-03 22:21:08 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.17445 (New) Package is "gzdoom" Fri Nov 3 22:21:08 2023 rev:32 rq:1123237 version:4.11.3 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2023-03-31 21:15:30.710381452 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.17445/gzdoom.changes 2023-11-03 22:21:54.787952168 +0100 @@ -1,0 +2,19 @@ +Fri Oct 27 04:20:10 UTC 2023 - Jan Engelhardt + +- Update to release 4.11.3 + * Several new languages: Danish, Norwegian, Swedish and Turkish. + * Cleanup of Doom's and Chex Quest's small font to use proper +character heights for international support. + * Extended all fonts to be capable of handling all European +languages which are in common use. + * DSDHacked support. + * WebP and QOI support for textures. + * Sanitized the light mode selection to make it a first class +mapping feature by separating map dependent light mode setup +from performance related user preferences for the default +setting. + * Lots of new ZScript features. +- Delete gzdoom-vulkan.patch, gcc13.diff +- Add more-32bit.patch, 0001-Revert-Switch-to-miniz-from-zlib.patch + +--- Old: g4.10.0.tar.gz gcc13.diff gzdoom-vulkan.patch New: 0001-Revert-Switch-to-miniz-from-zlib.patch g4.11.3.tar.gz more-32bit.patch BETA DEBUG BEGIN: Old: * Lots of new ZScript features. - Delete gzdoom-vulkan.patch, gcc13.diff - Add more-32bit.patch, 0001-Revert-Switch-to-miniz-from-zlib.patch Old: * Lots of new ZScript features. - Delete gzdoom-vulkan.patch, gcc13.diff - Add more-32bit.patch, 0001-Revert-Switch-to-miniz-from-zlib.patch BETA DEBUG END: BETA DEBUG BEGIN: New:- Delete gzdoom-vulkan.patch, gcc13.diff - Add more-32bit.patch, 0001-Revert-Switch-to-miniz-from-zlib.patch New:- Delete gzdoom-vulkan.patch, gcc13.diff - Add more-32bit.patch, 0001-Revert-Switch-to-miniz-from-zlib.patch BETA DEBUG END: Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.UZQVAG/_old 2023-11-03 22:21:55.487977919 +0100 +++ /var/tmp/diff_new_pack.UZQVAG/_new 2023-11-03 22:21:55.487977919 +0100 @@ -17,7 +17,7 @@ Name: gzdoom -Version:4.10.0 +Version:4.11.3 Release:0 Summary:A DOOM source port with graphic and modding extensions License:GPL-3.0-only @@ -28,11 +28,11 @@ Source: https://github.com/zdoom/gzdoom/archive/g%version.tar.gz Patch1: gzdoom-waddir.patch Patch2: gzdoom-lzma.patch -Patch5: gzdoom-vulkan.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:gcc13.diff +Patch10:0001-Revert-Switch-to-miniz-from-zlib.patch +Patch11:more-32bit.patch BuildRequires: cmake >= 2.8.7 BuildRequires: discord-rpc-devel BuildRequires: gcc-c++ @@ -45,17 +45,13 @@ BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(sdl2) >= 2.0.6 BuildRequires: pkgconfig(vpx) BuildRequires: pkgconfig(zlib) -%if 0%{?suse_version} >= 1550 -BuildRequires: glslang-devel >= 11.10 -BuildRequires: pkgconfig(vulkan) >= 1.2.189 -%else Provides: bundled(glslang) = 11.10.0 Provides: bundled(vulkan) = 1.2.189.1 -%endif Suggests: freedoom Provides: qzdoom = 1.3.0 Provides: zdoom = 2.8.1 @@ -79,12 +75,6 @@ %autosetup -n %name-g%version -p1 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 -mkdir -p extra_include/glslang -%if 0%{?suse_version} >= 1550 -rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan -%else -%patch -P 5 -R -p1 -%endif %build # There is handcrafted assembler, which LTO does not play nice with. ++ 0001-Revert-Switch-to-miniz-from-zlib.patch ++ >From b0910739a3fe9ade92356f2ed510049ebbccbec9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 27 Oct 2023 09:01:47 +0200 Subject: [PATCH] Revert "Switch to miniz from zlib" This reverts commit ba9ce0e83f6e25e3ddef5000bd51d53f2e3947a2. --- CMakeLists.txt| 13 - src/CMakeLists.txt|4 ++-- src/common/audio/music/i_music.cpp
commit gzdoom for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gzdoom for openSUSE:Factory checked in at 2023-03-31 21:15:28 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.31432 (New) Package is "gzdoom" Fri Mar 31 21:15:28 2023 rev:31 rq:1075701 version:4.10.0 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2023-02-08 17:20:31.626012062 +0100 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.31432/gzdoom.changes 2023-03-31 21:15:30.710381452 +0200 @@ -1,0 +2,5 @@ +Thu Mar 30 22:02:53 UTC 2023 - Jan Engelhardt + +- Add gcc13.diff + +--- New: gcc13.diff Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.qyI43O/_old 2023-03-31 21:15:31.594385560 +0200 +++ /var/tmp/diff_new_pack.qyI43O/_new 2023-03-31 21:15:31.606385616 +0200 @@ -32,6 +32,7 @@ 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:gcc13.diff BuildRequires: cmake >= 2.8.7 BuildRequires: discord-rpc-devel BuildRequires: gcc-c++ ++ gcc13.diff ++ From: Jan Engelhardt Date: 2023-03-30 23:52:45.534338531 +0200 Upstream: https://github.com/ZDoom/gzdoom/pull/2040 This is the g4.10.0 version of the change. diff --git a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h index fd4472286..db0b94f4e 100644 --- a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h +++ b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h @@ -104,6 +104,8 @@ Documentation of all members: vk_mem_alloc.h - [Source repository on GitHub](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator) */ +#include + #ifdef __cplusplus extern "C" { #endif
commit gzdoom for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gzdoom for openSUSE:Factory checked in at 2023-02-08 17:20:06 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.4462 (New) Package is "gzdoom" Wed Feb 8 17:20:06 2023 rev:30 rq:1063679 version:4.10.0 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2022-12-05 18:00:52.928477349 +0100 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.4462/gzdoom.changes 2023-02-08 17:20:31.626012062 +0100 @@ -1,0 +2,5 @@ +Tue Feb 7 18:44:20 UTC 2023 - Jan Engelhardt + +- Update gzdoom-vulkan.patch for glslang 12 + +--- Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.Ycbe6i/_old 2023-02-08 17:20:32.154014653 +0100 +++ /var/tmp/diff_new_pack.Ycbe6i/_new 2023-02-08 17:20:32.166014712 +0100 @@ -1,7 +1,7 @@ # # spec file for package gzdoom # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ gzdoom-vulkan.patch ++ --- /var/tmp/diff_new_pack.Ycbe6i/_old 2023-02-08 17:20:32.222014987 +0100 +++ /var/tmp/diff_new_pack.Ycbe6i/_new 2023-02-08 17:20:32.230015027 +0100 @@ -53,7 +53,7 @@ /* .maxTaskWorkGroupSizeY_NV = */ 1, /* .maxTaskWorkGroupSizeZ_NV = */ 1, /* .maxMeshViewCountNV = */ 4, -+#if GLSLANG_VERSION_MAJOR == 11 && GLSLANG_VERSION_MINOR >= 12 ++#if (GLSLANG_VERSION_MAJOR == 11 && GLSLANG_VERSION_MINOR >= 12) || GLSLANG_VERSION_MAJOR > 11 + 256, 256, 128, 128, 128, 128, 128, 128, 4, +#endif /* .maxDualSourceDrawBuffersEXT = */ 1,
commit gzdoom for openSUSE:Factory
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-12-05 18:00:50 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.1835 (New) Package is "gzdoom" Mon Dec 5 18:00:50 2022 rev:29 rq:1040019 version:4.10.0 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2022-11-07 13:51:41.723802879 +0100 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.1835/gzdoom.changes 2022-12-05 18:00:52.928477349 +0100 @@ -1,0 +2,9 @@ +Sun Dec 4 15:39:27 UTC 2022 - Jan Engelhardt + +- Update to release 4.10.0 + * Map and MapIterator for ZScript + * Quaternion support for model rotations + * Improved IQM support +- Delete 0001-build-unbreak-compilation-on-Linux.patch (merged) + +--- Old: 0001-build-unbreak-compilation-on-Linux.patch g4.9.0.tar.gz New: g4.10.0.tar.gz Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.p9Nj0u/_old 2022-12-05 18:00:53.768481923 +0100 +++ /var/tmp/diff_new_pack.p9Nj0u/_new 2022-12-05 18:00:53.776481967 +0100 @@ -17,18 +17,17 @@ Name: gzdoom -Version:4.9.0 +Version:4.10.0 Release:0 Summary:A DOOM source port with graphic and modding extensions License:GPL-3.0-only Group: Amusements/Games/3D/Shoot URL:https://zdoom.org/ -#Git-Clone: https://github.com/coelckers/gzdoom -Source: https://github.com/coelckers/gzdoom/archive/g%version.tar.gz +#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 -Patch3: 0001-build-unbreak-compilation-on-Linux.patch Patch5: gzdoom-vulkan.patch Patch6: gzdoom-discord.patch Patch8: 0001-removed-some-32bit-only-CMake-code.patch @@ -51,7 +50,7 @@ BuildRequires: pkgconfig(zlib) %if 0%{?suse_version} >= 1550 BuildRequires: glslang-devel >= 11.10 -BuildRequires: pkgconfig(vulkan) >= 1.2.162 +BuildRequires: pkgconfig(vulkan) >= 1.2.189 %else Provides: bundled(glslang) = 11.10.0 Provides: bundled(vulkan) = 1.2.189.1 @@ -61,7 +60,7 @@ Provides: zdoom = 2.8.1 Provides: bundled(gdtoa) Provides: bundled(re2c) = 0.16.0 -Provides: bundled(xbrz) = 1.7 +Provides: bundled(xbrz) = 1.8 %description GZDoom is a port (a modification) of the original Doom source code, featuring: ++ g4.9.0.tar.gz -> g4.10.0.tar.gz ++ /work/SRC/openSUSE:Factory/gzdoom/g4.9.0.tar.gz /work/SRC/openSUSE:Factory/.gzdoom.new.1835/g4.10.0.tar.gz differ: char 22, line 1
commit gzdoom for openSUSE:Factory
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-11-07 13:51:38 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.1597 (New) Package is "gzdoom" Mon Nov 7 13:51:38 2022 rev:28 rq:1033886 version:4.9.0 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2022-11-06 13:56:59.635417894 +0100 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.1597/gzdoom.changes 2022-11-07 13:51:41.723802879 +0100 @@ -1,0 +2,5 @@ +Sun Nov 6 23:02:58 UTC 2022 - Jan Engelhardt + +- Update description for the removal of SoftPoly + +--- Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.gEEA6P/_old 2022-11-07 13:51:42.371806521 +0100 +++ /var/tmp/diff_new_pack.gEEA6P/_new 2022-11-07 13:51:42.375806544 +0100 @@ -67,8 +67,6 @@ GZDoom is a port (a modification) of the original Doom source code, featuring: * an OpenGL renderer, HQnX/xBRZ rescaling, 3D floor and model support * Truecolor software rendering, extending the classic 8-bit palette -* a three-point projection software renderer, extending the classic - 2-point projection * Heretic, Hexen and Strife game modes and support for a lot of additional IWADs. * Boom and Hexen map extension support, scriptability with ACS and
commit gzdoom for openSUSE:Factory
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-11-06 13:56:57 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.2275 (New) Package is "gzdoom" Sun Nov 6 13:56:57 2022 rev:27 rq:1033845 version:4.9.0 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2022-10-25 11:20:40.766226016 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.2275/gzdoom.changes 2022-11-06 13:56:59.635417894 +0100 @@ -1,0 +2,12 @@ +Sat Nov 5 19:55:42 UTC 2022 - Jan Engelhardt + +- Update to release 4.9.0 + * IQM bone model support + * Textured particles + * The SoftPoly renderer was removed +- Delete gzdoom-sdlbug.patch (obsolete), + 0001-fix-gzdoom.pk3-not-found-error.patch (merged) +- Add 0001-build-unbreak-compilation-on-Linux.patch, + 0001-removed-some-32bit-only-CMake-code.patch + +--- Old: 0001-fix-gzdoom.pk3-not-found-error.patch g4.8.2.tar.gz gzdoom-sdlbug.patch New: 0001-build-unbreak-compilation-on-Linux.patch 0001-removed-some-32bit-only-CMake-code.patch g4.9.0.tar.gz Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.QXid0H/_old 2022-11-06 13:57:00.523423023 +0100 +++ /var/tmp/diff_new_pack.QXid0H/_new 2022-11-06 13:57:00.531423069 +0100 @@ -17,7 +17,7 @@ Name: gzdoom -Version:4.8.2 +Version:4.9.0 Release:0 Summary:A DOOM source port with graphic and modding extensions License:GPL-3.0-only @@ -28,10 +28,10 @@ Source: https://github.com/coelckers/gzdoom/archive/g%version.tar.gz Patch1: gzdoom-waddir.patch Patch2: gzdoom-lzma.patch -Patch4: gzdoom-sdlbug.patch +Patch3: 0001-build-unbreak-compilation-on-Linux.patch Patch5: gzdoom-vulkan.patch Patch6: gzdoom-discord.patch -Patch8: 0001-fix-gzdoom.pk3-not-found-error.patch +Patch8: 0001-removed-some-32bit-only-CMake-code.patch Patch9: 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch BuildRequires: cmake >= 2.8.7 BuildRequires: discord-rpc-devel ++ 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch ++ --- /var/tmp/diff_new_pack.QXid0H/_old 2022-11-06 13:57:00.551423185 +0100 +++ /var/tmp/diff_new_pack.QXid0H/_new 2022-11-06 13:57:00.551423185 +0100 @@ -5,23 +5,20 @@ This reverts commit 8c244f6f850eeb5a5dede7f887f3f1ba87b3d8bc. --- - src/common/engine/i_interface.cpp | 2 -- + 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" +Index: gzdoom-g4.9.0/src/common/engine/i_interface.cpp +=== +--- gzdoom-g4.9.0.orig/src/common/engine/i_interface.cpp gzdoom-g4.9.0/src/common/engine/i_interface.cpp +@@ -5,8 +5,6 @@ + #include "c_cvars.h" + #include "gstrings.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 - ++ 0001-build-unbreak-compilation-on-Linux.patch ++ >From 040fafaf7260b51031e20d850aa5358c0a7bd9a7 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 5 Nov 2022 22:30:07 +0100 Subject: [PATCH] build: unbreak compilation on Linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gzdoom/src/d_anonstats.cpp:14:10: fatal error: i_mainwindow.h: No such file or directory 14 | #include "i_mainwindow.h" | ^~~~ compilation terminated. make[2]: *** [src/CMakeFiles/zdoom.dir/build.make:1441: src/CMakeFiles/zdoom.dir/d_anonstats.cpp.o] Error 1 make[2]: *** Waiting for unfinished jobs make[1]: *** [CMakeFiles/Makefile2:959: src/CMakeFiles/zdoom.dir/all] Error 2 make: *** [Makefile:136: all] Error 2 gzdoom/src/d_anonstats.cpp:126:17: error: ???actor??? was not declared in this scope; did you mean ???AActor 126 | actor-> return false; // no host, disable | ^ | AActor $ find . -name "i_mainw*" ./src/common/platform/win32/i_mainwindow.h ./src/common/platform/win32/i_mainwindow.cpp Fixes: g4.5pre-1327-g6670bc09b Fixes: g4.9pre-359-g082818405 --- src/d_anonstats.cpp | 5 ++--- 1 file changed, 2
commit gzdoom for openSUSE:Factory
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-10-25 11:20:14 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.2275 (New) Package is "gzdoom" Tue Oct 25 11:20:14 2022 rev:26 rq:1030979 version:4.8.2 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2022-07-26 19:44:28.167387418 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.2275/gzdoom.changes 2022-10-25 11:20:40.766226016 +0200 @@ -1,0 +2,5 @@ +Mon Oct 24 23:24:06 UTC 2022 - Jan Engelhardt + +- Update gzdoom-vulkan.patch for glslang-11.12. + +--- Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.cF1nMa/_old 2022-10-25 11:20:41.354227319 +0200 +++ /var/tmp/diff_new_pack.cF1nMa/_new 2022-10-25 11:20:41.358227327 +0200 @@ -50,7 +50,7 @@ BuildRequires: pkgconfig(vpx) BuildRequires: pkgconfig(zlib) %if 0%{?suse_version} >= 1550 -BuildRequires: glslang-devel +BuildRequires: glslang-devel >= 11.10 BuildRequires: pkgconfig(vulkan) >= 1.2.162 %else Provides: bundled(glslang) = 11.10.0 ++ gzdoom-vulkan.patch ++ --- /var/tmp/diff_new_pack.cF1nMa/_old 2022-10-25 11:20:41.398227416 +0200 +++ /var/tmp/diff_new_pack.cF1nMa/_new 2022-10-25 11:20:41.406227435 +0200 @@ -6,13 +6,13 @@ --- CMakeLists.txt |4 +--- src/CMakeLists.txt |2 +- - src/common/rendering/vulkan/system/vk_builders.cpp |1 + - 3 files changed, 3 insertions(+), 4 deletions(-) + src/common/rendering/vulkan/system/vk_builders.cpp |4 + 3 files changed, 6 insertions(+), 4 deletions(-) -Index: gzdoom-g4.8.1/CMakeLists.txt +Index: gzdoom-g4.8.2/CMakeLists.txt === gzdoom-g4.8.1.orig/CMakeLists.txt -+++ gzdoom-g4.8.1/CMakeLists.txt +--- gzdoom-g4.8.2.orig/CMakeLists.txt gzdoom-g4.8.2/CMakeLists.txt @@ -325,9 +325,7 @@ option(FORCE_INTERNAL_ASMJIT "Use intern mark_as_advanced( FORCE_INTERNAL_ASMJIT ) @@ -24,10 +24,10 @@ endif() add_subdirectory( libraries/discordrpc EXCLUDE_FROM_ALL ) -Index: gzdoom-g4.8.1/src/CMakeLists.txt +Index: gzdoom-g4.8.2/src/CMakeLists.txt === gzdoom-g4.8.1.orig/src/CMakeLists.txt -+++ gzdoom-g4.8.1/src/CMakeLists.txt +--- gzdoom-g4.8.2.orig/src/CMakeLists.txt gzdoom-g4.8.2/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.1/src/common/rendering/vulkan/system/vk_builders.cpp +Index: gzdoom-g4.8.2/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 +--- gzdoom-g4.8.2.orig/src/common/rendering/vulkan/system/vk_builders.cpp gzdoom-g4.8.2/src/common/rendering/vulkan/system/vk_builders.cpp @@ -25,6 +25,7 @@ #include "renderstyle.h" #include @@ -49,4 +49,14 @@ static const TBuiltInResource DefaultTBuiltInResource = { /* .MaxLights = */ 32, +@@ -119,6 +120,9 @@ static const TBuiltInResource DefaultTBu + /* .maxTaskWorkGroupSizeY_NV = */ 1, + /* .maxTaskWorkGroupSizeZ_NV = */ 1, + /* .maxMeshViewCountNV = */ 4, ++#if GLSLANG_VERSION_MAJOR == 11 && GLSLANG_VERSION_MINOR >= 12 ++ 256, 256, 128, 128, 128, 128, 128, 128, 4, ++#endif + /* .maxDualSourceDrawBuffersEXT = */ 1, + + /* .limits = */ {
commit gzdoom for openSUSE:Factory
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-26 19:44:00 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.1533 (New) Package is "gzdoom" Tue Jul 26 19:44:00 2022 rev:25 rq:990870 version:4.8.2 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2022-07-10 23:15:43.832985583 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.1533/gzdoom.changes 2022-07-26 19:44:28.167387418 +0200 @@ -1,0 +2,8 @@ +Sun Jul 24 07:43:09 UTC 2022 - Jan Engelhardt + +- Replace 0001-Revert-load-the-hex-font-as-early-as-possible.patch + by better fix, 0001-fix-gzdoom.pk3-not-found-error.patch . +- Drop gzdoom-asmjit.patch (no longer needed; the linkage error + it used to fix seems just gone) + +--- Old: 0001-Revert-load-the-hex-font-as-early-as-possible.patch gzdoom-asmjit.patch New: 0001-fix-gzdoom.pk3-not-found-error.patch Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.iWoDbU/_old 2022-07-26 19:44:29.267217467 +0200 +++ /var/tmp/diff_new_pack.iWoDbU/_new 2022-07-26 19:44:29.271216849 +0200 @@ -28,16 +28,14 @@ Source: https://github.com/coelckers/gzdoom/archive/g%version.tar.gz Patch1: gzdoom-waddir.patch Patch2: gzdoom-lzma.patch -Patch3: gzdoom-asmjit.patch Patch4: gzdoom-sdlbug.patch Patch5: gzdoom-vulkan.patch Patch6: gzdoom-discord.patch -Patch8: 0001-Revert-load-the-hex-font-as-early-as-possible.patch +Patch8: 0001-fix-gzdoom.pk3-not-found-error.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++ -BuildRequires: glslang-devel BuildRequires: libjpeg-devel BuildRequires: pkg-config BuildRequires: unzip @@ -50,12 +48,17 @@ BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(sdl2) >= 2.0.6 BuildRequires: pkgconfig(vpx) -BuildRequires: pkgconfig(vulkan) >= 1.2.162 BuildRequires: pkgconfig(zlib) +%if 0%{?suse_version} >= 1550 +BuildRequires: glslang-devel +BuildRequires: pkgconfig(vulkan) >= 1.2.162 +%else +Provides: bundled(glslang) = 11.10.0 +Provides: bundled(vulkan) = 1.2.189.1 +%endif Suggests: freedoom Provides: qzdoom = 1.3.0 Provides: zdoom = 2.8.1 -# DUMB is modified to read OggVorbis samples Provides: bundled(gdtoa) Provides: bundled(re2c) = 0.16.0 Provides: bundled(xbrz) = 1.7 @@ -78,10 +81,11 @@ %autosetup -n %name-g%version -p1 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 -rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan mkdir -p extra_include/glslang -%if 0%{?suse_version} && 0%{?suse_version} < 1550 -touch extra_include/glslang/build_info.h +%if 0%{?suse_version} >= 1550 +rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan +%else +%patch -P 5 -R -p1 %endif %build ++ 0001-fix-gzdoom.pk3-not-found-error.patch ++ >From 0f0b4b7620557410e4969cec6119a7771b8acf35 Mon Sep 17 00:00:00 2001 From: Omar Polo Date: Mon, 11 Jul 2022 11:52:43 +0200 Subject: [PATCH] fix gzdoom.pk3 not found error Move the initialization before BaseFileSearch is called, otherwise GameConfig is used not initialized and it doesn't find the gzdoom.pk3 file. GameConfig used uninitalized was spotted by @LoneFox78. --- src/d_main.cpp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: gzdoom-g4.8.2/src/d_main.cpp === --- gzdoom-g4.8.2.orig/src/d_main.cpp +++ gzdoom-g4.8.2/src/d_main.cpp @@ -3534,6 +3534,8 @@ static int D_DoomMain_Internal (void) std::set_new_handler(NewFailure); const char *batchout = Args->CheckValue("-errorlog"); + + D_DoomInit(); // [RH] Make sure zdoom.pk3 is always loaded, // as it contains magic stuff we need. @@ -3568,8 +3570,6 @@ static int D_DoomMain_Internal (void) if (!batchrun) Printf(PRINT_LOG, "%s version %s\n", GAMENAME, GetVersionString()); - D_DoomInit(); - extern void D_ConfirmSendStats(); D_ConfirmSendStats();
commit gzdoom for openSUSE:Factory
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-10 23:15:35 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.1523 (New) Package is "gzdoom" Sun Jul 10 23:15:35 2022 rev:24 rq:988102 version:4.8.2 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2022-07-05 13:49:14.802048161 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.1523/gzdoom.changes 2022-07-10 23:15:43.832985583 +0200 @@ -1,0 +2,5 @@ +Sun Jul 10 08:32:53 UTC 2022 - Jan Engelhardt + +- Disable rpath + +--- Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.Tv1cdS/_old 2022-07-10 23:15:44.308986312 +0200 +++ /var/tmp/diff_new_pack.Tv1cdS/_new 2022-07-10 23:15:44.312986318 +0200 @@ -95,7 +95,7 @@ -DINSTALL_DOCS_PATH="%_defaultdocdir/%name" \ -DINSTALL_PK3_PATH="%_datadir/doom" \ -DINSTALL_SOUNDFONT_PATH="%_datadir/doom" \ - -DDYN_OPENAL=OFF + -DDYN_OPENAL=OFF -DINSTALL_RPATH:STRING="NO" %cmake_build %install
commit gzdoom for openSUSE:Factory
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.changes2022-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 + +- 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 + +--- 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 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
commit gzdoom for openSUSE:Factory
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-06-24 08:45:55 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.1548 (New) Package is "gzdoom" Fri Jun 24 08:45:55 2022 rev:22 rq:984769 version:4.8.0 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2022-04-23 19:49:09.291210792 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.1548/gzdoom.changes 2022-06-24 08:46:03.959189949 +0200 @@ -1,0 +2,20 @@ +Thu Jun 23 21:42:38 UTC 2022 - Jan Engelhardt + +- Add 0001-Revert-load-the-hex-font-as-early-as-possible.patch + +--- +Mon Jun 6 21:22:12 UTC 2022 - Jan Engelhardt + +- Update to release 4.8.0 + * Added Raze-style HUD scaling. Not exposed in the menu yet, +Set hud_oldscale to 0 and use shift with the screen resize +keys to scale the status bar. + * Handle the start/endoom screens with the ingame renderer. +They are now present on all platforms and use the full screen +size of the game. + * Many MBF21 fixes. + * Added the cutscene system from Raze. +- Add gzdoom-discord.patch +- Add 0001-Resolve-build-failure-on-i686-linux.patch + +--- Old: g4.7.1.tar.gz New: 0001-Resolve-build-failure-on-i686-linux.patch 0001-Revert-load-the-hex-font-as-early-as-possible.patch g4.8.0.tar.gz gzdoom-discord.patch Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.4yiBgt/_old 2022-06-24 08:46:04.767190854 +0200 +++ /var/tmp/diff_new_pack.4yiBgt/_new 2022-06-24 08:46:04.775190863 +0200 @@ -17,7 +17,7 @@ Name: gzdoom -Version:4.7.1 +Version:4.8.0 Release:0 Summary:A DOOM source port with graphic and modding extensions License:GPL-3.0-only @@ -31,7 +31,11 @@ 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 BuildRequires: cmake >= 2.8.7 +BuildRequires: discord-rpc-devel BuildRequires: gcc-c++ BuildRequires: glslang-devel BuildRequires: libjpeg-devel @@ -45,6 +49,7 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(sdl2) >= 2.0.6 +BuildRequires: pkgconfig(vpx) BuildRequires: pkgconfig(vulkan) BuildRequires: pkgconfig(zlib) Suggests: freedoom @@ -69,8 +74,9 @@ %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 +perl -i -pe 's{}{%version}g' tools/updaterevision/UpdateRevision.cmake rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan -perl -i -pe 's{__DATE__}{""}g' src/common/platform/posix/sdl/i_main.cpp mkdir -p extra_include/glslang %if 0%{?suse_version} && 0%{?suse_version} < 1550 touch extra_include/glslang/build_info.h ++ 0001-Resolve-build-failure-on-i686-linux.patch ++ >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 ++ 0001-Revert-load-the-hex-font-as-early-as-possible.patch ++ >From e5d7224171927f5a724128ffef7004daae6dd5c8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 23 Jun 2022 23:41:18 +0200 Subject: [PATCH] Revert "- load the hex font as early as possible." References: https://github.com/coelckers/gzdoom/issues/1615 This reverts commit 010f41a3aad3719b1e5d4d8ce157a5d9b0077b44. --- src/common/fonts/hexfont.cpp | 24 +++- src/d_main.cpp | 17 +++-- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/src/common/fonts/hexfont.cpp b/src/common/fonts/hexfont.cpp index 8b50427f4..e2bdbff7a 100644 --- a/src/common/fonts/hexfont.cpp +++ b/src/common/fonts/hexfont.cpp @@ -58,12 +58,11 @@ struct HexDataSource
commit gzdoom for openSUSE:Factory
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-04-23 19:46:59 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.1538 (New) Package is "gzdoom" Sat Apr 23 19:46:59 2022 rev:21 rq:972295 version:4.7.1 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2022-04-19 09:58:36.615591235 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.1538/gzdoom.changes 2022-04-23 19:49:09.291210792 +0200 @@ -1,0 +2,5 @@ +Sat Apr 23 01:04:05 UTC 2022 - Jan Engelhardt + +- Reenable use of system vulkan libraries on Tumbleweed. + +--- Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.RFPR3q/_old 2022-04-23 19:49:09.791211387 +0200 +++ /var/tmp/diff_new_pack.RFPR3q/_new 2022-04-23 19:49:09.795211391 +0200 @@ -33,6 +33,7 @@ Patch5: gzdoom-vulkan.patch BuildRequires: cmake >= 2.8.7 BuildRequires: gcc-c++ +BuildRequires: glslang-devel BuildRequires: libjpeg-devel BuildRequires: pkg-config BuildRequires: unzip @@ -44,14 +45,8 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(sdl2) >= 2.0.6 +BuildRequires: pkgconfig(vulkan) BuildRequires: pkgconfig(zlib) -%if 0%{?sle_version} >= 150200 -BuildRequires: glslang-devel >= 6.3 -BuildRequires: pkgconfig(vulkan) >= 1.1.77 -%else -Provides: bundled(glslang) = 8.13.3559 -Provides: bundled(vulkan) = 1.1.114 -%endif Suggests: freedoom Provides: qzdoom = 1.3.0 Provides: zdoom = 2.8.1 @@ -73,13 +68,13 @@ * Demo record/playback of classic and Boom demos is not supported. %prep -%setup -qn %name-g%version -%patch -P 1 -P 2 -P 3 -P 4 -p1 -%if 0%{?sle_version} >= 150200 -%patch -P 5 -p1 +%autosetup -n %name-g%version -p1 rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan -%endif perl -i -pe 's{__DATE__}{""}g' src/common/platform/posix/sdl/i_main.cpp +mkdir -p extra_include/glslang +%if 0%{?suse_version} && 0%{?suse_version} < 1550 +touch extra_include/glslang/build_info.h +%endif %build # There is handcrafted assembler, which LTO does not play nice with. @@ -91,6 +86,7 @@ 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="" \ -DCMAKE_EXE_LINKER_FLAGS="" -DCMAKE_MODULE_LINKER_FLAGS="" \ ++ gzdoom-vulkan.patch ++ --- /var/tmp/diff_new_pack.RFPR3q/_old 2022-04-23 19:49:09.835211439 +0200 +++ /var/tmp/diff_new_pack.RFPR3q/_new 2022-04-23 19:49:09.839211444 +0200 @@ -4,15 +4,16 @@ Use Vulkan/glslang/spirv system libraries instead of bundled code. --- - CMakeLists.txt |4 +--- - src/CMakeLists.txt |2 +- - 2 files changed, 2 insertions(+), 4 deletions(-) + CMakeLists.txt |4 +--- + src/CMakeLists.txt |2 +- + src/common/rendering/vulkan/system/vk_builders.cpp |4 + 3 files changed, 6 insertions(+), 4 deletions(-) -Index: gzdoom-g4.4.0/CMakeLists.txt +Index: gzdoom-g4.7.1/CMakeLists.txt === gzdoom-g4.4.0.orig/CMakeLists.txt -+++ gzdoom-g4.4.0/CMakeLists.txt -@@ -307,9 +307,7 @@ option(FORCE_INTERNAL_ASMJIT "Use intern +--- gzdoom-g4.7.1.orig/CMakeLists.txt gzdoom-g4.7.1/CMakeLists.txt +@@ -324,9 +324,7 @@ option(FORCE_INTERNAL_ASMJIT "Use intern mark_as_advanced( FORCE_INTERNAL_ASMJIT ) if (HAVE_VULKAN) @@ -23,11 +24,11 @@ endif() if( ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB ) -Index: gzdoom-g4.4.0/src/CMakeLists.txt +Index: gzdoom-g4.7.1/src/CMakeLists.txt === gzdoom-g4.4.0.orig/src/CMakeLists.txt -+++ gzdoom-g4.4.0/src/CMakeLists.txt -@@ -435,7 +435,7 @@ add_custom_target( revision_check ALL +--- gzdoom-g4.7.1.orig/src/CMakeLists.txt gzdoom-g4.7.1/src/CMakeLists.txt +@@ -404,7 +404,7 @@ add_custom_target( revision_check ALL set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${CMAKE_DL_LIBS}" ) if (HAVE_VULKAN) @@ -36,4 +37,26 @@ endif() include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" ) +Index: gzdoom-g4.7.1/src/common/rendering/vulkan/system/vk_builders.cpp +=== +--- gzdoom-g4.7.1.orig/src/common/rendering/vulkan/system/vk_builders.cpp
commit gzdoom for openSUSE:Factory
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-04-19 09:58:31 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.1941 (New) Package is "gzdoom" Tue Apr 19 09:58:31 2022 rev:20 rq:970626 version:4.7.1 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2021-10-28 18:31:35.196420111 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.1941/gzdoom.changes 2022-04-19 09:58:36.615591235 +0200 @@ -1,0 +2,5 @@ +Fri Apr 15 23:08:58 UTC 2022 - Cristian Rodr??guez + +- Drop unused nasm from buildrequires. + +--- Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.E45jYo/_old 2022-04-19 09:58:37.219592020 +0200 +++ /var/tmp/diff_new_pack.E45jYo/_new 2022-04-19 09:58:37.223592026 +0200 @@ -1,7 +1,7 @@ # # spec file for package gzdoom # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,7 +34,6 @@ BuildRequires: cmake >= 2.8.7 BuildRequires: gcc-c++ BuildRequires: libjpeg-devel -BuildRequires: nasm BuildRequires: pkg-config BuildRequires: unzip BuildRequires: zmusic-devel
commit gzdoom for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gzdoom for openSUSE:Factory checked in at 2021-10-28 18:31:21 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.1890 (New) Package is "gzdoom" Thu Oct 28 18:31:21 2021 rev:19 rq:927866 version:4.7.1 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2021-09-29 20:21:01.547172171 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.1890/gzdoom.changes 2021-10-28 18:31:35.196420111 +0200 @@ -1,0 +2,10 @@ +Wed Oct 20 21:47:30 UTC 2021 - Jan Engelhardt + +- Update to release 4.7.1 + * Allow map markers to scale relative to automap zoom. + * Add cvars to control automap line alpha and thickness. + * Resolved a VM abort upon morphing while the tome of power is +active. +- Remove 0001-gles-look-for-libGLESv2.so.2.patch (merged) + +--- Old: 0001-gles-look-for-libGLESv2.so.2.patch g4.7.0.tar.gz New: g4.7.1.tar.gz Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.3qJd40/_old 2021-10-28 18:31:35.976420597 +0200 +++ /var/tmp/diff_new_pack.3qJd40/_new 2021-10-28 18:31:35.980420599 +0200 @@ -17,7 +17,7 @@ Name: gzdoom -Version:4.7.0 +Version:4.7.1 Release:0 Summary:A DOOM source port with graphic and modding extensions License:GPL-3.0-only @@ -31,7 +31,6 @@ Patch3: gzdoom-asmjit.patch Patch4: gzdoom-sdlbug.patch Patch5: gzdoom-vulkan.patch -Patch6: 0001-gles-look-for-libGLESv2.so.2.patch BuildRequires: cmake >= 2.8.7 BuildRequires: gcc-c++ BuildRequires: libjpeg-devel @@ -76,7 +75,7 @@ %prep %setup -qn %name-g%version -%patch -P 1 -P 2 -P 3 -P 4 -P 6 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -p1 %if 0%{?sle_version} >= 150200 %patch -P 5 -p1 rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan ++ g4.7.0.tar.gz -> g4.7.1.tar.gz ++ /work/SRC/openSUSE:Factory/gzdoom/g4.7.0.tar.gz /work/SRC/openSUSE:Factory/.gzdoom.new.1890/g4.7.1.tar.gz differ: char 13, line 1
commit gzdoom for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gzdoom for openSUSE:Factory checked in at 2021-09-29 20:19:16 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.1899 (New) Package is "gzdoom" Wed Sep 29 20:19:16 2021 rev:18 rq:922201 version:4.7.0 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2021-07-28 19:21:48.335496550 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.1899/gzdoom.changes 2021-09-29 20:21:01.547172171 +0200 @@ -1,0 +2,11 @@ +Wed Sep 22 11:26:37 UTC 2021 - Jan Engelhardt + +- Update to release 4.7.0 + * GLES2 backend + * Widescreen graphics for Strife + * MBF21 support (beta) + * DEHEXTRA works properly now + * Various enhancements and fixes for ZScript +- Add 0001-gles-look-for-libGLESv2.so.2.patch + +--- Old: g4.6.1.tar.gz New: 0001-gles-look-for-libGLESv2.so.2.patch g4.7.0.tar.gz Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.1muxkD/_old 2021-09-29 20:21:02.551173626 +0200 +++ /var/tmp/diff_new_pack.1muxkD/_new 2021-09-29 20:21:02.555173632 +0200 @@ -17,7 +17,7 @@ Name: gzdoom -Version:4.6.1 +Version:4.7.0 Release:0 Summary:A DOOM source port with graphic and modding extensions License:GPL-3.0-only @@ -31,6 +31,7 @@ Patch3: gzdoom-asmjit.patch Patch4: gzdoom-sdlbug.patch Patch5: gzdoom-vulkan.patch +Patch6: 0001-gles-look-for-libGLESv2.so.2.patch BuildRequires: cmake >= 2.8.7 BuildRequires: gcc-c++ BuildRequires: libjpeg-devel @@ -44,7 +45,7 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(openal) -BuildRequires: pkgconfig(sdl2) +BuildRequires: pkgconfig(sdl2) >= 2.0.6 BuildRequires: pkgconfig(zlib) %if 0%{?sle_version} >= 150200 BuildRequires: glslang-devel >= 6.3 @@ -75,7 +76,7 @@ %prep %setup -qn %name-g%version -%patch -P 1 -P 2 -P 3 -P 4 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -P 6 -p1 %if 0%{?sle_version} >= 150200 %patch -P 5 -p1 rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan ++ 0001-gles-look-for-libGLESv2.so.2.patch ++ >From 0fc59ec057f8ce4ae2a92821d6edb49da9be300e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 22 Sep 2021 14:41:30 +0200 Subject: [PATCH] gles: look for libGLESv2.so.2 References: https://github.com/coelckers/gzdoom/pull/1464 Distros do not have the .so files at all times, because those are counted as development and not runtime. --- src/common/rendering/gles/gles_system.cpp |4 1 file changed, 4 insertions(+) Index: gzdoom-g4.7.0/src/common/rendering/gles/gles_system.cpp === --- gzdoom-g4.7.0.orig/src/common/rendering/gles/gles_system.cpp +++ gzdoom-g4.7.0/src/common/rendering/gles/gles_system.cpp @@ -32,6 +32,10 @@ static void* LoadGLES2Proc(const char* n { glesLib = dlopen("libGLESv2.so", flags); } + if(!glesLib) + { + glesLib = dlopen("libGLESv2.so.2", flags); + } } void * ret = NULL; ++ g4.6.1.tar.gz -> g4.7.0.tar.gz ++ /work/SRC/openSUSE:Factory/gzdoom/g4.6.1.tar.gz /work/SRC/openSUSE:Factory/.gzdoom.new.1899/g4.7.0.tar.gz differ: char 12, line 1 ++ gzdoom-sdlbug.patch ++ --- /var/tmp/diff_new_pack.1muxkD/_old 2021-09-29 20:21:02.611173714 +0200 +++ /var/tmp/diff_new_pack.1muxkD/_new 2021-09-29 20:21:02.611173714 +0200 @@ -29,7 +29,7 @@ polyvsync = vsync; + Priv::DestroyWindow(); -+ Priv::CreateWindow(Priv::VulkanWindowFlag | (Priv::softpolyEnabled ? SDL_WINDOW_HIDDEN : 0)); ++ Priv::CreateWindow(SDL_WINDOW_VULKAN | (Priv::softpolyEnabled ? SDL_WINDOW_HIDDEN : 0)); polyrendertarget = SDL_CreateRenderer(Priv::window, -1, vsync ? SDL_RENDERER_PRESENTVSYNC : 0); if (!polyrendertarget) {
commit gzdoom for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gzdoom for openSUSE:Factory checked in at 2021-07-28 19:21:42 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.1899 (New) Package is "gzdoom" Wed Jul 28 19:21:42 2021 rev:17 rq:908890 version:4.6.1 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2021-05-23 00:06:31.362499560 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.1899/gzdoom.changes 2021-07-28 19:21:48.335496550 +0200 @@ -1,0 +2,6 @@ +Wed Jul 28 11:24:38 UTC 2021 - Jan Engelhardt + +- Update to release 4.6.1 + * Bug fixes, and widepix updates + +--- Old: g4.6.0.tar.gz New: g4.6.1.tar.gz Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.VF42wI/_old 2021-07-28 19:21:48.963495726 +0200 +++ /var/tmp/diff_new_pack.VF42wI/_new 2021-07-28 19:21:48.967495721 +0200 @@ -17,7 +17,7 @@ Name: gzdoom -Version:4.6.0 +Version:4.6.1 Release:0 Summary:A DOOM source port with graphic and modding extensions License:GPL-3.0-only ++ g4.6.0.tar.gz -> g4.6.1.tar.gz ++ /work/SRC/openSUSE:Factory/gzdoom/g4.6.0.tar.gz /work/SRC/openSUSE:Factory/.gzdoom.new.1899/g4.6.1.tar.gz differ: char 13, line 1
commit gzdoom for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gzdoom for openSUSE:Factory checked in at 2021-03-30 21:11:34 Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.2401 (New) Package is "gzdoom" Tue Mar 30 21:11:34 2021 rev:15 rq:876936 version:4.5.0 Changes: --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes2020-09-16 19:37:27.514675791 +0200 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.2401/gzdoom.changes 2021-03-30 21:20:15.393909928 +0200 @@ -1,0 +2,33 @@ +Thu Mar 4 19:55:21 UTC 2021 - Jan Engelhardt + +- Add 0001-fixed-zipdir-inability-to-update-empty-zip-file.patch +- Update to release 4.5.0 + * For all of Doom's fullscreen images, there's now widescreen +versions provided. + * A simplified options menu is now available for quick setup of +the important settings. + * New keybindings presets. Users can now choose between the +classic layout and a WASD-based one. + * Menu and intermission screen now scale to the original +Doom.exe's layout by default. + * Major additions to the menu system - animated menu +transitions, image slideshows and fixed size menus can now be +created. + * The console now uses the border flat as default background +instead of the titlepic. + * It is now possible to fully quit the fullscreen console and +get back to the title loop. + * Interpolate positions and angles in the automap for smoother +appearance. + * Added $PitchSet for SNDINFO. + * Allow indirections in the string table by prefixing the +language string with '$$' the remaining text is interpreted +as another string label to resolve. + * Optimization of the patch texture checker - do not read in +the entire file if checking the initial header is sufficient +for rejecting it. This can speed up loading of large mods +quite significantly. + * OPUS support (via libsndfile) +- Drop gzdoom-spirv.patch (merged) + +--- Old: g4.4.2.tar.gz gzdoom-spirv.patch New: 0001-fixed-zipdir-inability-to-update-empty-zip-file.patch g4.5.0.tar.gz Other differences: -- ++ gzdoom.spec ++ --- /var/tmp/diff_new_pack.TGVffu/_old 2021-03-30 21:20:16.457910707 +0200 +++ /var/tmp/diff_new_pack.TGVffu/_new 2021-03-30 21:20:16.461910709 +0200 @@ -1,7 +1,7 @@ # # spec file for package gzdoom # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 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.4.2 +Version:4.5.0 Release:0 Summary:A DOOM source port with graphic and modding extensions License:GPL-3.0-only @@ -29,9 +29,9 @@ Patch1: gzdoom-waddir.patch Patch2: gzdoom-lzma.patch Patch3: gzdoom-asmjit.patch -Patch4: gzdoom-spirv.patch -Patch5: gzdoom-sdlbug.patch -Patch6: gzdoom-vulkan.patch +Patch4: gzdoom-sdlbug.patch +Patch5: gzdoom-vulkan.patch +Patch6: 0001-fixed-zipdir-inability-to-update-empty-zip-file.patch BuildRequires: cmake >= 2.8.7 BuildRequires: gcc-c++ BuildRequires: libjpeg-devel @@ -76,12 +76,13 @@ %prep %setup -qn %name-g%version -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -p1 %if 0%{?sle_version} >= 150200 -%patch -P 6 -p1 +%patch -P 5 -p1 rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan %endif -perl -i -pe 's{__DATE__}{""}g' src/posix/sdl/i_main.cpp +%patch -P 6 -p1 +perl -i -pe 's{__DATE__}{""}g' src/common/platform/posix/sdl/i_main.cpp %build # There is handcrafted assembler, which LTO does not play nice with. @@ -98,8 +99,9 @@ -DCMAKE_EXE_LINKER_FLAGS="" -DCMAKE_MODULE_LINKER_FLAGS="" \ -DINSTALL_DOCS_PATH="%_defaultdocdir/%name" \ -DINSTALL_PK3_PATH="%_datadir/doom" \ + -DINSTALL_SOUNDFONT_PATH="%_datadir/doom" \ -DDYN_OPENAL=OFF -make %{?_smp_mflags} +%cmake_build %install %cmake_install ++ 0001-fixed-zipdir-inability-to-update-empty-zip-file.patch ++ >From ecf070148199c333dec01f28e4a7a05118162260 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 1 Nov 2020 10:24:22 +0200 Subject: [PATCH] - fixed zipdir inability to update empty zip file https://forum.zdoom.org/viewtopic.php?t=70468 --- tools/zipdir/zipdir.c |2 ++ 1 file changed, 2 insertions(+) Index: gzdoom-g4.5.0/tools/zipdir/zipdir.c === --- gzdoom-g4.5.0.orig/tools/zipdir/zipdir.c +++