aballier 15/03/05 14:00:42
Modified: ffmpeg-1.0.10.ebuild ffmpeg-2.2.13.ebuild
ffmpeg-1.2.12.ebuild ffmpeg-1.2.6-r1.ebuild
ChangeLog
Log:
force libcdio update to shutup repoman warning
Signed-off-by: aball...@gentoo.org
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
160F534A)
Revision Changes Path
1.5 media-video/ffmpeg/ffmpeg-1.0.10.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild?r1=1.4&r2=1.5
Index: ffmpeg-1.0.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ffmpeg-1.0.10.ebuild 5 Mar 2015 13:57:08 -0000 1.4
+++ ffmpeg-1.0.10.ebuild 5 Mar 2015 14:00:41 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild,v
1.4 2015/03/05 13:57:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild,v
1.5 2015/03/05 14:00:41 aballier Exp $
EAPI="4"
@@ -56,7 +56,7 @@
amr? ( media-libs/opencore-amr )
bluray? ( media-libs/libbluray )
bzip2? ( app-arch/bzip2 )
- cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal]
) )
+ cdio? ( dev-libs/libcdio-paranoia )
celt? ( >=media-libs/celt-0.11.1 )
encode? (
aac? ( media-libs/vo-aacenc )
@@ -130,12 +130,10 @@
export revision=git-N-${FFMPEG_REVISION}
fi
- if has_version dev-libs/libcdio-paranoia; then
- sed -i \
- -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
- -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
- configure libavdevice/libcdio.c || die
- fi
+ sed -i \
+ -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+ -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
+ configure libavdevice/libcdio.c || die
epatch "${FILESDIR}"/${PN}-1.0.8-freetype251.patch
}
1.3 media-video/ffmpeg/ffmpeg-2.2.13.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild?r1=1.2&r2=1.3
Index: ffmpeg-2.2.13.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ffmpeg-2.2.13.ebuild 5 Mar 2015 13:57:08 -0000 1.2
+++ ffmpeg-2.2.13.ebuild 5 Mar 2015 14:00:41 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild,v
1.2 2015/03/05 13:57:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild,v
1.3 2015/03/05 14:00:41 aballier Exp $
EAPI="5"
@@ -78,12 +78,7 @@
amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
- cdio? (
- || (
-
>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
- <dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
- )
- )
+ cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
encode? (
aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
1.3 media-video/ffmpeg/ffmpeg-1.2.12.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild?r1=1.2&r2=1.3
Index: ffmpeg-1.2.12.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ffmpeg-1.2.12.ebuild 5 Mar 2015 13:57:08 -0000 1.2
+++ ffmpeg-1.2.12.ebuild 5 Mar 2015 14:00:41 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild,v
1.2 2015/03/05 13:57:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild,v
1.3 2015/03/05 14:00:41 aballier Exp $
EAPI="4"
@@ -56,12 +56,7 @@
amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
- cdio? (
- || (
-
>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
- <dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
- )
- )
+ cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
encode? (
aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
1.17 media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild?rev=1.17&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild?rev=1.17&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild?r1=1.16&r2=1.17
Index: ffmpeg-1.2.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ffmpeg-1.2.6-r1.ebuild 5 Mar 2015 13:57:08 -0000 1.16
+++ ffmpeg-1.2.6-r1.ebuild 5 Mar 2015 14:00:41 -0000 1.17
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v
1.16 2015/03/05 13:57:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v
1.17 2015/03/05 14:00:41 aballier Exp $
EAPI="4"
@@ -56,12 +56,7 @@
amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
- cdio? (
- || (
-
>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
- <dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
- )
- )
+ cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
encode? (
aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
1.841 media-video/ffmpeg/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.841&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.841&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.840&r2=1.841
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.840
retrieving revision 1.841
diff -u -r1.840 -r1.841
--- ChangeLog 5 Mar 2015 13:57:08 -0000 1.840
+++ ChangeLog 5 Mar 2015 14:00:41 -0000 1.841
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.840
2015/03/05 13:57:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.841
2015/03/05 14:00:41 aballier Exp $
+
+ 05 Mar 2015; Alexis Ballier <aball...@gentoo.org> ffmpeg-1.0.10.ebuild,
+ ffmpeg-1.2.12.ebuild, ffmpeg-1.2.6-r1.ebuild, ffmpeg-2.2.13.ebuild:
+ force libcdio update to shutup repoman warning
05 Mar 2015; Alexis Ballier <aball...@gentoo.org> ffmpeg-0.10.15.ebuild,
ffmpeg-1.0.10.ebuild, ffmpeg-1.2.12.ebuild, ffmpeg-1.2.6-r1.ebuild,
