[gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/, media-libs/libv4l/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     5b5c6024b4c553ae857ca682bd8e68beb9d86dc9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  4 12:00:45 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 17:36:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b5c6024

media-libs/libv4l: drop 1.22.1, 1.26.1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/libv4l/Manifest                         |   2 -
 media-libs/libv4l/files/libv4l-1.26.0-meson.patch  | 111 -----------------
 media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch |  58 ---------
 media-libs/libv4l/libv4l-1.22.1.ebuild             |  74 -----------
 media-libs/libv4l/libv4l-1.26.1.ebuild             | 136 ---------------------
 5 files changed, 381 deletions(-)

diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index f91463d984b7..56210e62db4a 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,3 +1 @@
-DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170
-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

diff --git a/media-libs/libv4l/files/libv4l-1.26.0-meson.patch b/media-libs/libv4l/files/libv4l-1.26.0-meson.patch
deleted file mode 100644
index 9f8384033865..000000000000
--- a/media-libs/libv4l/files/libv4l-1.26.0-meson.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 11ca2682040d14ba1a3d65e95a6f0dfded5e4365 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 12 Dec 2023 13:39:21 +0000
-Subject: [PATCH 1/2] meson: Fix building with -Dv4l-utils=false
-
-ir_bpf_enabled was referenced without being defined.
----
- meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index ab632976..7495a9c2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -358,6 +358,8 @@ subdir('lib')
- if get_option('v4l-utils')
-     subdir('utils')
-     subdir('contrib')
-+else
-+    ir_bpf_enabled = false
- endif
- 
- subdir('doc')
--- 
-2.42.1
-
-From 15343c83e43805223c098e4c5efe9e176343e801 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 12 Dec 2023 13:59:13 +0000
-Subject: [PATCH 2/2] meson: Allow documentation directory to be specified with
- -Ddocdir
-
-This is needed by Gentoo Linux QA.
-
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
----
- doc/meson.build   | 2 +-
- meson.build       | 5 +++++
- meson_options.txt | 2 ++
- 3 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/doc/meson.build b/doc/meson.build
-index 8f4437e7..4b23c3de 100644
---- a/doc/meson.build
-+++ b/doc/meson.build
-@@ -20,7 +20,7 @@ doxygen_install_dirs = []
- doxygen_output = []
- if get_option('doxygen-html')
-     doxygen_output += 'html'
--    doxygen_install_dirs += get_option('datadir') / 'doc' / '@0@'.format(meson.project_name())
-+    doxygen_install_dirs += docdir
- endif
- if get_option('doxygen-man')
-     doxygen_output += 'man'
-diff --git a/meson.build b/meson.build
-index 7495a9c2..0348b43b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -289,6 +289,11 @@ if udevdir == ''
-     udevdir = '/lib/udev'
- endif
- 
-+docdir = get_option('docdir')
-+if docdir == ''
-+    docdir = get_option('datadir') / 'doc' / '@0@'.format(meson.project_name())
-+endif
-+
- qt5_opengl_test = '''
- #define GL_GLEXT_PROTOTYPES
- #define QT_NO_OPENGL_ES_2
-diff --git a/meson_options.txt b/meson_options.txt
-index 2fa046c0..53cf832f 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -32,6 +32,8 @@ option('v4l2-ctl-stream-to', type : 'boolean',
-        description : 'Enable use of --stream-to in v4l2-ctl')
- 
- # Directories
-+option('docdir', type : 'string',
-+       description : 'Set documentation directory')
- option('gconvsysdir', type : 'string',
-        description : 'Set system gconv directory (default is to autodetect)')
- option('libv4l1subdir', type : 'string', value : 'libv4l',
--- 
-2.42.1
-
-From 8927b2e98efa070999fdf2c3c61825e672044ffd Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Mon, 1 Jan 2024 22:05:34 +0000
-Subject: [PATCH] meson: Fix missing v4l2gl dependency on argp
-
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
----
- contrib/test/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/contrib/test/meson.build b/contrib/test/meson.build
-index 29b51df6..48ee67b1 100644
---- a/contrib/test/meson.build
-+++ b/contrib/test/meson.build
-@@ -107,6 +107,7 @@ if dep_gl.found() and dep_glu.found() and dep_x11.found()
-     )
- 
-     v4l2gl_deps = [
-+        dep_argp,
-         dep_gl,
-         dep_glu,
-         dep_libv4l2,
--- 
-2.43.0
-

diff --git a/media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch b/media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch
deleted file mode 100644
index 5b5eea83bc9a..000000000000
--- a/media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From c7ef1a55bb6accb708a4e09d71028b904b07e49e Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Wed, 7 Feb 2024 22:48:59 +0000
-Subject: [PATCH] v4l2-compliance: Fix building against libc++
-
-v4l2-test-time32-64.cpp included compiler.h, which checks
-_LIBCPP_VERSION. This only works against libc++ when a C++ header has
-already been included, which wasn't the case here.
-
-The <version> header is the C++20 method of defining _LIBCPP_VERSION,
-but for older versions, <ciso646> works as an alternative, so include
-that in compiler.h.
-
-compiler.h is for C as well as C++ though, so use __cplusplus to check
-for a C++ compiler before including <ciso646>.
-
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
----
- include/compiler.h | 27 ++++++++++++---------------
- 1 file changed, 12 insertions(+), 15 deletions(-)
-
-diff --git a/include/compiler.h b/include/compiler.h
-index 5ad54f41..169247a8 100644
---- a/include/compiler.h
-+++ b/include/compiler.h
-@@ -1,17 +1,14 @@
--#ifdef _LIBCPP_VERSION
--#define fallthrough _LIBCPP_FALLTHROUGH()
-+#if !defined(__cplusplus) || __cplusplus < 201103L
-+	#define fallthrough ((void)0)
- #else
--
--#if __cplusplus >= 201103L
--
--#ifdef __clang__
--#define fallthrough [[clang::fallthrough]]
--#else
--#define fallthrough [[gnu::fallthrough]]
--#endif // __clang__
--
--#else
--#define fallthrough ((void)0)
--
-+	#include <ciso646>
-+	#ifdef _LIBCPP_VERSION
-+		#define fallthrough _LIBCPP_FALLTHROUGH()
-+	#else
-+		#ifdef __clang__
-+			#define fallthrough [[clang::fallthrough]]
-+		#else
-+			#define fallthrough [[gnu::fallthrough]]
-+		#endif // __clang__
-+	#endif // _LIBCPP_VERSION
- #endif // __cplusplus
--#endif // _LIBCPP_VERSION
--- 
-2.43.0
-

diff --git a/media-libs/libv4l/libv4l-1.22.1.ebuild b/media-libs/libv4l/libv4l-1.22.1.ebuild
deleted file mode 100644
index f87601a2e925..000000000000
--- a/media-libs/libv4l/libv4l-1.22.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 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 ~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
deleted file mode 100644
index 6a97e52ec66d..000000000000
--- a/media-libs/libv4l/libv4l-1.26.1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bpf doc dvb jpeg qt5 tracer +utils"
-
-REQUIRED_USE="
-	bpf? ( utils )
-	qt5? ( 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:=
-		)
-		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
-		qt5? ( dev-qt/qtcore:5 )
-	)
-"
-
-# Not really prebuilt but BPF objects make our QA checks go crazy.
-QA_PREBUILT="*/rc_keymaps/protocols/*.o"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.26.0-meson.patch
-	"${FILESDIR}"/${PN}-1.26.1-libcxx.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
-	CONFIG_CHECK="~SHMEM" linux-info_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_feature bpf)
-		-Dgconv=disabled
-		$(meson_feature jpeg)
-		$(meson_feature dvb libdvbv5)
-		$(meson_native_use_feature qt5 qv4l2)
-		$(meson_native_use_feature qt5 qvidcap)
-		$(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)
-	)
-	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
-}