Compare commits

...

No commits in common. 'c10-beta' and 'c9' have entirely different histories.
c10-beta ... c9

2
.gitignore vendored

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

@ -1 +1 @@
b2abb01e2522a65f1ed5f0e792ea0a6657fb161a SOURCES/v4l-utils-1.26.1.tar.xz 91128695040c694c3998540ca3b710ca9c8262e1 SOURCES/v4l-utils-1.20.0.tar.bz2

@ -1,45 +1,36 @@
%bcond qt5 %[%{undefined rhel} || 0%{?rhel} < 10] # workaround for GUILE exceptions bz#1801144
%global __brp_strip_lto %{nil}
# BPF decoder dependencies
%define with_bpf 1
Name: v4l-utils Name: v4l-utils
Version: 1.20.0
Version: 1.26.1 Release: 5%{?dist}
Release: 3%{?dist}
Summary: Utilities for video4linux and DVB devices Summary: Utilities for video4linux and DVB devices
# libdvbv5, dvbv5 utils, ir-keytable are GPL-2.0-only # libdvbv5, dvbv5 utils, ir-keytable and v4l2-sysfs-path are GPLv2 only
# e.g. utils/cec-follower/cec-follower.cpp is (GPL-2.0-only OR BSD-3-Clause) License: GPLv2+ and GPLv2
# 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/ 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
BuildRequires: make
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: gettext BuildRequires: gettext
BuildRequires: kernel-headers BuildRequires: kernel-headers
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
%if %{with qt5}
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
%endif
BuildRequires: systemd-devel BuildRequires: systemd-devel
# For /usr/share/pkgconfig/udev.pc
BuildRequires: systemd # BPF decoder dependencies
BuildRequires: meson >= 0.56
BuildRequires: json-c-devel %define with_bpf 1
%if %{with_bpf} %if %{with_bpf}
BuildRequires: clang BuildRequires: elfutils-libelf-devel clang
BuildRequires: elfutils-libelf-devel
BuildRequires: libbpf-devel
%endif %endif
# For /lib/udev/rules.d ownership # For /lib/udev/rules.d ownership
Requires: systemd-udev Requires: udev
Requires: libv4l%{?_isa} = %{version}-%{release} Requires: libv4l%{?_isa} = %{version}-%{release}
%description %description
@ -50,8 +41,8 @@ v4l2-sysfs-path.
%package devel-tools %package devel-tools
Summary: Utilities for v4l2 / DVB driver development and debugging Summary: Utilities for v4l2 / DVB driver development and debugging
# decode_tm6000 is GPL-2.0-only # decode_tm6000 is GPLv2 only
License: GPL-2.0-or-later AND GPL-2.0-only License: GPLv2+ and GPLv2
Requires: libv4l%{?_isa} = %{version}-%{release} Requires: libv4l%{?_isa} = %{version}-%{release}
%description devel-tools %description devel-tools
@ -59,24 +50,19 @@ Utilities for v4l2 / DVB driver authors: decode_tm6000, v4l2-compliance and
v4l2-dbg. v4l2-dbg.
%if %{with qt5}
%package -n qv4l2 %package -n qv4l2
Summary: QT v4l2 test control and streaming test application Summary: QT v4l2 test control and streaming test application
# utils/qv4l2/qv4l2.svg is CC-BY-SA-3.0 License: GPLv2+
License: GPL-2.0-or-later AND CC-BY-SA-3.0
Requires: libv4l%{?_isa} = %{version}-%{release} Requires: libv4l%{?_isa} = %{version}-%{release}
%description -n qv4l2 %description -n qv4l2
QT v4l2 test control and streaming test application. QT v4l2 test control and streaming test application.
%endif
%package -n libv4l %package -n libv4l
Summary: Collection of video4linux support libraries 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 # Some of the decompression helpers are GPLv2, the rest is LGPLv2+
# lib/libv4lconvert/jidctflt.c and jpeg_memsrcdest.c are IJG-short License: LGPLv2+ and GPLv2
# 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 URL: http://hansdegoede.livejournal.com/3636.html
%description -n libv4l %description -n libv4l
@ -99,24 +85,14 @@ application transparent libv4lconvert conversion where necessary.
%package -n libdvbv5 %package -n libdvbv5
Summary: Libraries to control, scan and zap on Digital TV channels 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: GPLv2
License: LGPL-2.1-or-later AND LGPL-2.1-or-later WITH Linux-syscall-note
%description -n libdvbv5 %description -n libdvbv5
Libraries to control, scan and zap on Digital TV channels 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 %package -n libv4l-devel
Summary: Development files for libv4l 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 URL: http://hansdegoede.livejournal.com/3636.html
Requires: libv4l%{?_isa} = %{version}-%{release} Requires: libv4l%{?_isa} = %{version}-%{release}
@ -127,7 +103,7 @@ developing applications that use libv4l.
%package -n libdvbv5-devel %package -n libdvbv5-devel
Summary: Development files for libdvbv5 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} Requires: libdvbv5%{?_isa} = %{version}-%{release}
%description -n libdvbv5-devel %description -n libdvbv5-devel
@ -139,25 +115,24 @@ files for developing applications that use libdvbv5.
%autosetup -p1 %autosetup -p1
%build %build
%meson -Dbpf=auto -Ddoxygen-man=true -Ddoxygen-html=false \ export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS"
%{!?with_qt5:-Dqv4l2=disabled -Dqvidcap=disabled -Dv4l2-tracer=disabled} %configure --disable-static --enable-libdvbv5 --enable-doxygen-man
# Don't use rpath!
#%if %{with_bpf} sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
#%meson -Ddoxygen-man=true -Ddoxygen-html=false sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
#%else %make_build
#%meson -Dbpf=disabled -Ddoxygen-man=true -Ddoxygen-html=false make doxygen-run
#%endif
#export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS"
%meson_build
%install %install
%meson_install %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
%make_install
find $RPM_BUILD_ROOT -name '*.la' -delete find $RPM_BUILD_ROOT -name '*.la' -delete
rm -f $RPM_BUILD_ROOT%{_libdir}/{v4l1compat.so,v4l2convert.so} 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 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
%endif
%find_lang %{name} %find_lang %{name}
%find_lang libdvbv5 %find_lang libdvbv5
@ -167,7 +142,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
%ldconfig_scriptlets -n libdvbv5 %ldconfig_scriptlets -n libdvbv5
%files -f %{name}.lang %files -f %{name}.lang
%doc README.md %doc README
%dir %{_sysconfdir}/rc_keymaps %dir %{_sysconfdir}/rc_keymaps
%config(noreplace) %{_sysconfdir}/rc_maps.cfg %config(noreplace) %{_sysconfdir}/rc_maps.cfg
%{_udevrulesdir}/70-infrared.rules %{_udevrulesdir}/70-infrared.rules
@ -184,35 +159,30 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
%{_bindir}/v4l2-sysfs-path %{_bindir}/v4l2-sysfs-path
%{_mandir}/man1/*.1* %{_mandir}/man1/*.1*
%{_mandir}/man5/*.5* %{_mandir}/man5/*.5*
%if %{with qt5}
%exclude %{_mandir}/man1/qv4l2.1* %exclude %{_mandir}/man1/qv4l2.1*
%endif
%exclude %{_mandir}/man1/v4l2-compliance.1* %exclude %{_mandir}/man1/v4l2-compliance.1*
%files devel-tools %files devel-tools
%doc README.md %doc README
%{_bindir}/decode_tm6000 %{_bindir}/decode_tm6000
%{_bindir}/v4l2-compliance %{_bindir}/v4l2-compliance
%{_mandir}/man1/v4l2-compliance.1* %{_mandir}/man1/v4l2-compliance.1*
%{_sbindir}/v4l2-dbg %{_sbindir}/v4l2-dbg
%if %{with qt5}
%files -n qv4l2 %files -n qv4l2
%doc README.md %doc README
%{_bindir}/qv4l2 %{_bindir}/qv4l2
%{_bindir}/qvidcap %{_bindir}/qvidcap
%{_bindir}/v4l2-tracer
%{_datadir}/applications/qv4l2.desktop %{_datadir}/applications/qv4l2.desktop
%{_datadir}/applications/qvidcap.desktop %{_datadir}/applications/qvidcap.desktop
%{_datadir}/icons/hicolor/*/apps/qv4l2.* %{_datadir}/icons/hicolor/*/apps/qv4l2.*
%{_datadir}/icons/hicolor/*/apps/qvidcap.* %{_datadir}/icons/hicolor/*/apps/qvidcap.*
%{_mandir}/man1/qv4l2.1* %{_mandir}/man1/qv4l2.1*
%{_mandir}/man1/qvidcap.1* %{_mandir}/man1/qvidcap.1*
%endif
%files -n libv4l %files -n libv4l
%doc ChangeLog README.libv4l TODO %doc ChangeLog README.libv4l TODO
%license COPYING.libv4l COPYING.libdvbv5 COPYING %license COPYING.libv4l COPYING
%{_libdir}/libv4l %{_libdir}/libv4l
%{_libdir}/libv4l*.so.* %{_libdir}/libv4l*.so.*
@ -227,10 +197,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
%license COPYING %license COPYING
%{_libdir}/libdvbv5*.so.* %{_libdir}/libdvbv5*.so.*
%files -n libdvbv5-gconv
%{_libdir}/gconv/*.so
%{_libdir}/gconv/gconv-modules
%files -n libdvbv5-devel %files -n libdvbv5-devel
%{_includedir}/libdvbv5/*.h %{_includedir}/libdvbv5/*.h
%{_libdir}/libdvbv5*.so %{_libdir}/libdvbv5*.so
@ -239,44 +205,12 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop
%changelog %changelog
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.26.1-3 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.20.0-5
- Bump release for June 2024 mass rebuild - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* 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 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.20.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - 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 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save