commit: fd34912a20515fbc9f11993403ce641e915f4985 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sun Aug 27 20:36:23 2017 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sat Sep 2 04:18:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd34912a
media-plugins/gst-plugins-libav: remove old, dropping all sparc keywords Package-Manager: Portage-2.3.6, Repoman-2.3.2 media-plugins/gst-plugins-libav/Manifest | 1 - .../gst-plugins-libav-1.8.3-ffmpeg-compat.patch | 51 --------------- .../gst-plugins-libav-1.8.3.ebuild | 76 ---------------------- 3 files changed, 128 deletions(-) diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest index db4c18637f4..5c5c19eae05 100644 --- a/media-plugins/gst-plugins-libav/Manifest +++ b/media-plugins/gst-plugins-libav/Manifest @@ -1,4 +1,3 @@ DIST gst-libav-1.10.3.tar.xz 8535624 SHA256 9a6bc165b1862b18b98d9f1755c43806e4839a80f69ec7ea9a2dab61b65752a9 SHA512 9f394fc5a23fa887e65c851836d338f9eb55be2a981429cfa7175e1112465696b1326386ef45d675bf1186cf8f1fec50dd0861273c763aa20ab97aaa257a1907 WHIRLPOOL 0833598516fd5f71a7cc105a4508f9301aee8c5db3569010ceabd270a8059679661508e8e2ae4e6e9147212f1454868e3244d631fbaff9bdde22ca865247331a DIST gst-libav-1.10.4.tar.xz 8535052 SHA256 6ca0feca75e3d48315e07f20ec37cf6260ed1e9dde58df355febd5016246268b SHA512 4037c4651c9f4c0e677f1f8136194c16319507dec3992270c1f98d461a69a55653d261ade45add833103872455e09c30695318181e81242ce78d1c2a2b95ca9c WHIRLPOOL 441ed31e9886a71bace9fadd9edcf8102db621cffa9185c087535e7fa4daedb14dd2cbf3a067868f821d36b58982b482c0c37d82907e079cbe0f3e48bb8a27f3 DIST gst-libav-1.10.5.tar.xz 8545300 SHA256 e4d2f315f478d47281fbfdfbd590a63d23704ca37911d7142d5992616f4b28d3 SHA512 a0636a3b32a5c20eba69a0002fc549facebb0211774e13dd526a3a1eb710f3342662179af6275d619d5075ad0f6dc7068b9950cfb0c60e3ad48249475b39216b WHIRLPOOL 3b3ed00516ab8c4599ec249619390f4c4d478299bb5e14c2bbf532ab67d57881cf0584d33c78a6c5839008179b7815add6bf95437c7f2c65408469f9c4167457 -DIST gst-libav-1.8.3.tar.xz 7958532 SHA256 9006a05990089f7155ee0e848042f6bb24e52ab1d0a59ff8d1b5d7e33001a495 SHA512 49aa96197cd32ad31e280870495d64cdfe4bde67507e9cb166b80d0c394b510e734befa3ff13d6fe0711be0ffa24dd0a63a77fb62af91ab776d9844059cb839d WHIRLPOOL 0109f897ce7d42d21b467b42a661f02900896ea90c085f731b1c69de9c4913de36f3d48544db6fd44a5b828614947b6b9b1d851af2c5f739fbb537ac3022af88 diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.8.3-ffmpeg-compat.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.8.3-ffmpeg-compat.patch deleted file mode 100644 index d6c027ecb68..00000000000 --- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.8.3-ffmpeg-compat.patch +++ /dev/null @@ -1,51 +0,0 @@ -From f48282d442689f7559bfefd70929634a0bde3b84 Mon Sep 17 00:00:00 2001 -From: Iain Lane <i...@orangesquash.org.uk> -Date: Fri, 2 Sep 2016 16:55:46 +0100 -Subject: [PATCH] Only use AV_CODEC_ID_WRAPPED_AVFRAME on new enough - libavcodecs - -https://bugzilla.gnome.org/show_bug.cgi?id=770753 ---- - ext/libav/gstavviddec.c | 7 +++++-- - ext/libav/gstavvidenc.c | 7 +++++-- - 2 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c -index 8aabcb1..71310ec 100644 ---- a/ext/libav/gstavviddec.c -+++ b/ext/libav/gstavviddec.c -@@ -2044,8 +2044,11 @@ gst_ffmpegviddec_register (GstPlugin * plugin) - || in_plugin->id == AV_CODEC_ID_Y41P - || in_plugin->id == AV_CODEC_ID_012V - || in_plugin->id == AV_CODEC_ID_YUV4 -- || in_plugin->id == AV_CODEC_ID_ZLIB -- || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME) { -+#if AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= \ -+ AV_VERSION_INT (57,4,0) -+ || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME -+#endif -+ || in_plugin->id == AV_CODEC_ID_ZLIB) { - goto next; - } - -diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c -index 9fb7f64..2ec32d8 100644 ---- a/ext/libav/gstavvidenc.c -+++ b/ext/libav/gstavvidenc.c -@@ -966,8 +966,11 @@ gst_ffmpegvidenc_register (GstPlugin * plugin) - || in_plugin->id == AV_CODEC_ID_Y41P - || in_plugin->id == AV_CODEC_ID_012V - || in_plugin->id == AV_CODEC_ID_YUV4 -- || in_plugin->id == AV_CODEC_ID_ZLIB -- || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME) { -+#if AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= \ -+ AV_VERSION_INT (57,4,0) -+ || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME -+#endif -+ || in_plugin->id == AV_CODEC_ID_ZLIB) { - goto next; - } - --- -2.7.4 - diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.3.ebuild deleted file mode 100644 index 035231ead80..00000000000 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils multilib-minimal - -MY_PN="gst-libav" -DESCRIPTION="FFmpeg based gstreamer plugin" -HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"; -SRC_URI="https://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" - -# XXX: bzip2/lzma are automagic -RDEPEND=" - app-arch/bzip2 - app-arch/xz-utils - >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] - >=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}] - !libav? ( >=media-video/ffmpeg-2.8.5: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}" - -PATCHES=( - # Fix compatibility with ffmpeg-2.8, by the fine Debian folks - "${FILESDIR}"/${PN}-1.8.3-ffmpeg-compat.patch -) - -multilib_src_configure() { - GST_PLUGINS_BUILD="" - # Upstream dropped support for system libav and won't work - # for preserving its compat anymore, forcing us to rely on internal - # ffmpeg copy if we don't want to cause unresolvable blockers for - # libav setups. - # https://bugzilla.gnome.org/show_bug.cgi?id=758183 - # Prefer system ffmpeg for -libav - local myconf - - if use libav; then - ewarn "Using internal ffmpeg copy as upstream dropped the" - ewarn "the support for compiling against system libav" - ewarn "http://bugzilla.gnome.org/show_bug.cgi?id=758183"; - else - myconf="--with-system-libav" - fi - - ECONF_SOURCE=${S} \ - econf \ - --disable-maintainer-mode \ - --with-package-name="Gentoo GStreamer ebuild" \ - --with-package-origin="https://www.gentoo.org"; \ - --disable-fatal-warnings \ - $(use_enable orc) \ - ${myconf} -} - -multilib_src_compile() { - # Don't build with -Werror - emake ERROR_CFLAGS= -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files --modules -}
