gentoo resync : 25.10.2021

3 files changed, 123 insertions, 1 deletions

diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 09a21b59cb50..85fee1b8e7c2 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,4 +1,6 @@
 AUX v4l-utils-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
 DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
-EBUILD v4l-utils-1.20.0.ebuild 2446 BLAKE2B 39b9192ddee93f01b4ee75db9813a426b083ab302db54c0923fde944b843677146a8bec48cde8eb939ec97a90bba2ff1a491fc33cc73b85c8ae8b5f44ac68058 SHA512 c50f3149199bacfd770cc1ef241f0d621621b3867dc9911c0a9b778f0e6d1598eb844ee6c28ca2e1760e8145836614979ac6145b6dbec617f5f1a2102bc67c21
+DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170
+EBUILD v4l-utils-1.20.0.ebuild 2779 BLAKE2B fa000969d7af8f938f096cb8136b96c5fa342d1a499952939e31c879e99148450f70d228052741f902acc3e195cd137f39ad7af89197bfe4823847dea56ae589 SHA512 11b7a270d5631672a6a61ee3bdca45e6415962b9c92fbf9ba6e215cbfbf0f1f185a301abe819b284e7fa150b27e19b56c466a7997db948fe91b58c293286a4a1
+EBUILD v4l-utils-1.22.1.ebuild 2709 BLAKE2B 41b79ad0afd87e2907a7030ed15050ef9202d27cab661b83fc72583ff515174cce0604659935b91887c972153c2b338ad637e318ac643d20e288d3d932ce1d50 SHA512 734ee79b4b66433cf1e0ba898dad56b3a76860a87611a85b449512f9b38089f7f8209a593c593fb1705bae729598c0d86c81e6ede85a596ad159c310099d3d38
 MISC metadata.xml 323 BLAKE2B 79c864de29f9e92372f16bc835f1d260bc7de2c2c809c625806cc18611c50d992abc69de9b8754afa683fabd6a9422e4eb619d87490d4cf5ae1142f05af3557f SHA512 89ec71cc2961d7a6787e4d0e95c959823d1068602ea6cbeac7065ffe926e6c218ad7984c32271131e2624f49f314507cccf1a639e68e3669481d979dcc50bdc7
diff --git a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
index 4965c6c3c704..d10a82913bc4 100644
--- a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
@@ -104,3 +104,13 @@ src_install() {
 	newdoc utils/dvb/README README.dvb
 	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	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
+}
diff --git a/media-tv/v4l-utils/v4l-utils-1.22.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.22.1.ebuild
new file mode 100644
index 000000000000..65a827a5b6d4
--- /dev/null
+++ b/media-tv/v4l-utils/v4l-utils-1.22.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 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?,jpeg]
+	>=virtual/jpeg-0-r2:0=
+	bpf? ( virtual/libelf:= )
+	udev? ( virtual/libudev )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui: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"
+
+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) \
+		--with-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
+	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
+
+	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
+}