From 59435e6c528ecca06decd86fa0d0249dc259b33c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 22 Nov 2018 11:26:30 -0200 Subject: [PATCH 1/5] Add dependencies required for building BPF code v4l-utils has now support for userspace BPF decoders, but that require some new dependencies to be added. Signed-off-by: Mauro Carvalho Chehab --- v4l-utils.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/v4l-utils.spec b/v4l-utils.spec index b6bc1b7..b1334b1 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -1,6 +1,6 @@ Name: v4l-utils Version: 1.16.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utilities for video4linux and DVB devices # libdvbv5, dvbv5 utils, ir-keytable and v4l2-sysfs-path are GPLv2 only License: GPLv2+ and GPLv2 @@ -16,6 +16,8 @@ BuildRequires: kernel-headers BuildRequires: libjpeg-devel BuildRequires: qt5-qtbase-devel BuildRequires: systemd-devel +# For BPF decoders +BuildRequires: elfutils-libelf-devel clang # For /lib/udev/rules.d ownership Requires: udev Requires: libv4l%{?_isa} = %{version}-%{release} @@ -193,6 +195,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop %changelog +* Thu Nov 22 2018 Mauro Carvalho Chehab 1.6.2-2 +- Add dependencies needed to build BPF code + * Mon Nov 19 2018 Peter Robinson 1.16.2-1 - New upstream release 1.16.2 From 48bdb0c452ddd137838c7e3ab65050bb1179b64d Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 22 Nov 2018 14:13:03 -0200 Subject: [PATCH 2/5] Only build BPF code on x86_64 and i686 Currently (v4l-utils version 1.16.2), trying to build the BPF decoders failed for non-x86 archs. While this is not solved, only enable building it on x86, as this is an optional feature anyway. Signed-off-by: Mauro Carvalho Chehab --- v4l-utils.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/v4l-utils.spec b/v4l-utils.spec index b1334b1..1258299 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -16,8 +16,19 @@ BuildRequires: kernel-headers BuildRequires: libjpeg-devel BuildRequires: qt5-qtbase-devel BuildRequires: systemd-devel -# For BPF decoders + +# BPF decoder dependencies + +%ifarch i686 x86_64 +%define with_bpf 1 +%else +%define with_bpf 0 +%endif + +%if %{with_bpf} BuildRequires: elfutils-libelf-devel clang +%endif + # For /lib/udev/rules.d ownership Requires: udev Requires: libv4l%{?_isa} = %{version}-%{release} From b2e1112ab6ca46d2c0c45802abf8f904bb44be37 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 22 Nov 2018 14:13:03 -0200 Subject: [PATCH 3/5] Update to version 1.16.3 That should address https://bugzilla.redhat.com/show_bug.cgi?id=1659055, as, on this version, BPF files are not marked as executable anymore, with would cause an issue with Fedora RPM, as pointed at: https://bugzilla.redhat.com/show_bug.cgi?id=1659047 With this, we should be able to build with BPF on all supported archs. Signed-off-by: Mauro Carvalho Chehab --- sources | 2 +- v4l-utils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9483459..b67ce2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v4l-utils-1.16.2.tar.bz2) = e74a422bf22ca47533c28680ce21169de428cf0a4718bbd20e51d4c7ab6327b1894edf76caade3cc38c1eeacb2a479940c7a8fcd4b79b51ba8a2df2fde1d34df +SHA512 (v4l-utils-1.16.3.tar.bz2) = 404672d18d94861c6957ea3a15a6a48f238d3859940810952a5a8cc33b57f1a360d1a19af28405c01b073c0ece90c5995a71dbe6544b30bdb8eace7daeb4bc0b diff --git a/v4l-utils.spec b/v4l-utils.spec index 1258299..442c43d 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -1,5 +1,5 @@ Name: v4l-utils -Version: 1.16.2 +Version: 1.16.3 Release: 2%{?dist} Summary: Utilities for video4linux and DVB devices # libdvbv5, dvbv5 utils, ir-keytable and v4l2-sysfs-path are GPLv2 only @@ -206,6 +206,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop %changelog +* Mon Dec 17 2018 Mauro Carvalho Chehab 1.6.3-1 +- Updated to new fix release, with should solve BPF protocol packaging issues + * Thu Nov 22 2018 Mauro Carvalho Chehab 1.6.2-2 - Add dependencies needed to build BPF code From c6cfa971996a770a66a59201a20dc4ce256a7ab2 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 17 Dec 2018 11:52:07 -0200 Subject: [PATCH 4/5] Allow building BPF on all archs Signed-off-by: Mauro Carvalho Chehab --- v4l-utils.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/v4l-utils.spec b/v4l-utils.spec index 442c43d..a1dffe6 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -1,6 +1,6 @@ Name: v4l-utils Version: 1.16.3 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Utilities for video4linux and DVB devices # libdvbv5, dvbv5 utils, ir-keytable and v4l2-sysfs-path are GPLv2 only License: GPLv2+ and GPLv2 @@ -19,11 +19,7 @@ BuildRequires: systemd-devel # BPF decoder dependencies -%ifarch i686 x86_64 %define with_bpf 1 -%else -%define with_bpf 0 -%endif %if %{with_bpf} BuildRequires: elfutils-libelf-devel clang From 5f8e194dfa2d4c1ee0587039c5eb02b97ca28275 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 2 Sep 2019 06:40:42 -0300 Subject: [PATCH 5/5] Update to version 1.16.7 with NIT table fixes Signed-off-by: Mauro Carvalho Chehab --- sources | 2 +- v4l-utils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b67ce2b..2c72f79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v4l-utils-1.16.3.tar.bz2) = 404672d18d94861c6957ea3a15a6a48f238d3859940810952a5a8cc33b57f1a360d1a19af28405c01b073c0ece90c5995a71dbe6544b30bdb8eace7daeb4bc0b +SHA512 (v4l-utils-1.16.7.tar.bz2) = 898b41cef7284f5796ec89c55ef08ecb3ec3fa3c5bf572ef30478be056fe9027b422b2d2513b906549e747e6a490e3211c6d2f8f1cade340b18185cc18b0684d diff --git a/v4l-utils.spec b/v4l-utils.spec index a1dffe6..5062fc3 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -1,5 +1,5 @@ Name: v4l-utils -Version: 1.16.3 +Version: 1.16.7 Release: 1%{?dist} Summary: Utilities for video4linux and DVB devices # libdvbv5, dvbv5 utils, ir-keytable and v4l2-sysfs-path are GPLv2 only @@ -202,6 +202,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop %changelog +* Mon Sep 02 2019 Mauro Carvalho Chehab 1.6.7-1 +- Updated to new fix release with NIT parsing fix + * Mon Dec 17 2018 Mauro Carvalho Chehab 1.6.3-1 - Updated to new fix release, with should solve BPF protocol packaging issues