.gitignore

@@ -1 +1 @@
-SOURCES/v4l-utils-1.14.2.tar.bz2
+SOURCES/v4l-utils-1.20.0.tar.bz2

.v4l-utils.metadata

@@ -1 +1 @@
-e723e9ec2d2ca3ccfcaf87d4a52160f601cab3ab SOURCES/v4l-utils-1.14.2.tar.bz2
+91128695040c694c3998540ca3b710ca9c8262e1 SOURCES/v4l-utils-1.20.0.tar.bz2

SOURCES/v4l-utils-sysmacros.patch

@@ -1,22 +0,0 @@
---- v4l-utils-1.14.2/lib/libv4lconvert/control/libv4lcontrol.c.orig	2018-04-29 18:42:05.534170391 +0100
-+++ v4l-utils-1.14.2/lib/libv4lconvert/control/libv4lcontrol.c	2018-04-29 18:42:17.765044988 +0100
-@@ -20,9 +20,7 @@
-  */
- 
- #include <sys/types.h>
--#if defined(MAJOR_IN_SYSMACROS)
- #include <sys/sysmacros.h>
--#endif
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <sys/stat.h>
---- v4l-utils-1.14.2/utils/v4l2-ctl/v4l2-ctl.cpp.orig	2018-04-29 18:49:34.091977421 +0100
-+++ v4l-utils-1.14.2/utils/v4l2-ctl/v4l2-ctl.cpp	2018-04-29 18:50:11.588702105 +0100
-@@ -27,6 +27,7 @@
- #include <inttypes.h>
- #include <getopt.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <ctype.h>

SPECS/v4l-utils.spec

@@ -1,14 +1,17 @@
+# workaround for GUILE exceptions bz#1801144
+%global __brp_strip_lto %{nil}
+
 Name:           v4l-utils
-Version:        1.14.2
-Release:        3%{?dist}
+Version:        1.20.0
+Release:        5%{?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:         v4l-utils-sysmacros.patch
 
+BuildRequires: make
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
@@ -17,6 +20,15 @@ BuildRequires:  kernel-headers
 BuildRequires:  libjpeg-devel
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  systemd-devel
+
+# BPF decoder dependencies
+
+%define with_bpf 1
+
+%if %{with_bpf}
+BuildRequires:  elfutils-libelf-devel clang
+%endif
+
 # For /lib/udev/rules.d ownership
 Requires:       udev
 Requires:       libv4l%{?_isa} = %{version}-%{release}
@@ -103,18 +115,19 @@ files for developing applications that use libdvbv5.
 %autosetup -p1
 
 %build
+export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS"
 %configure --disable-static --enable-libdvbv5 --enable-doxygen-man
 # Don't use rpath!
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
+%make_build
 make doxygen-run
 
 
 %install
 %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
 %make_install
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -name '*.la' -delete
 rm -f $RPM_BUILD_ROOT%{_libdir}/{v4l1compat.so,v4l2convert.so}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3/
 cp -arv %{_builddir}/%{name}-%{version}/doxygen-doc/man/man3 $RPM_BUILD_ROOT%{_mandir}/
@@ -124,13 +137,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
 %find_lang libdvbv5
 
 
-%post -n libv4l -p /sbin/ldconfig
-
-%postun -n libv4l -p /sbin/ldconfig
-
-%post -n libdvbv5 -p /sbin/ldconfig
+%ldconfig_scriptlets -n libv4l
 
-%postun -n libdvbv5 -p /sbin/ldconfig
+%ldconfig_scriptlets -n libdvbv5
 
 %files -f %{name}.lang
 %doc README
@@ -149,6 +158,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
 %{_bindir}/v4l2-ctl
 %{_bindir}/v4l2-sysfs-path
 %{_mandir}/man1/*.1*
+%{_mandir}/man5/*.5*
 %exclude %{_mandir}/man1/qv4l2.1*
 %exclude %{_mandir}/man1/v4l2-compliance.1*
 
@@ -162,9 +172,13 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
 %files -n qv4l2
 %doc README
 %{_bindir}/qv4l2
+%{_bindir}/qvidcap
 %{_datadir}/applications/qv4l2.desktop
+%{_datadir}/applications/qvidcap.desktop
 %{_datadir}/icons/hicolor/*/apps/qv4l2.*
+%{_datadir}/icons/hicolor/*/apps/qvidcap.*
 %{_mandir}/man1/qv4l2.1*
+%{_mandir}/man1/qvidcap.1*
 
 %files -n libv4l
 %doc ChangeLog README.libv4l TODO
@@ -191,6 +205,64 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
 
 
 %changelog
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.20.0-5
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.20.0-4
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Aug 18 2020 Jeff Law <law@redhat.com> - 1.20.0-2
+- Force C++14 as this code is not C++17 ready
+
+* Wed Aug 12 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.20.0-1
+- Update to 1.20.0
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Feb 25 2020 Than Ngo <than@redhat.com> - 1.18.0-4
+- Fixed FTBFS
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Sep 22 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> 1.18.0-1
+- Updated to latest stable release
+
+* Mon Sep 02 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> 1.16.7-1
+- Updated to new fix release with NIT parsing fix
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed May  1 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.16.5-3
+- The actual fix for libdvbv5 (rhbz 1695023)
+
+* Tue Apr 16 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.16.5-2
+- Upstream fix for libdvbv5 (rhbz 1695023)
+
+* Sun Mar 31 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.16.5-1
+- New upstream release 1.16.5
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Dec 17 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> 1.6.3-1
+- Updated to new fix release, with should solve BPF protocol packaging issues
+
+* Thu Nov 22 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> 1.6.2-2
+- Add dependencies needed to build BPF code
+
+* Mon Nov 19 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.16.2-1
+- New upstream release 1.16.2
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Sun Apr 29 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.14.2-2
 - Add sys/sysmacros.h include fix patch