| 1 |
commit: 0e0022cf7c98344343eb04454f8309aacff18b9b |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 25 22:38:31 2019 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 25 22:38:42 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e0022cf |
| 7 |
|
| 8 |
games-emulation/dolphin: fix libsoundtouch build, bug #686752 |
| 9 |
|
| 10 |
Reported-and-fixed-by: Sławomir Nizio |
| 11 |
Closes: https://bugs.gentoo.org/686752 |
| 12 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 14 |
|
| 15 |
games-emulation/dolphin/dolphin-5.0.ebuild | 3 ++- |
| 16 |
.../files/dolphin-5.0-soundtouch-exceptions.patch | 19 +++++++++++++++++++ |
| 17 |
2 files changed, 21 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild |
| 20 |
index 491d92991be..871b1246ade 100644 |
| 21 |
--- a/games-emulation/dolphin/dolphin-5.0.ebuild |
| 22 |
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2018 Gentoo Foundation |
| 25 |
+# Copyright 1999-2019 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=5 |
| 29 |
@@ -75,6 +75,7 @@ PATCHES=( |
| 30 |
"${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch |
| 31 |
"${FILESDIR}"/${P}-xgetbv.patch |
| 32 |
"${FILESDIR}"/${P}-no-pie.patch |
| 33 |
+ "${FILESDIR}"/${P}-soundtouch-exceptions.patch |
| 34 |
) |
| 35 |
|
| 36 |
src_prepare() { |
| 37 |
|
| 38 |
diff --git a/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch b/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch |
| 39 |
new file mode 100644 |
| 40 |
index 00000000000..ffd07cf0697 |
| 41 |
--- /dev/null |
| 42 |
+++ b/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch |
| 43 |
@@ -0,0 +1,19 @@ |
| 44 |
+https://bugs.gentoo.org/686752 |
| 45 |
+ |
| 46 |
+Description: Fix FTBFS with SoundTouch 2.1.2 |
| 47 |
+ Explicitly disable exceptions in SoundTouch headers because Dolphin |
| 48 |
+ is compiled with -fno-exceptions. |
| 49 |
+Author: James Cowgill <jcowgill@××××××.org> |
| 50 |
+Bug-Debian: https://bugs.debian.org/917671 |
| 51 |
+--- |
| 52 |
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |
| 53 |
+--- a/Source/Core/AudioCommon/OpenALStream.h |
| 54 |
++++ b/Source/Core/AudioCommon/OpenALStream.h |
| 55 |
+@@ -32,6 +32,7 @@ |
| 56 |
+ #define BOOL SoundTouch_BOOL |
| 57 |
+ #endif |
| 58 |
+ |
| 59 |
++#define ST_NO_EXCEPTION_HANDLING |
| 60 |
+ #include <soundtouch/SoundTouch.h> |
| 61 |
+ #include <soundtouch/STTypes.h> |
| 62 |
+ |
Archives