Revision bump the latest to use system ffmpeg like old version did. Remove the patch for 4.7 which patched only libav code, same goes for hardened useflag. Add some elog informations for ffmpeg users informing about upstream using libav.

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

3 files changed, 63 insertions, 16 deletions

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index c89cb8afb8df..c2afed84d4d5 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/gst-plugins-ffmpeg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.135 2012/06/15 14:58:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.136 2012/06/20 11:02:35 scarabeus Exp $
+
+*gst-plugins-ffmpeg-0.10.13-r2 (20 Jun 2012)
+
+  20 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +gst-plugins-ffmpeg-0.10.13-r2.ebuild, gst-plugins-ffmpeg-0.10.13-r1.ebuild:
+  Revision bump the latest to use system ffmpeg like old version did. Remove the
+  patch for 4.7 which patched only libav code, same goes for hardened useflag.
+  Add some elog informations for ffmpeg users informing about upstream using
+  libav.
 
   15 Jun 2012; Justin Lecher <jlec@gentoo.org>
   gst-plugins-ffmpeg-0.10.13-r1.ebuild, +files/0.10.13-gcc-4.7.patch,
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild
index 29cfb3330c33..cee136aab32c 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild,v 1.3 2012/06/15 14:58:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild,v 1.4 2012/06/20 11:02:35 scarabeus Exp $
 
 EAPI=4
 
 inherit base eutils flag-o-matic
 
-PD=${FILESDIR}/${PV}
 MY_PN=${PN/-plugins}
 MY_P=${MY_PN}-${PV}
 
 # Create a major/minor combo for SLOT
 PVP=(${PV//[-\._]/ })
 SLOT=${PVP[0]}.${PVP[1]}
-#SLOT=0.10
 
 DESCRIPTION="FFmpeg based gstreamer plugin"
 HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
@@ -21,26 +19,20 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+orc hardened"
+IUSE="+orc"
 
 S=${WORKDIR}/${MY_P}
 
 RDEPEND=">=media-libs/gstreamer-0.10.31
 	>=media-libs/gst-plugins-base-0.10.31
+	>=virtual/ffmpeg-0.10
 	orc? ( >=dev-lang/orc-0.4.6 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${PV}-gcc-4.7.patch )
-
 src_configure() {
-	append-flags -fno-strict-aliasing
-
-	if ! use hardened; then
-		econf $(use_enable orc)
-	else
-		# On hardened, we need to disable mmx and mmx2 to avoid TEXTRELs
-		econf $(use_enable orc) \
-			--with-ffmpeg-extra-configure='--disable-mmx --disable-mmx2'
-	fi
+	# always use system ffmpeg if possible
+	econf \
+		--with-system-ffmpeg \
+		$(use_enable orc)
 }
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild
new file mode 100644
index 000000000000..6c2ca258fa02
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild,v 1.1 2012/06/20 11:02:35 scarabeus Exp $
+
+EAPI=4
+
+inherit base eutils flag-o-matic
+
+MY_PN=${PN/-plugins}
+MY_P=${MY_PN}-${PV}
+
+# Create a major/minor combo for SLOT
+PVP=(${PV//[-\._]/ })
+SLOT=${PVP[0]}.${PVP[1]}
+
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
+SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+orc"
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND=">=media-libs/gstreamer-0.10.31
+	>=media-libs/gst-plugins-base-0.10.31
+	>=virtual/ffmpeg-0.10
+	orc? ( >=dev-lang/orc-0.4.6 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	# always use system ffmpeg if possible
+	econf \
+		--with-system-ffmpeg \
+		$(use_enable orc)
+}
+
+pkg_postinst() {
+	if has_version "media-video/ffmpeg"; then
+		elog "Please note that upstream uses media-video/libav"
+		elog "rather than media-video/ffmpeg. If you encoutner any"
+		elog "issues try to move from ffmpeg to libav."
+	fi
+}