diff --git a/gzdoom-asmjit.patch b/gzdoom-asmjit.patch deleted file mode 100644 index 8d0dd4a..0000000 --- a/gzdoom-asmjit.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- - libraries/asmjit/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -Index: gzdoom-g4.2.4/libraries/asmjit/CMakeLists.txt -=================================================================== ---- gzdoom-g4.2.4.orig/libraries/asmjit/CMakeLists.txt -+++ gzdoom-g4.2.4/libraries/asmjit/CMakeLists.txt -@@ -100,6 +100,7 @@ set(ASMJIT_SRCS - add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS}) - - set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit) -+target_link_libraries(${ASMJITNAME} rt) - - if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) - install(TARGETS ${ASMJITNAME} diff --git a/gzdoom.changes b/gzdoom.changes index dd53357..648f5cd 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -3,6 +3,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) ------------------------------------------------------------------- Sun Jul 10 08:32:53 UTC 2022 - Jan Engelhardt diff --git a/gzdoom.spec b/gzdoom.spec index abeb65c..2d652ff 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -28,7 +28,6 @@ URL: https://zdoom.org/ 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 @@ -37,7 +36,6 @@ 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(gtk+-3.0) 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) = +%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 @@ The executables hard-require SSE2 on i686 currently. %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