gentoo auto-resync : 07:08:2024 - 12:37:20

5 files changed, 3 insertions, 193 deletions

diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index e668266034f9..d54ff61e1d2f 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,9 +1,5 @@
 AUX v4l-utils-1.22.1-no-stack-protector-bpf.patch 1010 BLAKE2B aa8475fd643b1736fe3ad41c77d2debf0fe19f501d8edc56562d39d3dfabea7910e324fdab3951e6bb0a6cdb22bfaea002824189e0189bdec4d66a5b3feda470 SHA512 b0737955b566354b047b296822ed1ba0f573ebd1667d9455d6a08e5f839920f08a1e8b0d98f2515fa93f11ff7f22e5ed7044b8f96b632803260349a3a6e3cf67
-AUX v4l-utils-1.24.1-musl-include.patch 228 BLAKE2B 9eecd67c3687271c47e6a80ba2061d95f4167e52cb78213d9599cfa07f45fe396dd33d4c0ca6c910515d53f4755080c619e97cff1e907e29c9f72bab2c4b40d1 SHA512 f801227dac6735d811bc5d4b77150a3f0b1c661db0373848f60bbc6842d1f488f8baadc20dbb39c469ad09e151afcfa10421f35f4c0d185a67606246e5ec86e0
-AUX v4l-utils-1.24.1-musl-lfs.patch 1555 BLAKE2B 1aa5939aa02a3eb7a22a12f0a7db0b0c720eeeb07793099c86af39e6f014c0c7cf5ba97ed1fac1ca1acd9d2ef6d8b2fb531207b03a1c16df79e11fdabbde9d73 SHA512 228f14ea086ad88e5011a5c4518eb70c187cb829d8ea6be97e292e9b96018fe19690bf3ab26e248f1a5a691702027c01f629b75bbe59395104ca2af898bd6346
 DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170
-DIST v4l-utils-1.24.1.tar.bz2 2238340 BLAKE2B 1702918699d47b17467e012c2b1875c58851175c1007351a3b40d0b0fa40437eb695efa9e21afe3351f66780899d45798eef7f23c90a4831bface70a245b8a54 SHA512 1e82ba125285e875bf4a216adedab9147009e6af1aadd79a3a1770231d3c96ec29245b33e75f69a9ce1b25011e71746db242c778ac3369148de1e9de2e318663
 EBUILD v4l-utils-1.22.1-r1.ebuild 2877 BLAKE2B 7733fd090122d2661d314ef6db9841913229166bfb4e13e92414e2c29ef23fb0f162d71f8c69182ea2b297a7dc9880e9f26643932fdfaa146afddfb64d77c738 SHA512 28bb40f504b770cf79785bc843625a0ffc075ba7235db65c257ec5cc2a41145e83b666fb7df68cd22a5c34f488db4d89b2a016ab32fe14a28189ce1d23269fc7
-EBUILD v4l-utils-1.24.1.ebuild 2909 BLAKE2B 4b71eefd91b37d32701d4fb3a9d3b72b040c1f42e2e0f31c91e5233da8fd81caaf20b9aaf6747d8c56f478072288fd00c8a9b9baae2ee0f5f7e2fa554af79f91 SHA512 9fe5c4467e60c9dd40a476a3e7b98202d4565cfc463a512191c5671bef68e593fe2ed19847c9feeb3f2798cb7d54dff7017270967037d83bac17fd82fe7fde8a
-EBUILD v4l-utils-1.26.ebuild 419 BLAKE2B 92496d0efe31d2c94f2fdad5b236229995373ef302ee1b7e2eb8de66f85f6d87bc3adca7f09440d82a478ddfd6661bdb98e9b005291834ddb0bda233871ab500 SHA512 0cac8e4ed86f610a24c864b0402a93945a55049aca21a6f16b7dd25ef244b52021bb2bf353f3aa913484042be7db034ef2d4225a58e19909c97c2f113728c2cc
+EBUILD v4l-utils-1.26.ebuild 414 BLAKE2B 0d8ad756f1f31e60c43f4c02cd7e67bf9357c0a076b9f1d522c25f9fe79e4b7e64deca3dfcee7a77939f32433f58f09cd32d6f7a8c5d8deda29a725636fafa39 SHA512 72ea61b8bf3ce978d1a1c406b70d68911943b0397e8e2594e437fb675e543c5a3fcc7116c4fc15d07aee3b1cb995b258f22a1ffe82c82561c48194f24f567ef8
 MISC metadata.xml 323 BLAKE2B 79c864de29f9e92372f16bc835f1d260bc7de2c2c809c625806cc18611c50d992abc69de9b8754afa683fabd6a9422e4eb619d87490d4cf5ae1142f05af3557f SHA512 89ec71cc2961d7a6787e4d0e95c959823d1068602ea6cbeac7065ffe926e6c218ad7984c32271131e2624f49f314507cccf1a639e68e3669481d979dcc50bdc7
diff --git a/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-include.patch b/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-include.patch
deleted file mode 100644
index 8738f272aaed..000000000000
--- a/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/908380
---- a/utils/common/media-info.h
-+++ b/utils/common/media-info.h
-@@ -5,6 +5,7 @@
- 
- #ifndef _MEDIA_INFO_H
- #define _MEDIA_INFO_H
-+#include <sys/types.h>
- 
- enum media_type {
- 	MEDIA_TYPE_CANT_STAT,
diff --git a/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-lfs.patch b/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-lfs.patch
deleted file mode 100644
index 196b7430ca5c..000000000000
--- a/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-lfs.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://git.linuxtv.org/v4l-utils.git/commit/?id=5d7d99cd11acaaa3bdcb290f92012005dca58b1e
-
-From 5d7d99cd11acaaa3bdcb290f92012005dca58b1e Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Fri, 31 Mar 2023 23:35:02 +0200
-Subject: v4l2-tracer: wrap open64/mmap64 functions only if linux && __GLIBC__
-
-Wrap open64/mmap64 functions only if linux && __GLIBC__, as done
-in lib/libv4l1/v4l1comapt.c and lib/libv4l2/v4l2convert.c since
-commit 'libv4l: Wrap LFS64 functions only if linux && __GLIBC__'
-(403a4e2697a1ff96fe2fa16589039595f21cadf0), should fix musl libc
-compile.
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---- a/utils/v4l2-tracer/libv4l2tracer.cpp
-+++ b/utils/v4l2-tracer/libv4l2tracer.cpp
-@@ -83,6 +83,7 @@ int open(const char *path, int oflag, ...)
- 	return fd;
- }
- 
-+#if defined(linux) && defined(__GLIBC__)
- int open64(const char *path, int oflag, ...)
- {
- 	errno = 0;
-@@ -110,6 +111,7 @@ int open64(const char *path, int oflag, ...)
- 
- 	return fd;
- }
-+#endif
- 
- int close(int fd)
- {
-@@ -156,6 +158,7 @@ void *mmap(void *addr, size_t len, int prot, int flags, int fildes, off_t off)
- 	return buf_address_pointer;
- }
- 
-+#if defined(linux) && defined(__GLIBC__)
- void *mmap64(void *addr, size_t len, int prot, int flags, int fildes, off_t off)
- {
- 	errno = 0;
-@@ -170,6 +173,7 @@ void *mmap64(void *addr, size_t len, int prot, int flags, int fildes, off_t off)
- 
- 	return buf_address_pointer;
- }
-+#endif
- 
- int munmap(void *start, size_t length)
- {
--- 
-cgit v1.2.1
diff --git a/media-tv/v4l-utils/v4l-utils-1.24.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.24.1.ebuild
deleted file mode 100644
index 3d4eaac93b9a..000000000000
--- a/media-tv/v4l-utils/v4l-utils-1.24.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs udev xdg
-
-DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+bpf dvb opengl qt5 +udev"
-
-RDEPEND="
-	>=media-libs/libv4l-${PV}[dvb?]
-	bpf? (
-		dev-libs/libbpf:=
-		virtual/libelf:=
-	)
-	udev? ( virtual/libudev )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5[-gles2(-)] virtual/opengl )
-		media-libs/alsa-lib
-	)
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	bpf? ( sys-devel/clang:*[llvm_targets_BPF] )
-"
-
-# Not really prebuilt but BPF objects make our QA checks go crazy.
-QA_PREBUILT="*/rc_keymaps/protocols/*.o"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.24.1-musl-include.patch
-	"${FILESDIR}"/${P}-musl-lfs.patch
-)
-
-check_llvm() {
-	if [[ ${MERGE_TYPE} != binary ]] && use bpf; then
-		local clang=${ac_cv_prog_CLANG:-${CLANG:-clang}}
-		${clang} -target bpf -print-supported-cpus &>/dev/null ||
-			die "${clang} does not support the BPF target. Please check LLVM_TARGETS."
-	fi
-}
-
-pkg_pretend() {
-	has_version -b sys-devel/clang && check_llvm
-}
-
-pkg_setup() {
-	check_llvm
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use qt5; then
-		local qt5_paths=( \
-			MOC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/moc" \
-			UIC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/uic" \
-			RCC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/rcc" \
-		)
-		if ! use opengl; then
-			sed -e 's/Qt5OpenGL/DiSaBlEd/g' -i configure || die
-		fi
-	fi
-
-	# Hard disable the flags that apply only to the libs.
-	econf \
-		--disable-static \
-		$(use_enable dvb libdvbv5) \
-		$(use_enable qt5 qv4l2) \
-		$(use_enable qt5 qvidcap) \
-		$(use_enable bpf) \
-		--without-jpeg \
-		$(use_with udev libudev) \
-		--with-udevdir="$(get_udevdir)" \
-		"${qt5_paths[@]}"
-}
-
-src_install() {
-	emake -C utils DESTDIR="${D}" install
-	emake -C contrib DESTDIR="${D}" install
-
-	dodoc README.md
-	newdoc utils/libv4l2util/TODO TODO.libv4l2util
-	newdoc utils/libmedia_dev/README README.libmedia_dev
-	newdoc utils/dvb/README README.dvb
-	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use udev && udev_reload
-
-	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test 1.20.0 -ge ${REPLACING_VERSIONS%% *}; then
-		ewarn "WARNING! ir-keytable has changed significantly from version 1.20.0 so"
-		ewarn "you may need to take action to avoid breakage. See"
-		ewarn "https://bugs.gentoo.org/767175 for more details."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	use udev && udev_reload
-}
diff --git a/media-tv/v4l-utils/v4l-utils-1.26.ebuild b/media-tv/v4l-utils/v4l-utils-1.26.ebuild
index 4c300a474c80..179042a3715e 100644
--- a/media-tv/v4l-utils/v4l-utils-1.26.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="+bpf dvb qt5"
 
 RDEPEND=">=media-libs/libv4l-${PV}[utils,bpf?,dvb?,qt5?]"