Fix: v4l2-relayd and ipu6-camera-bins builds (#2953)

* Delete: v4l2-relayd/update.rhai

This project hasn't had an update in ages and GitLab makes fetching commits a pain. I can figure something else out but it is not urgent.

Signed-off-by: Gil <[email protected]>

* Fix: Put the version back

Signed-off-by: Gil <[email protected]>

* Fix (v4l2-relayd): Drop upstreamed patch

* Fix (ipu6-camera-bins): Completly redo spec

* Fix: Try this for update.rhai?

Signed-off-by: Gil <[email protected]>

* Update v4l2-relayd.spec

Signed-off-by: Gil <[email protected]>

---------

Signed-off-by: Gil <[email protected]>

anda/lib/ipu6-camera-bins/anda.hcl

@@ -1,4 +1,5 @@
 project pkg {
+   arches = ["x86_64"]
   rpm {
     spec = "ipu6-camera-bins.spec"
   }

anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec

@@ -12,15 +12,14 @@ URL:            https://github.com/intel/ipu6-camera-bins
 Source0:        https://github.com/intel/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  chrpath
-BuildRequires:  patchelf
-ExclusiveArch:  x86_64
 #Requires:       gstreamer1-plugin-icamerasrc
 Requires:       v4l2-relayd
 Requires:       intel-ipu6-kmod
 Requires:       intel-vsc-firmware >= 20240513
 Obsoletes:      ipu6-camera-bins-firmware < 0.0-11
 ### For Akmods package
 Provides:       intel-ipu6-kmod-common = %{version}
+ExclusiveArch:  x86_64
 
 %description
 Provides binaries for Intel IPU6, including libraries and firmware.
@@ -35,50 +34,31 @@ This provides the header files for IPU6 development.
 
 %prep
 %setup -q -n %{name}-%{commit}
-for i in ipu_tgl ipu_adl ipu_mtl; do
-  chrpath --delete lib/$i/*.so
-done
+chrpath --delete lib/*.so.*
+sed -i \
+    -e "s|libdir=\${exec_prefix}/lib|libdir=\${prefix}/%{_lib}|g" \
+    lib/pkgconfig/*.pc
 
 %build
 
 %install
-mkdir -p %{buildroot}%{_includedir}
-for i in ipu_tgl ipu_adl ipu_mtl; do
-  mkdir -p %{buildroot}%{_libdir}/$i
-  cp -pr include/$i %{buildroot}%{_includedir}
-  cp -pr lib/$i/lib* lib/$i/pkgconfig %{buildroot}%{_libdir}/$i
-  patchelf --set-rpath %{_libdir}/$i %{buildroot}%{_libdir}/$i/*.so
-  sed -i \
-    -e "s|libdir=\${prefix}/lib/$i|libdir=%{_libdir}/$i|g" \
-    %{buildroot}%{_libdir}/$i/pkgconfig/*.pc
-done
+mkdir -p %{buildroot}%{_includedir}/
+mkdir -p %{buildroot}%{_libdir}/
+cp -pr include/* %{buildroot}%{_includedir}/
+cp -pr lib/lib* lib/pkgconfig %{buildroot}%{_libdir}/
+chmod 755 %{buildroot}%{_libdir}/$target/*.so*
 
 
 %files
 %license LICENSE
-%dir %{_libdir}/ipu_tgl
-%dir %{_libdir}/ipu_adl
-%dir %{_libdir}/ipu_mtl
-%{_libdir}/ipu_tgl/*.so*
-%{_libdir}/ipu_adl/*.so*
-%{_libdir}/ipu_mtl/*.so*
+%doc README.md SECURITY.md
+%{_libdir}/*.so*
 
 %files devel
-%dir %{_includedir}/ipu_tgl
-%dir %{_includedir}/ipu_adl
-%dir %{_includedir}/ipu_mtl
-%dir %{_libdir}/ipu_tgl/pkgconfig
-%dir %{_libdir}/ipu_adl/pkgconfig
-%dir %{_libdir}/ipu_mtl/pkgconfig
-%{_includedir}/ipu_tgl/*
-%{_includedir}/ipu_adl/*
-%{_includedir}/ipu_mtl/*
-%{_libdir}/ipu_tgl/pkgconfig/*
-%{_libdir}/ipu_adl/pkgconfig/*
-%{_libdir}/ipu_mtl/pkgconfig/*
-%{_libdir}/ipu_tgl/*.a
-%{_libdir}/ipu_adl/*.a
-%{_libdir}/ipu_mtl/*.a
+%{_includedir}/*
+%{_libdir}/pkgconfig/*
+%{_libdir}/*.a
+%{_libdir}/*.so*
 
 
 %changelog

anda/system/v4l2-relayd/update.rhai

@@ -1 +1,5 @@
-rpm.version(gitlab("24306684"));
+rpm.global("commit", gitlab_commit("gitlab.com", "24306684", "main"));
+if rpm.changed() {
+	rpm.global("commit_date", date());
+	rpm.release();
+}

anda/system/v4l2-relayd/v4l2-relayd.spec

@@ -1,17 +1,14 @@
-%global commit 2e4d5c9ba53bfe8cfe16ea91932c8e5ecb090a87
-%global commitdate 20220126
+%global commit 35a06d89747ff31fbaabf744b7dae585bfa86723
+%global commit_date 20220126
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           v4l2-relayd
 Summary:        Utils for relaying the video stream between two video devices
-Version:        
+Version:        %{commit_date}.%{shortcommit}
 Release:        1%?dist
 License:        GPL-2.0-only
 Source0:        https://gitlab.com/vicamo/v4l2-relayd//-/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 Source1:        v4l2-relayd.preset
-### RPM Fusion | [v4l2-relayd] Set output stream to I420
-## https://lists.rpmfusion.org/archives/list/[email protected]/thread/VUMAJABDYISF3UVOSESSFYQBAMQK7VKY/
-Patch0:         0000-set-new-offset.patch
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  gcc
 BuildRequires:  g++