From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1047684-garchives=archives.gentoo.org@lists.gentoo.org>
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 8485B138335
for <garchives@archives.gentoo.org>; Tue, 18 Sep 2018 15:11:11 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 30A68E0DB8;
Tue, 18 Sep 2018 15:11:09 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id E6EB0E0DB8
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Sep 2018 15:11:08 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A54A7335C95
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Sep 2018 15:11:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DE3983D3
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Sep 2018 15:11:04 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1537283264.d8a4ee0263c4c38242fa751a779b8c5ec3bf3d5c.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/, media-libs/libquicktime/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/libquicktime/files/CVE-2016-2399.patch media-libs/libquicktime/files/libquicktime-1.2.4-CVE-2016-2399.patch media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
X-VCS-Directories: media-libs/libquicktime/ media-libs/libquicktime/files/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: d8a4ee0263c4c38242fa751a779b8c5ec3bf3d5c
X-VCS-Branch: master
Date: Tue, 18 Sep 2018 15:11:04 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: c6b56a1f-e38d-4752-aa0d-0a07b3e476ce
X-Archives-Hash: 44fa699df8f572565bf9e68fe5055314
commit: d8a4ee0263c4c38242fa751a779b8c5ec3bf3d5c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 14:49:30 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 18 15:07:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8a4ee02
media-libs/libquicktime: EAPI-7 bump
Package-Manager: Portage-2.3.49, Repoman-2.3.10
...atch => libquicktime-1.2.4-CVE-2016-2399.patch} | 0
.../libquicktime/libquicktime-1.2.4-r2.ebuild | 2 +-
....2.4-r2.ebuild => libquicktime-1.2.4-r3.ebuild} | 30 +++++++++++-----------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/media-libs/libquicktime/files/CVE-2016-2399.patch b/media-libs/libquicktime/files/libquicktime-1.2.4-CVE-2016-2399.patch
similarity index 100%
rename from media-libs/libquicktime/files/CVE-2016-2399.patch
rename to media-libs/libquicktime/files/libquicktime-1.2.4-CVE-2016-2399.patch
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index 7153bd3006a..32f2d0f169e 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -57,7 +57,7 @@ DOCS=( ChangeLog README TODO )
PATCHES=(
"${FILESDIR}"/${P}+libav-9.patch
"${FILESDIR}"/${P}-ffmpeg2.patch
- "${FILESDIR}"/CVE-2016-2399.patch
+ "${FILESDIR}"/${P}-CVE-2016-2399.patch
)
src_prepare() {
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
similarity index 87%
copy from media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
copy to media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index 7153bd3006a..69f1b64818e 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit libtool multilib-minimal
@@ -11,20 +11,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame libav cpu_flags_x86_mmx opengl png schroedinger static-libs vorbis X x264"
-RDEPEND=">=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
- sys-libs/zlib:=
+RDEPEND="
+ sys-libs/zlib
+ >=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
aac? (
>=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]
encode? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
- )
+ )
alsa? ( >=media-libs/alsa-lib-1.0.20 )
dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
ffmpeg? (
- libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+ libav? ( >=media-video/libav-12:0=[${MULTILIB_USEDEP}] )
+ !libav? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
)
gtk? ( x11-libs/gtk+:2 )
jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
@@ -35,16 +36,17 @@ RDEPEND=">=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
vorbis? (
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
- )
+ )
X? (
x11-libs/libX11
x11-libs/libXaw
x11-libs/libXext
x11-libs/libXt
x11-libs/libXv
- )
+ )
x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
sys-devel/gettext
doc? ( app-doc/doxygen )
@@ -57,15 +59,13 @@ DOCS=( ChangeLog README TODO )
PATCHES=(
"${FILESDIR}"/${P}+libav-9.patch
"${FILESDIR}"/${P}-ffmpeg2.patch
- "${FILESDIR}"/CVE-2016-2399.patch
+ "${FILESDIR}"/${P}-ffmpeg29.patch
+ "${FILESDIR}"/${P}-CVE-2016-2399.patch
)
src_prepare() {
default
- if has_version '>=media-video/ffmpeg-2.9' ||
- has_version '>=media-video/libav-12'; then
- eapply "${FILESDIR}"/${P}-ffmpeg29.patch
- fi
+
if has_version '>media-video/ffmpeg-3.5' ; then
eapply "${FILESDIR}/${P}-ffmpeg4.patch"
fi