[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/

[Alexis Ballier]

commit:     3ab0a11d7aaff28d4acbd7af4a72d8c25a27b166
Author:     Peter-Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Tue Feb 14 21:21:53 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 12:49:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab0a11d

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

 media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild 
b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
index 8e2a7f3867..749049e928 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