| 1 |
commit: 3ab0a11d7aaff28d4acbd7af4a72d8c25a27b166 |
| 2 |
Author: Peter-Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Feb 14 21:21:53 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 15 12:49:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab0a11d |
| 7 |
|
| 8 |
media-libs/libquicktime: Apply libquicktime-1.2.4-ffmpeg29.patch when building libquicktime-1.2.4 against >=media-video/libav-12 |
| 9 |
|
| 10 |
media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild | 5 ++++- |
| 11 |
1 file changed, 4 insertions(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild |
| 14 |
index 8e2a7f3867..749049e928 100644 |
| 15 |
--- a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild |
| 16 |
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild |
| 17 |
@@ -53,7 +53,10 @@ DOCS="ChangeLog README TODO" |
| 18 |
src_prepare() { |
| 19 |
epatch "${FILESDIR}"/${P}+libav-9.patch \ |
| 20 |
"${FILESDIR}"/${P}-ffmpeg2.patch |
| 21 |
- has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}"/${P}-ffmpeg29.patch |
| 22 |
+ if has_version '>=media-video/ffmpeg-2.9' || |
| 23 |
+ has_version '>=media-video/libav-12'; then |
| 24 |
+ epatch "${FILESDIR}"/${P}-ffmpeg29.patch |
| 25 |
+ fi |
| 26 |
|
| 27 |
for FILE in lqt_ffmpeg.c video.c audio.c ; do |
| 28 |
sed -i -e "s:CODEC_ID_:AV_&:g" "${S}/plugins/ffmpeg/${FILE}" || die |
Archives