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.changes 2022-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 <jeng...@inai.de> + +- 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{<unknown version>}{%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 <o...@omarpolo.com> 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();
