3 changed files with 114 additions and 45 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/v4l-utils-1.20.0.tar.bz2
+SOURCES/v4l-utils-1.26.1.tar.xz
--- a/.v4l-utils.metadata
+++ b/.v4l-utils.metadata
@ -1 +1 @@
-91128695040c694c3998540ca3b710ca9c8262e1 SOURCES/v4l-utils-1.20.0.tar.bz2
+b2abb01e2522a65f1ed5f0e792ea0a6657fb161a SOURCES/v4l-utils-1.26.1.tar.xz
--- a/SPECS/v4l-utils.spec
+++ b/SPECS/v4l-utils.spec
@ -1,36 +1,45 @@
-# workaround for GUILE exceptions bz#1801144
-%global __brp_strip_lto %{nil}
+%bcond qt5 %[%{undefined rhel} || 0%{?rhel} < 10]
+
+# BPF decoder dependencies
+%define with_bpf 1

 Name:           v4l-utils
-Version:        1.20.0
-Release:        5%{?dist}
+
+Version:        1.26.1
+Release:        3%{?dist}
 Summary:        Utilities for video4linux and DVB devices
-# libdvbv5, dvbv5 utils, ir-keytable and v4l2-sysfs-path are GPLv2 only
-License:        GPLv2+ and GPLv2
+# libdvbv5, dvbv5 utils, ir-keytable are GPL-2.0-only
+# e.g. utils/cec-follower/cec-follower.cpp is (GPL-2.0-only OR BSD-3-Clause) 
+# utils/qvidcap/capture.cpp, paint.cpp are LicenseRef-Fedora-Public-Domain
+# utils/v4l2-sysfs-path/v4l2-sysfs-path.c is HPND-sell-variant
+License:        GPL-2.0-or-later AND GPL-2.0-only AND (GPL-2.0-only OR BSD-3-Clause) AND LicenseRef-Fedora-Public-Domain AND HPND-sell-variant
 URL:            http://www.linuxtv.org/downloads/v4l-utils/

-Source0:        http://linuxtv.org/downloads/v4l-utils/v4l-utils-%{version}.tar.bz2
+Source0:        http://linuxtv.org/downloads/v4l-utils/v4l-utils-%{version}.tar.xz

-BuildRequires: make
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
 BuildRequires:  gettext
 BuildRequires:  kernel-headers
 BuildRequires:  libjpeg-devel
+%if %{with qt5}
 BuildRequires:  qt5-qtbase-devel
+%endif
 BuildRequires:  systemd-devel
-
-# BPF decoder dependencies
-
-%define with_bpf 1
+# For /usr/share/pkgconfig/udev.pc
+BuildRequires:  systemd
+BuildRequires:  meson >= 0.56
+BuildRequires:  json-c-devel

 %if %{with_bpf}
-BuildRequires:  elfutils-libelf-devel clang
+BuildRequires:  clang
+BuildRequires:  elfutils-libelf-devel
+BuildRequires:  libbpf-devel
 %endif

 # For /lib/udev/rules.d ownership
-Requires:       udev
+Requires:       systemd-udev
 Requires:       libv4l%{?_isa} = %{version}-%{release}

 %description
@ -41,8 +50,8 @@ v4l2-sysfs-path.

 %package        devel-tools
 Summary:        Utilities for v4l2 / DVB driver development and debugging
-# decode_tm6000 is GPLv2 only
-License:        GPLv2+ and GPLv2
+# decode_tm6000 is GPL-2.0-only
+License:        GPL-2.0-or-later AND GPL-2.0-only
 Requires:       libv4l%{?_isa} = %{version}-%{release}

 %description    devel-tools
@ -50,19 +59,24 @@ Utilities for v4l2 / DVB driver authors: decode_tm6000, v4l2-compliance and
 v4l2-dbg.


+%if %{with qt5}
 %package -n     qv4l2
 Summary:        QT v4l2 test control and streaming test application
-License:        GPLv2+
+# utils/qv4l2/qv4l2.svg is CC-BY-SA-3.0
+License:        GPL-2.0-or-later AND CC-BY-SA-3.0
 Requires:       libv4l%{?_isa} = %{version}-%{release}

 %description -n qv4l2
 QT v4l2 test control and streaming test application.
+%endif


 %package -n     libv4l
 Summary:        Collection of video4linux support libraries 
-# Some of the decompression helpers are GPLv2, the rest is LGPLv2+
-License:        LGPLv2+ and GPLv2
+# Some of the decompression helpers are GPL-2.0-or-later, the rest is LGPL-2.1-or-later
+# lib/libv4lconvert/jidctflt.c and jpeg_memsrcdest.c are IJG-short
+# lib/libv4lconvert/helper-funcs.h and libv4lsyscall-priv.h are BSD-2-Clause
+License:        LGPL-2.1-or-later AND GPL-2.0-or-later AND IJG-short AND BSD-2-Clause
 URL:            http://hansdegoede.livejournal.com/3636.html

 %description -n libv4l
@ -85,14 +99,24 @@ application transparent libv4lconvert conversion where necessary.

 %package -n     libdvbv5
 Summary:        Libraries to control, scan and zap on Digital TV channels
-License:        GPLv2
+# /lib/include/libdvbv5/dvb-frontend.h is LGPL-2.1-or-later WITH Linux-syscall-note
+License:        LGPL-2.1-or-later AND LGPL-2.1-or-later WITH Linux-syscall-note

 %description -n libdvbv5
 Libraries to control, scan and zap on Digital TV channels

+
+%package -n libdvbv5-gconv
+Summary:        Gconv files with the charsets For Digital TV.
+License:        LGPL-2.1-or-later
+
+%description -n libdvbv5-gconv
+Some digital TV standards define their own charsets. Add library
+support for them: EN 300 468 and ARIB STD-B24
+
 %package -n     libv4l-devel
 Summary:        Development files for libv4l
-License:        LGPLv2+
+License:        LGPL-2.1-or-later AND GPL-2.0-or-later AND IJG-short AND BSD-2-Clause
 URL:            http://hansdegoede.livejournal.com/3636.html
 Requires:       libv4l%{?_isa} = %{version}-%{release}

@ -103,7 +127,7 @@ developing applications that use libv4l.

 %package -n     libdvbv5-devel
 Summary:        Development files for libdvbv5
-License:        GPLv2
+License:        LGPL-2.1-or-later AND LGPL-2.1-or-later WITH Linux-syscall-note
 Requires:       libdvbv5%{?_isa} = %{version}-%{release}

 %description -n libdvbv5-devel
@ -115,24 +139,25 @@ 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_build
-make doxygen-run
+%meson -Dbpf=auto -Ddoxygen-man=true -Ddoxygen-html=false \
+  %{!?with_qt5:-Dqv4l2=disabled -Dqvidcap=disabled -Dv4l2-tracer=disabled}
+
+#%if %{with_bpf}
+#%meson -Ddoxygen-man=true -Ddoxygen-html=false
+#%else
+#%meson -Dbpf=disabled -Ddoxygen-man=true -Ddoxygen-html=false
+#%endif

+#export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS"
+%meson_build

 %install
-%{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
-%make_install
+%meson_install
 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}/
-rm $RPM_BUILD_ROOT%{_mandir}/man3/_*3
+%if %{with qt5}
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
+%endif
 %find_lang %{name}
 %find_lang libdvbv5

@ -142,7 +167,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
 %ldconfig_scriptlets -n libdvbv5

 %files -f %{name}.lang
-%doc README
+%doc README.md
 %dir %{_sysconfdir}/rc_keymaps
 %config(noreplace) %{_sysconfdir}/rc_maps.cfg
 %{_udevrulesdir}/70-infrared.rules
@ -159,30 +184,35 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
 %{_bindir}/v4l2-sysfs-path
 %{_mandir}/man1/*.1*
 %{_mandir}/man5/*.5*
+%if %{with qt5}
 %exclude %{_mandir}/man1/qv4l2.1*
+%endif
 %exclude %{_mandir}/man1/v4l2-compliance.1*

 %files devel-tools
-%doc README
+%doc README.md
 %{_bindir}/decode_tm6000
 %{_bindir}/v4l2-compliance
 %{_mandir}/man1/v4l2-compliance.1*
 %{_sbindir}/v4l2-dbg

+%if %{with qt5}
 %files -n qv4l2
-%doc README
+%doc README.md
 %{_bindir}/qv4l2
 %{_bindir}/qvidcap
+%{_bindir}/v4l2-tracer
 %{_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*
+%endif

 %files -n libv4l
 %doc ChangeLog README.libv4l TODO
-%license COPYING.libv4l COPYING
+%license COPYING.libv4l COPYING.libdvbv5 COPYING
 %{_libdir}/libv4l
 %{_libdir}/libv4l*.so.*

@ -197,6 +227,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
 %license COPYING
 %{_libdir}/libdvbv5*.so.*

+%files -n libdvbv5-gconv
+%{_libdir}/gconv/*.so
+%{_libdir}/gconv/gconv-modules
+
 %files -n libdvbv5-devel
 %{_includedir}/libdvbv5/*.h
 %{_libdir}/libdvbv5*.so
@ -205,12 +239,47 @@ 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
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.26.1-3
+- Rebuilt for MSVSphere 10
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.26.1-3
+- Bump release for June 2024 mass rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Dec 13 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 1.26.1-1
+- Update to 1.26.1
+
+* Mon Dec 04 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 1.26.0-1
+- Update to 1.26.0
+
+* Wed Aug 16 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.25.0-4
+- Disable qv4l2 in RHEL 10 builds
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.25.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Mar 20 2023 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> 1.25.0-1
+- Updated to latest development branch
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sun Oct 23 2022 Hans de Goede <hdegoede@redhat.com> - 1.22.1-4
+- Fix libv4lconvert issues when stride > width (with some formats)
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Dec 08 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.22.1-1
+- Update to 1.22.1

-* 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
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild