| 1 |
commit: 5f761feca7e6e7468e541c410660ed61b18bcd40 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 5 09:18:38 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 5 09:37:40 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f761fec |
| 7 |
|
| 8 |
media-sound/cantata: Fix build with USE=replaygain |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
media-sound/cantata/cantata-2.1.0.ebuild | 2 ++ |
| 13 |
.../cantata/files/cantata-2.1.0-headers.patch | 42 ++++++++++++++++++++++ |
| 14 |
2 files changed, 44 insertions(+) |
| 15 |
|
| 16 |
diff --git a/media-sound/cantata/cantata-2.1.0.ebuild b/media-sound/cantata/cantata-2.1.0.ebuild |
| 17 |
index 65f1626c7dd..e60ac6b3c74 100644 |
| 18 |
--- a/media-sound/cantata/cantata-2.1.0.ebuild |
| 19 |
+++ b/media-sound/cantata/cantata-2.1.0.ebuild |
| 20 |
@@ -60,6 +60,8 @@ DEPEND="${RDEPEND} |
| 21 |
# cantata has no tests |
| 22 |
RESTRICT="test" |
| 23 |
|
| 24 |
+PATCHES=( "${FILESDIR}/${P}-headers.patch" ) |
| 25 |
+ |
| 26 |
src_prepare() { |
| 27 |
remove_locale() { |
| 28 |
rm "translations/${PN}_${1}".ts || die |
| 29 |
|
| 30 |
diff --git a/media-sound/cantata/files/cantata-2.1.0-headers.patch b/media-sound/cantata/files/cantata-2.1.0-headers.patch |
| 31 |
new file mode 100644 |
| 32 |
index 00000000000..a442a2c1022 |
| 33 |
--- /dev/null |
| 34 |
+++ b/media-sound/cantata/files/cantata-2.1.0-headers.patch |
| 35 |
@@ -0,0 +1,42 @@ |
| 36 |
+Description: Fix include location for ebur128 files |
| 37 |
+ The Debian packages for ebur128 are shipping the headers in: |
| 38 |
+ |
| 39 |
+ libebur128-dev: /usr/include/ebur128.h |
| 40 |
+ |
| 41 |
+ while the upstream code expects ebur128/ebur128.h |
| 42 |
+ |
| 43 |
+Author: Stuart Prescott <stuart@××××××.org> |
| 44 |
+Forwarded: not sure -- check interaction with cmake rules |
| 45 |
+--- a/replaygain/ffmpeginput.cpp |
| 46 |
++++ b/replaygain/ffmpeginput.cpp |
| 47 |
+@@ -31,7 +31,7 @@ |
| 48 |
+ #include <QString> |
| 49 |
+ #include <QList> |
| 50 |
+ #include <QByteArray> |
| 51 |
+-#include "ebur128/ebur128.h" |
| 52 |
++#include "ebur128.h" |
| 53 |
+ #include "ffmpeginput.h" |
| 54 |
+ |
| 55 |
+ static QMutex mutex; |
| 56 |
+--- a/replaygain/mpg123input.cpp |
| 57 |
++++ b/replaygain/mpg123input.cpp |
| 58 |
+@@ -18,7 +18,7 @@ |
| 59 |
+ #include <QFile> |
| 60 |
+ #include <QString> |
| 61 |
+ #include <QByteArray> |
| 62 |
+-#include "ebur128/ebur128.h" |
| 63 |
++#include "ebur128.h" |
| 64 |
+ #include "mpg123input.h" |
| 65 |
+ |
| 66 |
+ struct Mpg123Input::Handle { |
| 67 |
+--- a/replaygain/trackscanner.h |
| 68 |
++++ b/replaygain/trackscanner.h |
| 69 |
+@@ -25,7 +25,7 @@ |
| 70 |
+ #define _SCANNER_H_ |
| 71 |
+ |
| 72 |
+ #include "jobcontroller.h" |
| 73 |
+-#include "ebur128/ebur128.h" |
| 74 |
++#include "ebur128.h" |
| 75 |
+ |
| 76 |
+ class Input; |
| 77 |
+ |
Archives