diff --git a/v4l-utils-1.24.1.tar.bz2 b/v4l-utils-1.24.1.tar.bz2 deleted file mode 100644 index 5050a3ae97435b389f06d127ef4f0847e8bf7030..0000000000000000000000000000000000000000 Binary files a/v4l-utils-1.24.1.tar.bz2 and /dev/null differ diff --git a/v4l-utils-1.26.1.tar.xz b/v4l-utils-1.26.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..dc9e7667c09225a64954cf751e70edd7b71fc298 Binary files /dev/null and b/v4l-utils-1.26.1.tar.xz differ diff --git a/v4l-utils.spec b/v4l-utils.spec index d5551e279771771a05981fafc57c7b95a2b57066..ba2aaf6e9f98c703d1829bb671bc53769ab2764c 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -1,21 +1,21 @@ -%define anolis_release 2 +%define anolis_release 1 %bcond_without bpf Name: v4l-utils -Version: 1.24.1 +Version: 1.26.1 Release: %{anolis_release}%{?dist} Summary: Utilities for video4linux and DVB devices License: GPLv2+ and GPLv2 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 Patch1: 0001-utils-v4l2-TPG-Update-use-of-typeof.patch -BuildRequires: make kernel-headers -BuildRequires: alsa-lib-devel desktop-file-utils qt5-qtbase-devel -BuildRequires: doxygen gettext systemd-devel libjpeg-devel +BuildRequires: kernel-headers systemd +BuildRequires: alsa-lib-devel desktop-file-utils qt5-qtbase-devel json-c-devel +BuildRequires: doxygen gettext systemd-devel meson >= 0.56 libjpeg-devel %if %{with bpf} -BuildRequires: elfutils-libelf-devel clang +BuildRequires: elfutils-libelf-devel clang libbpf-devel %endif Requires: systemd-udev libv4l = %{EVR} @@ -90,29 +90,19 @@ that use libdvbv5. %prep %autosetup -p1 +sed -i "/subdir('bpf_protocols')/d" utils/keytable/meson.build %build -export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" -%configure --disable-static \ - --enable-libdvbv5 \ - --enable-doxygen-man \ - --with-udevdir="/usr/lib/udev/" -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 +%meson_build %install -%make_install +%meson_install find %{buildroot} -name '*.la' -delete rm -f %{buildroot}%{_libdir}/{v4l1compat.so,v4l2convert.so} - -mkdir -p %{buildroot}%{_mandir}/man3/ -cp -arv %{_builddir}/%{name}-%{version}/doxygen-doc/man/man3 %{buildroot}%{_mandir}/ -rm %{buildroot}%{_mandir}/man3/_*3 -install -p %{_builddir}/%{name}-%{version}/lib/libdvbv5/README %{_builddir}/%{name}-%{version}/README.libdvbv5 - +mkdir $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.d +mv $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.d/libdvbv5.conf desktop-file-validate %{buildroot}%{_datadir}/applications/qv4l2.desktop %find_lang %{name} %find_lang libdvbv5 @@ -141,6 +131,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/qv4l2.desktop %{_bindir}/rds-ctl %{_bindir}/v4l2-ctl %{_bindir}/v4l2-sysfs-path +%{_bindir}/v4l2-tracer +%{_libdir}/gconv/*.so +%{_libdir}/gconv/gconv-modules.d/libdvbv5.conf %dir %{abidir} %{abidir}/cx18-ctl-option.list @@ -159,6 +152,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/qv4l2.desktop %{abidir}/rds-ctl-option.list %{abidir}/v4l2-ctl-option.list %{abidir}/v4l2-sysfs-path-option.list +%{abidir}/ARIB-STD-B24.dump +%{abidir}/EN300-468-TAB00.dump +%{abidir}/v4l2-tracer-option.list %{_mandir}/man1/*.1* %{_mandir}/man5/*.5* @@ -221,6 +217,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/qv4l2.desktop %{_mandir}/man3/*.3* %changelog +* Fri Mar 21 2025 mgb01105731 - 1.26.1-1 +- Update to 1.26.1 from 1.24.1 +- switch to build using meson + * Fri Apr 14 2023 Yuanhong Peng - 1.24.1-2 - Refactor the specfile