From 89f7c87413d82b9f8b17aed3634910e22d891ba0dddc020039c835032ca20e3c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 16 Oct 2018 13:31:11 +0000 Subject: [PATCH] - Add fl2.diff OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=11 --- fl2.patch | 23 +++++++++++++++++++++++ gzdoom.changes | 1 + gzdoom.spec | 7 ++++--- 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 fl2.patch diff --git a/fl2.patch b/fl2.patch new file mode 100644 index 0000000..0059b10 --- /dev/null +++ b/fl2.patch @@ -0,0 +1,23 @@ +--- + 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/gzdoom.changes b/gzdoom.changes index 9eaa79b..6c671fe 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -11,6 +11,7 @@ Tue Oct 16 11:52:51 UTC 2018 - Jan Engelhardt - Update to new upstream release 3.5.1 * Added post processing support to the software renderer and softpoly. +- Add fl2.diff ------------------------------------------------------------------- Sun Aug 5 12:00:27 UTC 2018 - mardnh@gmx.de diff --git a/gzdoom.spec b/gzdoom.spec index b1dd630..a08ba6b 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -29,6 +29,7 @@ Source: %name-%version.tar.xz Patch1: gzdoom-waddir.patch Patch2: gzdoom-wadsrc-extra.patch Patch3: gzdoom-staticlibs.patch +Patch4: fl2.patch Patch5: gzdoom-lzma.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake >= 2.8.7 @@ -81,7 +82,7 @@ GZDoom is a port (a modification) of the original Doom source code, featuring: %prep %setup -q -%patch -P 1 -P 2 -P 3 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -p1 %if 0%{?suse_version} >= 1500 %patch -P 5 -p1 @@ -101,8 +102,8 @@ perl -i -pe 's{}{%version}g' \ -DCMAKE_EXE_LINKER_FLAGS="" -DCMAKE_MODULE_LINKER_FLAGS="" \ -DINSTALL_DOCS_PATH="%_defaultdocdir/%name" \ -DINSTALL_PK3_PATH="%_datadir/doom" \ - -DDYN_FLUIDSYNTH=BOOL:FALSE -DDYN_OPENAL=BOOL:FALSE \ - -DDYN_SNDFILE=BOOL:FALSE -DDYN_MPG123=BOOL:FALSE + -DDYN_FLUIDSYNTH=OFF -DDYN_OPENAL=OFF \ + -DDYN_SNDFILE=OFF -DDYN_MPG123=OFF make %{?_smp_mflags} %install