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

Accepting request 876936 from games

Browse Source 
- Update to release 4.5.0

OBS-URL: https://build.opensuse.org/request/show/876936
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gzdoom?expand=0&rev=15
This commit is contained in:
Richard Brown 2021-03-30 19:11:34 +00:00 committed by Git OBS Bridge
commit 7a7ab44daf
6 changed files with 70 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
0001-fixed-zipdir-inability-to-update-empty-zip-file.patch Normal file
View File

@ -0,0 +1,23 @@
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;
}
}

3
g4.4.2.tar.gz
View File

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

3
g4.5.0.tar.gz Normal file
View File

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

23
gzdoom-spirv.patch
View File

@ -1,23 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2020-06-11 15:48:28.422839234 +0200
gzdoom is the only user of its own libSPIRV.so, so there is no need for a
shared library.
---
libraries/glslang/spirv/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: gzdoom-g4.4.0/libraries/glslang/spirv/CMakeLists.txt
===================================================================
--- gzdoom-g4.4.0.orig/libraries/glslang/spirv/CMakeLists.txt
+++ gzdoom-g4.4.0/libraries/glslang/spirv/CMakeLists.txt
@@ -49,7 +49,7 @@ set(SPVREMAP_HEADERS
SPVRemapper.h
doc.h)
-add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
+add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS})
set_property(TARGET SPIRV PROPERTY FOLDER glslang)
set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
target_include_directories(SPIRV PUBLIC

33
gzdoom.changes
View File

@ -1,3 +1,36 @@
-------------------------------------------------------------------
Thu Mar 4 19:55:21 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
- Add 0001-fixed-zipdir-inability-to-update-empty-zip-file.patch
- Update to release 4.5.0
* For all of Doom's fullscreen images, there's now widescreen
versions provided.
* A simplified options menu is now available for quick setup of
the important settings.
* New keybindings presets. Users can now choose between the
classic layout and a WASD-based one.
* Menu and intermission screen now scale to the original
Doom.exe's layout by default.
* Major additions to the menu system - animated menu
transitions, image slideshows and fixed size menus can now be
created.
* The console now uses the border flat as default background
instead of the titlepic.
* It is now possible to fully quit the fullscreen console and
get back to the title loop.
* Interpolate positions and angles in the automap for smoother
appearance.
* Added $PitchSet for SNDINFO.
* Allow indirections in the string table by prefixing the
language string with '$$' the remaining text is interpreted
as another string label to resolve.
* Optimization of the patch texture checker - do not read in
the entire file if checking the initial header is sufficient
for rejecting it. This can speed up loading of large mods
quite significantly.
* OPUS support (via libsndfile)
- Drop gzdoom-spirv.patch (merged)
-------------------------------------------------------------------
Tue Sep 15 23:25:49 UTC 2020 - Jan Engelhardt <jengelh@inai.de>

20
gzdoom.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gzdoom
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 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.4.2
Version: 4.5.0
Release: 0
Summary: A DOOM source port with graphic and modding extensions
License: GPL-3.0-only
@ -29,9 +29,9 @@ Source: https://github.com/coelckers/gzdoom/archive/g%version.tar.gz
Patch1: gzdoom-waddir.patch
Patch2: gzdoom-lzma.patch
Patch3: gzdoom-asmjit.patch
Patch4: gzdoom-spirv.patch
Patch5: gzdoom-sdlbug.patch
Patch6: gzdoom-vulkan.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
@ -76,12 +76,13 @@ GZDoom is a port (a modification) of the original Doom source code, featuring:
%prep
%setup -qn %name-g%version
%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
%patch -P 1 -P 2 -P 3 -P 4 -p1
%if 0%{?sle_version} >= 150200
%patch -P 6 -p1
%patch -P 5 -p1
rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan
%endif
perl -i -pe 's{__DATE__}{""}g' src/posix/sdl/i_main.cpp
%patch -P 6 -p1
perl -i -pe 's{__DATE__}{""}g' src/common/platform/posix/sdl/i_main.cpp
%build
# There is handcrafted assembler, which LTO does not play nice with.
@ -98,8 +99,9 @@ export CXXFLAGS="%optflags -msse -msse2"
-DCMAKE_EXE_LINKER_FLAGS="" -DCMAKE_MODULE_LINKER_FLAGS="" \
-DINSTALL_DOCS_PATH="%_defaultdocdir/%name" \
-DINSTALL_PK3_PATH="%_datadir/doom" \
-DINSTALL_SOUNDFONT_PATH="%_datadir/doom" \
-DDYN_OPENAL=OFF
make %{?_smp_mflags}
%cmake_build
%install
%cmake_install