Replace the virtual with USE=libav.

(Portage version: 2.2.16/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

3 files changed, 143 insertions, 1 deletions

diff --git a/media-plugins/gst-plugins-libav/ChangeLog b/media-plugins/gst-plugins-libav/ChangeLog
index bdd5f4e575ac..cf478ff09661 100644
--- a/media-plugins/gst-plugins-libav/ChangeLog
+++ b/media-plugins/gst-plugins-libav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/gst-plugins-libav
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.56 2015/02/04 13:02:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.57 2015/02/07 20:17:43 mgorny Exp $
+
+*gst-plugins-libav-1.4.5-r1 (07 Feb 2015)
+*gst-plugins-libav-1.2.4-r1 (07 Feb 2015)
+
+  07 Feb 2015; Michał Górny <mgorny@gentoo.org>
+  +gst-plugins-libav-1.2.4-r1.ebuild, +gst-plugins-libav-1.4.5-r1.ebuild:
+  Replace the virtual with USE=libav.
 
   04 Feb 2015; Pacho Ramos <pacho@gentoo.org> gst-plugins-libav-1.4.5.ebuild:
   Add a bug reference
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..6bca70611314
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild,v 1.1 2015/02/07 20:17:43 mgorny Exp $
+
+EAPI="5"
+inherit eutils flag-o-matic multilib-minimal
+
+MY_PN="gst-libav"
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
+SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="libav +orc"
+
+RDEPEND="
+	>=media-libs/gstreamer-1.2.3:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.2.3:1.0[${MULTILIB_USEDEP}]
+	libav? (
+		<media-video/libav-10:0=[${MULTILIB_USEDEP}]
+		>=media-video/libav-9.12:0=[${MULTILIB_USEDEP}] )
+	!libav? ( >=media-video/ffmpeg-1.2.6-r1:0=[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	# compatibility with recent releases 
+	# TODO: likely apply them with libav-10 when it's out but there will
+	# probably be an upstream gst-libav release compatible at that time.
+	if has_version '>=media-video/ffmpeg-2.0' ; then
+		sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
+			   -e 's/ CodecID/ AVCodecID/g' \
+			   ext/libav/*.{c,h} || die
+		epatch "${FILESDIR}/${PN}-1.2.4-ffmpeg2.patch"
+		epatch "${FILESDIR}/${PN}-1.2.4-fix-memory-leak.patch" #494282
+	fi
+}
+
+multilib_src_configure() {
+	GST_PLUGINS_BUILD=""
+	# always use system ffmpeg/libav if possible
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-maintainer-mode \
+		--with-package-name="Gentoo GStreamer ebuild" \
+		--with-package-origin="http://www.gentoo.org" \
+		--disable-fatal-warnings \
+		--with-system-libav \
+		$(use_enable orc)
+}
+
+multilib_src_compile() {
+	# Don't build with -Werror
+	emake ERROR_CFLAGS=
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	if ! use libav; then
+		elog "Please note that upstream uses media-video/libav"
+		elog "rather than media-video/ffmpeg. If you encounter any"
+		elog "issues try to move from ffmpeg to libav."
+	fi
+}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..43db66c09180
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild,v 1.1 2015/02/07 20:17:43 mgorny Exp $
+
+EAPI="5"
+inherit eutils flag-o-matic multilib-minimal
+
+MY_PN="gst-libav"
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
+SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="libav +orc"
+
+RDEPEND="
+	>=media-libs/gstreamer-1.4.0:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.4.0:1.0[${MULTILIB_USEDEP}]
+	!libav? ( >=media-video/ffmpeg-2.2:0=[${MULTILIB_USEDEP}] )
+	libav? ( >=media-video/libav-9:0=[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=743984
+	epatch "${FILESDIR}/${PN}-1.4.5-libav9.patch"
+}
+
+multilib_src_configure() {
+	GST_PLUGINS_BUILD=""
+	# always use system ffmpeg/libav if possible
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-maintainer-mode \
+		--with-package-name="Gentoo GStreamer ebuild" \
+		--with-package-origin="http://www.gentoo.org" \
+		--disable-fatal-warnings \
+		--with-system-libav \
+		$(use_enable orc)
+}
+
+multilib_src_compile() {
+	# Don't build with -Werror
+	emake ERROR_CFLAGS=
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}