commit: 52f6a9ff3d41a77a5a9f160004cd5d4f2fa06344 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Mon Jul 29 20:37:05 2024 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Mon Jul 29 20:37:05 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52f6a9ff
media-tv/v4l-utils: Drop old 1.24.1 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> media-tv/v4l-utils/Manifest | 1 - .../files/v4l-utils-1.24.1-musl-include.patch | 11 -- .../files/v4l-utils-1.24.1-musl-lfs.patch | 51 --------- media-tv/v4l-utils/v4l-utils-1.24.1.ebuild | 124 --------------------- 4 files changed, 187 deletions(-) diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest index 9a88ad1c15fe..eaca215a25f2 100644 --- a/media-tv/v4l-utils/Manifest +++ b/media-tv/v4l-utils/Manifest @@ -1,2 +1 @@ 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 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.rep...@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.rep...@gmx.net> -Signed-off-by: Hans Verkuil <hverkuil-ci...@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 -}
