1.22.1

0001-utils-v4l2-TPG-Update-use-of-typeof.patch

@@ -0,0 +1,51 @@
+From 9f799271e5e92cb84cbce002896ce7c25dad4fd8 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Mon, 27 Dec 2021 15:25:21 +0000
+Subject: [PATCH] utils: v4l2 TPG: Update use of typeof
+
+It seems the way to use typeof with newer gcc's is by using
+__typeof__
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ utils/common/v4l2-tpg.h     | 6 +++---
+ utils/common/v4l2-tpg.patch | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/utils/common/v4l2-tpg.h b/utils/common/v4l2-tpg.h
+index ecdb6eba..ba351c28 100644
+--- a/utils/common/v4l2-tpg.h
++++ b/utils/common/v4l2-tpg.h
+@@ -46,9 +46,9 @@ static inline void *vzalloc(unsigned long size)
+ }
+ 
+ #define clamp(val, min, max) ({			\
+-	typeof(val) __val = (val);		\
+-	typeof(min) __min = (min);		\
+-	typeof(max) __max = (max);		\
++	__typeof__(val) __val = (val);		\
++	__typeof__(min) __min = (min);		\
++	__typeof__(max) __max = (max);		\
+ 	(void) (&__val == &__min);		\
+ 	(void) (&__val == &__max);		\
+ 	__val = __val < __min ? __min: __val;	\
+diff --git a/utils/common/v4l2-tpg.patch b/utils/common/v4l2-tpg.patch
+index 2381ebd9..d7edc1f3 100644
+--- a/utils/common/v4l2-tpg.patch
++++ b/utils/common/v4l2-tpg.patch
+@@ -214,9 +214,9 @@ index 0b0ddb87..91da74ec 100644
+ +}
+ +
+ +#define clamp(val, min, max) ({			\
+-+	typeof(val) __val = (val);		\
+-+	typeof(min) __min = (min);		\
+-+	typeof(max) __max = (max);		\
+++	__typeof__(val) __val = (val);		\
+++	__typeof__(min) __min = (min);		\
+++	__typeof__(max) __max = (max);		\
+ +	(void) (&__val == &__min);		\
+ +	(void) (&__val == &__max);		\
+ +	__val = __val < __min ? __min: __val;	\
+-- 
+2.33.1
+

sources

@@ -1 +1 @@
-SHA512 (v4l-utils-1.20.0.tar.bz2) = 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
+SHA512 (v4l-utils-1.22.1.tar.bz2) = 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170

v4l-utils.spec

@@ -1,28 +1,25 @@
-# workaround for GUILE exceptions bz#1801144
-%global __brp_strip_lto %{nil}
-
 Name:           v4l-utils
-Version:        1.20.0
-Release:        4%{?dist}
+Version:        1.22.1
+Release:        1%{?dist}
 Summary:        Utilities for video4linux and DVB devices
 # libdvbv5, dvbv5 utils, ir-keytable and v4l2-sysfs-path are GPLv2 only
 License:        GPLv2+ and GPLv2
 URL:            http://www.linuxtv.org/downloads/v4l-utils/
 
 Source0:        http://linuxtv.org/downloads/v4l-utils/v4l-utils-%{version}.tar.bz2
+Patch0:         0001-utils-v4l2-TPG-Update-use-of-typeof.patch
 
-BuildRequires: make
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
 BuildRequires:  gettext
 BuildRequires:  kernel-headers
 BuildRequires:  libjpeg-devel
+BuildRequires:  make
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  systemd-devel
 
 # BPF decoder dependencies
-
 %define with_bpf 1
 
 %if %{with_bpf}
@@ -30,7 +27,7 @@ BuildRequires:  elfutils-libelf-devel clang
 %endif
 
 # For /lib/udev/rules.d ownership
-Requires:       udev
+Requires:       systemd-udev
 Requires:       libv4l%{?_isa} = %{version}-%{release}
 
 %description
@@ -90,6 +87,7 @@ License:        GPLv2
 %description -n libdvbv5
 Libraries to control, scan and zap on Digital TV channels
 
+
 %package -n     libv4l-devel
 Summary:        Development files for libv4l
 License:        LGPLv2+
@@ -125,7 +123,6 @@ make doxygen-run
 
 
 %install
-%{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
 %make_install
 find $RPM_BUILD_ROOT -name '*.la' -delete
 rm -f $RPM_BUILD_ROOT%{_libdir}/{v4l1compat.so,v4l2convert.so}
@@ -205,6 +202,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
 
 
 %changelog
+* Wed Dec 08 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.22.1-1
+- Update to 1.22.1
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild