forked from pool/gzdoom
Accepting request 725602 from games
- Update to new upstream release 4.2.0 - Turn off LTO, it is broken. [boo#1142267] OBS-URL: https://build.opensuse.org/request/show/725602 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gzdoom?expand=0&rev=7
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
88d2f9f63c
15
_service
15
_service
@ -1,15 +0,0 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">git://github.com/coelckers/gzdoom</param>
|
||||
<param name="revision">g4.0.0</param>
|
||||
<param name="versionformat">4.0.0</param>
|
||||
<!-- non-OSI media -->
|
||||
<param name="exclude">wadsrc_extra</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled"/>
|
||||
</services>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5174c73e553d8ebbb5939255a6bdc56aecd4ff862ed20e544f271d59290a2d2b
|
||||
size 13084313
|
||||
3
g4.2.0.tar.gz
Normal file
3
g4.2.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9d781e868f32ad53aa262691f76cab09b12661ababd2b7f5735fe852ab74d566
|
||||
size 13482879
|
||||
@ -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-4.0.0/CMakeLists.txt
|
||||
Index: gzdoom-g4.2.0/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-4.0.0.orig/CMakeLists.txt
|
||||
+++ gzdoom-4.0.0/CMakeLists.txt
|
||||
--- gzdoom-g4.2.0.orig/CMakeLists.txt
|
||||
+++ gzdoom-g4.2.0/CMakeLists.txt
|
||||
@@ -12,6 +12,7 @@ endif()
|
||||
|
||||
list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
|
||||
@ -21,28 +21,28 @@ Index: gzdoom-4.0.0/CMakeLists.txt
|
||||
|
||||
# Support cross compiling
|
||||
option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO )
|
||||
@@ -355,7 +356,7 @@ else()
|
||||
@@ -382,7 +383,7 @@ else()
|
||||
set( GME_LIBRARIES gme )
|
||||
endif()
|
||||
|
||||
-set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lzma/C" )
|
||||
-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 )
|
||||
@@ -373,7 +374,6 @@ install(DIRECTORY docs/
|
||||
@@ -400,7 +401,6 @@ install(DIRECTORY docs/
|
||||
DESTINATION ${INSTALL_DOCS_PATH}
|
||||
COMPONENT "Documentation")
|
||||
|
||||
-add_subdirectory( lzma )
|
||||
-add_subdirectory( libraries/lzma )
|
||||
add_subdirectory( tools )
|
||||
add_subdirectory( dumb )
|
||||
add_subdirectory( gdtoa )
|
||||
Index: gzdoom-4.0.0/src/CMakeLists.txt
|
||||
add_subdirectory( libraries/dumb )
|
||||
add_subdirectory( libraries/gdtoa )
|
||||
Index: gzdoom-g4.2.0/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-4.0.0.orig/src/CMakeLists.txt
|
||||
+++ gzdoom-4.0.0/src/CMakeLists.txt
|
||||
@@ -467,7 +467,7 @@ set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LI
|
||||
--- gzdoom-g4.2.0.orig/src/CMakeLists.txt
|
||||
+++ gzdoom-g4.2.0/src/CMakeLists.txt
|
||||
@@ -468,7 +468,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-4.0.0/src/CMakeLists.txt
|
||||
|
||||
if( ${HAVE_VM_JIT} )
|
||||
add_definitions( -DHAVE_VM_JIT )
|
||||
@@ -1370,7 +1370,7 @@ if( UNIX )
|
||||
@@ -1379,7 +1379,7 @@ if( UNIX )
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@ -60,10 +60,10 @@ Index: gzdoom-4.0.0/src/CMakeLists.txt
|
||||
|
||||
include_directories( .
|
||||
g_statusbar
|
||||
Index: gzdoom-4.0.0/tools/zipdir/CMakeLists.txt
|
||||
Index: gzdoom-g4.2.0/tools/zipdir/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-4.0.0.orig/tools/zipdir/CMakeLists.txt
|
||||
+++ gzdoom-4.0.0/tools/zipdir/CMakeLists.txt
|
||||
--- gzdoom-g4.2.0.orig/tools/zipdir/CMakeLists.txt
|
||||
+++ gzdoom-g4.2.0/tools/zipdir/CMakeLists.txt
|
||||
@@ -1,9 +1,9 @@
|
||||
cmake_minimum_required( VERSION 2.8.7 )
|
||||
|
||||
|
||||
@ -7,28 +7,28 @@ Use Vulkan system libraries instead of bundled code.
|
||||
CMakeLists.txt | 3 ---
|
||||
src/CMakeLists.txt | 2 +-
|
||||
src/rendering/vulkan/shaders/vk_shader.cpp | 2 +-
|
||||
src/rendering/vulkan/system/vk_builders.cpp | 22 +++++++++++-----------
|
||||
4 files changed, 13 insertions(+), 16 deletions(-)
|
||||
src/rendering/vulkan/system/vk_builders.cpp | 4 ++--
|
||||
4 files changed, 4 insertions(+), 7 deletions(-)
|
||||
|
||||
Index: gzdoom-4.0.0/CMakeLists.txt
|
||||
Index: gzdoom-g4.2.0/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-4.0.0.orig/CMakeLists.txt
|
||||
+++ gzdoom-4.0.0/CMakeLists.txt
|
||||
@@ -287,9 +287,6 @@ option(FORCE_INTERNAL_ASMJIT "Use intern
|
||||
--- gzdoom-g4.2.0.orig/CMakeLists.txt
|
||||
+++ gzdoom-g4.2.0/CMakeLists.txt
|
||||
@@ -301,9 +301,6 @@ option(FORCE_INTERNAL_ASMJIT "Use intern
|
||||
mark_as_advanced( FORCE_INTERNAL_ASMJIT )
|
||||
|
||||
if (HAVE_VULKAN)
|
||||
- add_subdirectory( glslang/glslang)
|
||||
- add_subdirectory( glslang/spirv )
|
||||
- add_subdirectory( glslang/OGLCompilersDLL )
|
||||
- add_subdirectory( libraries/glslang/glslang)
|
||||
- add_subdirectory( libraries/glslang/spirv )
|
||||
- add_subdirectory( libraries/glslang/OGLCompilersDLL )
|
||||
endif()
|
||||
|
||||
# Fast math flags, required by some subprojects
|
||||
Index: gzdoom-4.0.0/src/CMakeLists.txt
|
||||
Index: gzdoom-g4.2.0/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-4.0.0.orig/src/CMakeLists.txt
|
||||
+++ gzdoom-4.0.0/src/CMakeLists.txt
|
||||
@@ -465,7 +465,7 @@ add_custom_target( revision_check ALL
|
||||
--- gzdoom-g4.2.0.orig/src/CMakeLists.txt
|
||||
+++ gzdoom-g4.2.0/src/CMakeLists.txt
|
||||
@@ -466,7 +466,7 @@ add_custom_target( revision_check ALL
|
||||
message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" )
|
||||
set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" "${CMAKE_DL_LIBS}" )
|
||||
if (HAVE_VULKAN)
|
||||
@ -37,10 +37,10 @@ Index: gzdoom-4.0.0/src/CMakeLists.txt
|
||||
endif()
|
||||
include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" )
|
||||
|
||||
Index: gzdoom-4.0.0/src/rendering/vulkan/shaders/vk_shader.cpp
|
||||
Index: gzdoom-g4.2.0/src/rendering/vulkan/shaders/vk_shader.cpp
|
||||
===================================================================
|
||||
--- gzdoom-4.0.0.orig/src/rendering/vulkan/shaders/vk_shader.cpp
|
||||
+++ gzdoom-4.0.0/src/rendering/vulkan/shaders/vk_shader.cpp
|
||||
--- gzdoom-g4.2.0.orig/src/rendering/vulkan/shaders/vk_shader.cpp
|
||||
+++ gzdoom-g4.2.0/src/rendering/vulkan/shaders/vk_shader.cpp
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "hwrenderer/utility/hw_shaderpatcher.h"
|
||||
#include "w_wad.h"
|
||||
@ -50,10 +50,10 @@ Index: gzdoom-4.0.0/src/rendering/vulkan/shaders/vk_shader.cpp
|
||||
|
||||
VkShaderManager::VkShaderManager(VulkanDevice *device) : device(device)
|
||||
{
|
||||
Index: gzdoom-4.0.0/src/rendering/vulkan/system/vk_builders.cpp
|
||||
Index: gzdoom-g4.2.0/src/rendering/vulkan/system/vk_builders.cpp
|
||||
===================================================================
|
||||
--- gzdoom-4.0.0.orig/src/rendering/vulkan/system/vk_builders.cpp
|
||||
+++ gzdoom-4.0.0/src/rendering/vulkan/system/vk_builders.cpp
|
||||
--- gzdoom-g4.2.0.orig/src/rendering/vulkan/system/vk_builders.cpp
|
||||
+++ gzdoom-g4.2.0/src/rendering/vulkan/system/vk_builders.cpp
|
||||
@@ -2,8 +2,8 @@
|
||||
#include "vk_builders.h"
|
||||
#include "doomerrors.h"
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: 2018-01-09 00:35:47.044540108 +0100
|
||||
|
||||
Since the openSUSE _service file downloads and creates a tarball
|
||||
without wadsrc_extra, it now needs to be removed from CMakeLists
|
||||
so that cmake does not fail with an error.
|
||||
---
|
||||
CMakeLists.txt | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
Index: gzdoom-3.2.5/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gzdoom-3.2.5.orig/CMakeLists.txt
|
||||
+++ gzdoom-3.2.5/CMakeLists.txt
|
||||
@@ -336,7 +336,6 @@ add_subdirectory( gdtoa )
|
||||
add_subdirectory( wadsrc )
|
||||
add_subdirectory( wadsrc_bm )
|
||||
add_subdirectory( wadsrc_lights )
|
||||
-add_subdirectory( wadsrc_extra )
|
||||
add_subdirectory( src )
|
||||
|
||||
if( NOT CMAKE_CROSSCOMPILING )
|
||||
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 23 12:40:51 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to new upstream release 4.2.0
|
||||
* The survey code has been re-enabled for this version: it sends
|
||||
basic info about the operating system but no private data:
|
||||
the number of CPU cores, the graphics card, and supported
|
||||
OpenGL/Vulkan versions.
|
||||
* Restored original vanilla behavior of Lost Souls' charging
|
||||
attack.
|
||||
* Exposed Append() method to ZScript dynamic array
|
||||
* Fixed an inconsistency with missiles bouncing off actors.
|
||||
* Added A_SoundPitch and an optional pitch parameter to
|
||||
A_PlaySound and S_Sound.
|
||||
* Attachable dynamic lights with ZScript or DECORATE.
|
||||
- Drop _service and gzdoom-wadsrc-extra.patch,
|
||||
both unused since 4.1.3.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 23 12:28:14 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Turn off LTO, it is broken. [boo#1142267]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 9 11:31:24 UTC 2019 - Martin Hauke <mardnh@gmx.de>
|
||||
|
||||
|
||||
10
gzdoom.spec
10
gzdoom.spec
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: gzdoom
|
||||
Version: 4.1.3
|
||||
Version: 4.2.0
|
||||
Release: 0
|
||||
Summary: A DOOM source port with graphic and modding extensions
|
||||
License: GPL-3.0-only
|
||||
@ -25,9 +25,8 @@ Group: Amusements/Games/3D/Shoot
|
||||
Url: http://zdoom.org/
|
||||
|
||||
#Git-Clone: https://github.com/coelckers/gzdoom
|
||||
Source: https://github.com/coelckers/gzdoom/archive/g%{version}.tar.gz
|
||||
Source: https://github.com/coelckers/gzdoom/archive/g%version.tar.gz
|
||||
Patch1: gzdoom-waddir.patch
|
||||
Patch2: gzdoom-wadsrc-extra.patch
|
||||
Patch4: fl2.patch
|
||||
Patch5: gzdoom-lzma.patch
|
||||
Patch6: gzdoom-vulkan.patch
|
||||
@ -83,8 +82,8 @@ GZDoom is a port (a modification) of the original Doom source code, featuring:
|
||||
* Demo record/playback of classic and Boom demos is not supported.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-g%{version}
|
||||
%patch -P 1 -P 2 -P 4 -p1
|
||||
%setup -q -n %name-g%version
|
||||
%patch -P 1 -P 4 -p1
|
||||
|
||||
%if 0%{?suse_version} >= 1500
|
||||
%patch -P 5 -p1
|
||||
@ -98,6 +97,7 @@ perl -i -pe 's{<unknown version>}{%version}g' \
|
||||
tools/updaterevision/updaterevision.c
|
||||
|
||||
%build
|
||||
%define _lto_cflags %nil
|
||||
# We must not strip - %%debug_package will take care of it
|
||||
# Deactivate -Wl,--as-needed
|
||||
%cmake -DNO_STRIP=1 \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user