gentoo resync : 29.12.2022

9 files changed, 3 insertions, 258 deletions

diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index f161b06d27d6..26d74e4894f8 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,14 +1,3 @@
-AUX external-ffmpeg4-dep.patch 672 BLAKE2B f6abd0913ce1dbd26d3c75fab15537f582605d21b6eb7e49cfffe6390a870bac13dc440f1ed319940c216e5a789a87309e20016649388d3b689dc0e602641c55 SHA512 11f9e7e4c96ffebaeb8b3e29934f1dd01ae8794bc6401a8fe3e999110a64949d282c41da1c2145f72a394b45f5c6d62cf1d9af7634e1dc9c4a67a507a9a575ee
-AUX gst-plugins-libav-1.18.4_ffmpeg-4.4.patch 1237 BLAKE2B 19638004ad7778869d22eb3ee749524731a5b005a38e99ee0cc1170cbc1eed78471881e3c37e715b5898be845b20302705708ed1c90d5b974d963ccf3d97e692 SHA512 cdb2feb53277f7379dfca2d17a7e6b46fb35b6064545809fb18ddb3389e6b92984deecdaa80ea1284df38b6d754e5efd9c376b93261588353440cfdf942fdcb8
-DIST gst-libav-1.16.3.tar.xz 9472760 BLAKE2B 3e98381244d74aa695c737a898711b311518749c6f949af7bd03d08cdf383cbe1a78cea8e3f0268fdb2132bec930803f8fa31e919c6c268b6f8d58092f01fd04 SHA512 37fe621a8d45ac6bf51383a776f3091cc114faaf84b0097e86f33eb4e8c0b70b4cc6fa467aad63daca9b1b24db24c10a067c973ef8232c2965eedeba3d251b0b
-DIST gst-libav-1.18.4.tar.xz 281576 BLAKE2B 5ce7b15163a0671744ca6920865b2e3be35ac9209f8b3b0e73202684fe4da2e16abdee2be2d3844170cd688b58b3eadf89b3f3b87b457dc939ae409fe42bc410 SHA512 4eb10af6698f724bbc8d5b7b215e7349e6ff3b52e24b3987ee4077db1ae27ae0d6f25309adc50f0fccdf5af4d617634a7339ad1e5466a737c40a25c52c0d023f
-DIST gst-libav-1.18.6.tar.xz 286976 BLAKE2B a3cabee12ab7aedb950761133b719976b49bd14894de446df3dd17ff3b421902bde75f18f64d5f9a2c20a56780b7da1262535fc1707e364cd78a7f3e9e84dced SHA512 886e9f73bb9fdfb650d7c13cf3395679619fbdad3cc7f15b0415bdb9cc5a8f46484fa3dc57666dab0f337d2f2b1585b607516340e24760da58f9ae3137737ac0
-DIST gst-libav-1.20.1.tar.xz 280016 BLAKE2B aa734b9d05686ef829bc2243f7f44f1286cf5f1a72755cb7b9af695f4bc7e2b69916831e900b554967a89b5d103392e4fef3a31b47d542fd4a1acaaa70cd91b2 SHA512 5f4169ac03aec715b56d8bff5e45f471150b1997f785f1ad3dc687f9c76060d5bfaafe0ee51f460e53394adceaf41cb64875ce818c16c0111ee171b5dff46854
-DIST gst-plugins-libav-1.18.4_ffmpeg-5.patch.bz2 2454 BLAKE2B 7fd89996181f178b6597f3d445fb7b39b41e72173706b52e1b6aad28d35b54268a8aaeadcafebb002ed8264435cbfb7a0252713fc3f566dc002fdde71d6d6e70 SHA512 8da49c16fa2b4567016a16205b3be5830af2420ad8dfff0811f61237903751119be2a73a0953acdc0682c0c81de197af9196ba2abfc9f46bd2652b41f358db56
-EBUILD gst-plugins-libav-1.16.3.ebuild 1542 BLAKE2B 76fb8c784100e89c04d0fe8100e92a04994848f00ba47a8e670448b6334095cec3dc8df6807e82d85ed5396379d34e524e92d5c9918eeb23ee25204caaeece1f SHA512 68e257b8144feefda1ad2da36fba1712811cb08cedd3d710fc24f3a1d0dc46b4a9b49e674c749c96ed66d76557c78a4689b27cb257aa93212a922226dca4b3ff
-EBUILD gst-plugins-libav-1.18.4-r1.ebuild 975 BLAKE2B b69366848713680502b6d323d86fe9739f44709db3396d29894ade17eef1d96f45bc3b617334e8fe9c66a50973678e64ef413109c06d5c967ca4bb299b4ce0c5 SHA512 db94c591f99e00a3d1342d5c597614c31938d856c7e9c624107e196c9874a7a29142bd6af1774e1fd807190a9df5d83b1ae345e5a15eb0ac2ed2e77b6042455a
-EBUILD gst-plugins-libav-1.18.4.ebuild 869 BLAKE2B e47b8915fb34d56d98f75b5db1f038f497f4a2f3a1153708aeebdfb97407a11fc48e6bd767d94ab165ab758b88761853744519717cd4d0cd6e65f70a6d87a146 SHA512 f82f57402ff0b8f6be30d9319b48cefcd07cf561f63752850b05160cc31856c20623c20a50f5187d94e798df14f1906078cfb8fed32a5f0823752b6c242ec1d5
-EBUILD gst-plugins-libav-1.18.6-r1.ebuild 928 BLAKE2B 452c347e51ab23520ca73fbf8dfe2397fe331d802436228b52d3ed0f6c4d1fa821dc399f810396c224f6e046d70d1f5c5a4a5a8b2afaa2f695adcc777f9ae491 SHA512 c0ffe6f320170c8693bf30b5bdc809b6d98426439a91b8af3a0357291b62b22acef400b37fc0fdbb8918b90a8bd5b1747914b8a2b83c55b980cb083c9f701ab9
-EBUILD gst-plugins-libav-1.18.6.ebuild 776 BLAKE2B d8f4d94008175d00f9b377e0b4d8143a32c69d1310e3d099ed8cf7676480598152b86d00717b0d730d37fd697c92cbe4d6dad2e10734d8facf7c3b9f3f1d443b SHA512 a063a1e036ba8aefe7b4c3a867f5d3e311707cfd85c27c87a593897683ba9ceb794610e60e6f3cb2aad63b6693126383e0d18a3e35a3c5b4db90c486052e5588
-EBUILD gst-plugins-libav-1.20.1.ebuild 779 BLAKE2B 19df9ead90ae3d9152046216255bd6473c83b510abd8b142bd4f173d2e1aee6d04cb68326b32fae717e4fea4bddece5478ac4eddbc7530f80fe3a7670e0a6b7e SHA512 c2e751e0683ba9166a7a928d6c38c433c711caab35005793b5548bb4988801cb92df50daef46055ac6472ca1f4ebb53b55b4a723fbf2d0ffcd2713001d6dac2f
+DIST gst-libav-1.20.2.tar.xz 282468 BLAKE2B a1bb009321097e675c824c7c4def9d3ea4391b31584fa71df6eaaaf559ee01a73b12e777fdd3cd6158150db7bab98f51c84b9f09af4f72ff15a9131574745239 SHA512 845acd0144f333fc532c35a854a9773cef70c96b097995a684911b9ac3fe45aaf75011454e736427dbd6afabaf07459fd22cf7ce8543066e1d5547ee1992e2ca
+EBUILD gst-plugins-libav-1.20.2.ebuild 773 BLAKE2B 96842ba4934caf66e14e509fff1fb8fee694c9823b55c4065a3db2581c273d93b333e46334bfcb682ef465ee514de7a24c2ce869d071be925506dd701560230b SHA512 825081a533ca131a5fe82b0130717e8dccd63318883d48d653d08fb7312edc0c3ce71f34657c5e8f42bf9bde504c53ee5ced1571d6a84920715bbdbe030c00c1
 MISC metadata.xml 267 BLAKE2B 331be70b2fa90cce1bf91ded1dac141de6a9bec40c1736bcb90d280ac7fabf22cfd0a701c7fd5864f007d1159954f7ee55701d5e68b47a1a9a217ca34b7ee619 SHA512 4dcdd6bc6d148a0e02a0f1b766bd0c5712d373d898c06078d8630e0067e858b815117392a11332b257156e95da6337494d99c2724d24cadb97432089908644b5
diff --git a/media-plugins/gst-plugins-libav/files/external-ffmpeg4-dep.patch b/media-plugins/gst-plugins-libav/files/external-ffmpeg4-dep.patch
deleted file mode 100644
index c264507102f0..000000000000
--- a/media-plugins/gst-plugins-libav/files/external-ffmpeg4-dep.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/ext/libav/gstav.c b/ext/libav/gstav.c
-index 2a88230..f6a6303 100644
---- a/ext/libav/gstav.c
-+++ b/ext/libav/gstav.c
-@@ -155,6 +155,15 @@ plugin_init (GstPlugin * plugin)
-   /* build global ffmpeg param/property info */
-   gst_ffmpeg_cfg_init ();
- 
-+#ifndef HAVE_LIBAV_UNINSTALLED
-+  /* Not using bundled ffmpeg - add a feature rescan dependency for system-ffmpeg */
-+  gst_plugin_add_dependency_simple (plugin, NULL,
-+      GIO_LIBDIR,
-+      "libavcodec.so.58,"
-+      "libavformat.so.58",
-+      GST_PLUGIN_DEPENDENCY_FLAG_NONE);
-+#endif
-+
-   gst_ffmpegaudenc_register (plugin);
-   gst_ffmpegvidenc_register (plugin);
-   gst_ffmpegauddec_register (plugin);
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.18.4_ffmpeg-4.4.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.18.4_ffmpeg-4.4.patch
deleted file mode 100644
index 76e0a3476a33..000000000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.18.4_ffmpeg-4.4.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 801dc93b790e9a96aa437a3f344214170c0bd540 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
-Date: Tue, 13 Apr 2021 01:07:15 +0100
-Subject: [PATCH] avdemux: fix build with FFmpeg 4.4
-
-Direct access to avstream->index_entries was removed
-in favour of the newly added avformat_index_get_entry()
-and friends.
-
-Fixes https://gitlab.freedesktop.org/gstreamer/gst-libav/-/issues/85
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-libav/-/merge_requests/129>
----
- ext/libav/gstavdemux.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/ext/libav/gstavdemux.c b/ext/libav/gstavdemux.c
-index 21b46aa..80a0920 100644
---- a/ext/libav/gstavdemux.c
-+++ b/ext/libav/gstavdemux.c
-@@ -483,7 +483,11 @@ gst_ffmpegdemux_do_seek (GstFFMpegDemux * demux, GstSegment * segment)
-     GST_LOG_OBJECT (demux, "keyframeidx: %d", keyframeidx);
- 
-     if (keyframeidx >= 0) {
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58,78,0)
-+      fftarget = avformat_index_get_entry (stream, keyframeidx)->timestamp;
-+#else
-       fftarget = stream->index_entries[keyframeidx].timestamp;
-+#endif
-       target = gst_ffmpeg_time_ff_to_gst (fftarget, stream->time_base);
- 
-       GST_LOG_OBJECT (demux,
--- 
-GitLab
-
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
deleted file mode 100644
index 052ca7b3eef2..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 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.18.4-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.4-r1.ebuild
deleted file mode 100644
index e7561f84247b..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gstreamer-meson
-
-MY_PN="gst-libav"
-MY_PV="$(ver_cut 1-3)"
-MY_P="${MY_PN}-${MY_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"
-SRC_URI+=" https://cmpct.info/~sam/gentoo/distfiles/${CATEGORY}/${PN}/${P}_ffmpeg-5.patch.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-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}]
-	>=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/gst-plugins-libav-1.18.4_ffmpeg-4.4.patch"
-	"${WORKDIR}/${P}_ffmpeg-5.patch"
-)
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.4.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.4.ebuild
deleted file mode 100644
index 951f11ac6153..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gstreamer-meson
-
-MY_PN="gst-libav"
-MY_PV="$(ver_cut 1-3)"
-MY_P="${MY_PN}-${MY_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"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86"
-IUSE=""
-
-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}]
-	>=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-"
-
-PATCHES=(
-	"${FILESDIR}/gst-plugins-libav-1.18.4_ffmpeg-4.4.patch"
-)
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.6-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.6-r1.ebuild
deleted file mode 100644
index defca4b9e148..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.6-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gstreamer-meson
-
-MY_PN="gst-libav"
-MY_PV="$(ver_cut 1-3)"
-MY_P="${MY_PN}-${MY_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"
-SRC_URI+=" https://cmpct.info/~sam/gentoo/distfiles/${CATEGORY}/${PN}/${PN}-1.18.4_ffmpeg-5.patch.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86"
-IUSE=""
-
-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}]
-	>=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${WORKDIR}/${PN}-1.18.4_ffmpeg-5.patch"
-)
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.6.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.6.ebuild
deleted file mode 100644
index a171862fbead..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gstreamer-meson
-
-MY_PN="gst-libav"
-MY_PV="$(ver_cut 1-3)"
-MY_P="${MY_PN}-${MY_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"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-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}]
-	>=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.20.1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.20.2.ebuild
index bb77b1d2be15..facd70c3cb1c 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.20.1.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.20.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]