From 6d5c62e30102087501ff66f2342a90c67b1f75cc Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 17:21:39 +0100
Subject: [PATCH] update to 20210423git [release 20210423git-1mamba;Fri Apr 23
 2021]

---
 raspberrypi-firmware-udev-vchiq-permissions |  1 +
 raspberrypi-userland.spec                   | 23 +++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 raspberrypi-firmware-udev-vchiq-permissions

diff --git a/raspberrypi-firmware-udev-vchiq-permissions b/raspberrypi-firmware-udev-vchiq-permissions
new file mode 100644
index 0000000..1237f5f
--- /dev/null
+++ b/raspberrypi-firmware-udev-vchiq-permissions
@@ -0,0 +1 @@
+SUBSYSTEM=="vchiq", GROUP="video", MODE="0660"
diff --git a/raspberrypi-userland.spec b/raspberrypi-userland.spec
index 4429564..cd62a90 100644
--- a/raspberrypi-userland.spec
+++ b/raspberrypi-userland.spec
@@ -1,17 +1,18 @@
 Name:          raspberrypi-userland
-Version:       20210317git
+Version:       20210423git
 Release:       1mamba
 Summary:       Libraries for interfacing to Raspberry Pi GPU
 Group:         System/Libraries
 Vendor:        openmamba
 Distribution:  openmamba
-Packager:      Davide Madrisan <davide.madrisan@gmail.com>
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://www.raspberrypi.org/
 Source:        git://github.com/raspberrypi/userland.git/master/userland-%{version}.tar.bz2
 Source1:       raspberrypi-userland-ldconfig
 Source2:       tvservice-off
 Source3:       tvservice-on
 Source4:       tvservice-ison
+Source5:       raspberrypi-firmware-udev-vchiq-permissions
 Patch0:        %{name}-20121028git-disable_cmake_toolchain_check.patch
 Patch1:        raspberrypi-userland-20210317git-aarch64-brcmegl.patch
 License:       BSD
@@ -30,10 +31,10 @@ Libraries for interfacing to Raspberry Pi GPU.
 %package -n raspberrypi-utils
 Group:         System/Tools
 Summary:       System tools for the Raspberry Pi
+Requires:      libraspberrypi = %{?epoch:%epoch:}%{version}-%{release}
 
 %description -n raspberrypi-utils
 This package contains some system tools for the Raspberry Pi.
-Source: https://github.com/raspberrypi/userland.git
 
 %package -n libraspberrypi
 Group:         System/Libraries
@@ -92,11 +93,20 @@ done
 %endif
 
 install -D -m0644 %{S:1} %{buildroot}%{_sysconfdir}/ld.so.conf.d/vmcs.conf
-
 install -m0755 %{S:2} %{buildroot}/opt/vc/bin/tvservice-off
 install -m0755 %{S:3} %{buildroot}/opt/vc/bin/tvservice-on
 install -m0755 %{S:4} %{buildroot}/opt/vc/bin/tvservice-ison
 
+# add /opt/vc/bin to systemd PATH
+install -d %{buildroot}%{_sysconfdir}/profile.d/
+cat >  %{buildroot}%{_sysconfdir}/profile.d/vmcs.sh << _EOF
+PATH=$PATH:/opt/vc/bin
+_EOF
+
+# udev rules
+install -D -m 644 %{S:5} \
+   %{buildroot}%{_udevrulesdir}/10-vchiq-permissions.rules
+
 # remove unpackaged files
 rm -f %{buildroot}/opt/vc/share/install/vmcs.conf
 rm -fr %{buildroot}/opt/vc/src/hello_pi
@@ -118,6 +128,7 @@ mv %{buildroot}/opt/vc/lib/pkgconfig %{buildroot}%{_libdir}/
 
 %files -n raspberrypi-utils
 %defattr(-,root,root)
+%{_sysconfdir}/profile.d/vmcs.sh
 #/opt/vc/bin/raspicam
 /opt/vc/bin/*
 %doc LICENCE
@@ -125,6 +136,7 @@ mv %{buildroot}/opt/vc/lib/pkgconfig %{buildroot}%{_libdir}/
 %files -n libraspberrypi
 %defattr(-,root,root)
 %{_sysconfdir}/ld.so.conf.d/vmcs.conf
+%{_udevrulesdir}/10-vchiq-permissions.rules
 %dir /opt/vc
 %dir /opt/vc/lib
 /opt/vc/lib/lib*.so
@@ -150,6 +162,9 @@ mv %{buildroot}/opt/vc/lib/pkgconfig %{buildroot}%{_libdir}/
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Apr 23 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 20210423git-1mamba
+- update to 20210423git
+
 * Wed Mar 17 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 20210317git-1mamba
 - update to 20210317git
 - libraspberrypi-userland-devel: move pkgconfig files to %_libdir