v4l-utils: update to 1.32.0.

Author: oreo639

srcpkgs/v4l-utils/patches/musl-ioctl.patch

@@ -1,56 +1,34 @@
-From fd882f9e77b13cbc6a669e6836c3943393b44152 Mon Sep 17 00:00:00 2001
-From: Michal Rostecki <vadorovsky@gmail.com>
-Date: Fri, 6 Sep 2024 14:46:31 +0200
-Subject: libv4l2: Guard the v4l2_ioctl function with HAVE_POSIX_IOCTL
+Ensure that LIBV4L_HAVE_POSIX_IOCTL define is used when linking with other packages.
 
-Lack of this check leads to issues on musl-based system. Even though
-compilation of libv4l2 itself with musl doesn't cause any errors,
-using the library inside gst-plugins-v4l2 causes a compiler error
-due to mismatch of the ioctl signature.
-
-A similar check is already performed in v4l2convert.c, so the change
-doesn't bring any inconsistency.
-
-Link: https://bugs.gentoo.org/896418
-Signed-off-by: Michal Rostecki <vadorovsky@gmail.com>
-Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
----
- lib/include/libv4l2.h | 4 ++++
- lib/libv4l2/libv4l2.c | 4 ++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/lib/include/libv4l2.h b/lib/include/libv4l2.h
-index ea1870db..16565555 100644
---- a/lib/include/libv4l2.h
-+++ b/lib/include/libv4l2.h
-@@ -63,7 +63,11 @@ LIBV4L_PUBLIC extern FILE *v4l2_log_file;
- LIBV4L_PUBLIC int v4l2_open(const char *file, int oflag, ...);
- LIBV4L_PUBLIC int v4l2_close(int fd);
- LIBV4L_PUBLIC int v4l2_dup(int fd);
-+#ifdef HAVE_POSIX_IOCTL
-+LIBV4L_PUBLIC int v4l2_ioctl(int fd, int request, ...);
-+#else
- LIBV4L_PUBLIC int v4l2_ioctl(int fd, unsigned long int request, ...);
-+#endif
- LIBV4L_PUBLIC ssize_t v4l2_read(int fd, void *buffer, size_t n);
- LIBV4L_PUBLIC ssize_t v4l2_write(int fd, const void *buffer, size_t n);
- LIBV4L_PUBLIC void *v4l2_mmap(void *start, size_t length, int prot, int flags,
-diff --git a/lib/libv4l2/libv4l2.c b/lib/libv4l2/libv4l2.c
-index 032a4f1c..1607ec35 100644
---- a/lib/libv4l2/libv4l2.c
-+++ b/lib/libv4l2/libv4l2.c
-@@ -1051,7 +1051,11 @@ static int v4l2_s_fmt(int index, struct v4l2_format *dest_fmt)
- 	return 0;
- }
+diff -rup meson.build.orig meson.build
+--- a/meson.build.orig
++++ b/meson.build
+@@ -383,12 +383,14 @@ if have_qt_opengl
+     conf.set('HAVE_QTGL', 1)
+ endif
+ 
++pkg_arguments = []
+ ioctl_posix_test = '''
+ #include <sys/ioctl.h>
+ int ioctl (int, int, ...);
+ '''
+ if cc.compiles(ioctl_posix_test)
+     conf.set('LIBV4L_HAVE_POSIX_IOCTL', 1)
++    pkg_arguments += '-DLIBV4L_HAVE_POSIX_IOCTL=1'
+ endif
+ 
+ c_arguments = []
+diff -rup lib/libv4l2/meson.build.orig lib/libv4l2/meson.build
+--- a/lib/libv4l2/meson.build.orig
++++ b/lib/libv4l2/meson.build
+@@ -48,7 +48,8 @@ pkg.generate(
+     name : 'libv4l2',
+     version : meson.project_version(),
+     requires_private : 'libv4lconvert',
+-    description : 'v4l2 device access library')
++    description : 'v4l2 device access library',
++    extra_cflags : pkg_arguments)
 
-+#ifdef HAVE_POSIX_IOCTL
-+int v4l2_ioctl(int fd, int request, ...)
-+#else
- int v4l2_ioctl(int fd, unsigned long int request, ...)
-+#endif
- {
- 	void *arg;
- 	va_list ap;
--- 
-cgit v1.2.3
+ if not get_option('v4l-wrappers')
+     subdir_done()
 

srcpkgs/v4l-utils/template

@@ -1,7 +1,7 @@
 # Template file for 'v4l-utils'
 pkgname=v4l-utils
-version=1.28.1
-revision=2
+version=1.32.0
+revision=1
 build_style=meson
 configure_args="-Dqv4l2=disabled -Dudevdir=/usr/lib/udev -Dgconv=disabled"
 hostmakedepends="perl pkg-config gettext-devel"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://linuxtv.org/"
 changelog="https://git.linuxtv.org/v4l-utils.git/plain/ChangeLog"
 distfiles="https://linuxtv.org/downloads/v4l-utils/v4l-utils-${version}.tar.xz"
-checksum=0fa075ce59b6618847af6ea191b6155565ccaa44de0504581ddfed795a328a82
+checksum=6828828a17775526eb93fb258a9294d1d1073d633c344dd71ecd4e7a1ffb7dfc
 conf_files="/etc/rc_maps.cfg"
 
 case "$XBPS_TARGET_MACHINE" in