- Update to release 4.8.0

OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=66
2022-06-16 16:39:07 +00:00 · 2022-06-16 16:39:07 +00:00 · 6c3c514319
commit 6c3c514319
parent 953d7a3437
7 changed files with 97 additions and 40 deletions
--- a/g4.7.1.tar.gz
+++ b/g4.7.1.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:454257582be0576501eef1efc99fe7ea70f1c4d7993549db3cbc709ce75fc102
-size 19562412
--- a/g4.8.0.tar.gz
+++ b/g4.8.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f749120e8151bf3b4a9ac6cc923820cf9559a123bf60298e8f83e70e4cffc245
+size 24121381
--- a/gzdoom-discord.patch
+++ b/gzdoom-discord.patch
@ -0,0 +1,40 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2022-06-12 10:37:00.984596068 +0200
+
+Unbundle discord-rpc.
+---
+ CMakeLists.txt                          |    7 +++----
+ libraries/discordrpc/src/CMakeLists.txt |    2 +-
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+Index: gzdoom-g4.8.0/CMakeLists.txt
+===================================================================
+--- gzdoom-g4.8.0.orig/CMakeLists.txt
+++ gzdoom-g4.8.0/CMakeLists.txt
+@@ -328,10 +328,9 @@ if (HAVE_VULKAN)
+ 	include_directories(/usr/include/glslang/Public /usr/include/SPIRV)
+ endif()
+ 
+-add_subdirectory( libraries/discordrpc )
+-set( DRPC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/discordrpc/include" )
+-set( DRPC_LIBRARIES discord-rpc )
+-set( DRPC_LIBRARY discord-rpc )
+set( DRPC_INCLUDE_DIR "-I/ignore" )
+set( DRPC_LIBRARIES -ldiscord-rpc )
+set( DRPC_LIBRARY -ldiscord-rpc )
+ 
+ if( ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB )
+ 	message( STATUS "Using system zlib, includes found at ${ZLIB_INCLUDE_DIR}" )
+Index: gzdoom-g4.8.0/libraries/discordrpc/src/CMakeLists.txt
+===================================================================
+--- gzdoom-g4.8.0.orig/libraries/discordrpc/src/CMakeLists.txt
+++ gzdoom-g4.8.0/libraries/discordrpc/src/CMakeLists.txt
+@@ -28,7 +28,7 @@ endif(${BUILD_SHARED_LIBS})
+ if(WIN32)
+     add_definitions(-DDISCORD_WINDOWS)
+     set(BASE_RPC_SRC ${BASE_RPC_SRC} connection_win.cpp discord_register_win.cpp)
+-    add_library(discord-rpc ${BASE_RPC_SRC})
+    add_library(discord-rpc STATIC ${BASE_RPC_SRC})
+     if (MSVC)
+         if(USE_STATIC_CRT)
+             foreach(CompilerFlag
--- a/gzdoom-lzma.patch
+++ b/gzdoom-lzma.patch
@ -9,10 +9,10 @@ Use LZMA system libraries instead of bundled code.
 tools/zipdir/CMakeLists.txt |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

-Index: gzdoom-g4.6.0/CMakeLists.txt
+Index: gzdoom-g4.8.0/CMakeLists.txt
 ===================================================================
--- gzdoom-g4.6.0.orig/CMakeLists.txt
-+++ gzdoom-g4.6.0/CMakeLists.txt
+--- gzdoom-g4.8.0.orig/CMakeLists.txt
+++ gzdoom-g4.8.0/CMakeLists.txt
@@ -17,6 +17,7 @@ endif()
 
 list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
@ -21,16 +21,16 @@ Index: gzdoom-g4.6.0/CMakeLists.txt
 
 # Support cross compiling
 option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO )
-@@ -378,7 +379,7 @@ else()
+@@ -392,7 +393,7 @@ else()
+ 	set( BZIP2_LIBRARY bz2 )
 endif()
 
- 
 -set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/lzma/C" )
 +pkg_check_modules(LZMA REQUIRED clzma)
 
 if( NOT CMAKE_CROSSCOMPILING )
 	if( NOT CROSS_EXPORTS )
-@@ -398,7 +399,6 @@ install(DIRECTORY docs/
+@@ -412,7 +413,6 @@ install(DIRECTORY docs/
 
 option( DYN_OPENAL "Dynamically load OpenAL" ON )
 
@ -38,32 +38,32 @@ Index: gzdoom-g4.6.0/CMakeLists.txt
 add_subdirectory( tools )
 add_subdirectory( libraries/gdtoa )
 add_subdirectory( wadsrc )
-Index: gzdoom-g4.6.0/src/CMakeLists.txt
+Index: gzdoom-g4.8.0/src/CMakeLists.txt
 ===================================================================
--- 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")
+--- gzdoom-g4.8.0.orig/src/CMakeLists.txt
+++ gzdoom-g4.8.0/src/CMakeLists.txt
+@@ -427,7 +427,7 @@ else()
+ 	message( SEND_ERROR "Could not find libvpx" )
 endif()
-include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" )
-+include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" )
+ 
+-include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}")
+include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}")
 
 if( ${HAVE_VM_JIT} )
 	add_definitions( -DHAVE_VM_JIT )
-@@ -1231,7 +1231,7 @@ if( UNIX )
+@@ -1297,7 +1297,7 @@ if( UNIX )
 	endif()
 endif()
 
-target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa lzma ${ZMUSIC_LIBRARIES} )
-+target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa ${LZMA_LIBRARIES} ${ZMUSIC_LIBRARIES} )
+-target_link_libraries( zdoom ${PROJECT_LIBRARIES} gdtoa lzma ${ZMUSIC_LIBRARIES} )
+target_link_libraries( zdoom ${PROJECT_LIBRARIES} gdtoa ${LZMA_LIBRARIES} ${ZMUSIC_LIBRARIES} )
 
 include_directories( .
 	common/audio/sound
-Index: gzdoom-g4.6.0/tools/zipdir/CMakeLists.txt
+Index: gzdoom-g4.8.0/tools/zipdir/CMakeLists.txt
 ===================================================================
--- gzdoom-g4.6.0.orig/tools/zipdir/CMakeLists.txt
-+++ gzdoom-g4.6.0/tools/zipdir/CMakeLists.txt
+--- gzdoom-g4.8.0.orig/tools/zipdir/CMakeLists.txt
+++ gzdoom-g4.8.0/tools/zipdir/CMakeLists.txt
@@ -1,9 +1,9 @@
 cmake_minimum_required( VERSION 3.1.0 )
 
--- a/gzdoom-vulkan.patch
+++ b/gzdoom-vulkan.patch
@ -9,11 +9,11 @@ Use Vulkan/glslang/spirv system libraries instead of bundled code.
 src/common/rendering/vulkan/system/vk_builders.cpp |    4 ++++
 3 files changed, 6 insertions(+), 4 deletions(-)

-Index: gzdoom-g4.7.1/CMakeLists.txt
+Index: gzdoom-g4.8.0/CMakeLists.txt
 ===================================================================
--- gzdoom-g4.7.1.orig/CMakeLists.txt
-+++ gzdoom-g4.7.1/CMakeLists.txt
-@@ -324,9 +324,7 @@ option(FORCE_INTERNAL_ASMJIT "Use intern
+--- gzdoom-g4.8.0.orig/CMakeLists.txt
+++ gzdoom-g4.8.0/CMakeLists.txt
+@@ -325,9 +325,7 @@ option(FORCE_INTERNAL_ASMJIT "Use intern
 mark_as_advanced( FORCE_INTERNAL_ASMJIT )
 
 if (HAVE_VULKAN)
@ -23,24 +23,24 @@ Index: gzdoom-g4.7.1/CMakeLists.txt
 +	include_directories(/usr/include/glslang/Public /usr/include/SPIRV)
 endif()
 
- if( ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB )
-Index: gzdoom-g4.7.1/src/CMakeLists.txt
+ add_subdirectory( libraries/discordrpc )
+Index: gzdoom-g4.8.0/src/CMakeLists.txt
 ===================================================================
--- gzdoom-g4.7.1.orig/src/CMakeLists.txt
-+++ gzdoom-g4.7.1/src/CMakeLists.txt
-@@ -404,7 +404,7 @@ add_custom_target( revision_check ALL
+--- gzdoom-g4.8.0.orig/src/CMakeLists.txt
+++ gzdoom-g4.8.0/src/CMakeLists.txt
+@@ -368,7 +368,7 @@ add_custom_target( revision_check ALL
 
- set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${CMAKE_DL_LIBS}" )
+ set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${CMAKE_DL_LIBS}" "${DRPC_LIBRARIES}")
 if (HAVE_VULKAN)
-	set( ZDOOM_LIBS ${ZDOOM_LIBS} "glslang" "SPIRV" "OGLCompiler")
-+	set( ZDOOM_LIBS ${ZDOOM_LIBS} -lglslang -lSPIRV -lOGLCompiler)
+-	set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "glslang" "SPIRV" "OGLCompiler")
+	set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} -lglslang -lSPIRV -lOGLCompiler)
 endif()
- include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" )
 
-Index: gzdoom-g4.7.1/src/common/rendering/vulkan/system/vk_builders.cpp
+ # ZMUSIC
+Index: gzdoom-g4.8.0/src/common/rendering/vulkan/system/vk_builders.cpp
 ===================================================================
--- gzdoom-g4.7.1.orig/src/common/rendering/vulkan/system/vk_builders.cpp
-+++ gzdoom-g4.7.1/src/common/rendering/vulkan/system/vk_builders.cpp
+--- gzdoom-g4.8.0.orig/src/common/rendering/vulkan/system/vk_builders.cpp
+++ gzdoom-g4.8.0/src/common/rendering/vulkan/system/vk_builders.cpp
@@ -25,6 +25,7 @@
 #include "renderstyle.h"
 #include <ShaderLang.h>
--- a/gzdoom.changes
+++ b/gzdoom.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Jun  6 21:22:12 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 4.8.0
+  * Added Raze-style HUD scaling. Not exposed in the menu yet,
+    Set hud_oldscale to 0 and use shift with the screen resize
+    keys to scale the status bar.
+  * Handle the start/endoom screens with the ingame renderer.
+    They are now present on all platforms and use the full screen
+    size of the game.
+  * Many MBF21 fixes.
+  * Added the cutscene system from Raze.
+- Add gzdoom-discord.patch
+
 -------------------------------------------------------------------
 Sat Apr 23 01:04:05 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

--- a/gzdoom.spec
+++ b/gzdoom.spec
@ -17,7 +17,7 @@


 Name:           gzdoom
-Version:        4.7.1
+Version:        4.8.0
 Release:        0
 Summary:        A DOOM source port with graphic and modding extensions
 License:        GPL-3.0-only
@ -31,7 +31,9 @@ Patch2:         gzdoom-lzma.patch
 Patch3:         gzdoom-asmjit.patch
 Patch4:         gzdoom-sdlbug.patch
 Patch5:         gzdoom-vulkan.patch
+Patch6:         gzdoom-discord.patch
 BuildRequires:  cmake >= 2.8.7
+BuildRequires:  discord-rpc-devel
 BuildRequires:  gcc-c++
 BuildRequires:  glslang-devel
 BuildRequires:  libjpeg-devel
@ -45,6 +47,7 @@ BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(openal)
 BuildRequires:  pkgconfig(sdl2) >= 2.0.6
+BuildRequires:  pkgconfig(vpx)
 BuildRequires:  pkgconfig(vulkan)
 BuildRequires:  pkgconfig(zlib)
 Suggests:       freedoom