jengelh/gzdoom
SHA256
1
0
Fork 0
forked from pool/gzdoom
Code Pull Requests Activity

- Update to new upstream release 3.7.1

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=17
This commit is contained in:
Jan Engelhardt 2019-01-03 16:09:32 +00:00 committed by Git OBS Bridge
parent 00272b58ec
commit 88040d83ff
7 changed files with 71 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

@ -2,8 +2,8 @@
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="disabled">
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">git://github.com/coelckers/gzdoom</param> <param name="url">git://github.com/coelckers/gzdoom</param>
<param name="revision">g3.6.0</param> <param name="revision">g3.7.1</param>
<param name="versionformat">3.6.0</param> <param name="versionformat">3.7.1</param>
<!-- non-OSI media --> <!-- non-OSI media -->
<param name="exclude">wadsrc_extra</param> <param name="exclude">wadsrc_extra</param>
</service> </service>

3
gzdoom-3.6.0.tar.xz
View File

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

3
gzdoom-3.7.1.tar.xz Normal file
View File

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

22
gzdoom-asmjit.patch Normal file
View File

@ -0,0 +1,22 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2019-01-03 14:48:11.831267534 +0100
Nothing else uses asmjit at this time, so save on the extra library.
(`make install` also misses installing it as a shared library.)
---
asmjit/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: gzdoom-3.7.1/asmjit/CMakeLists.txt
===================================================================
--- gzdoom-3.7.1.orig/asmjit/CMakeLists.txt
+++ gzdoom-3.7.1/asmjit/CMakeLists.txt
@@ -97,7 +97,7 @@ set(ASMJIT_SRCS
asmjit/x86/x86regalloc.cpp
)
-add_library(${ASMJITNAME} ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
+add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit)

46
gzdoom-lzma.patch
View File

@ -1,7 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt ---
index 1328491d3..219c20461 100644 CMakeLists.txt | 4 ++--
--- a/CMakeLists.txt src/CMakeLists.txt | 4 ++--
+++ b/CMakeLists.txt tools/zipdir/CMakeLists.txt | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
Index: gzdoom-3.7.1/CMakeLists.txt
===================================================================
--- gzdoom-3.7.1.orig/CMakeLists.txt
+++ gzdoom-3.7.1/CMakeLists.txt
@@ -12,6 +12,7 @@ endif() @@ -12,6 +12,7 @@ endif()
list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
@ -10,7 +16,7 @@ index 1328491d3..219c20461 100644
# Produce a warning if XP support will be missing when building a 32 bit target for MSVC. # Produce a warning if XP support will be missing when building a 32 bit target for MSVC.
if( MSVC ) if( MSVC )
@@ -320,7 +321,7 @@ else() @@ -336,7 +337,7 @@ else()
set( GME_LIBRARIES gme ) set( GME_LIBRARIES gme )
endif() endif()
@ -19,28 +25,28 @@ index 1328491d3..219c20461 100644
if( NOT CMAKE_CROSSCOMPILING ) if( NOT CMAKE_CROSSCOMPILING )
if( NOT CROSS_EXPORTS ) if( NOT CROSS_EXPORTS )
@@ -338,7 +339,6 @@ install(DIRECTORY docs/ @@ -354,7 +355,6 @@ install(DIRECTORY docs/
DESTINATION ${INSTALL_DOCS_PATH} DESTINATION ${INSTALL_DOCS_PATH}
COMPONENT "Documentation") COMPONENT "Documentation")
-add_subdirectory( lzma ) -add_subdirectory( lzma )
add_subdirectory( tools ) add_subdirectory( tools )
add_subdirectory( dumb ) add_subdirectory( dumb )
add_subdirectory( gdtoa ) add_subdirectory( gdtoa )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt Index: gzdoom-3.7.1/src/CMakeLists.txt
index 993952e8d..ea222f12a 100644 ===================================================================
--- a/src/CMakeLists.txt --- gzdoom-3.7.1.orig/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ gzdoom-3.7.1/src/CMakeLists.txt
@@ -460,7 +460,7 @@ add_custom_target( revision_check ALL @@ -461,7 +461,7 @@ add_custom_target( revision_check ALL
message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" ) message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" )
set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" "${CMAKE_DL_LIBS}" ) set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" "${ASMJIT_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_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${ASMJIT_INCLUDE_DIR}" )
+include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" ) +include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${ASMJIT_INCLUDE_DIR}" )
if( SNDFILE_FOUND ) if( SNDFILE_FOUND )
set( ZDOOM_LIBS ${ZDOOM_LIBS} "${SNDFILE_LIBRARIES}" ) set( ZDOOM_LIBS ${ZDOOM_LIBS} "${SNDFILE_LIBRARIES}" )
@@ -1285,7 +1285,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") @@ -1301,7 +1301,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS"
set( ZDOOM_LIBS ${ZDOOM_LIBS} nsl socket) set( ZDOOM_LIBS ${ZDOOM_LIBS} nsl socket)
endif() endif()
@ -49,10 +55,10 @@ index 993952e8d..ea222f12a 100644
include_directories( . include_directories( .
g_statusbar g_statusbar
diff --git a/tools/zipdir/CMakeLists.txt b/tools/zipdir/CMakeLists.txt Index: gzdoom-3.7.1/tools/zipdir/CMakeLists.txt
index 6a36b2cb5..75cadf47e 100644 ===================================================================
--- a/tools/zipdir/CMakeLists.txt --- gzdoom-3.7.1.orig/tools/zipdir/CMakeLists.txt
+++ b/tools/zipdir/CMakeLists.txt +++ gzdoom-3.7.1/tools/zipdir/CMakeLists.txt
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
cmake_minimum_required( VERSION 2.8.7 ) cmake_minimum_required( VERSION 2.8.7 )

14
gzdoom.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Jan 3 01:37:12 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 3.7.1
* Expand UDMF and ZScript API for side's own additive colors
* Added NOFRICTION and NOFRICTIONBOUNCE actor flags
* Added an AMD64 JIT for DECORATE and ZScript
* Lights are now referenced by sections rather than surface, to
speed up light linking. This should allow a dynamically-lit
plasma bolt to pass over a 3D bridge in Frozen Time without
turning the game into a slide show.
* Add shader cache for Intel GPUs which should result in faster
startups.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 14 09:58:09 UTC 2018 - Jan Engelhardt <jengelh@inai.de> Wed Nov 14 09:58:09 UTC 2018 - Jan Engelhardt <jengelh@inai.de>

7
gzdoom.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package gzdoom # spec file for package gzdoom
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: gzdoom Name: gzdoom
Version: 3.6.0 Version: 3.7.1
Release: 0 Release: 0
Summary: A DOOM source port with graphic and modding extensions Summary: A DOOM source port with graphic and modding extensions
License: GPL-3.0-only License: GPL-3.0-only
@ -31,6 +31,7 @@ Patch2: gzdoom-wadsrc-extra.patch
Patch3: gzdoom-staticlibs.patch Patch3: gzdoom-staticlibs.patch
Patch4: fl2.patch Patch4: fl2.patch
Patch5: gzdoom-lzma.patch Patch5: gzdoom-lzma.patch
Patch6: gzdoom-asmjit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake >= 2.8.7 BuildRequires: cmake >= 2.8.7
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -82,7 +83,7 @@ GZDoom is a port (a modification) of the original Doom source code, featuring:
%prep %prep
%setup -q %setup -q
%patch -P 1 -P 2 -P 3 -P 4 -p1 %patch -P 1 -P 2 -P 3 -P 4 -P 6 -p1
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
%patch -P 5 -p1 %patch -P 5 -p1