- Update to new upstream release 4.0.0

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

_service

@@ -2,8 +2,8 @@
 	<service name="tar_scm" mode="disabled">
 		<param name="scm">git</param>
 		<param name="url">git://github.com/coelckers/gzdoom</param>
-		<param name="revision">g3.7.2</param>
+		<param name="revision">g4.0.0</param>
-		<param name="versionformat">3.7.2</param>
+		<param name="versionformat">4.0.0</param>
 		<!-- non-OSI media -->
 		<param name="exclude">wadsrc_extra</param>
 	</service>

gzdoom-3.7.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7414160623d46fa56672bea88f0140e86ee70dbfe2fd778cd1e4e5410b74685b
-size 8379076

gzdoom-4.0.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42d368cdb9cf1cba65ffa0c4c6f28f5aaad4c345c1924eda25466ef97b1e661e
+size 9583396

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-4.0.0.orig/CMakeLists.txt
-+++ gzdoom-3.7.2/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.
+ # Support cross compiling
- if( MSVC )
+ option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO )
-@@ -340,7 +341,7 @@ else()
+@@ -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-4.0.0.orig/src/CMakeLists.txt
-+++ gzdoom-3.7.2/src/CMakeLists.txt
++++ gzdoom-4.0.0/src/CMakeLists.txt
-@@ -461,7 +461,7 @@ add_custom_target( revision_check ALL
+@@ -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}" )
+ if( ${HAVE_VM_JIT} )
- set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" "${ASMJIT_LIBRARIES}" "${CMAKE_DL_LIBS}" )
+ 	add_definitions( -DHAVE_VM_JIT )
--include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${ASMJIT_INCLUDE_DIR}" )
+@@ -1370,7 +1370,7 @@ if( UNIX )
-+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 )
  	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-4.0.0.orig/tools/zipdir/CMakeLists.txt
-+++ gzdoom-3.7.2/tools/zipdir/CMakeLists.txt
++++ gzdoom-4.0.0/tools/zipdir/CMakeLists.txt
 @@ -1,9 +1,9 @@
  cmake_minimum_required( VERSION 2.8.7 )
  

gzdoom-staticlibs.patch

@@ -1,22 +1,23 @@
 From: Jan Engelhardt <jengelh@inai.de>
 Date: 2018-01-02 19:17:14.364202580 +0100
 
-Some bundled code (which is also an older version and cannot simply be switched
+Bundled code needs to be explicitly set to STATIC, or cmake will generate files
-out just yet) needs to be explicitly set to STATIC, or cmake will generate
+like "liblzma.so" etc. with no versioning and which are not installed by
-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
-cmake_install.
+necessarily be suitable for getting switched out by system library copies.
 
 ---
- CMakeLists.txt       |    1 -
  dumb/CMakeLists.txt            |    2 +-
  gdtoa/CMakeLists.txt           |    2 +-
+ glslang/glslang/CMakeLists.txt |    2 +-
+ glslang/spirv/CMakeLists.txt   |    4 ++--
  lzma/CMakeLists.txt            |    2 +-
- 4 files changed, 3 insertions(+), 4 deletions(-)
+ 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-4.0.0.orig/dumb/CMakeLists.txt
-+++ gzdoom-g3.2.4/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-4.0.0.orig/gdtoa/CMakeLists.txt
-+++ gzdoom-g3.2.4/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-4.0.0.orig/glslang/glslang/CMakeLists.txt
-+++ gzdoom-g3.2.4/lzma/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()

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-4.0.0.orig/src/posix/i_system.h
-+++ gzdoom-g3.2.4/src/posix/i_system.h
++++ gzdoom-4.0.0/src/posix/i_system.h
-@@ -40,7 +40,7 @@ struct ticcmd_t;
+@@ -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
+ 

gzdoom.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Mon Apr 08 20:31:53 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- 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 <jengelh@inai.de>
 

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)