summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-08-05 11:18:38 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-08-05 11:37:40 +0200
commit5f761feca7e6e7468e541c410660ed61b18bcd40 (patch)
tree4fbd1f13e80389eab2ee5e3aad6dcb6242477f06
parentdev-python/nltk: x86 stable (diff)
downloadgentoo-5f761feca7e6e7468e541c410660ed61b18bcd40.tar.gz
gentoo-5f761feca7e6e7468e541c410660ed61b18bcd40.tar.bz2
gentoo-5f761feca7e6e7468e541c410660ed61b18bcd40.zip
media-sound/cantata: Fix build with USE=replaygain
Package-Manager: Portage-2.3.6, Repoman-2.3.1
-rw-r--r--media-sound/cantata/cantata-2.1.0.ebuild2
-rw-r--r--media-sound/cantata/files/cantata-2.1.0-headers.patch42
2 files changed, 44 insertions, 0 deletions
diff --git a/media-sound/cantata/cantata-2.1.0.ebuild b/media-sound/cantata/cantata-2.1.0.ebuild
index 65f1626c7dd1..e60ac6b3c74a 100644
--- a/media-sound/cantata/cantata-2.1.0.ebuild
+++ b/media-sound/cantata/cantata-2.1.0.ebuild
@@ -60,6 +60,8 @@ DEPEND="${RDEPEND}
# cantata has no tests
RESTRICT="test"
+PATCHES=( "${FILESDIR}/${P}-headers.patch" )
+
src_prepare() {
remove_locale() {
rm "translations/${PN}_${1}".ts || die
diff --git a/media-sound/cantata/files/cantata-2.1.0-headers.patch b/media-sound/cantata/files/cantata-2.1.0-headers.patch
new file mode 100644
index 000000000000..a442a2c1022d
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.1.0-headers.patch
@@ -0,0 +1,42 @@
+Description: Fix include location for ebur128 files
+ The Debian packages for ebur128 are shipping the headers in:
+
+ libebur128-dev: /usr/include/ebur128.h
+
+ while the upstream code expects ebur128/ebur128.h
+
+Author: Stuart Prescott <stuart@debian.org>
+Forwarded: not sure -- check interaction with cmake rules
+--- a/replaygain/ffmpeginput.cpp
++++ b/replaygain/ffmpeginput.cpp
+@@ -31,7 +31,7 @@
+ #include <QString>
+ #include <QList>
+ #include <QByteArray>
+-#include "ebur128/ebur128.h"
++#include "ebur128.h"
+ #include "ffmpeginput.h"
+
+ static QMutex mutex;
+--- a/replaygain/mpg123input.cpp
++++ b/replaygain/mpg123input.cpp
+@@ -18,7 +18,7 @@
+ #include <QFile>
+ #include <QString>
+ #include <QByteArray>
+-#include "ebur128/ebur128.h"
++#include "ebur128.h"
+ #include "mpg123input.h"
+
+ struct Mpg123Input::Handle {
+--- a/replaygain/trackscanner.h
++++ b/replaygain/trackscanner.h
+@@ -25,7 +25,7 @@
+ #define _SCANNER_H_
+
+ #include "jobcontroller.h"
+-#include "ebur128/ebur128.h"
++#include "ebur128.h"
+
+ class Input;
+