- Update to new upstream 3.2.5

OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=5

_service

@@ -0,0 +1,15 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">git://github.com/coelckers/gzdoom</param>
+		<param name="revision">g3.2.5</param>
+		<param name="versionformat">3.2.5</param>
+		<!-- non-OSI media -->
+		<param name="exclude">wadsrc_extra</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>

gzdoom-3.2.5.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69f941b20fa9e7260f04f1949a2956805b72db58cb8a8435b54905cc9d206a13
+size 7600388

gzdoom-g3.2.4.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f7881afc86e6a999d959e3567cc278dffb0dda6e81251606648498f9aa3e773
-size 10963409

gzdoom-lzma.patch

@@ -0,0 +1,78 @@
+From: Jan Engelhradt <jengelh@inai.de>
+Date: 2018-01-08 13:45:39.937133591 +0100
+
+Use system-provided LZMA SDK.
+
+---
+ CMakeLists.txt              |    4 ++--
+ src/CMakeLists.txt          |    4 ++--
+ tools/zipdir/CMakeLists.txt |    4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+Index: gzdoom-3.2.5/CMakeLists.txt
+===================================================================
+--- gzdoom-3.2.5.orig/CMakeLists.txt
++++ gzdoom-3.2.5/CMakeLists.txt
+@@ -13,6 +13,7 @@ endif()
+ list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
+ include( CreateLaunchers )
+ include( FindPackageHandleStandardArgs )
++include(FindPkgConfig)
+ 
+ # Produce a warning if XP support will be missing.
+ if( MSVC )
+@@ -311,7 +312,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 )
+@@ -329,7 +330,6 @@ install(DIRECTORY docs/
+ 		DESTINATION ${INSTALL_DOCS_PATH} 
+ 		COMPONENT "Documentation")
+ 
+-add_subdirectory( lzma )
+ add_subdirectory( tools )
+ add_subdirectory( dumb )
+ add_subdirectory( gdtoa )
+Index: gzdoom-3.2.5/src/CMakeLists.txt
+===================================================================
+--- gzdoom-3.2.5.orig/src/CMakeLists.txt
++++ gzdoom-3.2.5/src/CMakeLists.txt
+@@ -454,7 +454,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}" )
+ 
+ if( SNDFILE_FOUND )
+     set( ZDOOM_LIBS ${ZDOOM_LIBS} "${SNDFILE_LIBRARIES}" )
+@@ -1220,7 +1220,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS"
+ 	set( ZDOOM_LIBS ${ZDOOM_LIBS} nsl socket)
+ 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-3.2.5/tools/zipdir/CMakeLists.txt
+===================================================================
+--- gzdoom-3.2.5.orig/tools/zipdir/CMakeLists.txt
++++ gzdoom-3.2.5/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()

gzdoom-wadsrc-extra.patch

@@ -0,0 +1,22 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2018-01-09 00:35:47.044540108 +0100
+
+Since the openSUSE _service file downloads and creates a tarball
+without wadsrc_extra, it now needs to be removed from CMakeLists
+so that cmake does not fail with an error.
+---
+ CMakeLists.txt |    1 -
+ 1 file changed, 1 deletion(-)
+
+Index: gzdoom-3.2.5/CMakeLists.txt
+===================================================================
+--- gzdoom-3.2.5.orig/CMakeLists.txt
++++ gzdoom-3.2.5/CMakeLists.txt
+@@ -336,7 +336,6 @@ add_subdirectory( gdtoa )
+ add_subdirectory( wadsrc )
+ add_subdirectory( wadsrc_bm )
+ add_subdirectory( wadsrc_lights )
+-add_subdirectory( wadsrc_extra )
+ add_subdirectory( src )
+ 
+ if( NOT CMAKE_CROSSCOMPILING )

gzdoom.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Mon Jan  8 12:48:59 UTC 2018 - jengelh@inai.de
+
+- Update to new upstream 3.2.5
+  * Implemented 'i_soundinbackground' to continue playing sounds
+    and music while in background.
+  * OpenGL rendering now continues even when losing focus if not
+    running fullscreen.
+  * Added 'playerrespawn' skill flag to allow gameplay mods to
+    retroactively enable player respawns in single player on
+    all maps.
+  * Improved Advanced Sound Options menu - added option for
+    FluidSynth chorus, removed fractional part from FluidSynth
+    voices option.
+  * Fixed applying of Doom 64 lighting to horizon portals.
+  * Particles are now interpolated.
+- Use system lzma-sdk
+- Add 0001-Update-LZMA-SDK-to-version-17.01.patch,
+  gzdoom-lzma.patch, gzdoom-wadsrc-extra.patch
+
 -------------------------------------------------------------------
 Tue Jan  2 13:14:54 UTC 2018 - jengelh@inai.de
 

gzdoom.spec

@@ -17,7 +17,7 @@
 
 
 Name:           gzdoom
-Version:        3.2.4
+Version:        3.2.5
 Release:        0
 Summary:        A DOOM source port with graphic and modding extensions
 License:        GPL-3.0
@@ -25,9 +25,12 @@ Group:          Amusements/Games/3D/Shoot
 Url:            http://zdoom.org/
 
 #Git-Clone:     https://github.com/coelckers/gzdoom
-Source:         https://zdoom.org/files/gzdoom/src/gzdoom-g%version.zip
+Source:         %name-%version.tar.xz
 Patch1:         gzdoom-waddir.patch
 Patch2:         gzdoom-staticlibs.patch
+Patch3:         0001-Update-LZMA-SDK-to-version-17.01.patch
+Patch4:         gzdoom-lzma.patch
+Patch5:         gzdoom-wadsrc-extra.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake >= 2.8.7
 BuildRequires:  gcc-c++
@@ -35,13 +38,14 @@ BuildRequires:  libjpeg-devel
 BuildRequires:  nasm
 BuildRequires:  pkg-config
 BuildRequires:  unzip
+BuildRequires:  xz
 BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  pkgconfig(clzma) >= 17.01
 BuildRequires:  pkgconfig(flac)
 BuildRequires:  pkgconfig(fluidsynth)
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libgme)
-BuildRequires:  pkgconfig(liblzma)
 BuildRequires:  pkgconfig(openal)
 BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(zlib)
@@ -56,7 +60,6 @@ Provides:       zdoom = 2.8.1
 # DUMB is modified to read OggVorbis samples
 Provides:       bundled(dumb) = 0.9.3
 Provides:       bundled(gdtoa)
-Provides:       bundled(lzma-sdk) = 15.13
 Provides:       bundled(re2c) = 0.16.0
 
 %description
@@ -72,8 +75,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 -qn gzdoom-g%version
+%setup -q
-%patch -P 1 -P 2 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
 perl -i -pe 's{__DATE__}{""}g' src/posix/sdl/i_main.cpp
 perl -i -pe 's{<unknown version>}{%version}g' \
 	tools/updaterevision/updaterevision.c