gentoo resync : 31.05.2021

3 files changed, 72 insertions, 0 deletions

diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index d3e7b82693a1..61050ebe5c0e 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,4 +1,7 @@
 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
 EBUILD gst-plugins-libav-1.16.3.ebuild 1542 BLAKE2B 76fb8c784100e89c04d0fe8100e92a04994848f00ba47a8e670448b6334095cec3dc8df6807e82d85ed5396379d34e524e92d5c9918eeb23ee25204caaeece1f SHA512 68e257b8144feefda1ad2da36fba1712811cb08cedd3d710fc24f3a1d0dc46b4a9b49e674c749c96ed66d76557c78a4689b27cb257aa93212a922226dca4b3ff
+EBUILD gst-plugins-libav-1.18.4.ebuild 868 BLAKE2B 807bb1a76dca05d609620a925cddd4aef3e2d277c121bcb7a8445e26f16157d0096b079e98d999a1225b9e0a00beca6c6b835ed53deb916d63f618794789fa8b SHA512 42591f617f2758be71f94e76fe305ed200a12e6054d3870348182135b83dbdde6f4cdb7117a9841a7fe9dcc5ae863e818b991ef15672315d0e4e2c411ffef2f8
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
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
new file mode 100644
index 000000000000..76e0a3476a33
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.18.4_ffmpeg-4.4.patch
@@ -0,0 +1,35 @@
+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.18.4.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.4.ebuild
new file mode 100644
index 000000000000..4039834f2daf
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.4.ebuild
@@ -0,0 +1,34 @@
+# 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 ~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"
+)