mgorny 14/06/16 22:00:35
Modified: ffmpeg-9999.ebuild ffmpeg-2.2.3-r1.ebuild
ffmpeg-1.2.6-r1.ebuild ChangeLog
Log:
Wrap libavutil/avconfig.h since in some cases it differs per-ABI, bug #513184.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
EFB4464E!)
Revision Changes Path
1.157 media-video/ffmpeg/ffmpeg-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.157&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.157&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.156&r2=1.157
Index: ffmpeg-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- ffmpeg-9999.ebuild 12 Jun 2014 14:14:17 -0000 1.156
+++ ffmpeg-9999.ebuild 16 Jun 2014 22:00:35 -0000 1.157
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v
1.156 2014/06/12 14:14:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v
1.157 2014/06/16 22:00:35 mgorny Exp $
EAPI="5"
@@ -184,6 +184,10 @@
S=${WORKDIR}/${P/_/-}
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/libavutil/avconfig.h
+)
+
src_prepare() {
if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
export revision=git-N-${FFMPEG_REVISION}
1.4 media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild?r1=1.3&r2=1.4
Index: ffmpeg-2.2.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ffmpeg-2.2.3-r1.ebuild 14 Jun 2014 02:46:27 -0000 1.3
+++ ffmpeg-2.2.3-r1.ebuild 16 Jun 2014 22:00:35 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild,v
1.3 2014/06/14 02:46:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild,v
1.4 2014/06/16 22:00:35 mgorny Exp $
EAPI="5"
@@ -184,6 +184,10 @@
S=${WORKDIR}/${P/_/-}
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/libavutil/avconfig.h
+)
+
src_prepare() {
if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
export revision=git-N-${FFMPEG_REVISION}
1.2 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.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild?r1=1.1&r2=1.2
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ffmpeg-1.2.6-r1.ebuild 14 Jun 2014 08:09:19 -0000 1.1
+++ ffmpeg-1.2.6-r1.ebuild 16 Jun 2014 22:00:35 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.1 2014/06/14 08:09:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v
1.2 2014/06/16 22:00:35 mgorny Exp $
EAPI="4"
@@ -153,6 +153,10 @@
S=${WORKDIR}/${P/_/-}
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/libavutil/avconfig.h
+)
+
src_prepare() {
if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
export revision=git-N-${FFMPEG_REVISION}
1.752 media-video/ffmpeg/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.752&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.752&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.751&r2=1.752
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.751
retrieving revision 1.752
diff -u -r1.751 -r1.752
--- ChangeLog 14 Jun 2014 09:49:09 -0000 1.751
+++ ChangeLog 16 Jun 2014 22:00:35 -0000 1.752
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.751
2014/06/14 09:49:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.752
2014/06/16 22:00:35 mgorny Exp $
+
+ 16 Jun 2014; Michał Górny <mgo...@gentoo.org> ffmpeg-1.2.6-r1.ebuild,
+ ffmpeg-2.2.3-r1.ebuild, ffmpeg-9999.ebuild:
+ Wrap libavutil/avconfig.h since in some cases it differs per-ABI, bug
#513184.
*ffmpeg-0.10.13 (14 Jun 2014)
