From 88040d83ffd68b3762ee6f6115841d6e68acb40999b3d562c7495f3679848ac8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 3 Jan 2019 16:09:32 +0000 Subject: [PATCH 1/3] - Update to new upstream release 3.7.1 OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=17 --- _service | 4 ++-- gzdoom-3.6.0.tar.xz | 3 --- gzdoom-3.7.1.tar.xz | 3 +++ gzdoom-asmjit.patch | 22 ++++++++++++++++++++++ gzdoom-lzma.patch | 46 +++++++++++++++++++++++++-------------------- gzdoom.changes | 14 ++++++++++++++ gzdoom.spec | 7 ++++--- 7 files changed, 71 insertions(+), 28 deletions(-) delete mode 100644 gzdoom-3.6.0.tar.xz create mode 100644 gzdoom-3.7.1.tar.xz create mode 100644 gzdoom-asmjit.patch diff --git a/_service b/_service index 095b121..fa329d5 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ git git://github.com/coelckers/gzdoom - g3.6.0 - 3.6.0 + g3.7.1 + 3.7.1 wadsrc_extra diff --git a/gzdoom-3.6.0.tar.xz b/gzdoom-3.6.0.tar.xz deleted file mode 100644 index 8f74ce1..0000000 --- a/gzdoom-3.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:970536a12e1ae718911100e2152f26e73bd7a8505a32f911576b387f4fe78901 -size 8032488 diff --git a/gzdoom-3.7.1.tar.xz b/gzdoom-3.7.1.tar.xz new file mode 100644 index 0000000..2305765 --- /dev/null +++ b/gzdoom-3.7.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40aae7098354ca424a64bd5d10a4741b4e51d86416968ab5ad6fcbe5847c2cdc +size 8382380 diff --git a/gzdoom-asmjit.patch b/gzdoom-asmjit.patch new file mode 100644 index 0000000..21c3a96 --- /dev/null +++ b/gzdoom-asmjit.patch @@ -0,0 +1,22 @@ +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 index 5483d45..7022952 100644 --- a/gzdoom-lzma.patch +++ b/gzdoom-lzma.patch @@ -1,7 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1328491d3..219c20461 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt +--- + CMakeLists.txt | 4 ++-- + src/CMakeLists.txt | 4 ++-- + tools/zipdir/CMakeLists.txt | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +Index: gzdoom-3.7.1/CMakeLists.txt +=================================================================== +--- gzdoom-3.7.1.orig/CMakeLists.txt ++++ gzdoom-3.7.1/CMakeLists.txt @@ -12,6 +12,7 @@ endif() list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) @@ -10,7 +16,7 @@ index 1328491d3..219c20461 100644 # Produce a warning if XP support will be missing when building a 32 bit target for MSVC. if( MSVC ) -@@ -320,7 +321,7 @@ else() +@@ -336,7 +337,7 @@ else() set( GME_LIBRARIES gme ) endif() @@ -19,28 +25,28 @@ index 1328491d3..219c20461 100644 if( NOT CMAKE_CROSSCOMPILING ) if( NOT CROSS_EXPORTS ) -@@ -338,7 +339,6 @@ install(DIRECTORY docs/ - DESTINATION ${INSTALL_DOCS_PATH} +@@ -354,7 +355,6 @@ install(DIRECTORY docs/ + DESTINATION ${INSTALL_DOCS_PATH} COMPONENT "Documentation") -add_subdirectory( lzma ) add_subdirectory( tools ) add_subdirectory( dumb ) add_subdirectory( gdtoa ) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 993952e8d..ea222f12a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -460,7 +460,7 @@ add_custom_target( revision_check ALL +Index: gzdoom-3.7.1/src/CMakeLists.txt +=================================================================== +--- gzdoom-3.7.1.orig/src/CMakeLists.txt ++++ gzdoom-3.7.1/src/CMakeLists.txt +@@ -461,7 +461,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}" ) --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}" ) + 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}" ) -@@ -1285,7 +1285,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") +@@ -1301,7 +1301,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS" set( ZDOOM_LIBS ${ZDOOM_LIBS} nsl socket) endif() @@ -49,10 +55,10 @@ index 993952e8d..ea222f12a 100644 include_directories( . g_statusbar -diff --git a/tools/zipdir/CMakeLists.txt b/tools/zipdir/CMakeLists.txt -index 6a36b2cb5..75cadf47e 100644 ---- a/tools/zipdir/CMakeLists.txt -+++ b/tools/zipdir/CMakeLists.txt +Index: gzdoom-3.7.1/tools/zipdir/CMakeLists.txt +=================================================================== +--- gzdoom-3.7.1.orig/tools/zipdir/CMakeLists.txt ++++ gzdoom-3.7.1/tools/zipdir/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required( VERSION 2.8.7 ) diff --git a/gzdoom.changes b/gzdoom.changes index bf76ce4..25bebe2 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Jan 3 01:37:12 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 3.7.1 + * Expand UDMF and ZScript API for side's own additive colors + * Added NOFRICTION and NOFRICTIONBOUNCE actor flags + * Added an AMD64 JIT for DECORATE and ZScript + * Lights are now referenced by sections rather than surface, to + speed up light linking. This should allow a dynamically-lit + plasma bolt to pass over a 3D bridge in Frozen Time without + turning the game into a slide show. + * Add shader cache for Intel GPUs which should result in faster + startups. + ------------------------------------------------------------------- Wed Nov 14 09:58:09 UTC 2018 - Jan Engelhardt diff --git a/gzdoom.spec b/gzdoom.spec index 87d601a..e808a58 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -1,7 +1,7 @@ # # spec file for package gzdoom # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gzdoom -Version: 3.6.0 +Version: 3.7.1 Release: 0 Summary: A DOOM source port with graphic and modding extensions License: GPL-3.0-only @@ -31,6 +31,7 @@ Patch2: gzdoom-wadsrc-extra.patch Patch3: gzdoom-staticlibs.patch Patch4: fl2.patch Patch5: gzdoom-lzma.patch +Patch6: gzdoom-asmjit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake >= 2.8.7 BuildRequires: gcc-c++ @@ -82,7 +83,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 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -P 6 -p1 %if 0%{?suse_version} >= 1500 %patch -P 5 -p1 From 0a089a95ee84e25cfacad1c0220994a36a74f9307267f2b19fe7fadc47b3dbe3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 7 Jan 2019 11:38:55 +0000 Subject: [PATCH 2/3] - Add gzdoom-asmjit.patch OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=18 --- gzdoom.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/gzdoom.changes b/gzdoom.changes index 25bebe2..5a3e800 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -11,6 +11,7 @@ Thu Jan 3 01:37:12 UTC 2019 - Jan Engelhardt turning the game into a slide show. * Add shader cache for Intel GPUs which should result in faster startups. +- Add gzdoom-asmjit.patch ------------------------------------------------------------------- Wed Nov 14 09:58:09 UTC 2018 - Jan Engelhardt From 0e5c8351855092fc1d8521b29b11d2854550e0ba58a0c3971918bddd715b0e9d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 23 Jan 2019 16:00:40 +0000 Subject: [PATCH 3/3] - Update to new upstream release 3.7.2 OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=19 --- _service | 4 ++-- gzdoom-3.7.1.tar.xz | 3 --- gzdoom-3.7.2.tar.xz | 3 +++ gzdoom-lzma.patch | 26 +++++++++++++------------- gzdoom.changes | 10 ++++++++++ gzdoom.spec | 2 +- 6 files changed, 29 insertions(+), 19 deletions(-) delete mode 100644 gzdoom-3.7.1.tar.xz create mode 100644 gzdoom-3.7.2.tar.xz diff --git a/_service b/_service index fa329d5..ea2a180 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ git git://github.com/coelckers/gzdoom - g3.7.1 - 3.7.1 + g3.7.2 + 3.7.2 wadsrc_extra diff --git a/gzdoom-3.7.1.tar.xz b/gzdoom-3.7.1.tar.xz deleted file mode 100644 index 2305765..0000000 --- a/gzdoom-3.7.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40aae7098354ca424a64bd5d10a4741b4e51d86416968ab5ad6fcbe5847c2cdc -size 8382380 diff --git a/gzdoom-3.7.2.tar.xz b/gzdoom-3.7.2.tar.xz new file mode 100644 index 0000000..05948d4 --- /dev/null +++ b/gzdoom-3.7.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7414160623d46fa56672bea88f0140e86ee70dbfe2fd778cd1e4e5410b74685b +size 8379076 diff --git a/gzdoom-lzma.patch b/gzdoom-lzma.patch index 7022952..bef5dd0 100644 --- a/gzdoom-lzma.patch +++ b/gzdoom-lzma.patch @@ -4,10 +4,10 @@ tools/zipdir/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) -Index: gzdoom-3.7.1/CMakeLists.txt +Index: gzdoom-3.7.2/CMakeLists.txt =================================================================== ---- gzdoom-3.7.1.orig/CMakeLists.txt -+++ gzdoom-3.7.1/CMakeLists.txt +--- gzdoom-3.7.2.orig/CMakeLists.txt ++++ gzdoom-3.7.2/CMakeLists.txt @@ -12,6 +12,7 @@ endif() list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) @@ -16,7 +16,7 @@ Index: gzdoom-3.7.1/CMakeLists.txt # Produce a warning if XP support will be missing when building a 32 bit target for MSVC. if( MSVC ) -@@ -336,7 +337,7 @@ else() +@@ -340,7 +341,7 @@ else() set( GME_LIBRARIES gme ) endif() @@ -25,7 +25,7 @@ Index: gzdoom-3.7.1/CMakeLists.txt if( NOT CMAKE_CROSSCOMPILING ) if( NOT CROSS_EXPORTS ) -@@ -354,7 +355,6 @@ install(DIRECTORY docs/ +@@ -358,7 +359,6 @@ install(DIRECTORY docs/ DESTINATION ${INSTALL_DOCS_PATH} COMPONENT "Documentation") @@ -33,10 +33,10 @@ Index: gzdoom-3.7.1/CMakeLists.txt add_subdirectory( tools ) add_subdirectory( dumb ) add_subdirectory( gdtoa ) -Index: gzdoom-3.7.1/src/CMakeLists.txt +Index: gzdoom-3.7.2/src/CMakeLists.txt =================================================================== ---- gzdoom-3.7.1.orig/src/CMakeLists.txt -+++ gzdoom-3.7.1/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 message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" ) @@ -46,8 +46,8 @@ Index: gzdoom-3.7.1/src/CMakeLists.txt if( SNDFILE_FOUND ) set( ZDOOM_LIBS ${ZDOOM_LIBS} "${SNDFILE_LIBRARIES}" ) -@@ -1301,7 +1301,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS" - set( ZDOOM_LIBS ${ZDOOM_LIBS} nsl socket) +@@ -1308,7 +1308,7 @@ if( UNIX ) + endif() endif() -target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma ) @@ -55,10 +55,10 @@ Index: gzdoom-3.7.1/src/CMakeLists.txt include_directories( . g_statusbar -Index: gzdoom-3.7.1/tools/zipdir/CMakeLists.txt +Index: gzdoom-3.7.2/tools/zipdir/CMakeLists.txt =================================================================== ---- gzdoom-3.7.1.orig/tools/zipdir/CMakeLists.txt -+++ gzdoom-3.7.1/tools/zipdir/CMakeLists.txt +--- gzdoom-3.7.2.orig/tools/zipdir/CMakeLists.txt ++++ gzdoom-3.7.2/tools/zipdir/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required( VERSION 2.8.7 ) diff --git a/gzdoom.changes b/gzdoom.changes index 5a3e800..10030b6 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jan 23 15:22:45 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 3.7.2 + * The resolution selector now sets to auto detected resolution at + startup, no longer uses entries from the config file. + * Committing a scaling change for fullscreen sets scaling to 1.0 + to guarantee the selected number of pixels are actually used. + * For details, see https://forum.zdoom.org/viewtopic.php?t=63346 + ------------------------------------------------------------------- Thu Jan 3 01:37:12 UTC 2019 - Jan Engelhardt diff --git a/gzdoom.spec b/gzdoom.spec index e808a58..ec0f548 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -17,7 +17,7 @@ Name: gzdoom -Version: 3.7.1 +Version: 3.7.2 Release: 0 Summary: A DOOM source port with graphic and modding extensions License: GPL-3.0-only