From 45948f8f0e5370265dae32616a1c3a1549c45c3c9aec3591d6d1e6251768afc6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 13 Apr 2019 09:50:27 +0000 Subject: [PATCH 1/4] - Update to new upstream release 4.0.0 OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=21 --- _service | 4 +-- gzdoom-3.7.2.tar.xz | 3 -- gzdoom-4.0.0.tar.xz | 3 ++ gzdoom-lzma.patch | 44 +++++++++++++------------- gzdoom-staticlibs.patch | 69 ++++++++++++++++++++++++++++++----------- gzdoom-waddir.patch | 10 +++--- gzdoom.changes | 17 ++++++++++ gzdoom.spec | 4 ++- 8 files changed, 103 insertions(+), 51 deletions(-) delete mode 100644 gzdoom-3.7.2.tar.xz create mode 100644 gzdoom-4.0.0.tar.xz diff --git a/_service b/_service index ea2a180..12cd5fc 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ git git://github.com/coelckers/gzdoom - g3.7.2 - 3.7.2 + g4.0.0 + 4.0.0 wadsrc_extra diff --git a/gzdoom-3.7.2.tar.xz b/gzdoom-3.7.2.tar.xz deleted file mode 100644 index 05948d4..0000000 --- a/gzdoom-3.7.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7414160623d46fa56672bea88f0140e86ee70dbfe2fd778cd1e4e5410b74685b -size 8379076 diff --git a/gzdoom-4.0.0.tar.xz b/gzdoom-4.0.0.tar.xz new file mode 100644 index 0000000..290fe6c --- /dev/null +++ b/gzdoom-4.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42d368cdb9cf1cba65ffa0c4c6f28f5aaad4c345c1924eda25466ef97b1e661e +size 9583396 diff --git a/gzdoom-lzma.patch b/gzdoom-lzma.patch index bef5dd0..0606f8f 100644 --- a/gzdoom-lzma.patch +++ b/gzdoom-lzma.patch @@ -4,19 +4,19 @@ tools/zipdir/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) -Index: gzdoom-3.7.2/CMakeLists.txt +Index: gzdoom-4.0.0/CMakeLists.txt =================================================================== ---- gzdoom-3.7.2.orig/CMakeLists.txt -+++ gzdoom-3.7.2/CMakeLists.txt +--- gzdoom-4.0.0.orig/CMakeLists.txt ++++ gzdoom-4.0.0/CMakeLists.txt @@ -12,6 +12,7 @@ endif() list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) include( FindPackageHandleStandardArgs ) +include(FindPkgConfig) - # Produce a warning if XP support will be missing when building a 32 bit target for MSVC. - if( MSVC ) -@@ -340,7 +341,7 @@ else() + # Support cross compiling + option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO ) +@@ -355,7 +356,7 @@ else() set( GME_LIBRARIES gme ) endif() @@ -25,7 +25,7 @@ Index: gzdoom-3.7.2/CMakeLists.txt if( NOT CMAKE_CROSSCOMPILING ) if( NOT CROSS_EXPORTS ) -@@ -358,7 +359,6 @@ install(DIRECTORY docs/ +@@ -373,7 +374,6 @@ install(DIRECTORY docs/ DESTINATION ${INSTALL_DOCS_PATH} COMPONENT "Documentation") @@ -33,20 +33,20 @@ Index: gzdoom-3.7.2/CMakeLists.txt add_subdirectory( tools ) add_subdirectory( dumb ) add_subdirectory( gdtoa ) -Index: gzdoom-3.7.2/src/CMakeLists.txt +Index: gzdoom-4.0.0/src/CMakeLists.txt =================================================================== ---- gzdoom-3.7.2.orig/src/CMakeLists.txt -+++ gzdoom-3.7.2/src/CMakeLists.txt -@@ -461,7 +461,7 @@ add_custom_target( revision_check ALL +--- gzdoom-4.0.0.orig/src/CMakeLists.txt ++++ gzdoom-4.0.0/src/CMakeLists.txt +@@ -467,7 +467,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}" ) - message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" ) - set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" "${ASMJIT_LIBRARIES}" "${CMAKE_DL_LIBS}" ) --include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${ASMJIT_INCLUDE_DIR}" ) -+include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${ASMJIT_INCLUDE_DIR}" ) - - if( SNDFILE_FOUND ) - set( ZDOOM_LIBS ${ZDOOM_LIBS} "${SNDFILE_LIBRARIES}" ) -@@ -1308,7 +1308,7 @@ if( UNIX ) + if( ${HAVE_VM_JIT} ) + add_definitions( -DHAVE_VM_JIT ) +@@ -1370,7 +1370,7 @@ if( UNIX ) endif() endif() @@ -55,10 +55,10 @@ Index: gzdoom-3.7.2/src/CMakeLists.txt include_directories( . g_statusbar -Index: gzdoom-3.7.2/tools/zipdir/CMakeLists.txt +Index: gzdoom-4.0.0/tools/zipdir/CMakeLists.txt =================================================================== ---- gzdoom-3.7.2.orig/tools/zipdir/CMakeLists.txt -+++ gzdoom-3.7.2/tools/zipdir/CMakeLists.txt +--- gzdoom-4.0.0.orig/tools/zipdir/CMakeLists.txt ++++ gzdoom-4.0.0/tools/zipdir/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required( VERSION 2.8.7 ) diff --git a/gzdoom-staticlibs.patch b/gzdoom-staticlibs.patch index 4b4e5d7..f89d564 100644 --- a/gzdoom-staticlibs.patch +++ b/gzdoom-staticlibs.patch @@ -1,22 +1,23 @@ From: Jan Engelhardt Date: 2018-01-02 19:17:14.364202580 +0100 -Some bundled code (which is also an older version and cannot simply be switched -out just yet) needs to be explicitly set to STATIC, or cmake will generate -files like "liblzma.so" etc. with no versioning and which are not installed by -cmake_install. +Bundled code needs to be explicitly set to STATIC, or cmake will generate files +like "liblzma.so" etc. with no versioning and which are not installed by +cmake_install. Some of the code is also an older version and may not +necessarily be suitable for getting switched out by system library copies. --- - CMakeLists.txt | 1 - - dumb/CMakeLists.txt | 2 +- - gdtoa/CMakeLists.txt | 2 +- - lzma/CMakeLists.txt | 2 +- - 4 files changed, 3 insertions(+), 4 deletions(-) + dumb/CMakeLists.txt | 2 +- + gdtoa/CMakeLists.txt | 2 +- + glslang/glslang/CMakeLists.txt | 2 +- + glslang/spirv/CMakeLists.txt | 4 ++-- + lzma/CMakeLists.txt | 2 +- + 5 files changed, 6 insertions(+), 6 deletions(-) -Index: gzdoom-g3.2.4/dumb/CMakeLists.txt +Index: gzdoom-4.0.0/dumb/CMakeLists.txt =================================================================== ---- gzdoom-g3.2.4.orig/dumb/CMakeLists.txt -+++ gzdoom-g3.2.4/dumb/CMakeLists.txt +--- gzdoom-4.0.0.orig/dumb/CMakeLists.txt ++++ gzdoom-4.0.0/dumb/CMakeLists.txt @@ -24,7 +24,7 @@ endif() include_directories( include ) @@ -26,10 +27,10 @@ Index: gzdoom-g3.2.4/dumb/CMakeLists.txt src/core/unload.c src/core/rendsig.c src/core/rendduh.c -Index: gzdoom-g3.2.4/gdtoa/CMakeLists.txt +Index: gzdoom-4.0.0/gdtoa/CMakeLists.txt =================================================================== ---- gzdoom-g3.2.4.orig/gdtoa/CMakeLists.txt -+++ gzdoom-g3.2.4/gdtoa/CMakeLists.txt +--- gzdoom-4.0.0.orig/gdtoa/CMakeLists.txt ++++ gzdoom-4.0.0/gdtoa/CMakeLists.txt @@ -35,7 +35,7 @@ if( NOT MSVC AND NOT APPLE ) set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h ${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h ) endif() @@ -39,10 +40,42 @@ Index: gzdoom-g3.2.4/gdtoa/CMakeLists.txt ${GEN_FP_FILES} dmisc.c dtoa.c -Index: gzdoom-g3.2.4/lzma/CMakeLists.txt +Index: gzdoom-4.0.0/glslang/glslang/CMakeLists.txt =================================================================== ---- gzdoom-g3.2.4.orig/lzma/CMakeLists.txt -+++ gzdoom-g3.2.4/lzma/CMakeLists.txt +--- gzdoom-4.0.0.orig/glslang/glslang/CMakeLists.txt ++++ gzdoom-4.0.0/glslang/glslang/CMakeLists.txt +@@ -106,7 +106,7 @@ set(HEADERS + # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + # set(BISON_GLSLParser_OUTPUT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp) + +-add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) ++add_library(glslang STATIC ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) + set_property(TARGET glslang PROPERTY FOLDER glslang) + set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON) + target_link_libraries(glslang OGLCompiler OSDependent) +Index: gzdoom-4.0.0/glslang/spirv/CMakeLists.txt +=================================================================== +--- gzdoom-4.0.0.orig/glslang/spirv/CMakeLists.txt ++++ gzdoom-4.0.0/glslang/spirv/CMakeLists.txt +@@ -56,12 +56,12 @@ if(ENABLE_NV_EXTENSIONS) + GLSL.ext.NV.h) + endif(ENABLE_NV_EXTENSIONS) + +-add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) ++add_library(SPIRV STATIC ${SOURCES} ${HEADERS}) + set_property(TARGET SPIRV PROPERTY FOLDER glslang) + set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) + target_include_directories(SPIRV PUBLIC ..) + +-add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) ++add_library(SPVRemapper STATIC ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) + set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) + set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) + +Index: gzdoom-4.0.0/lzma/CMakeLists.txt +=================================================================== +--- gzdoom-4.0.0.orig/lzma/CMakeLists.txt ++++ gzdoom-4.0.0/lzma/CMakeLists.txt @@ -34,5 +34,5 @@ else() set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_7ZIP_ST" ) endif() diff --git a/gzdoom-waddir.patch b/gzdoom-waddir.patch index 772b2e4..4c8ad69 100644 --- a/gzdoom-waddir.patch +++ b/gzdoom-waddir.patch @@ -7,11 +7,11 @@ Ensure same IWAD directory across all Doom source ports in openSUSE src/posix/i_system.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: gzdoom-g3.2.4/src/posix/i_system.h +Index: gzdoom-4.0.0/src/posix/i_system.h =================================================================== ---- gzdoom-g3.2.4.orig/src/posix/i_system.h -+++ gzdoom-g3.2.4/src/posix/i_system.h -@@ -40,7 +40,7 @@ struct ticcmd_t; +--- gzdoom-4.0.0.orig/src/posix/i_system.h ++++ gzdoom-4.0.0/src/posix/i_system.h +@@ -42,7 +42,7 @@ struct ticcmd_t; struct WadStuff; #ifndef SHARE_DIR @@ -19,4 +19,4 @@ Index: gzdoom-g3.2.4/src/posix/i_system.h +#define SHARE_DIR "/usr/share/doom/" #endif - // Index values into the LanguageIDs array + diff --git a/gzdoom.changes b/gzdoom.changes index 10030b6..dc24bee 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Apr 08 20:31:53 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 4.0.0 + * Experimental Vulkan renderer (via "+vid_backend 0" console + option) + * Scaling has been changed. GZDoom now runs at a minimum of + 640x400. An extra mode (960x600) has been added to replace the + lost 320x200 one. + * Added "cl_blockcheats" - useful for people who use debugging + keys, allows a user to consciously turn off cheats without + affecting the serveradd "cl_blockcheats" - useful for people + who use debugging keys, allows a user to consciously turn off + cheats without affecting the server + * "wait" console commands no longer execute inside the level, + and can run during intermissions and outside the game. + ------------------------------------------------------------------- Wed Jan 23 15:22:45 UTC 2019 - Jan Engelhardt diff --git a/gzdoom.spec b/gzdoom.spec index ec0f548..9ae6db6 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -17,7 +17,7 @@ Name: gzdoom -Version: 3.7.2 +Version: 4.0.0 Release: 0 Summary: A DOOM source port with graphic and modding extensions License: GPL-3.0-only @@ -35,11 +35,13 @@ Patch6: gzdoom-asmjit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake >= 2.8.7 BuildRequires: gcc-c++ +#BuildRequires: glslang-devel BuildRequires: libjpeg-devel BuildRequires: nasm BuildRequires: pkg-config BuildRequires: unzip BuildRequires: xz +#BuildRequires: pkgconfig(SPIRV-Tools) BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(fluidsynth) From 7c13bdb0ef93db178fe802d7dc303d7793a0c1c86f810018067cfdd618a367e0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 13 Apr 2019 12:41:25 +0000 Subject: [PATCH 2/4] - Folded gzdoom-asmjit.patch into gzdoom-staticlibs.patch. - Rename gzdoom-lzma.patch to gzdoom-systemlibs.patch. OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=22 --- gzdoom-asmjit.patch | 22 ------ gzdoom-lzma.patch | 73 -------------------- gzdoom-staticlibs.patch | 16 ++++- gzdoom-systemlibs.patch | 146 ++++++++++++++++++++++++++++++++++++++++ gzdoom.changes | 2 + gzdoom.spec | 11 +-- 6 files changed, 169 insertions(+), 101 deletions(-) delete mode 100644 gzdoom-asmjit.patch delete mode 100644 gzdoom-lzma.patch create mode 100644 gzdoom-systemlibs.patch diff --git a/gzdoom-asmjit.patch b/gzdoom-asmjit.patch deleted file mode 100644 index 21c3a96..0000000 --- a/gzdoom-asmjit.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Jan Engelhardt -Date: 2019-01-03 14:48:11.831267534 +0100 - -Nothing else uses asmjit at this time, so save on the extra library. -(`make install` also misses installing it as a shared library.) ---- - asmjit/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: gzdoom-3.7.1/asmjit/CMakeLists.txt -=================================================================== ---- gzdoom-3.7.1.orig/asmjit/CMakeLists.txt -+++ gzdoom-3.7.1/asmjit/CMakeLists.txt -@@ -97,7 +97,7 @@ set(ASMJIT_SRCS - asmjit/x86/x86regalloc.cpp - ) - --add_library(${ASMJITNAME} ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS}) -+add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS}) - - set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit) - diff --git a/gzdoom-lzma.patch b/gzdoom-lzma.patch deleted file mode 100644 index 0606f8f..0000000 --- a/gzdoom-lzma.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- - CMakeLists.txt | 4 ++-- - src/CMakeLists.txt | 4 ++-- - tools/zipdir/CMakeLists.txt | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -Index: gzdoom-4.0.0/CMakeLists.txt -=================================================================== ---- gzdoom-4.0.0.orig/CMakeLists.txt -+++ gzdoom-4.0.0/CMakeLists.txt -@@ -12,6 +12,7 @@ endif() - - list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) - include( FindPackageHandleStandardArgs ) -+include(FindPkgConfig) - - # Support cross compiling - option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO ) -@@ -355,7 +356,7 @@ else() - set( GME_LIBRARIES gme ) - endif() - --set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lzma/C" ) -+pkg_check_modules(LZMA REQUIRED clzma) - - if( NOT CMAKE_CROSSCOMPILING ) - if( NOT CROSS_EXPORTS ) -@@ -373,7 +374,6 @@ install(DIRECTORY docs/ - DESTINATION ${INSTALL_DOCS_PATH} - COMPONENT "Documentation") - --add_subdirectory( lzma ) - add_subdirectory( tools ) - add_subdirectory( dumb ) - add_subdirectory( gdtoa ) -Index: gzdoom-4.0.0/src/CMakeLists.txt -=================================================================== ---- gzdoom-4.0.0.orig/src/CMakeLists.txt -+++ gzdoom-4.0.0/src/CMakeLists.txt -@@ -467,7 +467,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}" ) - - if( ${HAVE_VM_JIT} ) - add_definitions( -DHAVE_VM_JIT ) -@@ -1370,7 +1370,7 @@ if( UNIX ) - endif() - endif() - --target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma ) -+target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb ${LZMA_LIBRARIES}) - - include_directories( . - g_statusbar -Index: gzdoom-4.0.0/tools/zipdir/CMakeLists.txt -=================================================================== ---- gzdoom-4.0.0.orig/tools/zipdir/CMakeLists.txt -+++ gzdoom-4.0.0/tools/zipdir/CMakeLists.txt -@@ -1,9 +1,9 @@ - cmake_minimum_required( VERSION 2.8.7 ) - - if( NOT CMAKE_CROSSCOMPILING ) -- include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) -+ include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" ) - add_executable( zipdir - zipdir.c ) -- target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} lzma ) -+ target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${LZMA_LDFLAGS}) - set( CROSS_EXPORTS ${CROSS_EXPORTS} zipdir PARENT_SCOPE ) - endif() diff --git a/gzdoom-staticlibs.patch b/gzdoom-staticlibs.patch index f89d564..86381f1 100644 --- a/gzdoom-staticlibs.patch +++ b/gzdoom-staticlibs.patch @@ -7,13 +7,27 @@ cmake_install. Some of the code is also an older version and may not necessarily be suitable for getting switched out by system library copies. --- + asmjit/CMakeLists.txt | 2 +- dumb/CMakeLists.txt | 2 +- gdtoa/CMakeLists.txt | 2 +- glslang/glslang/CMakeLists.txt | 2 +- glslang/spirv/CMakeLists.txt | 4 ++-- lzma/CMakeLists.txt | 2 +- - 5 files changed, 6 insertions(+), 6 deletions(-) + 6 files changed, 7 insertions(+), 7 deletions(-) +Index: gzdoom-4.0.0/asmjit/CMakeLists.txt +=================================================================== +--- gzdoom-4.0.0.orig/asmjit/CMakeLists.txt ++++ gzdoom-4.0.0/asmjit/CMakeLists.txt +@@ -97,7 +97,7 @@ set(ASMJIT_SRCS + asmjit/x86/x86regalloc.cpp + ) + +-add_library(${ASMJITNAME} ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS}) ++add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS}) + + set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit) + Index: gzdoom-4.0.0/dumb/CMakeLists.txt =================================================================== --- gzdoom-4.0.0.orig/dumb/CMakeLists.txt diff --git a/gzdoom-systemlibs.patch b/gzdoom-systemlibs.patch new file mode 100644 index 0000000..18dcddc --- /dev/null +++ b/gzdoom-systemlibs.patch @@ -0,0 +1,146 @@ +From: Jan Engelhardt +Date: 2018-01-08 13:48:59+0100 + +Use system libraries instead of bundled code. + +--- + CMakeLists.txt | 7 ++----- + src/CMakeLists.txt | 6 +++--- + src/rendering/vulkan/shaders/vk_shader.cpp | 2 +- + src/rendering/vulkan/system/vk_builders.cpp | 22 +++++++++++----------- + tools/zipdir/CMakeLists.txt | 4 ++-- + 5 files changed, 19 insertions(+), 22 deletions(-) + +Index: gzdoom-4.0.0/CMakeLists.txt +=================================================================== +--- gzdoom-4.0.0.orig/CMakeLists.txt ++++ gzdoom-4.0.0/CMakeLists.txt +@@ -12,6 +12,7 @@ endif() + + list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) + include( FindPackageHandleStandardArgs ) ++include(FindPkgConfig) + + # Support cross compiling + option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO ) +@@ -286,9 +287,6 @@ option(FORCE_INTERNAL_ASMJIT "Use intern + mark_as_advanced( FORCE_INTERNAL_ASMJIT ) + + if (HAVE_VULKAN) +- add_subdirectory( glslang/glslang) +- add_subdirectory( glslang/spirv ) +- add_subdirectory( glslang/OGLCompilersDLL ) + endif() + + # Fast math flags, required by some subprojects +@@ -355,7 +353,7 @@ else() + set( GME_LIBRARIES gme ) + endif() + +-set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lzma/C" ) ++pkg_check_modules(LZMA REQUIRED clzma) + + if( NOT CMAKE_CROSSCOMPILING ) + if( NOT CROSS_EXPORTS ) +@@ -373,7 +371,6 @@ install(DIRECTORY docs/ + DESTINATION ${INSTALL_DOCS_PATH} + COMPONENT "Documentation") + +-add_subdirectory( lzma ) + add_subdirectory( tools ) + add_subdirectory( dumb ) + add_subdirectory( gdtoa ) +Index: gzdoom-4.0.0/src/CMakeLists.txt +=================================================================== +--- gzdoom-4.0.0.orig/src/CMakeLists.txt ++++ gzdoom-4.0.0/src/CMakeLists.txt +@@ -465,9 +465,9 @@ add_custom_target( revision_check ALL + message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" ) + 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_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" ) ++include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" ) + + if( ${HAVE_VM_JIT} ) + add_definitions( -DHAVE_VM_JIT ) +@@ -1370,7 +1370,7 @@ if( UNIX ) + endif() + endif() + +-target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma ) ++target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb ${LZMA_LIBRARIES}) + + include_directories( . + g_statusbar +Index: gzdoom-4.0.0/src/rendering/vulkan/shaders/vk_shader.cpp +=================================================================== +--- gzdoom-4.0.0.orig/src/rendering/vulkan/shaders/vk_shader.cpp ++++ gzdoom-4.0.0/src/rendering/vulkan/shaders/vk_shader.cpp +@@ -4,7 +4,7 @@ + #include "hwrenderer/utility/hw_shaderpatcher.h" + #include "w_wad.h" + #include "doomerrors.h" +-#include ++#include + + VkShaderManager::VkShaderManager(VulkanDevice *device) : device(device) + { +Index: gzdoom-4.0.0/src/rendering/vulkan/system/vk_builders.cpp +=================================================================== +--- gzdoom-4.0.0.orig/src/rendering/vulkan/system/vk_builders.cpp ++++ gzdoom-4.0.0/src/rendering/vulkan/system/vk_builders.cpp +@@ -2,8 +2,8 @@ + #include "vk_builders.h" + #include "doomerrors.h" + #include "r_data/renderstyle.h" +-#include +-#include ++#include ++#include + + static const TBuiltInResource DefaultTBuiltInResource = { + /* .MaxLights = */ 32, +@@ -89,15 +89,15 @@ static const TBuiltInResource DefaultTBu + /* .MaxCullDistances = */ 8, + /* .MaxCombinedClipAndCullDistances = */ 8, + /* .MaxSamples = */ 4, +-// /* .maxMeshOutputVerticesNV = */ 256, +-// /* .maxMeshOutputPrimitivesNV = */ 512, +-// /* .maxMeshWorkGroupSizeX_NV = */ 32, +-// /* .maxMeshWorkGroupSizeY_NV = */ 1, +-// /* .maxMeshWorkGroupSizeZ_NV = */ 1, +-// /* .maxTaskWorkGroupSizeX_NV = */ 32, +-// /* .maxTaskWorkGroupSizeY_NV = */ 1, +-// /* .maxTaskWorkGroupSizeZ_NV = */ 1, +-// /* .maxMeshViewCountNV = */ 4, ++ /* .maxMeshOutputVerticesNV = */ 256, ++ /* .maxMeshOutputPrimitivesNV = */ 512, ++ /* .maxMeshWorkGroupSizeX_NV = */ 32, ++ /* .maxMeshWorkGroupSizeY_NV = */ 1, ++ /* .maxMeshWorkGroupSizeZ_NV = */ 1, ++ /* .maxTaskWorkGroupSizeX_NV = */ 32, ++ /* .maxTaskWorkGroupSizeY_NV = */ 1, ++ /* .maxTaskWorkGroupSizeZ_NV = */ 1, ++ /* .maxMeshViewCountNV = */ 4, + + /* .limits = */ { + /* .nonInductiveForLoops = */ 1, +Index: gzdoom-4.0.0/tools/zipdir/CMakeLists.txt +=================================================================== +--- gzdoom-4.0.0.orig/tools/zipdir/CMakeLists.txt ++++ gzdoom-4.0.0/tools/zipdir/CMakeLists.txt +@@ -1,9 +1,9 @@ + cmake_minimum_required( VERSION 2.8.7 ) + + if( NOT CMAKE_CROSSCOMPILING ) +- include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) ++ include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" ) + add_executable( zipdir + zipdir.c ) +- target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} lzma ) ++ target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${LZMA_LDFLAGS}) + set( CROSS_EXPORTS ${CROSS_EXPORTS} zipdir PARENT_SCOPE ) + endif() diff --git a/gzdoom.changes b/gzdoom.changes index dc24bee..ded050b 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -14,6 +14,8 @@ Mon Apr 08 20:31:53 UTC 2019 - Jan Engelhardt cheats without affecting the server * "wait" console commands no longer execute inside the level, and can run during intermissions and outside the game. +- Folded gzdoom-asmjit.patch into gzdoom-staticlibs.patch. +- Rename gzdoom-lzma.patch to gzdoom-systemlibs.patch. ------------------------------------------------------------------- Wed Jan 23 15:22:45 UTC 2019 - Jan Engelhardt diff --git a/gzdoom.spec b/gzdoom.spec index 9ae6db6..7045453 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -30,18 +30,17 @@ Patch1: gzdoom-waddir.patch Patch2: gzdoom-wadsrc-extra.patch Patch3: gzdoom-staticlibs.patch Patch4: fl2.patch -Patch5: gzdoom-lzma.patch -Patch6: gzdoom-asmjit.patch +Patch5: gzdoom-systemlibs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake >= 2.8.7 BuildRequires: gcc-c++ -#BuildRequires: glslang-devel +BuildRequires: glslang-devel BuildRequires: libjpeg-devel BuildRequires: nasm BuildRequires: pkg-config BuildRequires: unzip BuildRequires: xz -#BuildRequires: pkgconfig(SPIRV-Tools) +BuildRequires: pkgconfig(SPIRV-Tools) BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(fluidsynth) @@ -52,6 +51,7 @@ BuildRequires: pkgconfig(libmpg123) BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(sndfile) +BuildRequires: pkgconfig(vulkan) BuildRequires: pkgconfig(zlib) %if 0%{?suse_version} >= 1500 BuildRequires: pkgconfig(clzma) >= 17.01 @@ -85,7 +85,7 @@ GZDoom is a port (a modification) of the original Doom source code, featuring: %prep %setup -q -%patch -P 1 -P 2 -P 3 -P 4 -P 6 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -p1 %if 0%{?suse_version} >= 1500 %patch -P 5 -p1 @@ -93,6 +93,7 @@ GZDoom is a port (a modification) of the original Doom source code, featuring: perl -i -pe 's{__DATE__}{""}g' src/posix/sdl/i_main.cpp perl -i -pe 's{}{%version}g' \ tools/updaterevision/updaterevision.c +rm -Rfv glslang src/rendering/vulkan/thirdparty/vulkan %build # We must not strip - %%debug_package will take care of it From fa9a5374f72bb18ca6c0bd873b697ca283873a600d6f6167fc9d60b73c4898c4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 13 Apr 2019 13:11:19 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=23 --- gzdoom-lzma.patch | 78 +++++++++++++++++++ ...om-systemlibs.patch => gzdoom-vulkan.patch | 70 ++--------------- gzdoom.changes | 2 +- gzdoom.spec | 10 ++- 4 files changed, 94 insertions(+), 66 deletions(-) create mode 100644 gzdoom-lzma.patch rename gzdoom-systemlibs.patch => gzdoom-vulkan.patch (57%) diff --git a/gzdoom-lzma.patch b/gzdoom-lzma.patch new file mode 100644 index 0000000..51310c5 --- /dev/null +++ b/gzdoom-lzma.patch @@ -0,0 +1,78 @@ +From: Jan Engelhardt +Date: 2018-01-08 13:48:59+0100 + +Use LZMA system libraries instead of bundled code. + +--- + CMakeLists.txt | 4 ++-- + src/CMakeLists.txt | 4 ++-- + tools/zipdir/CMakeLists.txt | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +Index: gzdoom-4.0.0/CMakeLists.txt +=================================================================== +--- gzdoom-4.0.0.orig/CMakeLists.txt ++++ gzdoom-4.0.0/CMakeLists.txt +@@ -12,6 +12,7 @@ endif() + + list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) + include( FindPackageHandleStandardArgs ) ++include(FindPkgConfig) + + # Support cross compiling + option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO ) +@@ -355,7 +356,7 @@ else() + set( GME_LIBRARIES gme ) + endif() + +-set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lzma/C" ) ++pkg_check_modules(LZMA REQUIRED clzma) + + if( NOT CMAKE_CROSSCOMPILING ) + if( NOT CROSS_EXPORTS ) +@@ -373,7 +374,6 @@ install(DIRECTORY docs/ + DESTINATION ${INSTALL_DOCS_PATH} + COMPONENT "Documentation") + +-add_subdirectory( lzma ) + add_subdirectory( tools ) + add_subdirectory( dumb ) + add_subdirectory( gdtoa ) +Index: gzdoom-4.0.0/src/CMakeLists.txt +=================================================================== +--- gzdoom-4.0.0.orig/src/CMakeLists.txt ++++ gzdoom-4.0.0/src/CMakeLists.txt +@@ -467,7 +467,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}" ) + + if( ${HAVE_VM_JIT} ) + add_definitions( -DHAVE_VM_JIT ) +@@ -1370,7 +1370,7 @@ if( UNIX ) + endif() + endif() + +-target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma ) ++target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb ${LZMA_LIBRARIES}) + + include_directories( . + g_statusbar +Index: gzdoom-4.0.0/tools/zipdir/CMakeLists.txt +=================================================================== +--- gzdoom-4.0.0.orig/tools/zipdir/CMakeLists.txt ++++ gzdoom-4.0.0/tools/zipdir/CMakeLists.txt +@@ -1,9 +1,9 @@ + cmake_minimum_required( VERSION 2.8.7 ) + + if( NOT CMAKE_CROSSCOMPILING ) +- include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) ++ include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" ) + add_executable( zipdir + zipdir.c ) +- target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} lzma ) ++ target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${LZMA_LDFLAGS}) + set( CROSS_EXPORTS ${CROSS_EXPORTS} zipdir PARENT_SCOPE ) + endif() diff --git a/gzdoom-systemlibs.patch b/gzdoom-vulkan.patch similarity index 57% rename from gzdoom-systemlibs.patch rename to gzdoom-vulkan.patch index 18dcddc..906f965 100644 --- a/gzdoom-systemlibs.patch +++ b/gzdoom-vulkan.patch @@ -1,29 +1,20 @@ From: Jan Engelhardt -Date: 2018-01-08 13:48:59+0100 +Date: 2019-04-13 15:02:22.799297208 +0200 -Use system libraries instead of bundled code. +Use Vulkan system libraries instead of bundled code. --- - CMakeLists.txt | 7 ++----- - src/CMakeLists.txt | 6 +++--- + CMakeLists.txt | 3 --- + src/CMakeLists.txt | 2 +- src/rendering/vulkan/shaders/vk_shader.cpp | 2 +- src/rendering/vulkan/system/vk_builders.cpp | 22 +++++++++++----------- - tools/zipdir/CMakeLists.txt | 4 ++-- - 5 files changed, 19 insertions(+), 22 deletions(-) + 4 files changed, 13 insertions(+), 16 deletions(-) Index: gzdoom-4.0.0/CMakeLists.txt =================================================================== --- gzdoom-4.0.0.orig/CMakeLists.txt +++ gzdoom-4.0.0/CMakeLists.txt -@@ -12,6 +12,7 @@ endif() - - list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) - include( FindPackageHandleStandardArgs ) -+include(FindPkgConfig) - - # Support cross compiling - option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO ) -@@ -286,9 +287,6 @@ option(FORCE_INTERNAL_ASMJIT "Use intern +@@ -287,9 +287,6 @@ option(FORCE_INTERNAL_ASMJIT "Use intern mark_as_advanced( FORCE_INTERNAL_ASMJIT ) if (HAVE_VULKAN) @@ -33,48 +24,19 @@ Index: gzdoom-4.0.0/CMakeLists.txt endif() # Fast math flags, required by some subprojects -@@ -355,7 +353,7 @@ else() - set( GME_LIBRARIES gme ) - endif() - --set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lzma/C" ) -+pkg_check_modules(LZMA REQUIRED clzma) - - if( NOT CMAKE_CROSSCOMPILING ) - if( NOT CROSS_EXPORTS ) -@@ -373,7 +371,6 @@ install(DIRECTORY docs/ - DESTINATION ${INSTALL_DOCS_PATH} - COMPONENT "Documentation") - --add_subdirectory( lzma ) - add_subdirectory( tools ) - add_subdirectory( dumb ) - add_subdirectory( gdtoa ) Index: gzdoom-4.0.0/src/CMakeLists.txt =================================================================== --- gzdoom-4.0.0.orig/src/CMakeLists.txt +++ gzdoom-4.0.0/src/CMakeLists.txt -@@ -465,9 +465,9 @@ add_custom_target( revision_check ALL +@@ -465,7 +465,7 @@ add_custom_target( revision_check ALL message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" ) 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_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_DIRS}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" ) - if( ${HAVE_VM_JIT} ) - add_definitions( -DHAVE_VM_JIT ) -@@ -1370,7 +1370,7 @@ if( UNIX ) - endif() - endif() - --target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma ) -+target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb ${LZMA_LIBRARIES}) - - include_directories( . - g_statusbar Index: gzdoom-4.0.0/src/rendering/vulkan/shaders/vk_shader.cpp =================================================================== --- gzdoom-4.0.0.orig/src/rendering/vulkan/shaders/vk_shader.cpp @@ -128,19 +90,3 @@ Index: gzdoom-4.0.0/src/rendering/vulkan/system/vk_builders.cpp /* .limits = */ { /* .nonInductiveForLoops = */ 1, -Index: gzdoom-4.0.0/tools/zipdir/CMakeLists.txt -=================================================================== ---- gzdoom-4.0.0.orig/tools/zipdir/CMakeLists.txt -+++ gzdoom-4.0.0/tools/zipdir/CMakeLists.txt -@@ -1,9 +1,9 @@ - cmake_minimum_required( VERSION 2.8.7 ) - - if( NOT CMAKE_CROSSCOMPILING ) -- include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) -+ include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" ) - add_executable( zipdir - zipdir.c ) -- target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} lzma ) -+ target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${LZMA_LDFLAGS}) - set( CROSS_EXPORTS ${CROSS_EXPORTS} zipdir PARENT_SCOPE ) - endif() diff --git a/gzdoom.changes b/gzdoom.changes index ded050b..47fe983 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -15,7 +15,7 @@ Mon Apr 08 20:31:53 UTC 2019 - Jan Engelhardt * "wait" console commands no longer execute inside the level, and can run during intermissions and outside the game. - Folded gzdoom-asmjit.patch into gzdoom-staticlibs.patch. -- Rename gzdoom-lzma.patch to gzdoom-systemlibs.patch. +- Added gzdoom-vulkan.patch. ------------------------------------------------------------------- Wed Jan 23 15:22:45 UTC 2019 - Jan Engelhardt diff --git a/gzdoom.spec b/gzdoom.spec index 7045453..55a245d 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -30,7 +30,8 @@ Patch1: gzdoom-waddir.patch Patch2: gzdoom-wadsrc-extra.patch Patch3: gzdoom-staticlibs.patch Patch4: fl2.patch -Patch5: gzdoom-systemlibs.patch +Patch5: gzdoom-lzma.patch +Patch6: gzdoom-vulkan.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake >= 2.8.7 BuildRequires: gcc-c++ @@ -38,9 +39,9 @@ BuildRequires: glslang-devel BuildRequires: libjpeg-devel BuildRequires: nasm BuildRequires: pkg-config +BuildRequires: spirv-tools-devel BuildRequires: unzip BuildRequires: xz -BuildRequires: pkgconfig(SPIRV-Tools) BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(fluidsynth) @@ -90,10 +91,13 @@ GZDoom is a port (a modification) of the original Doom source code, featuring: %if 0%{?suse_version} >= 1500 %patch -P 5 -p1 %endif +%if 0%{?suse_version} >= 1550 +%patch -P 6 -p1 +rm -Rfv glslang src/rendering/vulkan/thirdparty/vulkan +%endif perl -i -pe 's{__DATE__}{""}g' src/posix/sdl/i_main.cpp perl -i -pe 's{}{%version}g' \ tools/updaterevision/updaterevision.c -rm -Rfv glslang src/rendering/vulkan/thirdparty/vulkan %build # We must not strip - %%debug_package will take care of it From 6da4db3f66dbc0606f47089a88de3f0d54e4ec404f1ce756c85d4af9c27b7881 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 9 Jun 2019 12:52:59 +0000 Subject: [PATCH 4/4] Accepting request 708833 from home:mnhauke:games - Update to new upstream release 4.1.3 * bug fixes for both zscript and vulkan (the vulkan renderer is pretty much complete at this point) * added native double round(double) function * added a crosshair on/off toggle * cl_blockcheats 2 blocks cheats without showing any messages, useful for streamers who happen to be mappers/modders/etc - Update to new upstream release 4.1.0 * workaround buggy preprocessor in old AMD OpenGL drivers * fix bloom pass regression * fixed scale calculations for option menus. * implement custom post process shaders for vulkan backend * improve error handling during vulkan initialization * fixed inverted logic for displaying the generic log in Strife. - Remove patch: * gzdoom-staticlibs.patch (fixed by upstream) - Update patch: * gzdoom-vulkan.patch OBS-URL: https://build.opensuse.org/request/show/708833 OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=24 --- g4.1.3.tar.gz | 3 ++ gzdoom-4.0.0.tar.xz | 3 -- gzdoom-staticlibs.patch | 99 ----------------------------------------- gzdoom-vulkan.patch | 25 ----------- gzdoom.changes | 22 +++++++++ gzdoom.spec | 10 ++--- 6 files changed, 29 insertions(+), 133 deletions(-) create mode 100644 g4.1.3.tar.gz delete mode 100644 gzdoom-4.0.0.tar.xz delete mode 100644 gzdoom-staticlibs.patch diff --git a/g4.1.3.tar.gz b/g4.1.3.tar.gz new file mode 100644 index 0000000..3b84d34 --- /dev/null +++ b/g4.1.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5174c73e553d8ebbb5939255a6bdc56aecd4ff862ed20e544f271d59290a2d2b +size 13084313 diff --git a/gzdoom-4.0.0.tar.xz b/gzdoom-4.0.0.tar.xz deleted file mode 100644 index 290fe6c..0000000 --- a/gzdoom-4.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42d368cdb9cf1cba65ffa0c4c6f28f5aaad4c345c1924eda25466ef97b1e661e -size 9583396 diff --git a/gzdoom-staticlibs.patch b/gzdoom-staticlibs.patch deleted file mode 100644 index 86381f1..0000000 --- a/gzdoom-staticlibs.patch +++ /dev/null @@ -1,99 +0,0 @@ -From: Jan Engelhardt -Date: 2018-01-02 19:17:14.364202580 +0100 - -Bundled code needs to be explicitly set to STATIC, or cmake will generate files -like "liblzma.so" etc. with no versioning and which are not installed by -cmake_install. Some of the code is also an older version and may not -necessarily be suitable for getting switched out by system library copies. - ---- - asmjit/CMakeLists.txt | 2 +- - dumb/CMakeLists.txt | 2 +- - gdtoa/CMakeLists.txt | 2 +- - glslang/glslang/CMakeLists.txt | 2 +- - glslang/spirv/CMakeLists.txt | 4 ++-- - lzma/CMakeLists.txt | 2 +- - 6 files changed, 7 insertions(+), 7 deletions(-) - -Index: gzdoom-4.0.0/asmjit/CMakeLists.txt -=================================================================== ---- gzdoom-4.0.0.orig/asmjit/CMakeLists.txt -+++ gzdoom-4.0.0/asmjit/CMakeLists.txt -@@ -97,7 +97,7 @@ set(ASMJIT_SRCS - asmjit/x86/x86regalloc.cpp - ) - --add_library(${ASMJITNAME} ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS}) -+add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS}) - - set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit) - -Index: gzdoom-4.0.0/dumb/CMakeLists.txt -=================================================================== ---- gzdoom-4.0.0.orig/dumb/CMakeLists.txt -+++ gzdoom-4.0.0/dumb/CMakeLists.txt -@@ -24,7 +24,7 @@ endif() - - include_directories( include ) - --add_library( dumb -+add_library( dumb STATIC - src/core/unload.c - src/core/rendsig.c - src/core/rendduh.c -Index: gzdoom-4.0.0/gdtoa/CMakeLists.txt -=================================================================== ---- gzdoom-4.0.0.orig/gdtoa/CMakeLists.txt -+++ gzdoom-4.0.0/gdtoa/CMakeLists.txt -@@ -35,7 +35,7 @@ if( NOT MSVC AND NOT APPLE ) - set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h ${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h ) - endif() - --add_library( gdtoa -+add_library( gdtoa STATIC - ${GEN_FP_FILES} - dmisc.c - dtoa.c -Index: gzdoom-4.0.0/glslang/glslang/CMakeLists.txt -=================================================================== ---- gzdoom-4.0.0.orig/glslang/glslang/CMakeLists.txt -+++ gzdoom-4.0.0/glslang/glslang/CMakeLists.txt -@@ -106,7 +106,7 @@ set(HEADERS - # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - # set(BISON_GLSLParser_OUTPUT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp) - --add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) -+add_library(glslang STATIC ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) - set_property(TARGET glslang PROPERTY FOLDER glslang) - set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON) - target_link_libraries(glslang OGLCompiler OSDependent) -Index: gzdoom-4.0.0/glslang/spirv/CMakeLists.txt -=================================================================== ---- gzdoom-4.0.0.orig/glslang/spirv/CMakeLists.txt -+++ gzdoom-4.0.0/glslang/spirv/CMakeLists.txt -@@ -56,12 +56,12 @@ if(ENABLE_NV_EXTENSIONS) - GLSL.ext.NV.h) - endif(ENABLE_NV_EXTENSIONS) - --add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) -+add_library(SPIRV STATIC ${SOURCES} ${HEADERS}) - set_property(TARGET SPIRV PROPERTY FOLDER glslang) - set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) - target_include_directories(SPIRV PUBLIC ..) - --add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) -+add_library(SPVRemapper STATIC ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) - set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) - set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) - -Index: gzdoom-4.0.0/lzma/CMakeLists.txt -=================================================================== ---- gzdoom-4.0.0.orig/lzma/CMakeLists.txt -+++ gzdoom-4.0.0/lzma/CMakeLists.txt -@@ -34,5 +34,5 @@ else() - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_7ZIP_ST" ) - endif() - --add_library( lzma ${LZMA_FILES} ) -+add_library( lzma STATIC ${LZMA_FILES} ) - target_link_libraries( lzma ) diff --git a/gzdoom-vulkan.patch b/gzdoom-vulkan.patch index 906f965..343e3de 100644 --- a/gzdoom-vulkan.patch +++ b/gzdoom-vulkan.patch @@ -65,28 +65,3 @@ Index: gzdoom-4.0.0/src/rendering/vulkan/system/vk_builders.cpp static const TBuiltInResource DefaultTBuiltInResource = { /* .MaxLights = */ 32, -@@ -89,15 +89,15 @@ static const TBuiltInResource DefaultTBu - /* .MaxCullDistances = */ 8, - /* .MaxCombinedClipAndCullDistances = */ 8, - /* .MaxSamples = */ 4, --// /* .maxMeshOutputVerticesNV = */ 256, --// /* .maxMeshOutputPrimitivesNV = */ 512, --// /* .maxMeshWorkGroupSizeX_NV = */ 32, --// /* .maxMeshWorkGroupSizeY_NV = */ 1, --// /* .maxMeshWorkGroupSizeZ_NV = */ 1, --// /* .maxTaskWorkGroupSizeX_NV = */ 32, --// /* .maxTaskWorkGroupSizeY_NV = */ 1, --// /* .maxTaskWorkGroupSizeZ_NV = */ 1, --// /* .maxMeshViewCountNV = */ 4, -+ /* .maxMeshOutputVerticesNV = */ 256, -+ /* .maxMeshOutputPrimitivesNV = */ 512, -+ /* .maxMeshWorkGroupSizeX_NV = */ 32, -+ /* .maxMeshWorkGroupSizeY_NV = */ 1, -+ /* .maxMeshWorkGroupSizeZ_NV = */ 1, -+ /* .maxTaskWorkGroupSizeX_NV = */ 32, -+ /* .maxTaskWorkGroupSizeY_NV = */ 1, -+ /* .maxTaskWorkGroupSizeZ_NV = */ 1, -+ /* .maxMeshViewCountNV = */ 4, - - /* .limits = */ { - /* .nonInductiveForLoops = */ 1, diff --git a/gzdoom.changes b/gzdoom.changes index 47fe983..342672e 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sun Jun 9 11:31:24 UTC 2019 - Martin Hauke + +- Update to new upstream release 4.1.3 + * bug fixes for both zscript and vulkan (the vulkan renderer is + pretty much complete at this point) + * added native double round(double) function + * added a crosshair on/off toggle + * cl_blockcheats 2 blocks cheats without showing any messages, + useful for streamers who happen to be mappers/modders/etc +- Update to new upstream release 4.1.0 + * workaround buggy preprocessor in old AMD OpenGL drivers + * fix bloom pass regression + * fixed scale calculations for option menus. + * implement custom post process shaders for vulkan backend + * improve error handling during vulkan initialization + * fixed inverted logic for displaying the generic log in Strife. +- Remove patch: + * gzdoom-staticlibs.patch (fixed by upstream) +- Update patch: + * gzdoom-vulkan.patch + ------------------------------------------------------------------- Mon Apr 08 20:31:53 UTC 2019 - Jan Engelhardt diff --git a/gzdoom.spec b/gzdoom.spec index 55a245d..1d02fcd 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -17,7 +17,7 @@ Name: gzdoom -Version: 4.0.0 +Version: 4.1.3 Release: 0 Summary: A DOOM source port with graphic and modding extensions License: GPL-3.0-only @@ -25,14 +25,12 @@ Group: Amusements/Games/3D/Shoot Url: http://zdoom.org/ #Git-Clone: https://github.com/coelckers/gzdoom -Source: %name-%version.tar.xz +Source: https://github.com/coelckers/gzdoom/archive/g%{version}.tar.gz Patch1: gzdoom-waddir.patch Patch2: gzdoom-wadsrc-extra.patch -Patch3: gzdoom-staticlibs.patch Patch4: fl2.patch Patch5: gzdoom-lzma.patch Patch6: gzdoom-vulkan.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake >= 2.8.7 BuildRequires: gcc-c++ BuildRequires: glslang-devel @@ -85,8 +83,8 @@ GZDoom is a port (a modification) of the original Doom source code, featuring: * Demo record/playback of classic and Boom demos is not supported. %prep -%setup -q -%patch -P 1 -P 2 -P 3 -P 4 -p1 +%setup -q -n %{name}-g%{version} +%patch -P 1 -P 2 -P 4 -p1 %if 0%{?suse_version} >= 1500 %patch -P 5 -p1