summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2021-04-15 21:56:08 +0200
committerMichał Górny <mgorny@gentoo.org>2021-04-15 22:44:17 +0200
commit713092ca1835ce8bc9981013c996abc563132054 (patch)
treeac3d7fb9edcaca8fdcedc8d7868e42603a8c8fff /games-engines/scummvm/files
parentxfce-extra/xfce4-cpufreq-plugin: Remove old (diff)
downloadgentoo-713092ca1835ce8bc9981013c996abc563132054.tar.gz
gentoo-713092ca1835ce8bc9981013c996abc563132054.tar.bz2
gentoo-713092ca1835ce8bc9981013c996abc563132054.zip
games-engines/scummvm: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'games-engines/scummvm/files')
-rw-r--r--games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch b/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch
deleted file mode 100644
index 6b4760e16dda..000000000000
--- a/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 68758a879e0c8ecc0d40962516d4e808aa4e15e5 Mon Sep 17 00:00:00 2001
-From: D G Turner <digitall@scummvm.org>
-Date: Tue, 17 Dec 2019 04:21:04 +0000
-Subject: [PATCH] AUDIO: Really Fix Compilation Against Fluidsynth v2.1+
-
-The previous fix did not work as the forbidden exception had no effect
-since scummsys.h and thus forbidden.h had already been included prior
-to the fluidsynth header being included. This also meant that undefining
-the exception define after the header would have had no effect anyway.
-
-This new solution was suggest by eriktorbjorn on bug #11278 and should
-avoid the need to add an exception which would persist over the entire
-source file.
----
- audio/softsynth/fluidsynth.cpp | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
-index 33a74a15247..f8c2412492e 100644
---- a/audio/softsynth/fluidsynth.cpp
-+++ b/audio/softsynth/fluidsynth.cpp
-@@ -20,10 +20,16 @@
- *
- */
-
--#include "common/scummsys.h"
-+#include "config.h"
-
- #ifdef USE_FLUIDSYNTH
-
-+// Fluidsynth v2.1+ uses printf in one of it's headers,
-+// include/fluidsynth/log.h around line 82 so need to include this
-+// prior scummsys.h inclusion and thus forbidden.h
-+#include <fluidsynth.h>
-+
-+#include "common/scummsys.h"
- #include "common/config-manager.h"
- #include "common/error.h"
- #include "common/system.h"