- Update to release 4.12.2
OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=105
This commit is contained in:
parent
76c5c69474
commit
36533034f7
@ -25,19 +25,19 @@ This reverts commit ba9ce0e83f6e25e3ddef5000bd51d53f2e3947a2.
|
||||
vcpkg.json | 4 ++++
|
||||
18 files changed, 46 insertions(+), 21 deletions(-)
|
||||
|
||||
Index: gzdoom-g4.11.3/CMakeLists.txt
|
||||
Index: gzdoom-g4.12.2/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/CMakeLists.txt
|
||||
+++ gzdoom-g4.11.3/CMakeLists.txt
|
||||
--- gzdoom-g4.12.2.orig/CMakeLists.txt
|
||||
+++ gzdoom-g4.12.2/CMakeLists.txt
|
||||
@@ -216,6 +216,7 @@ option( NO_OPENAL "Disable OpenAL sound
|
||||
|
||||
find_package( BZip2 )
|
||||
find_package( VPX )
|
||||
+find_package( ZLIB )
|
||||
find_package( WebP )
|
||||
if (NOT WebP_FOUND)
|
||||
include(FindPkgConfig)
|
||||
@@ -347,6 +348,7 @@ set( CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE
|
||||
|
||||
include( TargetArch )
|
||||
|
||||
@@ -333,6 +334,7 @@ set( CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE
|
||||
set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${REL_C_FLAGS}" )
|
||||
set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${DEB_C_FLAGS} -D_DEBUG" )
|
||||
|
||||
@ -45,7 +45,7 @@ Index: gzdoom-g4.11.3/CMakeLists.txt
|
||||
option(FORCE_INTERNAL_BZIP2 "Use internal bzip2")
|
||||
option(FORCE_INTERNAL_ASMJIT "Use internal asmjit" ON)
|
||||
mark_as_advanced( FORCE_INTERNAL_ASMJIT )
|
||||
@@ -360,6 +362,16 @@ set( DRPC_INCLUDE_DIR "-I/ignore" )
|
||||
@@ -349,6 +351,16 @@ set( DRPC_INCLUDE_DIR "-I/ignore" )
|
||||
set( DRPC_LIBRARIES -ldiscord-rpc )
|
||||
set( DRPC_LIBRARY -ldiscord-rpc )
|
||||
|
||||
@ -62,7 +62,7 @@ Index: gzdoom-g4.11.3/CMakeLists.txt
|
||||
if( HAVE_VM_JIT AND UNIX )
|
||||
check_symbol_exists( "backtrace" "execinfo.h" HAVE_BACKTRACE )
|
||||
if( NOT HAVE_BACKTRACE )
|
||||
@@ -417,7 +429,6 @@ install(DIRECTORY docs/
|
||||
@@ -406,7 +418,6 @@ install(DIRECTORY docs/
|
||||
|
||||
option( DYN_OPENAL "Dynamically load OpenAL" ON )
|
||||
|
||||
@ -70,10 +70,10 @@ Index: gzdoom-g4.11.3/CMakeLists.txt
|
||||
add_subdirectory( tools )
|
||||
add_subdirectory( wadsrc )
|
||||
add_subdirectory( wadsrc_bm )
|
||||
Index: gzdoom-g4.11.3/src/CMakeLists.txt
|
||||
Index: gzdoom-g4.12.2/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/src/CMakeLists.txt
|
||||
+++ gzdoom-g4.11.3/src/CMakeLists.txt
|
||||
--- gzdoom-g4.12.2.orig/src/CMakeLists.txt
|
||||
+++ gzdoom-g4.12.2/src/CMakeLists.txt
|
||||
@@ -344,7 +344,7 @@ add_custom_target( revision_check ALL
|
||||
|
||||
# required libraries
|
||||
@ -83,8 +83,8 @@ Index: gzdoom-g4.11.3/src/CMakeLists.txt
|
||||
if (HAVE_VULKAN)
|
||||
list( APPEND PROJECT_LIBRARIES "zvulkan" )
|
||||
endif()
|
||||
@@ -412,7 +412,7 @@ if (TARGET WebP::webp)
|
||||
endif()
|
||||
@@ -408,7 +408,7 @@ else()
|
||||
message( SEND_ERROR "Could not find libvpx" )
|
||||
endif()
|
||||
|
||||
-include_directories( SYSTEM "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}")
|
||||
@ -92,10 +92,10 @@ Index: gzdoom-g4.11.3/src/CMakeLists.txt
|
||||
|
||||
if( ${HAVE_VM_JIT} )
|
||||
add_definitions( -DHAVE_VM_JIT )
|
||||
Index: gzdoom-g4.11.3/src/common/audio/music/i_music.cpp
|
||||
Index: gzdoom-g4.12.2/src/common/audio/music/i_music.cpp
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/src/common/audio/music/i_music.cpp
|
||||
+++ gzdoom-g4.11.3/src/common/audio/music/i_music.cpp
|
||||
--- gzdoom-g4.12.2.orig/src/common/audio/music/i_music.cpp
|
||||
+++ gzdoom-g4.12.2/src/common/audio/music/i_music.cpp
|
||||
@@ -37,7 +37,7 @@
|
||||
#include <sys/wait.h>
|
||||
#endif
|
||||
@ -105,11 +105,11 @@ Index: gzdoom-g4.11.3/src/common/audio/music/i_music.cpp
|
||||
|
||||
#include <zmusic.h>
|
||||
#include "filesystem.h"
|
||||
Index: gzdoom-g4.11.3/src/common/engine/serializer.cpp
|
||||
Index: gzdoom-g4.12.2/src/common/engine/serializer.cpp
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/src/common/engine/serializer.cpp
|
||||
+++ gzdoom-g4.11.3/src/common/engine/serializer.cpp
|
||||
@@ -38,7 +38,7 @@
|
||||
--- gzdoom-g4.12.2.orig/src/common/engine/serializer.cpp
|
||||
+++ gzdoom-g4.12.2/src/common/engine/serializer.cpp
|
||||
@@ -37,7 +37,7 @@
|
||||
#define RAPIDJSON_HAS_CXX11_RANGE_FOR 1
|
||||
#define RAPIDJSON_PARSE_DEFAULT_FLAGS kParseFullPrecisionFlag
|
||||
|
||||
@ -118,23 +118,23 @@ Index: gzdoom-g4.11.3/src/common/engine/serializer.cpp
|
||||
#include "rapidjson/rapidjson.h"
|
||||
#include "rapidjson/writer.h"
|
||||
#include "rapidjson/prettywriter.h"
|
||||
Index: gzdoom-g4.11.3/src/common/filesystem/source/files_decompress.cpp
|
||||
Index: gzdoom-g4.12.2/src/common/filesystem/source/files_decompress.cpp
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/src/common/filesystem/source/files_decompress.cpp
|
||||
+++ gzdoom-g4.11.3/src/common/filesystem/source/files_decompress.cpp
|
||||
@@ -36,7 +36,7 @@
|
||||
// Caution: LzmaDec also pulls in windows.h!
|
||||
#define NOMINMAX
|
||||
#include "LzmaDec.h"
|
||||
--- gzdoom-g4.12.2.orig/src/common/filesystem/source/files_decompress.cpp
|
||||
+++ gzdoom-g4.12.2/src/common/filesystem/source/files_decompress.cpp
|
||||
@@ -39,7 +39,7 @@
|
||||
#include "Xz.h"
|
||||
// CRC table needs to be generated prior to reading XZ compressed files.
|
||||
#include "7zCrc.h"
|
||||
-#include <miniz.h>
|
||||
+#include <zlib.h>
|
||||
#include <bzlib.h>
|
||||
#include <algorithm>
|
||||
#include <stdexcept>
|
||||
Index: gzdoom-g4.11.3/src/common/filesystem/source/filesystem.cpp
|
||||
Index: gzdoom-g4.12.2/src/common/filesystem/source/filesystem.cpp
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/src/common/filesystem/source/filesystem.cpp
|
||||
+++ gzdoom-g4.11.3/src/common/filesystem/source/filesystem.cpp
|
||||
--- gzdoom-g4.12.2.orig/src/common/filesystem/source/filesystem.cpp
|
||||
+++ gzdoom-g4.12.2/src/common/filesystem/source/filesystem.cpp
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
// HEADER FILES ------------------------------------------------------------
|
||||
@ -144,23 +144,23 @@ Index: gzdoom-g4.11.3/src/common/filesystem/source/filesystem.cpp
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
Index: gzdoom-g4.11.3/src/common/filesystem/source/resourcefile.cpp
|
||||
Index: gzdoom-g4.12.2/src/common/filesystem/source/resourcefile.cpp
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/src/common/filesystem/source/resourcefile.cpp
|
||||
+++ gzdoom-g4.11.3/src/common/filesystem/source/resourcefile.cpp
|
||||
@@ -34,7 +34,7 @@
|
||||
**
|
||||
--- gzdoom-g4.12.2.orig/src/common/filesystem/source/resourcefile.cpp
|
||||
+++ gzdoom-g4.12.2/src/common/filesystem/source/resourcefile.cpp
|
||||
@@ -35,7 +35,7 @@
|
||||
*/
|
||||
|
||||
#include <algorithm>
|
||||
-#include <miniz.h>
|
||||
+#include <zlib.h>
|
||||
#include "resourcefile_internal.h"
|
||||
#include "resourcefile.h"
|
||||
#include "md5.hpp"
|
||||
#include "fs_stringpool.h"
|
||||
Index: gzdoom-g4.11.3/src/common/models/model.cpp
|
||||
Index: gzdoom-g4.12.2/src/common/models/model.cpp
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/src/common/models/model.cpp
|
||||
+++ gzdoom-g4.11.3/src/common/models/model.cpp
|
||||
--- gzdoom-g4.12.2.orig/src/common/models/model.cpp
|
||||
+++ gzdoom-g4.12.2/src/common/models/model.cpp
|
||||
@@ -25,7 +25,6 @@
|
||||
** General model handling code
|
||||
**
|
||||
@ -169,7 +169,7 @@ Index: gzdoom-g4.11.3/src/common/models/model.cpp
|
||||
|
||||
#include "filesystem.h"
|
||||
#include "cmdlib.h"
|
||||
@@ -133,7 +132,17 @@ FTextureID LoadSkin(const char * path, c
|
||||
@@ -132,7 +131,17 @@ FTextureID LoadSkin(const char * path, c
|
||||
|
||||
int ModelFrameHash(FSpriteModelFrame * smf)
|
||||
{
|
||||
@ -188,10 +188,10 @@ Index: gzdoom-g4.11.3/src/common/models/model.cpp
|
||||
}
|
||||
|
||||
//===========================================================================
|
||||
Index: gzdoom-g4.11.3/src/common/platform/win32/i_crash.cpp
|
||||
Index: gzdoom-g4.12.2/src/common/platform/win32/i_crash.cpp
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/src/common/platform/win32/i_crash.cpp
|
||||
+++ gzdoom-g4.11.3/src/common/platform/win32/i_crash.cpp
|
||||
--- gzdoom-g4.12.2.orig/src/common/platform/win32/i_crash.cpp
|
||||
+++ gzdoom-g4.12.2/src/common/platform/win32/i_crash.cpp
|
||||
@@ -68,7 +68,7 @@
|
||||
#include "i_mainwindow.h"
|
||||
|
||||
@ -201,10 +201,10 @@ Index: gzdoom-g4.11.3/src/common/platform/win32/i_crash.cpp
|
||||
|
||||
// MACROS ------------------------------------------------------------------
|
||||
|
||||
Index: gzdoom-g4.11.3/src/common/textures/m_png.cpp
|
||||
Index: gzdoom-g4.12.2/src/common/textures/m_png.cpp
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/src/common/textures/m_png.cpp
|
||||
+++ gzdoom-g4.11.3/src/common/textures/m_png.cpp
|
||||
--- gzdoom-g4.12.2.orig/src/common/textures/m_png.cpp
|
||||
+++ gzdoom-g4.12.2/src/common/textures/m_png.cpp
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
#include <algorithm>
|
||||
@ -214,10 +214,10 @@ Index: gzdoom-g4.11.3/src/common/textures/m_png.cpp
|
||||
#include <stdint.h>
|
||||
#ifdef _MSC_VER
|
||||
#include <malloc.h> // for alloca()
|
||||
Index: gzdoom-g4.11.3/src/common/thirdparty/m_crc32.h
|
||||
Index: gzdoom-g4.12.2/src/common/thirdparty/m_crc32.h
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/src/common/thirdparty/m_crc32.h
|
||||
+++ gzdoom-g4.11.3/src/common/thirdparty/m_crc32.h
|
||||
--- gzdoom-g4.12.2.orig/src/common/thirdparty/m_crc32.h
|
||||
+++ gzdoom-g4.12.2/src/common/thirdparty/m_crc32.h
|
||||
@@ -32,11 +32,12 @@
|
||||
**
|
||||
*/
|
||||
@ -233,10 +233,10 @@ Index: gzdoom-g4.11.3/src/common/thirdparty/m_crc32.h
|
||||
inline uint32_t CalcCRC32 (const uint8_t *buf, unsigned int len)
|
||||
{
|
||||
return crc32 (0, buf, len);
|
||||
Index: gzdoom-g4.11.3/src/g_pch.h
|
||||
Index: gzdoom-g4.12.2/src/g_pch.h
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/src/g_pch.h
|
||||
+++ gzdoom-g4.11.3/src/g_pch.h
|
||||
--- gzdoom-g4.12.2.orig/src/g_pch.h
|
||||
+++ gzdoom-g4.12.2/src/g_pch.h
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <errno.h>
|
||||
#include <ctype.h>
|
||||
@ -246,10 +246,10 @@ Index: gzdoom-g4.11.3/src/g_pch.h
|
||||
#include <new>
|
||||
#include <algorithm>
|
||||
#include <forward_list>
|
||||
Index: gzdoom-g4.11.3/src/g_pch2.h
|
||||
Index: gzdoom-g4.12.2/src/g_pch2.h
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/src/g_pch2.h
|
||||
+++ gzdoom-g4.11.3/src/g_pch2.h
|
||||
--- gzdoom-g4.12.2.orig/src/g_pch2.h
|
||||
+++ gzdoom-g4.12.2/src/g_pch2.h
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <errno.h>
|
||||
#include <ctype.h>
|
||||
@ -259,10 +259,10 @@ Index: gzdoom-g4.11.3/src/g_pch2.h
|
||||
#include <new>
|
||||
#include <algorithm>
|
||||
#include <sys/stat.h>
|
||||
Index: gzdoom-g4.11.3/src/maploader/glnodes.cpp
|
||||
Index: gzdoom-g4.12.2/src/maploader/glnodes.cpp
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/src/maploader/glnodes.cpp
|
||||
+++ gzdoom-g4.11.3/src/maploader/glnodes.cpp
|
||||
--- gzdoom-g4.12.2.orig/src/maploader/glnodes.cpp
|
||||
+++ gzdoom-g4.12.2/src/maploader/glnodes.cpp
|
||||
@@ -42,7 +42,7 @@
|
||||
|
||||
#endif
|
||||
@ -272,10 +272,10 @@ Index: gzdoom-g4.11.3/src/maploader/glnodes.cpp
|
||||
|
||||
#include "m_argv.h"
|
||||
#include "c_dispatch.h"
|
||||
Index: gzdoom-g4.11.3/src/serializer_doom.cpp
|
||||
Index: gzdoom-g4.12.2/src/serializer_doom.cpp
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/src/serializer_doom.cpp
|
||||
+++ gzdoom-g4.11.3/src/serializer_doom.cpp
|
||||
--- gzdoom-g4.12.2.orig/src/serializer_doom.cpp
|
||||
+++ gzdoom-g4.12.2/src/serializer_doom.cpp
|
||||
@@ -38,7 +38,7 @@
|
||||
#define RAPIDJSON_HAS_CXX11_RANGE_FOR 1
|
||||
#define RAPIDJSON_PARSE_DEFAULT_FLAGS kParseFullPrecisionFlag
|
||||
@ -285,10 +285,10 @@ Index: gzdoom-g4.11.3/src/serializer_doom.cpp
|
||||
#include "rapidjson/rapidjson.h"
|
||||
#include "rapidjson/writer.h"
|
||||
#include "rapidjson/prettywriter.h"
|
||||
Index: gzdoom-g4.11.3/tools/zipdir/CMakeLists.txt
|
||||
Index: gzdoom-g4.12.2/tools/zipdir/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/tools/zipdir/CMakeLists.txt
|
||||
+++ gzdoom-g4.11.3/tools/zipdir/CMakeLists.txt
|
||||
--- gzdoom-g4.12.2.orig/tools/zipdir/CMakeLists.txt
|
||||
+++ gzdoom-g4.12.2/tools/zipdir/CMakeLists.txt
|
||||
@@ -1,9 +1,9 @@
|
||||
cmake_minimum_required( VERSION 3.16 )
|
||||
|
||||
@ -301,10 +301,10 @@ Index: gzdoom-g4.11.3/tools/zipdir/CMakeLists.txt
|
||||
+ target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${LZMA_LDFLAGS} )
|
||||
set( CROSS_EXPORTS ${CROSS_EXPORTS} zipdir PARENT_SCOPE )
|
||||
endif()
|
||||
Index: gzdoom-g4.11.3/tools/zipdir/zipdir.c
|
||||
Index: gzdoom-g4.12.2/tools/zipdir/zipdir.c
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/tools/zipdir/zipdir.c
|
||||
+++ gzdoom-g4.11.3/tools/zipdir/zipdir.c
|
||||
--- gzdoom-g4.12.2.orig/tools/zipdir/zipdir.c
|
||||
+++ gzdoom-g4.12.2/tools/zipdir/zipdir.c
|
||||
@@ -46,7 +46,7 @@
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
@ -314,10 +314,10 @@ Index: gzdoom-g4.11.3/tools/zipdir/zipdir.c
|
||||
#include "bzlib.h"
|
||||
#include "LzmaEnc.h"
|
||||
#include "7zVersion.h"
|
||||
Index: gzdoom-g4.11.3/vcpkg.json
|
||||
Index: gzdoom-g4.12.2/vcpkg.json
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/vcpkg.json
|
||||
+++ gzdoom-g4.11.3/vcpkg.json
|
||||
--- gzdoom-g4.12.2.orig/vcpkg.json
|
||||
+++ gzdoom-g4.12.2/vcpkg.json
|
||||
@@ -28,6 +28,10 @@
|
||||
},
|
||||
"dependencies": [
|
||||
@ -327,5 +327,5 @@ Index: gzdoom-g4.11.3/vcpkg.json
|
||||
+ },
|
||||
+ {
|
||||
"name": "bzip2",
|
||||
"platform": "!windows | (windows & static & staticcrt)"
|
||||
"platform": "(!windows & static) | (windows & static & staticcrt)"
|
||||
},
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5943dba50da20ff94f1fcc415132672d42a15917c571b1c2b7ceefe14935f5d5
|
||||
size 24354699
|
3
g4.12.2.tar.gz
Normal file
3
g4.12.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:864c5a1ec976dd6068f9cd93f92c5404c662824996101f1411ddb25a54afc732
|
||||
size 25910359
|
@ -7,12 +7,12 @@ Unbundle discord-rpc.
|
||||
libraries/discordrpc/src/CMakeLists.txt | 2 +-
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: gzdoom-g4.11.3/CMakeLists.txt
|
||||
Index: gzdoom-g4.12.2/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/CMakeLists.txt
|
||||
+++ gzdoom-g4.11.3/CMakeLists.txt
|
||||
@@ -356,9 +356,9 @@ if (HAVE_VULKAN)
|
||||
endif()
|
||||
--- gzdoom-g4.12.2.orig/CMakeLists.txt
|
||||
+++ gzdoom-g4.12.2/CMakeLists.txt
|
||||
@@ -345,9 +345,9 @@ add_subdirectory( libraries/ZWidget )
|
||||
add_subdirectory( libraries/webp )
|
||||
|
||||
add_subdirectory( libraries/discordrpc EXCLUDE_FROM_ALL )
|
||||
-set( DRPC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/discordrpc/include" )
|
||||
@ -24,10 +24,10 @@ Index: gzdoom-g4.11.3/CMakeLists.txt
|
||||
|
||||
if( HAVE_VM_JIT AND UNIX )
|
||||
check_symbol_exists( "backtrace" "execinfo.h" HAVE_BACKTRACE )
|
||||
Index: gzdoom-g4.11.3/libraries/discordrpc/src/CMakeLists.txt
|
||||
Index: gzdoom-g4.12.2/libraries/discordrpc/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.3.orig/libraries/discordrpc/src/CMakeLists.txt
|
||||
+++ gzdoom-g4.11.3/libraries/discordrpc/src/CMakeLists.txt
|
||||
--- gzdoom-g4.12.2.orig/libraries/discordrpc/src/CMakeLists.txt
|
||||
+++ gzdoom-g4.12.2/libraries/discordrpc/src/CMakeLists.txt
|
||||
@@ -28,7 +28,7 @@ endif(${BUILD_SHARED_LIBS})
|
||||
if(WIN32)
|
||||
add_definitions(-DDISCORD_WINDOWS)
|
||||
|
@ -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.11.0/CMakeLists.txt
|
||||
Index: gzdoom-g4.12.2/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.0.orig/CMakeLists.txt
|
||||
+++ gzdoom-g4.11.0/CMakeLists.txt
|
||||
--- gzdoom-g4.12.2.orig/CMakeLists.txt
|
||||
+++ gzdoom-g4.12.2/CMakeLists.txt
|
||||
@@ -50,6 +50,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
|
||||
list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
|
||||
@ -21,7 +21,7 @@ Index: gzdoom-g4.11.0/CMakeLists.txt
|
||||
|
||||
# Support cross compiling
|
||||
option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO )
|
||||
@@ -396,7 +397,7 @@ else()
|
||||
@@ -385,7 +386,7 @@ else()
|
||||
set( BZIP2_LIBRARY bz2 )
|
||||
endif()
|
||||
|
||||
@ -30,7 +30,7 @@ Index: gzdoom-g4.11.0/CMakeLists.txt
|
||||
|
||||
if( NOT CMAKE_CROSSCOMPILING )
|
||||
if( NOT CROSS_EXPORTS )
|
||||
@@ -416,7 +417,6 @@ install(DIRECTORY docs/
|
||||
@@ -405,7 +406,6 @@ install(DIRECTORY docs/
|
||||
|
||||
option( DYN_OPENAL "Dynamically load OpenAL" ON )
|
||||
|
||||
@ -38,12 +38,12 @@ Index: gzdoom-g4.11.0/CMakeLists.txt
|
||||
add_subdirectory( libraries/miniz )
|
||||
add_subdirectory( tools )
|
||||
add_subdirectory( wadsrc )
|
||||
Index: gzdoom-g4.11.0/src/CMakeLists.txt
|
||||
Index: gzdoom-g4.12.2/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.0.orig/src/CMakeLists.txt
|
||||
+++ gzdoom-g4.11.0/src/CMakeLists.txt
|
||||
@@ -387,7 +387,7 @@ if (TARGET WebP::webp)
|
||||
endif()
|
||||
--- gzdoom-g4.12.2.orig/src/CMakeLists.txt
|
||||
+++ gzdoom-g4.12.2/src/CMakeLists.txt
|
||||
@@ -383,7 +383,7 @@ else()
|
||||
message( SEND_ERROR "Could not find libvpx" )
|
||||
endif()
|
||||
|
||||
-include_directories( SYSTEM "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}")
|
||||
@ -51,7 +51,7 @@ Index: gzdoom-g4.11.0/src/CMakeLists.txt
|
||||
|
||||
if( ${HAVE_VM_JIT} )
|
||||
add_definitions( -DHAVE_VM_JIT )
|
||||
@@ -1252,7 +1252,7 @@ if( UNIX )
|
||||
@@ -1267,7 +1267,7 @@ if( UNIX )
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@ -60,10 +60,10 @@ Index: gzdoom-g4.11.0/src/CMakeLists.txt
|
||||
|
||||
include_directories(
|
||||
BEFORE
|
||||
Index: gzdoom-g4.11.0/tools/zipdir/CMakeLists.txt
|
||||
Index: gzdoom-g4.12.2/tools/zipdir/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-g4.11.0.orig/tools/zipdir/CMakeLists.txt
|
||||
+++ gzdoom-g4.11.0/tools/zipdir/CMakeLists.txt
|
||||
--- gzdoom-g4.12.2.orig/tools/zipdir/CMakeLists.txt
|
||||
+++ gzdoom-g4.12.2/tools/zipdir/CMakeLists.txt
|
||||
@@ -1,9 +1,9 @@
|
||||
cmake_minimum_required( VERSION 3.16 )
|
||||
|
||||
|
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 30 10:40:25 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 4.12.2
|
||||
* Set default backend to Vulkan, if Vulkan fails go GLES not OpenGL.
|
||||
* Added a `mapinfo` console command.
|
||||
* zscript: add `final` and `sealed` as class options.
|
||||
* Always save a copy of the map in a savegame's metadata.
|
||||
* Added wall texture skewing.
|
||||
* Implemented dsda-doom's sector scrolling properties, added
|
||||
UDMF wall scrolling properties from DSDA, added friction and
|
||||
colormap related properties from DSDA, added DSDA's thrust
|
||||
properties for UDMF, and added per-sector sky UDMF
|
||||
properties.
|
||||
* Allow defining zero gravity through MAPINFO
|
||||
* Added rudimentary support for DSDA's COMPLVL lump.
|
||||
* Added actor flag +BILLBOARDFACECAMERA.
|
||||
* Added `sv_pistolstart` server flag.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 27 04:20:10 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package gzdoom
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# 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: 4.11.3
|
||||
Version: 4.12.2
|
||||
Release: 0
|
||||
Summary: A DOOM source port with graphic and modding extensions
|
||||
License: GPL-3.0-only
|
||||
|
Loading…
Reference in New Issue
Block a user