From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 6 Apr 2022 22:33:41 +0100
Subject: gentoo resync : 06.04.2022

---
 media-libs/libv4l/Manifest                         |  5 +-
 .../libv4l/files/libv4l-1.20.0-automagic.patch     | 52 ---------------
 media-libs/libv4l/libv4l-1.20.0.ebuild             | 78 ----------------------
 media-libs/libv4l/libv4l-1.22.1.ebuild             |  4 +-
 4 files changed, 3 insertions(+), 136 deletions(-)
 delete mode 100644 media-libs/libv4l/files/libv4l-1.20.0-automagic.patch
 delete mode 100644 media-libs/libv4l/libv4l-1.20.0.ebuild

(limited to 'media-libs/libv4l')

diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index b1d62c798d8f..12908735a27b 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,6 +1,3 @@
-AUX libv4l-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
-DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
 DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170
-EBUILD libv4l-1.20.0.ebuild 1516 BLAKE2B 9c9efeeb9d02ea98df998efc4a0996fb64a60837941cc4095a1bd3ff7c03d57cc21c68796fef729281d782095c14ce4bfaa429c59aa99dd647062da31291700c SHA512 d857040a48458d67154d08ef5d70b55a25a192b41278a1f098f215f025a098b35d8d69391b14b855dd6b989a2afec56c0437056843082318c8bdcc8d73213147
-EBUILD libv4l-1.22.1.ebuild 1474 BLAKE2B 51965a0c6c96baae98b62827facfb9b93c019d1cbfdea78145eb28d4a03c611e01caae7e8be798a42310041221129f2ed28bfb3ee6378ee8aea72241d20b28b1 SHA512 5b4d029d0e745e7f42d792c8216298a7f1b0098f0c2034f1ff1da3adf43ce884eb254172bb66be9ae73c0551e9f08006471c3f8067bf7f90bb3935ce9f02d6b1
+EBUILD libv4l-1.22.1.ebuild 1467 BLAKE2B aaf5b0160710a087ce3c8bed30c89b2a0622a375f9ab7854f8786be9f5a7d114538cc0ec18e05aac54c6ec76d40981aa156547494cce1c435ca07bf320234c7f SHA512 da296cf7abcd04f6d35e6a99455ff52ee65a85246ebc7a37b4da09275acd2e88bd450fac0e833c7c73923332e0208f916eda5afae1d20b4bbb2534b964c6eaaf
 MISC metadata.xml 1117 BLAKE2B 1d9a1bb6f3e6f2fdeb8c892b8714f8e36ccee4e95defb2ddd9e2fe43e4e9901636e7fa717475b13efe111a2b4be89d78b1b610c153de778ab625b9bee566b783 SHA512 63617e7fccd7394ba402cde356011429b60d7781197fcbfaf473ff88a788fd0a7b631ab10e6cc198bd5a5985cef7ccf026359d4c4ff7a28616661cd8cef1b07d
diff --git a/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch b/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch
deleted file mode 100644
index 017513bcb907..000000000000
--- a/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From e018720a49b96535613ca9173750ce2271608cd5 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 23 Aug 2020 16:33:21 +0100
-Subject: [PATCH] configure.ac: Add --without-libudev option to avoid automagic
- dep
-
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
----
- configure.ac | 27 +++++++++++++++++----------
- 1 file changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d9f43ab5..e6134d08 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -291,16 +291,23 @@ else
-    AC_MSG_WARN(ALSA library not available)
- fi
- 
--PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, have_libudev=no)
--if test "x$have_libudev" = "xyes"; then
--	AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev])
--	LIBUDEV_CFLAGS="$libudev_CFLAGS"
--	LIBUDEV_LIBS="$libudev_LIBS"
--	AC_SUBST(LIBUDEV_CFLAGS)
--	AC_SUBST(LIBUDEV_LIBS)
--else
--   AC_MSG_WARN(udev library not available)
--fi
-+AC_ARG_WITH([libudev],
-+            AS_HELP_STRING([--without-libudev], [Do not use udev library]),
-+            [],
-+            [with_libudev=yes])
-+
-+have_libudev=no
-+
-+AS_IF([test "x$with_libudev" != xno -o "x$enable_libdvbv5" != xno],
-+      [PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, [])
-+       AS_IF([test "x$have_libudev" = xyes],
-+             [AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev])
-+              LIBUDEV_CFLAGS="$libudev_CFLAGS"
-+              LIBUDEV_LIBS="$libudev_LIBS"
-+              AC_SUBST(LIBUDEV_CFLAGS)
-+              AC_SUBST(LIBUDEV_LIBS)],
-+             AC_MSG_WARN(udev library not available)
-+            )])
- 
- AC_SUBST([JPEG_LIBS])
- 
--- 
-2.26.2
-
diff --git a/media-libs/libv4l/libv4l-1.20.0.ebuild b/media-libs/libv4l/libv4l-1.20.0.ebuild
deleted file mode 100644
index 653db36f66ce..000000000000
--- a/media-libs/libv4l/libv4l-1.20.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info multilib-minimal
-
-MY_P="v4l-utils-${PV}"
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dvb jpeg"
-
-RDEPEND="
-	dvb? ( virtual/libudev[${MULTILIB_USEDEP}] )
-	!elibc_glibc? ( sys-libs/argp-standalone )
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-automagic.patch
-)
-
-pkg_setup() {
-	CONFIG_CHECK="~SHMEM"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Hard disable the flags that apply only to the utils.
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		$(use_enable dvb libdvbv5) \
-		--disable-qv4l2 \
-		--disable-qvidcap \
-		--disable-v4l-utils \
-		$(use_with jpeg) \
-		$(use_with dvb libudev)
-}
-
-multilib_src_compile() {
-	emake -C lib
-}
-
-multilib_src_install() {
-	emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README.lib* TODO
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libv4l/libv4l-1.22.1.ebuild b/media-libs/libv4l/libv4l-1.22.1.ebuild
index af9048e8367b..2223dab92514 100644
--- a/media-libs/libv4l/libv4l-1.22.1.ebuild
+++ b/media-libs/libv4l/libv4l-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dvb jpeg"
 
 RDEPEND="
-- 
cgit v1.2.3