gentoo resync : 03.03.2021

7 files changed, 3 insertions, 253 deletions

diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index f45d467ab421..d3e7b82693a1 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,12 +1,4 @@
-AUX AVOptionsRanges-leak-fix.patch 1181 BLAKE2B 112c55b0b96d2223fef39380f0e53e21be5adaf5c24acb33ef4bcef6f62a8ffdf981ab4166cfc4b777220f828d675801608ffed958de6c44190913085f95d476 SHA512 caea8b2ba2fcadeebd30689ac380a97ba0047c25a98fdde0a8c2591cf85eac52ba2327fb30a14c152bb100c7f764e7034969b2978eebeee67e2783f257132f98
 AUX external-ffmpeg4-dep.patch 672 BLAKE2B f6abd0913ce1dbd26d3c75fab15537f582605d21b6eb7e49cfffe6390a870bac13dc440f1ed319940c216e5a789a87309e20016649388d3b689dc0e602641c55 SHA512 11f9e7e4c96ffebaeb8b3e29934f1dd01ae8794bc6401a8fe3e999110a64949d282c41da1c2145f72a394b45f5c6d62cf1d9af7634e1dc9c4a67a507a9a575ee
-AUX fix-negative-pts.patch 1462 BLAKE2B 1f661913eef1d7d2827c95107473556213152e7a4e2c25ff0c9368cfb8933da2cb3c60f9132129e882238c0351179d11ce0ee5273d4a1bf6eee2f7971a52b53e SHA512 dbe9ce45154ab9d6d88faa4507b03e76026dc82236ad1075cf21b3b9d867c273be7aaab8d8c3eb103ac1cd2fbbc5ddcfd6a18ed6d4538c8c087e8755ca875cf7
-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
-EBUILD gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild 3126 BLAKE2B 3d8267242e1af55656243bdc89f85d35714babe276a05bc3c1b15f47304dfcf15b13a49cf9206e5e50f19fc17fab91bbb0f49d0ac1cad490cc157749ee8d79c0 SHA512 d8a41201e8960baccdcdd727aab7a29448f2885eae2623ac4c2d186d965c10a32d96ef47afeb485bb06c980f15dadb7bc215ab39fa1b80f242d0bb9797406a05
-EBUILD gst-plugins-libav-1.16.2-r1.ebuild 1542 BLAKE2B 603496216cada7d92373e3e341d89ccf2ff7fe8d14791c8d586d8f23b2c91ce81cd3e900d511ab7bccbe29f7e8ad6d98f5002a399103d89c6adc0907daf41e5f SHA512 978e6e4088b71ea1f3c221afad99d284658ae8cec81dcb00bcdb4249dd72f403c3c356e90b2dcdc865cd9862854703fa25a3de27bfa29b4009e75894f1eef61f
-EBUILD gst-plugins-libav-1.16.3.ebuild 1544 BLAKE2B 28554bdcd3663322ecdd06d18fa85ca6f6d49c0a4132330c1c3713cc04dd7939bc1572f6ca4561b83ab9b7386e29ce2a4745ac034fbc58e4e80c5dbf1721293d SHA512 9f6a256967b2e62c4c9e3942a7418fbac8461c96ff1ccf53ae5857289ad17cdd02fc947d84489c37d16a21631649f97eeb25756ef9d0982e0e3b4c5dacaff91b
-MISC metadata.xml 412 BLAKE2B eefb0541bc4b374bf50a8e6fa0650424998cf6e78c0ea4ede7db812267d8319e0b16b0341f03431525a87dbc8f97ac6c1ebd5c2b0d32910fe2b7ab873c34895a SHA512 34f9c3e64dd114d2ecb6ddfe9a521753dd5244b078b0e9ff4155a8bf2e7e3278f312d9758b65a4a4a518591132e88b04f1d9e8f788e741948eefe5cbe95e60b0
+EBUILD gst-plugins-libav-1.16.3.ebuild 1542 BLAKE2B 76fb8c784100e89c04d0fe8100e92a04994848f00ba47a8e670448b6334095cec3dc8df6807e82d85ed5396379d34e524e92d5c9918eeb23ee25204caaeece1f SHA512 68e257b8144feefda1ad2da36fba1712811cb08cedd3d710fc24f3a1d0dc46b4a9b49e674c749c96ed66d76557c78a4689b27cb257aa93212a922226dca4b3ff
+MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
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 5594dbc1ab80..000000000000
--- 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 <seungha.yang@navercorp.com>
-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 d5be422e781d..000000000000
--- 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 <guillaume.desmottes@collabora.com>
-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 612b7bd335d9..000000000000
--- 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 3c2fb1c94da1..000000000000
--- 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/gst-plugins-libav-1.16.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.3.ebuild
index 5eea97690b12..052ca7b3eef2 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.3.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.3.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-libav/metadata.xml b/media-plugins/gst-plugins-libav/metadata.xml
index 6653b2dae6fc..42b76fdc5c1b 100644
--- a/media-plugins/gst-plugins-libav/metadata.xml
+++ b/media-plugins/gst-plugins-libav/metadata.xml
@@ -5,8 +5,4 @@
 		<email>gstreamer@gentoo.org</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>