From a84293a4c11627713306ca8734c6144ed2d56226 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 4 Dec 2023 13:10:17 +0000 Subject: [PATCH] 1.26.0 --- .gitignore | 1 + sources | 2 +- v4l-utils.spec | 19 ++++++++++++------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 600bda2..cfd48f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /v4l-utils-*.tar.bz2 /v4l-utils-1.25.0.tar.xz +/v4l-utils-1.26.0.tar.xz diff --git a/sources b/sources index dd0d379..8b4e738 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v4l-utils-1.25.0.tar.xz) = 7c585526f6d8cf129e5ea03cc5128a468258bed79156a514933b131d500bc8ffb242065b8d8a0bb424c19be3d417989d52badcd2782d537055ba18fd8d4b5efd +SHA512 (v4l-utils-1.26.0.tar.xz) = 7820a91beb5cfc8e3ecf54145f2503fbbbf879abf1551d5bba5d8454f5a93242daaa51ff4636959d3434aa0d352bdf35afcd5f56e0eb9ab50c8191e8f6283f4a diff --git a/v4l-utils.spec b/v4l-utils.spec index af8b904..3bd0488 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -1,9 +1,12 @@ %bcond qt5 %[%{undefined rhel} || 0%{?rhel} < 10] +# BPF decoder dependencies +%define with_bpf 1 + Name: v4l-utils -Version: 1.25.0 -Release: 4%{?dist} +Version: 1.26.0 +Release: 1%{?dist} Summary: Utilities for video4linux and DVB devices # libdvbv5, dvbv5 utils, ir-keytable and v4l2-sysfs-path are GPLv2 only License: GPL-2.0-or-later AND GPL-2.0-only @@ -26,11 +29,10 @@ BuildRequires: systemd BuildRequires: meson >= 0.56 BuildRequires: json-c-devel -# BPF decoder dependencies -%define with_bpf 1 - %if %{with_bpf} -BuildRequires: elfutils-libelf-devel clang libbpf-devel +BuildRequires: clang +BuildRequires: elfutils-libelf-devel +BuildRequires: libbpf-devel %endif # For /lib/udev/rules.d ownership @@ -129,6 +131,7 @@ files for developing applications that use libdvbv5. %prep %autosetup -p1 +%build %meson -Dbpf=auto -Ddoxygen-man=true -Ddoxygen-html=false \ %{!?with_qt5:-Dqv4l2=disabled -Dqvidcap=disabled -Dv4l2-tracer=disabled} @@ -138,7 +141,6 @@ files for developing applications that use libdvbv5. #%meson -Dbpf=disabled -Ddoxygen-man=true -Ddoxygen-html=false #%endif -%build #export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" %meson_build @@ -230,6 +232,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop %changelog +* Mon Dec 04 2023 Peter Robinson - 1.26.0-1 +- Update to 1.26.0 + * Wed Aug 16 2023 Yaakov Selkowitz - 1.25.0-4 - Disable qv4l2 in RHEL 10 builds