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

4 files changed, 156 insertions, 79 deletions

diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 2d5d17eca266..112ea80828da 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,9 +1,9 @@
 AUX libv4l-1.26.0-meson.patch 3156 BLAKE2B c0b91160b4a065458e2889a196671f4fe083fa44c0061c00ecb1f272274af5edc00780bbe74003a03264a3d50ca5af010f4c75ce574547a1d39a09ebf1f72ec1 SHA512 f20f72ac9edc1ac188b838975dac7f5a64fb37910c6e714003121355a587bc6610e70a355fceb15839051ca9ca5042695e83ee424b1238e8159e0ffdb971e878
 AUX libv4l-1.26.1-libcxx.patch 1681 BLAKE2B 7a9caceeb658b11161ceffd62337b7415688cc52498a6ee710c392f812dc3489b9fc670116e11a077f1d3a6e31be51dadd7d2f3e94e4cd9fa52b5109a4fb379b SHA512 c9750908a19454ea31b8a8167350c375040acbcde75c798062d712d9d5cb17d87175beb4c10abcab20fa6f13a21cf2bfd1b809c34ee42ee7166d4dfb02a18ae0
 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
 DIST v4l-utils-1.26.1.tar.xz 1192312 BLAKE2B 84a6b5737447fa332b64af8fdc2ecb308865528bc16487e55a4ccc00a76288239432b299ab2225829530db9158b0449f64e2e1c3fb782c7495da55ea8e7a171a SHA512 a3b12b311977afec410db8b430696e923a24e04f003a5891cc77ddeb667d0b98666a06d31a439c95ce57d9e9c9c2593c5e9dd9e7cf2be002adb95db5b8f00ac8
+DIST v4l-utils-1.28.1.tar.xz 1246516 BLAKE2B a68728ab6802754cd766453375e212624ee731a7fc9b0d0da6a4c62ce19e75968c5bdbefa33d2977d439a23f36f5c8ff83efc44dae65eed206a31ef19ea57363 SHA512 6493c97f59af5fe0ffa4bb815ebac4531f5ea2b0612c2035c7f00a888ce686ee0aeeaef982553ff9ad6441c39dac63e6c718b1bedb0541cb2ce2e3c2f91ab12f
 EBUILD libv4l-1.22.1.ebuild 1474 BLAKE2B 02e405372e756e104f9f12fbcf91fdad9065a7da032cdec3b5ef1e1978ec816625d605f89b79a428a5cc21cdfc9422148cb133160aee9d97775d45565ed5516c SHA512 a4b2facc7b261e0b7231374ffe7e049460b1f9da123d02e9b82e5371e6d6dea77e052ea007554b0090a2c5bfe452ca9a02f43d86d3add0bc942fde22563e577d
-EBUILD libv4l-1.24.1.ebuild 1481 BLAKE2B 1ea5253e7f594b4ed2f51a3bbe002992ba979c4beb662497e5912faebfb30ce23363b851f114873b44a7d4030e20c4a350f2d92afafc1c20f503f31e4c575923 SHA512 b55663f8836ecef9c5b45a0e436c9bef3842e058af4f066c1586c6bc38a315ffe57e489741ca273816e5e99420a97ead030224f1e6058f1059d61a3d7a5b38ab
-EBUILD libv4l-1.26.1.ebuild 3297 BLAKE2B e48dfeb1023184db54cd491309bd2a4978d9998dfe741b941eb5edcab350b74c6a0eb55d2ca6425df817206f30a5e42bd177911b9fd644c7a11cf7d0906736c8 SHA512 4100011c4b7b9bd775a62d4eff555772a6f451667a0a01bc7e28c20d6a33bf8f93acc7e8d5ecf46ae0d2a33b3c4aca7e609e75ee41930c5ea32ad2a2c358b4b2
+EBUILD libv4l-1.26.1.ebuild 3300 BLAKE2B 426736f90057b463d70a0764d04351f836f5e92b841feb417094a0593073bc9c7f10785a28489c12ea5877a9e489f790b60bc680003fe1bbb5ca1cec6e75ba5e SHA512 32e0aca1a0a122d924687ed16d5646c3128b43b2e6b7f2d5916b66517fb6d388262ab2453fa36c36c56b944f6d1df1cfc4aa7f2736eaef007d1bd2ada676e1a2
+EBUILD libv4l-1.28.1.ebuild 3611 BLAKE2B 42f909447826bd449e065294a814026be69e05afaa5ed662154883a2bf5dc57cba37986a3611fa18aed0fc81c97af9beec8ec7e7edd6abfd082e6842d80f381d SHA512 0928faf388acfb51abd0939d7abcf6f96a5a378b146ad967e9d324c2eef21729717059da467e23faf4f8133802df6dd05c6ca20ac728a2053c1b7b2d0b8e060e
 MISC metadata.xml 1333 BLAKE2B 980117d95da191d35287e97e99c1add4231438d0e5f763cd576bd9bf79ce894297bd32252b8e73a1356d14be66dde09ef0ae3307a0e856554cb024569eee63ee SHA512 da28f9574865217098fb8602d7860131e58b7c16501bef840814a3ef7870a5565795151c8b574ecc895c9614400b5ac5b444430fd147dabea0f747174d6ae7a0
diff --git a/media-libs/libv4l/libv4l-1.24.1.ebuild b/media-libs/libv4l/libv4l-1.24.1.ebuild
deleted file mode 100644
index f740eb8669a1..000000000000
--- a/media-libs/libv4l/libv4l-1.24.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~loong ~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}"
-
-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.26.1.ebuild b/media-libs/libv4l/libv4l-1.26.1.ebuild
index 3480dac0970b..7359cb46f31a 100644
--- a/media-libs/libv4l/libv4l-1.26.1.ebuild
+++ b/media-libs/libv4l/libv4l-1.26.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bpf doc dvb jpeg qt5 tracer +utils"
 
 REQUIRED_USE="
@@ -99,7 +99,7 @@ multilib_src_configure() {
 		$(meson_native_use_bool utils v4l-utils)
 		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
 		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
-		-Dudevdir="$(get_udevdir)"
+		-Dudevdir="${EPREFIX}$(get_udevdir)"
 		$(meson_native_use_feature doc doxygen-doc)
 		$(meson_native_use_bool doc doxygen-html)
 		$(meson_native_use_bool doc doxygen-man)
diff --git a/media-libs/libv4l/libv4l-1.28.1.ebuild b/media-libs/libv4l/libv4l-1.28.1.ebuild
new file mode 100644
index 000000000000..7f11f9769139
--- /dev/null
+++ b/media-libs/libv4l/libv4l-1.28.1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info meson-multilib systemd udev xdg
+
+MY_P="v4l-utils-${PV}"
+
+DESCRIPTION="v4l-utils libraries and optional utilities"
+HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
+SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+LICENSE="LGPL-2.1+"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bpf doc dvb jpeg qt5 qt6 tracer +utils"
+
+REQUIRED_USE="
+	bpf? ( utils )
+	qt5? ( utils )
+	qt6? ( utils )
+	tracer? ( utils )
+"
+
+RDEPEND="
+	dvb? ( virtual/libudev[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	utils? (
+		!elibc_glibc? ( sys-libs/argp-standalone )
+		bpf? (
+			dev-libs/libbpf:=
+			virtual/libelf:=
+		)
+		qt6? (
+			dev-qt/qtbase:6[gui,opengl,widgets,-gles2-only]
+			dev-qt/qt5compat:6
+			media-libs/alsa-lib
+			virtual/opengl
+		)
+		!qt6? ( qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtopengl:5[-gles2-only(-),-gles2(-)]
+			dev-qt/qtwidgets:5
+			media-libs/alsa-lib
+			virtual/opengl
+		) )
+		tracer? ( dev-libs/json-c:= )
+		virtual/libudev
+	)
+	!<media-tv/v4l-utils-1.26
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	bpf? ( sys-devel/clang:*[llvm_targets_BPF] )
+	doc? ( app-text/doxygen )
+	utils? (
+		dev-lang/perl
+		qt6? ( dev-qt/qtbase:6 )
+		!qt6? ( qt5? ( dev-qt/qtcore:5 ) )
+	)
+"
+
+# Not really prebuilt but BPF objects make our QA checks go crazy.
+QA_PREBUILT="*/rc_keymaps/protocols/*.o"
+
+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
+	CONFIG_CHECK="~SHMEM" linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	use qt6 || sed -i "/^dep_qt6/s/'qt6/&DiSaBlEd/" meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_feature bpf)
+		-Dgconv=disabled
+		$(meson_feature jpeg)
+		$(meson_feature dvb libdvbv5)
+		$(meson_native_use_feature tracer v4l2-tracer)
+		$(meson_native_use_bool utils v4l-utils)
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Dudevdir="${EPREFIX}$(get_udevdir)"
+		$(meson_native_use_feature doc doxygen-doc)
+		$(meson_native_use_bool doc doxygen-html)
+		$(meson_native_use_bool doc doxygen-man)
+	)
+	if multilib_is_native_abi && { use qt6 || use qt5; }; then
+		emesonargs+=(
+			-Dqv4l2=enabled
+			-Dqvidcap=enabled
+		)
+	else
+		emesonargs+=(
+			-Dqv4l2=disabled
+			-Dqvidcap=disabled
+		)
+	fi
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog README.lib* TODO
+
+	if use utils; then
+		dodoc README.md
+		newdoc utils/dvb/README README.dvb
+		newdoc utils/libv4l2util/TODO TODO.libv4l2util
+		newdoc utils/libmedia_dev/README README.libmedia_dev
+		newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	use utils && udev_reload
+
+	if use utils && [[ -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 utils && udev_reload
+}