From: Peter-Levine <plevine457@gmail.com>
Date: Tue, 14 Feb 2017 21:21:53 +0000 (-0500)
Subject: media-libs/libquicktime: Apply libquicktime-1.2.4-ffmpeg29.patch when building libqui... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3ab0a11d7aaff28d4acbd7af4a72d8c25a27b166;p=gentoo.git

media-libs/libquicktime: Apply libquicktime-1.2.4-ffmpeg29.patch when building libquicktime-1.2.4 against >=media-video/libav-12
---

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