From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4F03B139694 for ; Wed, 15 Feb 2017 12:49:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2C9BE0839; Wed, 15 Feb 2017 12:49:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 939A4E0839 for ; Wed, 15 Feb 2017 12:49:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD59A34164E for ; Wed, 15 Feb 2017 12:49:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC48048AF for ; Wed, 15 Feb 2017 12:49:31 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1487162965.3ab0a11d7aaff28d4acbd7af4a72d8c25a27b166.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild X-VCS-Directories: media-libs/libquicktime/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 3ab0a11d7aaff28d4acbd7af4a72d8c25a27b166 X-VCS-Branch: master Date: Wed, 15 Feb 2017 12:49:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1a818230-1951-4bab-a935-6f0f530ffd94 X-Archives-Hash: c76e8a0b0b5f5b46324dfcb1fe29599c commit: 3ab0a11d7aaff28d4acbd7af4a72d8c25a27b166 Author: Peter-Levine gmail com> AuthorDate: Tue Feb 14 21:21:53 2017 +0000 Commit: Alexis Ballier gentoo 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