* update v4l-utils to 1.24.1-2

v4l-utils/0001-v4l2-tpg.patch-rename-min-max-defines-to-tpg_min-max.patch

@@ -1,36 +0,0 @@
-From 02f295d4c4c1b401cdb589df5bef2645c7f83813 Mon Sep 17 00:00:00 2001
-From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-Date: Mon, 15 Mar 2021 08:13:14 +0100
-Subject: [PATCH] v4l2-tpg.patch: rename min/max defines to tpg_min/max
-
-With gcc 11 the min/max defines clash with what gcc provides,
-so rename these defines. They are only used in the min3/max3
-defines, so the change it kept to a minimum.
-
-Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-Reported-by: Gregor Jasny <gjasny@googlemail.com>
----
- utils/common/v4l2-tpg.h     | 10 ++++------
- utils/common/v4l2-tpg.patch | 12 +++++-------
- 2 files changed, 9 insertions(+), 13 deletions(-)
-
-diff --git a/utils/common/v4l2-tpg.h b/utils/common/v4l2-tpg.h
-index caf7b1a1..ecdb6eba 100644
---- a/utils/common/v4l2-tpg.h
-+++ b/utils/common/v4l2-tpg.h
-@@ -28,12 +28,10 @@ typedef __s8 s8;
- #define pr_info printf
- #define noinline
- 
--#ifndef min
--#define min(a,b)	((a) < (b) ? (a) : (b))
--#define max(a,b)	((a) > (b) ? (a) : (b))
--#endif /* !min */
--#define min3(x, y, z) min((typeof(x))min(x, y), z)
--#define max3(x, y, z) max((typeof(x))max(x, y), z)
-+#define tpg_min(a,b)	((a) < (b) ? (a) : (b))
-+#define tpg_max(a,b)	((a) > (b) ? (a) : (b))
-+#define min3(x, y, z) tpg_min((typeof(x))tpg_min(x, y), z)
-+#define max3(x, y, z) tpg_max((typeof(x))tpg_max(x, y), z)
- #define array_size(a, b) ((a) * (b))
- #define array3_size(a, b, c) ((a) * (b) * (c))

v4l-utils/PKGBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
 pkgver=1.24.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url="https://linuxtv.org/"
@@ -11,9 +11,9 @@ replaces=('libv4l')
 conflicts=('libv4l')
 backup=(etc/rc_maps.cfg)
 license=('LGPL')
+depends=('hicolor-icon-theme' 'gcc-libs' 'libjpeg-turbo'  'systemd-libs' 'json-c')
 makedepends=('qt5-base' 'alsa-lib')
-optdepends=('qt5-base: for qv4l2' 'alsa-lib: for qv4l2')
-depends=('hicolor-icon-theme' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
+optdepends=('qt5-base: for qv4l2 and qvidcap' 'alsa-lib: for qv4l2')
 options=(!ccache !distcc)
 source=(https://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2{,.asc})
 sha256sums=('cbb7fe8a6307f5ce533a05cded70bb93c3ba06395ab9b6d007eb53b75d805f5b'

v4l-utils/keys/pgp/05D0169C26E41593418129DF199A64FADFB500FF.asc

@@ -0,0 +1,63 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=OMI7
+-----END PGP PUBLIC KEY BLOCK-----