diff --git a/fl2.patch b/fl2.patch deleted file mode 100644 index bcd6410..0000000 --- a/fl2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Jan Engelhardt -Date: 2018-10-16 14:29:56.900427855 +0200 - -Make the build work with fluidsynth 2.x. - ---- - src/sound/mididevices/music_fluidsynth_mididevice.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -Index: gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp -=================================================================== ---- gzdoom-3.6.0.orig/src/sound/mididevices/music_fluidsynth_mididevice.cpp -+++ gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp -@@ -78,10 +78,13 @@ extern "C" unsigned __stdcall GetSystemD - #define FLUID_CHORUS_DEFAULT_LEVEL 2.0f - #define FLUID_CHORUS_DEFAULT_SPEED 0.3f - #define FLUID_CHORUS_DEFAULT_DEPTH 8.0f --#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE - - #endif - -+#ifndef FLUID_CHORUS_DEFAULT_TYPE -+#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE -+#endif -+ - // TYPES ------------------------------------------------------------------- - - // EXTERNAL FUNCTION PROTOTYPES -------------------------------------------- diff --git a/g4.2.0.tar.gz b/g4.2.0.tar.gz deleted file mode 100644 index 37277bc..0000000 --- a/g4.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d781e868f32ad53aa262691f76cab09b12661ababd2b7f5735fe852ab74d566 -size 13482879 diff --git a/g4.2.1.tar.gz b/g4.2.1.tar.gz new file mode 100644 index 0000000..dd0795b --- /dev/null +++ b/g4.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de014b0d3e1c702dbba16acadc596158bb8185c268ed4afa605d625d35f37a62 +size 13660636 diff --git a/gzdoom.changes b/gzdoom.changes index cf23570..536c959 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Sep 13 11:39:15 UTC 2019 - Jan Engelhardt + +- Update to release 4.2.1 + * Level compatibility additions for Scythe 2 and Hell Revealed. + * Add current, max and average velocity as stat. + * Let Hexen Cleric and Mage use unique health chains. + * Allow custom status bars to override notification and + centered message display. + * Improve crosshair health color to be more informative. + * Added obituary fallbacks for actors that do not have + any defined. +- Remove fl2.patch (merged) + ------------------------------------------------------------------- Fri Aug 23 12:40:51 UTC 2019 - Jan Engelhardt diff --git a/gzdoom.spec b/gzdoom.spec index 6241d31..1f33a78 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -17,7 +17,7 @@ Name: gzdoom -Version: 4.2.0 +Version: 4.2.1 Release: 0 Summary: A DOOM source port with graphic and modding extensions License: GPL-3.0-only @@ -27,9 +27,8 @@ Url: http://zdoom.org/ #Git-Clone: https://github.com/coelckers/gzdoom Source: https://github.com/coelckers/gzdoom/archive/g%version.tar.gz Patch1: gzdoom-waddir.patch -Patch4: fl2.patch -Patch5: gzdoom-lzma.patch -Patch6: gzdoom-vulkan.patch +Patch2: gzdoom-lzma.patch +Patch3: gzdoom-vulkan.patch BuildRequires: cmake >= 2.8.7 BuildRequires: gcc-c++ BuildRequires: glslang-devel @@ -68,6 +67,7 @@ Provides: zdoom = 2.8.1 Provides: bundled(dumb) = 0.9.3 Provides: bundled(gdtoa) Provides: bundled(re2c) = 0.16.0 +Provides: bundled(xbrz) = 1.7 %description GZDoom is a port (a modification) of the original Doom source code, featuring: @@ -83,13 +83,13 @@ GZDoom is a port (a modification) of the original Doom source code, featuring: %prep %setup -q -n %name-g%version -%patch -P 1 -P 4 -p1 +%patch -P 1 -p1 %if 0%{?suse_version} >= 1500 -%patch -P 5 -p1 +%patch -P 2 -p1 %endif %if 0%{?suse_version} >= 1550 -%patch -P 6 -p1 +%patch -P 3 -p1 rm -Rfv glslang src/rendering/vulkan/thirdparty/vulkan %endif perl -i -pe 's{__DATE__}{""}g' src/posix/sdl/i_main.cpp