Compare commits

...

No commits in common. "c10s" and "c8" have entirely different histories.
c10s ... c8

6 changed files with 61 additions and 194 deletions

5
.gitignore vendored
View File

@ -1,4 +1 @@
/v4l-utils-*.tar.bz2
/v4l-utils-1.25.0.tar.xz
/v4l-utils-1.26.0.tar.xz
/v4l-utils-1.26.1.tar.xz
SOURCES/v4l-utils-1.14.2.tar.bz2

1
.v4l-utils.metadata Normal file
View File

@ -0,0 +1 @@
e723e9ec2d2ca3ccfcaf87d4a52160f601cab3ab SOURCES/v4l-utils-1.14.2.tar.bz2

View File

@ -0,0 +1,22 @@
--- 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>

View File

@ -1,21 +1,13 @@
%bcond qt5 %[%{undefined rhel} || 0%{?rhel} < 10]
# BPF decoder dependencies
%define with_bpf 1
Name: v4l-utils
Version: 1.26.1
Release: 5%{?dist}
Version: 1.14.2
Release: 3%{?dist}
Summary: Utilities for video4linux and DVB devices
# 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
# 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.xz
Source0: http://linuxtv.org/downloads/v4l-utils/v4l-utils-%{version}.tar.bz2
Patch0: v4l-utils-sysmacros.patch
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
@ -23,23 +15,10 @@ BuildRequires: doxygen
BuildRequires: gettext
BuildRequires: kernel-headers
BuildRequires: libjpeg-devel
%if %{with qt5}
BuildRequires: qt5-qtbase-devel
%endif
BuildRequires: systemd-devel
# For /usr/share/pkgconfig/udev.pc
BuildRequires: systemd
BuildRequires: meson >= 0.56
BuildRequires: json-c-devel
%if %{with_bpf}
BuildRequires: clang
BuildRequires: elfutils-libelf-devel
BuildRequires: libbpf-devel
%endif
# For /lib/udev/rules.d ownership
Requires: systemd-udev
Requires: udev
Requires: libv4l%{?_isa} = %{version}-%{release}
%description
@ -50,8 +29,8 @@ v4l2-sysfs-path.
%package devel-tools
Summary: Utilities for v4l2 / DVB driver development and debugging
# decode_tm6000 is GPL-2.0-only
License: GPL-2.0-or-later AND GPL-2.0-only
# decode_tm6000 is GPLv2 only
License: GPLv2+ and GPLv2
Requires: libv4l%{?_isa} = %{version}-%{release}
%description devel-tools
@ -59,24 +38,19 @@ 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
# utils/qv4l2/qv4l2.svg is CC-BY-SA-3.0
License: GPL-2.0-or-later AND CC-BY-SA-3.0
License: GPLv2+
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 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
# Some of the decompression helpers are GPLv2, the rest is LGPLv2+
License: LGPLv2+ and GPLv2
URL: http://hansdegoede.livejournal.com/3636.html
%description -n libv4l
@ -99,24 +73,14 @@ application transparent libv4lconvert conversion where necessary.
%package -n libdvbv5
Summary: Libraries to control, scan and zap on Digital TV channels
# /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
License: GPLv2
%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: LGPL-2.1-or-later AND GPL-2.0-or-later AND IJG-short AND BSD-2-Clause
License: LGPLv2+
URL: http://hansdegoede.livejournal.com/3636.html
Requires: libv4l%{?_isa} = %{version}-%{release}
@ -127,7 +91,7 @@ developing applications that use libv4l.
%package -n libdvbv5-devel
Summary: Development files for libdvbv5
License: LGPL-2.1-or-later AND LGPL-2.1-or-later WITH Linux-syscall-note
License: GPLv2
Requires: libdvbv5%{?_isa} = %{version}-%{release}
%description -n libdvbv5-devel
@ -139,35 +103,37 @@ files for developing applications that use libdvbv5.
%autosetup -p1
%build
%meson -Dbpf=auto -Ddoxygen-man=true -Ddoxygen-html=false \
%{!?with_qt5:-Dqv4l2=disabled -Dqvidcap=disabled -Dv4l2-tracer=disabled}
%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 doxygen-run
#%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
%meson_install
find $RPM_BUILD_ROOT -name '*.la' -delete
%{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
%make_install
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
rm -f $RPM_BUILD_ROOT%{_libdir}/{v4l1compat.so,v4l2convert.so}
%if %{with qt5}
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
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
%endif
%find_lang %{name}
%find_lang libdvbv5
%ldconfig_scriptlets -n libv4l
%post -n libv4l -p /sbin/ldconfig
%ldconfig_scriptlets -n libdvbv5
%postun -n libv4l -p /sbin/ldconfig
%post -n libdvbv5 -p /sbin/ldconfig
%postun -n libdvbv5 -p /sbin/ldconfig
%files -f %{name}.lang
%doc README.md
%doc README
%dir %{_sysconfdir}/rc_keymaps
%config(noreplace) %{_sysconfdir}/rc_maps.cfg
%{_udevrulesdir}/70-infrared.rules
@ -183,36 +149,26 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
%{_bindir}/v4l2-ctl
%{_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.md
%doc README
%{_bindir}/decode_tm6000
%{_bindir}/v4l2-compliance
%{_mandir}/man1/v4l2-compliance.1*
%{_sbindir}/v4l2-dbg
%if %{with qt5}
%files -n qv4l2
%doc README.md
%doc README
%{_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.libdvbv5 COPYING
%license COPYING.libv4l COPYING
%{_libdir}/libv4l
%{_libdir}/libv4l*.so.*
@ -227,10 +183,6 @@ 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
@ -239,104 +191,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
%changelog
* Thu Dec 11 2025 Tomas Pelka <tpelka@redhat.com> - 1.26.1-5
- Rebuilt for CRB inclusion
Resolves: RHEL-135109
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.26.1-4
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* 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 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
* 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

View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -1 +0,0 @@
SHA512 (v4l-utils-1.26.1.tar.xz) = a3b12b311977afec410db8b430696e923a24e04f003a5891cc77ddeb667d0b98666a06d31a439c95ce57d9e9c9c2593c5e9dd9e7cf2be002adb95db5b8f00ac8