commit: 30dcb6077b6ff408f0d8707f461fa01d55bf2c8c Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Fri Feb 19 23:01:10 2021 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Fri Feb 19 23:01:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30dcb607
media-plugins/gst-plugins-libav: remove old Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> media-plugins/gst-plugins-libav/Manifest | 4 - .../files/AVOptionsRanges-leak-fix.patch | 34 ------- .../gst-plugins-libav/files/fix-negative-pts.patch | 40 -------- ...gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild | 104 --------------------- .../gst-plugins-libav-1.16.2-r1.ebuild | 60 ------------ media-plugins/gst-plugins-libav/metadata.xml | 4 - 6 files changed, 246 deletions(-) diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest index 9c0c950788b..d47fa3044c9 100644 --- a/media-plugins/gst-plugins-libav/Manifest +++ b/media-plugins/gst-plugins-libav/Manifest @@ -1,5 +1 @@ -DIST ffmpeg-4.1.3.tar.bz2 10689073 BLAKE2B 8486e21c8df116af802bb7f9208e702ec1feaa4f292f14021e0b6bfb3957b13ddacfa87db361e677ae0583cc2bd1d402a66b0c8507cbed79a001c9b8462100bf SHA512 d0f8b3ee7b55e67b1c7ad9610a7b19a15acfc35dc843683502e536ebcc2e8678b55325532c0039b764cc978e95f83afb48bd24304abaee26f26d3247a8310bfe -DIST gst-libav-1.14.4-ffmpeg4-patchset.tar.xz 49428 BLAKE2B 74c3e0b25643bcfdf01d1d16514401fef4bb988ba3d1f306b647ba0cd6e89f0205cc33e6d144889d6b2f7fab9e4fae946e03821a85009fa95c68f3cedf25068a SHA512 1347424ed342f00c25ac4780670611a24eeaf708426b6efc6d9f6c6fa7bf91ef292302a5363afe9523c497265b8c0d7ad81374364cbecb2924b749e716819745 -DIST gst-libav-1.14.4.tar.xz 9036732 BLAKE2B 1c2e257912f61dac71e1d890f4cb650e0cdbbf4472cbd8dc6b73e471d1914409b71699bd198c154069e15e68364530e91f76619afb52b91e373e58c9237ab7cb SHA512 4a0e9a91c23cba82e6a6b8eb65ff42b9d80389dd232b08c22b3431d3942fb93a6a7e64be97083d11cbceb2abe5d45dc5b37d230f7552e1a7fb193610d0530717 -DIST gst-libav-1.16.2.tar.xz 9466288 BLAKE2B c14f3921bf357541b6ae4b5095dbff963fec90aa9ae3ef59e7b52c1d1f68fce8f497de017a6654f293d7b489ff5a880896018f5de0412456668f60bae1b2a32a SHA512 10817dec823b8ca84372d16e36c4ee11ab7a96a9168418f4c0bd0909fbda0ff45426bd3f754d7d491d4b07a51ec7eaa8e065e7e5c1daa120828c35a68adb312d DIST gst-libav-1.16.3.tar.xz 9472760 BLAKE2B 3e98381244d74aa695c737a898711b311518749c6f949af7bd03d08cdf383cbe1a78cea8e3f0268fdb2132bec930803f8fa31e919c6c268b6f8d58092f01fd04 SHA512 37fe621a8d45ac6bf51383a776f3091cc114faaf84b0097e86f33eb4e8c0b70b4cc6fa467aad63daca9b1b24db24c10a067c973ef8232c2965eedeba3d251b0b diff --git a/media-plugins/gst-plugins-libav/files/AVOptionsRanges-leak-fix.patch b/media-plugins/gst-plugins-libav/files/AVOptionsRanges-leak-fix.patch deleted file mode 100644 index 5594dbc1ab8..00000000000 --- a/media-plugins/gst-plugins-libav/files/AVOptionsRanges-leak-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a2c88ec9dadf4a6d7f5f7b16feb2c5c2e155d72d Mon Sep 17 00:00:00 2001 -From: Seungha Yang <[email protected]> -Date: Sun, 13 Jan 2019 00:46:50 +0900 -Subject: [PATCH] avcfg: Fix AVOptionRanges leak - -It must be freed with av_opt_freep_ranges as documented. ---- - ext/libav/gstavcfg.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/ext/libav/gstavcfg.c b/ext/libav/gstavcfg.c -index 9236078..9d34462 100644 ---- a/ext/libav/gstavcfg.c -+++ b/ext/libav/gstavcfg.c -@@ -252,10 +252,12 @@ install_opts (GObjectClass * gobject_class, const AVClass ** obj, guint prop_id, - if (g_object_class_find_property (gobject_class, name)) - continue; - -- if (av_opt_query_ranges (&r, obj, opt->name, AV_OPT_SEARCH_FAKE_OBJ) >= 0 -- && r->nb_ranges == 1) { -- min = r->range[0]->value_min; -- max = r->range[0]->value_max; -+ if (av_opt_query_ranges (&r, obj, opt->name, AV_OPT_SEARCH_FAKE_OBJ) >= 0) { -+ if (r->nb_ranges == 1) { -+ min = r->range[0]->value_min; -+ max = r->range[0]->value_max; -+ } -+ av_opt_freep_ranges (&r); - } - - help = g_strdup_printf ("%s%s", opt->help, extra_help); --- -2.17.0 - diff --git a/media-plugins/gst-plugins-libav/files/fix-negative-pts.patch b/media-plugins/gst-plugins-libav/files/fix-negative-pts.patch deleted file mode 100644 index d5be422e781..00000000000 --- a/media-plugins/gst-plugins-libav/files/fix-negative-pts.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1d293764e55fb9c3901c9dfa903fa5ae0021ab10 Mon Sep 17 00:00:00 2001 -From: Guillaume Desmottes <[email protected]> -Date: Thu, 21 Feb 2019 08:48:31 +0100 -Subject: [PATCH] avdemux: fix negative pts if start_time is bigger than the ts - -The start time is supposed to be the ts of the first frame. -FFmpeg uses fractions to represent timestamps and the start time may use a -different base than the frame pts. So we may end up having the start -time bigger than the pts because of rounding when converting to gst ts. - -See https://gitlab.freedesktop.org/gstreamer/gst-libav/issues/51 -for details. ---- - ext/libav/gstavdemux.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/ext/libav/gstavdemux.c b/ext/libav/gstavdemux.c -index 30e0360..3b74f92 100644 ---- a/ext/libav/gstavdemux.c -+++ b/ext/libav/gstavdemux.c -@@ -1473,8 +1473,14 @@ gst_ffmpegdemux_loop (GstFFMpegDemux * demux) - goto drop; - #endif - -- if (GST_CLOCK_TIME_IS_VALID (timestamp)) -- timestamp -= demux->start_time; -+ if (GST_CLOCK_TIME_IS_VALID (timestamp)) { -+ /* start_time should be the ts of the first frame but it may actually be -+ * higher because of rounding when converting to gst ts. */ -+ if (demux->start_time >= timestamp) -+ timestamp = 0; -+ else -+ timestamp -= demux->start_time; -+ } - - /* check if we ran outside of the segment */ - if (demux->segment.stop != -1 && timestamp > demux->segment.stop) --- -2.17.0 - diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild deleted file mode 100644 index 612b7bd335d..00000000000 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eapi7-ver multilib-minimal - -MY_PN="gst-libav" -MY_PV="$(ver_cut 1-3)" -MY_P="${MY_PN}-${MY_PV}" -FFMPEG_PV="$(ver_cut 4- ${PV%_*})" - -DESCRIPTION="FFmpeg based gstreamer plugin" -HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"; -SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz - https://dev.gentoo.org/~leio/distfiles/${MY_P}-ffmpeg4-patchset.tar.xz - libav? ( https://ffmpeg.org/releases/ffmpeg-${FFMPEG_PV}.tar.bz2 )" - -LICENSE="LGPL-2+" -SLOT="1.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86" -IUSE="libav +orc" - -RDEPEND=" - >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] - >=media-libs/gstreamer-${MY_PV}:1.0[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-base-${MY_PV}:1.0[${MULTILIB_USEDEP}] - !libav? ( >=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}] ) - libav? ( - app-arch/bzip2[${MULTILIB_USEDEP}] - app-arch/xz-utils[${MULTILIB_USEDEP}] - ) - orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.12 - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${WORKDIR}"/patches # ffmpeg-4 compat and more from git up to 20181115; requires eautoreconf - "${FILESDIR}"/AVOptionsRanges-leak-fix.patch # extra patch from Jan 2019 for a leak fix - "${FILESDIR}"/fix-negative-pts.patch # extra patch from Feb 2019 to fix negative pts if start_time is bigger than the ts - "${FILESDIR}"/external-ffmpeg4-dep.patch # Automatically rescan available elements for registry when system ffmpeg changes -) - -RESTRICT="test" # FIXME: tests seem to get stuck at one point; investigate properly - -src_unpack() { - default - - if use libav; then - # Use newer version of bundled FFmpeg. - rm -r "${S}/gst-libs/ext/libav" || die - ln -s ../../../ffmpeg-${FFMPEG_PV} "${S}/gst-libs/ext/libav" || die - fi -} - -src_prepare() { - default - eautoreconf # remove with a proper release without build system touching patchset -} - -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 bundled ffmpeg copy as upstream dropped" - ewarn "the support for compiling against system libav" - ewarn "https://bugzilla.gnome.org/show_bug.cgi?id=758183"; - - myconf+=(--with-libav-extra-configure="--disable-debug --optflags=\\\"${CFLAGS}\\\"") - 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; verbose build - emake ERROR_CFLAGS= V=1 -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild deleted file mode 100644 index 3c2fb1c94da..00000000000 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eapi7-ver 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="LGPL-2+" -SLOT="1.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86" -IUSE="+orc" - -RDEPEND=" - >=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}] - >=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}] - orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.12 - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RESTRICT="test" # FIXME: tests seem to get stuck at one point; investigate properly - -PATCHES=( - "${FILESDIR}"/external-ffmpeg4-dep.patch # Automatically rescan available elements for registry when system ffmpeg changes -) - -multilib_src_configure() { - GST_PLUGINS_BUILD="" - - ECONF_SOURCE=${S} \ - econf \ - --disable-maintainer-mode \ - --with-package-name="Gentoo GStreamer ebuild" \ - --with-package-origin="https://www.gentoo.org"; \ - --disable-fatal-warnings \ - --with-system-libav \ - $(use_enable orc) -} - -multilib_src_compile() { - # Don't build with -Werror; verbose build - emake ERROR_CFLAGS= V=1 -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-plugins/gst-plugins-libav/metadata.xml b/media-plugins/gst-plugins-libav/metadata.xml index 6653b2dae6f..42b76fdc5c1 100644 --- a/media-plugins/gst-plugins-libav/metadata.xml +++ b/media-plugins/gst-plugins-libav/metadata.xml @@ -5,8 +5,4 @@ <email>[email protected]</email> <name>GStreamer package maintainers</name> </maintainer> - <use> - <flag name="libav">Use bundled ffmpeg to support systems using - libav globally instead of <pkg>media-video/ffmpeg</pkg></flag> - </use> </pkgmetadata>
