2 p.m.
commit 00f24232d34443b62646f922d19fc798e6c7df5e
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Fri Jun 28 09:32:02 2024 +0200
Update to commit 1baecb1a466ad610042e437d963cb38a4cfcf592
Switch to using hal-adaptor to dispatch between different libcamhal builds
.gitignore | 1 +
gstreamer1-plugins-icamerasrc.rpmlintrc | 2 ++
gstreamer1-plugins-icamerasrc.spec | 23 ++++++++++++++++-------
sources | 2 +-
4 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b0833dd..2f618d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/icamerasrc-3b7cdb9.tar.gz
/icamerasrc-528a6f1.tar.gz
+/icamerasrc-1baecb1.tar.gz
diff --git a/gstreamer1-plugins-icamerasrc.rpmlintrc
b/gstreamer1-plugins-icamerasrc.rpmlintrc
new file mode 100644
index 0000000..f4a30dd
--- /dev/null
+++ b/gstreamer1-plugins-icamerasrc.rpmlintrc
@@ -0,0 +1,2 @@
+addFilter("W: no-documentation")
+addFilter("E: incorrect-fsf-address")
diff --git a/gstreamer1-plugins-icamerasrc.spec b/gstreamer1-plugins-icamerasrc.spec
index 5825d7b..2872a81 100644
--- a/gstreamer1-plugins-icamerasrc.spec
+++ b/gstreamer1-plugins-icamerasrc.spec
@@ -1,17 +1,23 @@
-%global commit 528a6f177732def4d5ebc17927220d8823bc8fdc
-%global commitdate 20231023
+%global commit 1baecb1a466ad610042e437d963cb38a4cfcf592
+%global commitdate 20240606
%global shortcommit %(c=%{commit}; echo ${c:0:7})
+# The gstreamer provides generator causes libhal_adaptor.so init/constructor
+# function to run which fails on systems without an IPU6, do not run it on
+# the gstreamer plugin
+%global __provides_exclude_from ^(%{_libdir}/gstreamer-1\\.0/libgsticamerasrc\\.so)$
+
Name: gstreamer1-plugins-icamerasrc
Summary: GStreamer 1.0 Intel IPU6 camera plug-in
Version: 0.0
-Release: 9.%{commitdate}git%{shortcommit}%{?dist}
+Release: 10.%{commitdate}git%{shortcommit}%{?dist}
License: LGPLv2
+URL: https://github.com/intel/icamerasrc/tree/icamerasrc_slim_api
Source0:
https://github.com/intel/icamerasrc/archive/%{commit}/icamerasrc-%{shortc...
BuildRequires: ipu6-camera-bins-devel
-BuildRequires: ipu6-camera-hal-devel
+BuildRequires: ipu6-camera-hal-devel >= 0.0-18
BuildRequires: gcc
BuildRequires: g++
BuildRequires: libdrm-devel
@@ -43,8 +49,7 @@ autoreconf --verbose --force --install --make
%build
export CHROME_SLIM_CAMHAL=ON
export STRIP_VIRTUAL_CHANNEL_CAMHAL=ON
-export PKG_CONFIG_PATH="/usr/lib64/pkgconfig"
-%configure
+%configure --with-haladaptor
%make_build
%install
@@ -62,6 +67,10 @@ export PKG_CONFIG_PATH="/usr/lib64/pkgconfig"
%{_libdir}/pkgconfig/*
%changelog
+* Mon Jun 24 2024 Hans de Goede <hdegoede(a)redhat.com> - 0.0-10.20240606git1baecb1
+- Update to commit 1baecb1a466ad610042e437d963cb38a4cfcf592
+- Switch to using hal-adaptor to dispatch between different libcamhal builds
+
* Fri Mar 15 2024 Kate Hsuan <hpa(a)redhat.com> - 0.0-9.20231023git528a6f1
- Update to the latest upstream commit
@@ -73,7 +82,7 @@ export PKG_CONFIG_PATH="/usr/lib64/pkgconfig"
* Fri Feb 17 2023 Kate Hsuan <hpa(a)redhat.com> - 0.0-5.20220926git3b7cdb9
- A few minor revisions includes
-- Removed unnecessary %dir
+- Removed unnecessary %%dir
- Removed .so file from devel package
* Wed Feb 15 2023 Kate Hsuan <hpa(a)redhat.com> - 0.0-4.20220926git3b7cdb9
diff --git a/sources b/sources
index 6c9353f..4085798 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (icamerasrc-528a6f1.tar.gz) =
f0b8f8762efe6dd97c7eba8a31dbc7edaa8c26c64e8519905fb226f23a5cec8a2b294fea5ab977f447fdd19d5182808e5b3ff431da8820a31c1904410bc2ef27
+SHA512 (icamerasrc-1baecb1.tar.gz) =
ae0e700fc6d65b6b86e4fa984841c7081ccd0177dd10177812fc97dbdb1ec8abdda59ba4a82fc393936ebb26e5743bbc3fd139a4ac711619f5c8170ca0888ecb