From 89eee319af8f2652666d37f79f6db0f0901b5f6be40fa5bb2dc1185779d33a27 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 18 Dec 2019 22:09:50 +0000 Subject: [PATCH] - Update to release 4.2.4 OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=35 --- g4.2.1.tar.gz | 3 -- g4.2.4.tar.gz | 3 ++ gzdoom-asmjit.patch | 14 +++++----- gzdoom-lzma.patch | 44 ++++++++++++++--------------- gzdoom-system-gme.patch | 62 +++++++++++++++++++++++++++++++++++++++++ gzdoom-vulkan.patch | 34 +++++++++++----------- gzdoom.changes | 9 ++++++ gzdoom.spec | 11 ++++---- 8 files changed, 126 insertions(+), 54 deletions(-) delete mode 100644 g4.2.1.tar.gz create mode 100644 g4.2.4.tar.gz create mode 100644 gzdoom-system-gme.patch diff --git a/g4.2.1.tar.gz b/g4.2.1.tar.gz deleted file mode 100644 index dd0795b..0000000 --- a/g4.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de014b0d3e1c702dbba16acadc596158bb8185c268ed4afa605d625d35f37a62 -size 13660636 diff --git a/g4.2.4.tar.gz b/g4.2.4.tar.gz new file mode 100644 index 0000000..3e9022c --- /dev/null +++ b/g4.2.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d5b441fe7fc449eb934b87d920c2f76529c331747eb4fe6cb1cdf185465c51c +size 13683768 diff --git a/gzdoom-asmjit.patch b/gzdoom-asmjit.patch index a5f4960..8d0dd4a 100644 --- a/gzdoom-asmjit.patch +++ b/gzdoom-asmjit.patch @@ -2,15 +2,15 @@ libraries/asmjit/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) -Index: gzdoom-g4.2.1/libraries/asmjit/CMakeLists.txt +Index: gzdoom-g4.2.4/libraries/asmjit/CMakeLists.txt =================================================================== ---- gzdoom-g4.2.1.orig/libraries/asmjit/CMakeLists.txt -+++ gzdoom-g4.2.1/libraries/asmjit/CMakeLists.txt -@@ -140,6 +140,7 @@ endforeach() +--- 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}) - add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS}) 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} + if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) + install(TARGETS ${ASMJITNAME} diff --git a/gzdoom-lzma.patch b/gzdoom-lzma.patch index acdb95f..ec9ad69 100644 --- a/gzdoom-lzma.patch +++ b/gzdoom-lzma.patch @@ -9,10 +9,10 @@ Use LZMA system libraries instead of bundled code. tools/zipdir/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) -Index: gzdoom-g4.2.0/CMakeLists.txt +Index: gzdoom-g4.2.4/CMakeLists.txt =================================================================== ---- gzdoom-g4.2.0.orig/CMakeLists.txt -+++ gzdoom-g4.2.0/CMakeLists.txt +--- gzdoom-g4.2.4.orig/CMakeLists.txt ++++ gzdoom-g4.2.4/CMakeLists.txt @@ -12,6 +12,7 @@ endif() list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) @@ -21,49 +21,49 @@ Index: gzdoom-g4.2.0/CMakeLists.txt # Support cross compiling option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO ) -@@ -382,7 +383,7 @@ else() +@@ -403,7 +404,7 @@ else() set( GME_LIBRARIES gme ) endif() -set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/lzma/C" ) +pkg_check_modules(LZMA REQUIRED clzma) - - if( NOT CMAKE_CROSSCOMPILING ) - if( NOT CROSS_EXPORTS ) -@@ -400,7 +401,6 @@ install(DIRECTORY docs/ - DESTINATION ${INSTALL_DOCS_PATH} - COMPONENT "Documentation") + set( ADL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/adlmidi" ) + set( OPN_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/opnmidi" ) + set( TIMIDITYPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/timidityplus" ) +@@ -433,7 +434,6 @@ option( DYN_OPENAL "Dynamically load Ope + option( DYN_SNDFILE "Dynamically load libsndfile" ON ) + option( DYN_MPG123 "Dynamically load libmpg123" ON ) -add_subdirectory( libraries/lzma ) add_subdirectory( tools ) add_subdirectory( libraries/dumb ) add_subdirectory( libraries/gdtoa ) -Index: gzdoom-g4.2.0/src/CMakeLists.txt +Index: gzdoom-g4.2.4/src/CMakeLists.txt =================================================================== ---- gzdoom-g4.2.0.orig/src/CMakeLists.txt -+++ gzdoom-g4.2.0/src/CMakeLists.txt -@@ -468,7 +468,7 @@ set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LI +--- gzdoom-g4.2.4.orig/src/CMakeLists.txt ++++ gzdoom-g4.2.4/src/CMakeLists.txt +@@ -436,7 +436,7 @@ set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LI if (HAVE_VULKAN) set( ZDOOM_LIBS ${ZDOOM_LIBS} "glslang" "SPIRV" "OGLCompiler") endif() --include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" ) -+include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" ) +-include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" ) ++include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" ) if( ${HAVE_VM_JIT} ) add_definitions( -DHAVE_VM_JIT ) -@@ -1379,7 +1379,7 @@ if( UNIX ) +@@ -1211,7 +1211,7 @@ if( UNIX ) endif() endif() --target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma ) -+target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb ${LZMA_LIBRARIES}) +-target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic ) ++target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb ${LZMA_LIBRARIES} adl opn timidity timidityplus wildmidi oplsynth zmusic ) include_directories( . g_statusbar -Index: gzdoom-g4.2.0/tools/zipdir/CMakeLists.txt +Index: gzdoom-g4.2.4/tools/zipdir/CMakeLists.txt =================================================================== ---- gzdoom-g4.2.0.orig/tools/zipdir/CMakeLists.txt -+++ gzdoom-g4.2.0/tools/zipdir/CMakeLists.txt +--- gzdoom-g4.2.4.orig/tools/zipdir/CMakeLists.txt ++++ gzdoom-g4.2.4/tools/zipdir/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required( VERSION 2.8.7 ) diff --git a/gzdoom-system-gme.patch b/gzdoom-system-gme.patch new file mode 100644 index 0000000..8283e69 --- /dev/null +++ b/gzdoom-system-gme.patch @@ -0,0 +1,62 @@ +--- + CMakeLists.txt | 13 ++++--------- + libraries/zmusic/CMakeLists.txt | 2 +- + 2 files changed, 5 insertions(+), 10 deletions(-) + +Index: gzdoom-g4.2.4/CMakeLists.txt +=================================================================== +--- gzdoom-g4.2.4.orig/CMakeLists.txt ++++ gzdoom-g4.2.4/CMakeLists.txt +@@ -195,12 +195,7 @@ endif() + #endif() + + # GME +-#find_path( GME_INCLUDE_DIR gme/gme.h ) +-#find_library( GME_LIBRARIES gme ) +-#mark_as_advanced( GME_INCLUDE_DIR GME_LIBRARIES ) +-#FIND_PACKAGE_HANDLE_STANDARD_ARGS( GME +-# REQUIRED_VARS GME_LIBRARIES GME_INCLUDE_DIR +-#) ++pkg_check_modules(GME libgme) + + if( MSVC ) + # Eliminate unreferenced functions and data +@@ -323,7 +318,7 @@ set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_ + option(FORCE_INTERNAL_ZLIB "Use internal zlib") + option(FORCE_INTERNAL_JPEG "Use internal jpeg") + option(FORCE_INTERNAL_BZIP2 "Use internal bzip2") +-option(FORCE_INTERNAL_GME "Use internal gme" ON) ++option(FORCE_INTERNAL_GME "Use internal gme" OFF) + mark_as_advanced( FORCE_INTERNAL_GME ) + option(FORCE_INTERNAL_ASMJIT "Use internal asmjit" ON) + mark_as_advanced( FORCE_INTERNAL_ASMJIT ) +@@ -392,14 +387,14 @@ else() + endif() + + if( GME_FOUND AND NOT FORCE_INTERNAL_GME ) +- message( STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIR}" ) ++ message( STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIRS}" ) + else() + message( STATUS "Using internal gme library" ) + # Use MAME as it's balanced emulator: well-accurate, but doesn't eats lot of CPU + # Nuked OPN2 is very accurate emulator, but it eats too much CPU for the workflow + set( GME_YM2612_EMU "MAME" ) + add_subdirectory( libraries/game-music-emu ) +- set( GME_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/game-music-emu" ) ++ set( GME_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/libraries/game-music-emu" ) + set( GME_LIBRARIES gme ) + endif() + +Index: gzdoom-g4.2.4/libraries/zmusic/CMakeLists.txt +=================================================================== +--- gzdoom-g4.2.4.orig/libraries/zmusic/CMakeLists.txt ++++ gzdoom-g4.2.4/libraries/zmusic/CMakeLists.txt +@@ -41,7 +41,7 @@ else() + endif() + + +-include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../libraries/dumb/include" "${ZLIB_INCLUDE_DIR}" "${ADL_INCLUDE_DIR}" "${OPN_INCLUDE_DIR}" "${TIMIDITYPP_INCLUDE_DIR}" "${TIMIDITY_INCLUDE_DIR}" "${WILDMIDI_INCLUDE_DIR}" "${OPLSYNTH_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" ) ++include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../libraries/dumb/include" "${ZLIB_INCLUDE_DIR}" "${ADL_INCLUDE_DIR}" "${OPN_INCLUDE_DIR}" "${TIMIDITYPP_INCLUDE_DIR}" "${TIMIDITY_INCLUDE_DIR}" "${WILDMIDI_INCLUDE_DIR}" "${OPLSYNTH_INCLUDE_DIR}" "${GME_INCLUDEDIR}" "${CMAKE_CURRENT_SOURCE_DIR}" ) + + if (WIN32) + set( PLAT_SOURCES diff --git a/gzdoom-vulkan.patch b/gzdoom-vulkan.patch index b35810a..1de41de 100644 --- a/gzdoom-vulkan.patch +++ b/gzdoom-vulkan.patch @@ -10,11 +10,11 @@ Use Vulkan system libraries instead of bundled code. src/rendering/vulkan/system/vk_builders.cpp | 4 ++-- 4 files changed, 4 insertions(+), 7 deletions(-) -Index: gzdoom-g4.2.0/CMakeLists.txt +Index: gzdoom-g4.2.4/CMakeLists.txt =================================================================== ---- gzdoom-g4.2.0.orig/CMakeLists.txt -+++ gzdoom-g4.2.0/CMakeLists.txt -@@ -301,9 +301,6 @@ option(FORCE_INTERNAL_ASMJIT "Use intern +--- gzdoom-g4.2.4.orig/CMakeLists.txt ++++ gzdoom-g4.2.4/CMakeLists.txt +@@ -330,9 +330,6 @@ option(FORCE_INTERNAL_ASMJIT "Use intern mark_as_advanced( FORCE_INTERNAL_ASMJIT ) if (HAVE_VULKAN) @@ -23,24 +23,24 @@ Index: gzdoom-g4.2.0/CMakeLists.txt - add_subdirectory( libraries/glslang/OGLCompilersDLL ) endif() - # Fast math flags, required by some subprojects -Index: gzdoom-g4.2.0/src/CMakeLists.txt + if( ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB ) +Index: gzdoom-g4.2.4/src/CMakeLists.txt =================================================================== ---- gzdoom-g4.2.0.orig/src/CMakeLists.txt -+++ gzdoom-g4.2.0/src/CMakeLists.txt -@@ -466,7 +466,7 @@ add_custom_target( revision_check ALL - message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" ) +--- gzdoom-g4.2.4.orig/src/CMakeLists.txt ++++ gzdoom-g4.2.4/src/CMakeLists.txt +@@ -434,7 +434,7 @@ add_custom_target( revision_check ALL + set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" "${CMAKE_DL_LIBS}" ) if (HAVE_VULKAN) - set( ZDOOM_LIBS ${ZDOOM_LIBS} "glslang" "SPIRV" "OGLCompiler") + set( ZDOOM_LIBS ${ZDOOM_LIBS} -lglslang -lSPIRV -lOGLCompiler) endif() - include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" ) + include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" ) -Index: gzdoom-g4.2.0/src/rendering/vulkan/shaders/vk_shader.cpp +Index: gzdoom-g4.2.4/src/rendering/vulkan/shaders/vk_shader.cpp =================================================================== ---- gzdoom-g4.2.0.orig/src/rendering/vulkan/shaders/vk_shader.cpp -+++ gzdoom-g4.2.0/src/rendering/vulkan/shaders/vk_shader.cpp +--- gzdoom-g4.2.4.orig/src/rendering/vulkan/shaders/vk_shader.cpp ++++ gzdoom-g4.2.4/src/rendering/vulkan/shaders/vk_shader.cpp @@ -4,7 +4,7 @@ #include "hwrenderer/utility/hw_shaderpatcher.h" #include "w_wad.h" @@ -50,10 +50,10 @@ Index: gzdoom-g4.2.0/src/rendering/vulkan/shaders/vk_shader.cpp VkShaderManager::VkShaderManager(VulkanDevice *device) : device(device) { -Index: gzdoom-g4.2.0/src/rendering/vulkan/system/vk_builders.cpp +Index: gzdoom-g4.2.4/src/rendering/vulkan/system/vk_builders.cpp =================================================================== ---- gzdoom-g4.2.0.orig/src/rendering/vulkan/system/vk_builders.cpp -+++ gzdoom-g4.2.0/src/rendering/vulkan/system/vk_builders.cpp +--- gzdoom-g4.2.4.orig/src/rendering/vulkan/system/vk_builders.cpp ++++ gzdoom-g4.2.4/src/rendering/vulkan/system/vk_builders.cpp @@ -2,8 +2,8 @@ #include "vk_builders.h" #include "doomerrors.h" diff --git a/gzdoom.changes b/gzdoom.changes index 26543a8..3122b08 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Dec 17 00:10:32 UTC 2019 - Jan Engelhardt + +- Update to release 4.2.4 + * This is a bugfix release without new features. The notable + highlight is that this fixes translucent objects in the + software renderer. +- Add gzdoom-system-gme.patch + ------------------------------------------------------------------- Tue Oct 1 06:23:02 UTC 2019 - Jan Engelhardt diff --git a/gzdoom.spec b/gzdoom.spec index f1c00fc..582e070 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -1,7 +1,7 @@ # # spec file for package gzdoom # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: gzdoom -Version: 4.2.1 +Version: 4.2.4 Release: 0 Summary: A DOOM source port with graphic and modding extensions License: GPL-3.0-only Group: Amusements/Games/3D/Shoot -Url: http://zdoom.org/ +URL: http://zdoom.org/ #Git-Clone: https://github.com/coelckers/gzdoom Source: https://github.com/coelckers/gzdoom/archive/g%version.tar.gz @@ -30,6 +30,7 @@ Patch1: gzdoom-waddir.patch Patch2: gzdoom-lzma.patch Patch3: gzdoom-vulkan.patch Patch4: gzdoom-asmjit.patch +Patch5: gzdoom-system-gme.patch BuildRequires: cmake >= 2.8.7 BuildRequires: gcc-c++ BuildRequires: glslang-devel @@ -54,7 +55,7 @@ BuildRequires: pkgconfig(zlib) %if 0%{?suse_version} >= 1500 BuildRequires: pkgconfig(clzma) >= 17.01 %else -Provides: bundled(lzma-sdk) = 17.01 +Provides: bundled(lzma-sdk) = 19.00 %endif %if 0%{?suse_version} == 1315 BuildRequires: gcc6-c++ @@ -93,7 +94,7 @@ GZDoom is a port (a modification) of the original Doom source code, featuring: %patch -P 3 -p1 rm -Rfv glslang src/rendering/vulkan/thirdparty/vulkan %endif -%patch -P 4 -p1 +%patch -P 4 -P 5 -p1 perl -i -pe 's{__DATE__}{""}g' src/posix/sdl/i_main.cpp perl -i -pe 's{}{%version}g' \ tools/updaterevision/updaterevision.c