- Update to release 4.6

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

0001-fixed-zipdir-inability-to-update-empty-zip-file.patch

@@ -1,23 +0,0 @@
-From ecf070148199c333dec01f28e4a7a05118162260 Mon Sep 17 00:00:00 2001
-From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
-Date: Sun, 1 Nov 2020 10:24:22 +0200
-Subject: [PATCH] - fixed zipdir inability to update empty zip file
-
-https://forum.zdoom.org/viewtopic.php?t=70468
----
- tools/zipdir/zipdir.c |    2 ++
- 1 file changed, 2 insertions(+)
-
-Index: gzdoom-g4.5.0/tools/zipdir/zipdir.c
-===================================================================
---- gzdoom-g4.5.0.orig/tools/zipdir/zipdir.c
-+++ gzdoom-g4.5.0/tools/zipdir/zipdir.c
-@@ -781,6 +781,8 @@ void write_zip(const char *zipname, dir_
- 			if (central_dir == NULL)
- 			{
- 				fprintf(stderr, "Could not read central directory from %s. (Is it a zipfile?)\n", zipname);
-+				fclose(ozip);
-+				ozip = NULL;
- 				update = 0;
- 			}
- 		}

g4.5.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:21eb1a221dae532a6c29f243584be3d5454f8eb4da85a67e405115f89666611d
-size 12741814

g4.6.0.tar.gz

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

gzdoom-lzma.patch

@@ -9,11 +9,11 @@ Use LZMA system libraries instead of bundled code.
  tools/zipdir/CMakeLists.txt |    4 ++--
  3 files changed, 6 insertions(+), 6 deletions(-)
 
-Index: gzdoom-g4.4.0/CMakeLists.txt
+Index: gzdoom-g4.6.0/CMakeLists.txt
 ===================================================================
---- gzdoom-g4.4.0.orig/CMakeLists.txt
-+++ gzdoom-g4.4.0/CMakeLists.txt
-@@ -12,6 +12,7 @@ endif()
+--- gzdoom-g4.6.0.orig/CMakeLists.txt
++++ gzdoom-g4.6.0/CMakeLists.txt
+@@ -17,6 +17,7 @@ endif()
  
  list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
  include( FindPackageHandleStandardArgs )
@@ -21,7 +21,7 @@ Index: gzdoom-g4.4.0/CMakeLists.txt
  
  # Support cross compiling
  option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO )
-@@ -369,7 +370,7 @@ else()
+@@ -378,7 +379,7 @@ else()
  endif()
  
  
@@ -30,7 +30,7 @@ Index: gzdoom-g4.4.0/CMakeLists.txt
  
  if( NOT CMAKE_CROSSCOMPILING )
  	if( NOT CROSS_EXPORTS )
-@@ -389,7 +390,6 @@ install(DIRECTORY docs/
+@@ -398,7 +399,6 @@ install(DIRECTORY docs/
  
  option( DYN_OPENAL "Dynamically load OpenAL" ON )
  
@@ -38,11 +38,11 @@ Index: gzdoom-g4.4.0/CMakeLists.txt
  add_subdirectory( tools )
  add_subdirectory( libraries/gdtoa )
  add_subdirectory( wadsrc )
-Index: gzdoom-g4.4.0/src/CMakeLists.txt
+Index: gzdoom-g4.6.0/src/CMakeLists.txt
 ===================================================================
---- gzdoom-g4.4.0.orig/src/CMakeLists.txt
-+++ gzdoom-g4.4.0/src/CMakeLists.txt
-@@ -437,7 +437,7 @@ set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LI
+--- gzdoom-g4.6.0.orig/src/CMakeLists.txt
++++ gzdoom-g4.6.0/src/CMakeLists.txt
+@@ -406,7 +406,7 @@ set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LI
  if (HAVE_VULKAN)
  	set( ZDOOM_LIBS ${ZDOOM_LIBS} "glslang" "SPIRV" "OGLCompiler")
  endif()
@@ -51,7 +51,7 @@ Index: gzdoom-g4.4.0/src/CMakeLists.txt
  
  if( ${HAVE_VM_JIT} )
  	add_definitions( -DHAVE_VM_JIT )
-@@ -1238,7 +1238,7 @@ if( UNIX )
+@@ -1231,7 +1231,7 @@ if( UNIX )
  	endif()
  endif()
  
@@ -60,12 +60,12 @@ Index: gzdoom-g4.4.0/src/CMakeLists.txt
  
  include_directories( .
  	common/audio/sound
-Index: gzdoom-g4.4.0/tools/zipdir/CMakeLists.txt
+Index: gzdoom-g4.6.0/tools/zipdir/CMakeLists.txt
 ===================================================================
---- gzdoom-g4.4.0.orig/tools/zipdir/CMakeLists.txt
-+++ gzdoom-g4.4.0/tools/zipdir/CMakeLists.txt
+--- gzdoom-g4.6.0.orig/tools/zipdir/CMakeLists.txt
++++ gzdoom-g4.6.0/tools/zipdir/CMakeLists.txt
 @@ -1,9 +1,9 @@
- cmake_minimum_required( VERSION 2.8.7 )
+ cmake_minimum_required( VERSION 3.1.0 )
  
  if( NOT CMAKE_CROSSCOMPILING )
 -	include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" )

gzdoom.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat May 22 17:03:00 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 4.6
+  * Widescreen graphics for Heretic and Hexen
+  * Sprite shadows like in the Build engine. Both in software and
+    hardware renderer.
+  * 16 bit channel PNG files can be read.
+  * DEHEXTRA working properly now.
+  * Various enhancements and fixes for ZScript.
+
 -------------------------------------------------------------------
 Thu Mar  4 19:55:21 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
 

gzdoom.spec

@@ -17,7 +17,7 @@
 
 
 Name:           gzdoom
-Version:        4.5.0
+Version:        4.6.0
 Release:        0
 Summary:        A DOOM source port with graphic and modding extensions
 License:        GPL-3.0-only
@@ -31,7 +31,6 @@ Patch2:         gzdoom-lzma.patch
 Patch3:         gzdoom-asmjit.patch
 Patch4:         gzdoom-sdlbug.patch
 Patch5:         gzdoom-vulkan.patch
-Patch6:         0001-fixed-zipdir-inability-to-update-empty-zip-file.patch
 BuildRequires:  cmake >= 2.8.7
 BuildRequires:  gcc-c++
 BuildRequires:  libjpeg-devel
@@ -81,7 +80,6 @@ GZDoom is a port (a modification) of the original Doom source code, featuring:
 %patch -P 5 -p1
 rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan
 %endif
-%patch -P 6 -p1
 perl -i -pe 's{__DATE__}{""}g' src/common/platform/posix/sdl/i_main.cpp
 
 %build