gentoo resync : 03.03.2021

5 files changed, 2 insertions, 121 deletions

diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index c683290b14e7..5de3635a30a8 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -1,8 +1,3 @@
-AUX 1.14.5-glibc-2.30-compat.patch 1315 BLAKE2B e02cdb5b6ae1b2a8c94d577a0378a3c74394afbc62be71448715c2e5096d5156f4cbe625ad26c2950e14d691bb314b6ef53f9a997b3cd61851c4b20da3453066 SHA512 dfb48424e9ec6219962ff15a0939d1450474fc2a6fa42aa8dec77581f60cbb14ed5cde504dbe08f10d0b5a04b2010c205e3c5d33cf0fa5d94e7cb1e177493ffb
-DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 DIST gst-plugins-good-1.16.3.tar.xz 3914676 BLAKE2B 52f18027f9d9a77e8b459a0a10fa7c1450dff2faf8a2a63134f833ad08b19985b7f0d3d2af4b766c9b8bf802d048fabd6f52ad5a7865eccd1fe0d26404b7b2de SHA512 3e0da4a4defc0ddea1c26dfc767fed732548654f4155452649777109a17d5b65b2fde895483a3e35dc1646de5a16e913cd2408f826251d46a99b7751b88dcb65
-EBUILD gst-plugins-v4l2-1.14.5.ebuild 729 BLAKE2B a2cc46df6a7ee806ff755f589d62fdff7288c4e0f723b39d71abb23d78bc63fe54fc7f8b7190c454186dbc3038fd9f4f78176562c5178557a5edb1b46273c56b SHA512 b8cf6427c18231eb6090c8eb8d941cfcef086a92a2580a9ba88ee446cec12bd7d7b6e2e2537f160517ebe5d9d48dcf7ff904d71eaee117213d96eb9acb7fa446
-EBUILD gst-plugins-v4l2-1.16.2.ebuild 663 BLAKE2B ce413102cbc0a337448b12f76f1224c1cb4bc1d99abacb31c29d23f4d7f7485cfe6e662c660429e5f806c239d41ff9963fd17221263c9a22b41c47ae890c3ba5 SHA512 0e4a763032506bc40a6ffa880576dfbba1353b3abed56fe03bf7f659a477a02bf8d4d368b64972e95c7dbc64c7ecf57cf6db5b78815e7692681895e6c4b1bd11
-EBUILD gst-plugins-v4l2-1.16.3.ebuild 665 BLAKE2B 0315a0e987fa29116441c0acdf7072319d0fdf749651a806f67e19fa7ddd304b632e67a36147e98b7beaa583d68f1aed46d6cb69aa5fe728c623386adb8dc630 SHA512 10f921045a3d1b6a360c5c2b1d4bd081505076e252293842789d30a2ebad4754e6dafcea61a9e251df0348ba0a7bf250280715c74fb2fcb5c9614be2686aa041
+EBUILD gst-plugins-v4l2-1.16.3.ebuild 663 BLAKE2B 838621f470d4e5c79bd6b85b63543b25eea5aea4cc794de523fefe88ce8d99defb2c4cf5beaf0de5ace7bde6606be4feb0bb77e469e98fc9cd2b7f1e75c2071d SHA512 270e4b4a4c5d66a087fa51e1ce1f1b9efed18b95e6a444260501883d9370ede9552386f4f3452c11b373e2158d748713957b2c05d304c00cbc1d173d051e83c1
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-v4l2/files/1.14.5-glibc-2.30-compat.patch b/media-plugins/gst-plugins-v4l2/files/1.14.5-glibc-2.30-compat.patch
deleted file mode 100644
index e429fadf1744..000000000000
--- a/media-plugins/gst-plugins-v4l2/files/1.14.5-glibc-2.30-compat.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 29c3570901e1c145dce57824ddc9276fddf0d808 Mon Sep 17 00:00:00 2001
-From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
-Date: Tue, 6 Aug 2019 22:27:40 -0400
-Subject: [PATCH] v4l2: Fix type compatibility issue with glibc 2.30
-
-From now on, we will use linux/types.h on Linux, and use typedef of the
-various flavour of BSD.
-
-Fixes #635
----
- sys/v4l2/ext/types-compat.h | 21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/sys/v4l2/ext/types-compat.h b/sys/v4l2/ext/types-compat.h
-index d3673dd49..ea21c9513 100644
---- a/sys/v4l2/ext/types-compat.h
-+++ b/sys/v4l2/ext/types-compat.h
-@@ -24,6 +24,11 @@
- #ifndef __TYPES_COMPAT_H__
- #define __TYPES_COMPAT_H__
- 
-+#ifdef   __linux__
-+#include <linux/types.h>
-+#include <asm/ioctl.h>
-+
-+#else /* One of the BSDs */
- /* From linux/types.h */
- #ifndef __bitwise__
- #  ifdef __CHECKER__
-@@ -41,12 +46,14 @@
- #  endif
- #endif
- 
--#define __u64 guint64
--#define __u32 guint32
--#define __u16 guint16
--#define __u8 guint8
--#define __s64 gint64
--#define __s32 gint32
--#define __le32 guint32 __bitwise
-+typedef guint8  __u8;
-+typedef guint16 __u16;
-+typedef gint32  __s32;
-+typedef guint32 __u32;
-+typedef gint64  __s64;
-+typedef guint64 __u64;
-+typedef guint32 __bitwise __le32;
-+
-+#endif
- 
- #endif /* __TYPES_COMPAT_H__ */
--- 
-2.22.0
-
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild
deleted file mode 100644
index bec54324acc8..000000000000
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPION="V4L2 source/sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="udev"
-
-RDEPEND="
-	>=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	udev? ( >=dev-libs/libgudev-208:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-"
-
-GST_PLUGINS_BUILD="gst_v4l2"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-glibc-2.30-compat.patch #691882
-)
-
-multilib_src_configure() {
-	gstreamer_multilib_src_configure \
-		--with-libv4l2 \
-		$(use_with udev gudev)
-}
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.2.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.2.ebuild
deleted file mode 100644
index ec43841f24ed..000000000000
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPION="V4L2 source/sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="udev"
-
-RDEPEND="
-	>=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	udev? ( >=dev-libs/libgudev-208:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-"
-
-GST_PLUGINS_BUILD="gst_v4l2"
-
-multilib_src_configure() {
-	gstreamer_multilib_src_configure \
-		--with-libv4l2 \
-		$(use_with udev gudev)
-}
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.3.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.3.ebuild
index 75f8a922b39f..dfed382356f4 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.3.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="V4L2 source/sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="udev"
 
 RDEPEND="