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.changes 2022-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 <jeng...@inai.de>
+
+- 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
++++ gzdoom-g4.7.1/src/common/rendering/vulkan/system/vk_builders.cpp
+@@ -25,6 +25,7 @@
+ #include "renderstyle.h"
+ #include <ShaderLang.h>
+ #include <GlslangToSpv.h>
++#include <glslang/build_info.h>
+
+ 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,
