summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter-Levine <plevine457@gmail.com>2017-02-14 16:21:53 -0500
committerAlexis Ballier <aballier@gentoo.org>2017-02-15 13:49:25 +0100
commit3ab0a11d7aaff28d4acbd7af4a72d8c25a27b166 (patch)
tree1f6e6496981ff279a3ece1b23b108e9a2c1815e7
parentsys-devel/clang-runtime: Bump to 4.0.0.rc2 (diff)
downloadgentoo-3ab0a11d7aaff28d4acbd7af4a72d8c25a27b166.tar.gz
gentoo-3ab0a11d7aaff28d4acbd7af4a72d8c25a27b166.tar.bz2
gentoo-3ab0a11d7aaff28d4acbd7af4a72d8c25a27b166.zip
media-libs/libquicktime: Apply libquicktime-1.2.4-ffmpeg29.patch when building libquicktime-1.2.4 against >=media-video/libav-12
-rw-r--r--media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild5
1 files changed, 4 insertions, 1 deletions
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
index 8e2a7f3867cd..749049e92884 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
@@ -53,7 +53,10 @@ DOCS="ChangeLog README TODO"
src_prepare() {
epatch "${FILESDIR}"/${P}+libav-9.patch \
"${FILESDIR}"/${P}-ffmpeg2.patch
- has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}"/${P}-ffmpeg29.patch
+ if has_version '>=media-video/ffmpeg-2.9' ||
+ has_version '>=media-video/libav-12'; then
+ epatch "${FILESDIR}"/${P}-ffmpeg29.patch
+ fi
for FILE in lqt_ffmpeg.c video.c audio.c ; do
sed -i -e "s:CODEC_ID_:AV_&:g" "${S}/plugins/ffmpeg/${FILE}" || die