[ipu6-camera-hal] Add ipu6-driver-select script to switch between proprietary and foss stacks
by jwrdegoede
commit ea9e0bd71c2c629929bbbe3b40a85c82ba458dab
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Wed Jul 3 16:56:14 2024 +0200
Add ipu6-driver-select script to switch between proprietary and foss stacks
ipu6-camera-hal.rpmlintrc | 3 ++-
ipu6-camera-hal.spec | 16 ++++++++++++++--
ipu6-driver-select.sh | 35 +++++++++++++++++++++++++++++++++++
3 files changed, 51 insertions(+), 3 deletions(-)
---
diff --git a/ipu6-camera-hal.rpmlintrc b/ipu6-camera-hal.rpmlintrc
index 58a14ae..0a312d7 100644
--- a/ipu6-camera-hal.rpmlintrc
+++ b/ipu6-camera-hal.rpmlintrc
@@ -1,5 +1,6 @@
-# Upstream provides no docs
+# there are no docs
addFilter("W: no-documentation")
+addFilter("W: no-manual-page-for-binary")
# A bunch of the sensor cfg and xml files are available through 2 different paths, meh
addFilter("W: files-duplicate")
addFilter("E: files-duplicated-waste")
diff --git a/ipu6-camera-hal.spec b/ipu6-camera-hal.spec
index 7593416..8a9527c 100644
--- a/ipu6-camera-hal.spec
+++ b/ipu6-camera-hal.spec
@@ -9,7 +9,7 @@ Name: ipu6-camera-hal
Summary: Hardware abstraction layer for Intel IPU6
URL: https://github.com/intel/ipu6-camera-hal
Version: 0.0
-Release: 18.%{commitdate}git%{shortcommit}%{?dist}
+Release: 19.%{commitdate}git%{shortcommit}%{?dist}
License: Apache-2.0
Source0: https://github.com/intel/%{name}/archive/%{commit}/%{name}-%{shortcommit}...
@@ -17,6 +17,7 @@ Source1: 60-intel-ipu6.rules
Source2: v4l2-relayd-adl
Source3: v4l2-relayd-tgl
Source4: icamera_ipu6_isys.conf
+Source5: ipu6-driver-select.sh
# Patches
Patch01: 0001-Patch-lib-path-to-align-fedora-path-usage.patch
@@ -108,8 +109,15 @@ install -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/defaults/etc/camera/ipu_tg
# Make kmod-intel-ipu6 use /dev/video7 leaving /dev/video0 for loopback
install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_modprobedir}/icamera_ipu6_isys.conf
+# Script to switch between proprietary and foss ipu6 stacks
+install -p -D -m 0755 %{SOURCE5} %{buildroot}%{_bindir}/ipu6-driver-select
-%post
+
+%posttrans
+# posttrans to ensure that v4l2-relayd service enabled by ipu6-driver-select is installed
+if [ ! -f /etc/modprobe.d/ipu6-driver-select.conf ]; then
+ /usr/bin/ipu6-driver-select proprietary
+fi
# skip triggering if udevd isn't even accessible, e.g. containers or
# rpm-ostree-based systems
if [ -S /run/udev/control ]; then
@@ -120,6 +128,7 @@ fi
%files
%license LICENSE
+%{_bindir}/ipu6-driver-select
# per variant libcamhal.so links are also in main pkg because libhal_adaptor opens them
%{_libdir}/*/libcamhal.so*
%{_libdir}/libhal_adaptor.so.*
@@ -135,6 +144,9 @@ fi
%changelog
+* Wed Jul 3 2024 Hans de Goede <hdegoede(a)redhat.com> - 0.0-19.20240509git289e645
+- Add ipu6-driver-select script to switch between proprietary and foss stacks
+
* Mon Jun 24 2024 Hans de Goede <hdegoede(a)redhat.com> - 0.0-18.20240509git289e645
- Update to commit 289e645dffbd0ea633f10bb4f93855f1e4429e9a
- Update /lib/modprobe.d/intel_ipu6_isys.conf for the out of tree module
diff --git a/ipu6-driver-select.sh b/ipu6-driver-select.sh
new file mode 100755
index 0000000..2c0fb37
--- /dev/null
+++ b/ipu6-driver-select.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+
+function show_help () {
+ echo "Usage: 'ipu6-driver-select [ proprietary | foss ]'"
+ exit 1
+}
+
+function needs_reboot () {
+ echo "Reboot your system for the changes to take effect"
+ exit 0
+}
+
+if (( $# != 1 )); then
+ show_help
+fi
+
+case "$1" in
+ "foss")
+ echo "blacklist icamera-ipu6" > /etc/modprobe.d/ipu6-driver-select.conf
+ echo "blacklist icamera-ipu6-isys" >> /etc/modprobe.d/ipu6-driver-select.conf
+ echo "blacklist icamera-ipu6-psys" >> /etc/modprobe.d/ipu6-driver-select.conf
+ systemctl disable v4l2-relayd.service
+ needs_reboot
+ ;;
+ "proprietary")
+ echo "blacklist intel-ipu6" > /etc/modprobe.d/ipu6-driver-select.conf
+ systemctl enable v4l2-relayd.service
+ needs_reboot
+ ;;
+ *)
+ show_help
+ ;;
+esac
4 months, 3 weeks
[telegram-desktop] Fix build with openssl engine in the separate package.
by Vasiliy Glazov
commit a265a973bebd31b4f63e220814b23cf4cb05198a
Author: Vasiliy Glazov <v.glazov(a)1440.space>
Date: Wed Jul 3 11:00:56 2024 +0300
Fix build with openssl engine in the separate package.
telegram-desktop.spec | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index ef49d40..26a92f5 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -62,7 +62,11 @@ BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libswresample)
BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(libxxhash)
+%if 0%{?fedora} < 41
BuildRequires: pkgconfig(openssl)
+%else
+BuildRequires: openssl-devel-engine
+%endif
BuildRequires: pkgconfig(opus)
BuildRequires: pkgconfig(protobuf)
BuildRequires: pkgconfig(protobuf-lite)
4 months, 3 weeks
[telegram-desktop] Update to 5.2.2.
by Vasiliy Glazov
commit 862268676af37efbbb74c7f8d9b44ad9dab4a373
Author: Vasiliy Glazov <v.glazov(a)1440.space>
Date: Wed Jul 3 10:32:14 2024 +0300
Update to 5.2.2.
sources | 2 +-
telegram-desktop.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index 673950a..a978352 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-5.1.7-full.tar.gz) = 7d457bb1fe5f533340faf8e92853aede8a6586b0b78b0ee51780a16a49b00a99c9142403f0c89952ed4eb864faaa74bed104c8069eaadf9ccf565d01413585ca
+SHA512 (tdesktop-5.2.2-full.tar.gz) = 85fde17b0ea225e6ef7842688123381f1703aea460a4d4ecf46a8ac5d062c9d630140fca754c832e98925c71f4c6727233be418e88885e76d8f54386c826878e
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 7b1ccbd..ef49d40 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -5,7 +5,7 @@
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
Name: telegram-desktop
-Version: 5.1.7
+Version: 5.2.2
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -169,6 +169,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_metainfodir}/*.metainfo.xml
%changelog
+* Wed Jul 03 2024 Vasiliy Glazov <vascom2(a)gmail.com> - 5.2.2-1
+- Update to 5.2.2
+
* Tue Jun 18 2024 Vasiliy Glazov <vascom2(a)gmail.com> - 5.1.7-1
- Update to 5.1.7
4 months, 3 weeks
[nvidia-xconfig/f39: 2/2] Merge branch 'master' into f39
by Leigh Scott
commit 0bdda6f57f6a59b44d81cf637c175e41d7ab4445
Merge: 7c98e8b d87eee0
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jul 2 08:29:22 2024 +0100
Merge branch 'master' into f39
nvidia-xconfig.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
4 months, 3 weeks
[nvidia-xconfig/f40: 2/2] Merge branch 'master' into f40
by Leigh Scott
commit 59e17a3c4b3fece0103514a02fb93072e21edf1f
Merge: 21b6d3e d87eee0
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jul 2 08:28:59 2024 +0100
Merge branch 'master' into f40
nvidia-xconfig.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
4 months, 3 weeks
[nvidia-xconfig] Update to 555.58.02
by Leigh Scott
commit d87eee007d882ad404b38af06bedc9cfedc04c2c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jul 2 08:28:25 2024 +0100
Update to 555.58.02
nvidia-xconfig.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/nvidia-xconfig.spec b/nvidia-xconfig.spec
index 47cc0e4..49e085d 100644
--- a/nvidia-xconfig.spec
+++ b/nvidia-xconfig.spec
@@ -1,6 +1,6 @@
Name: nvidia-xconfig
Epoch: 3
-Version: 555.58
+Version: 555.58.02
Release: 1%{?dist}
Summary: NVIDIA X configuration file editor
@@ -54,6 +54,9 @@ mkdir -p %{buildroot}%{_sbindir}
%changelog
+* Tue Jul 02 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:555.58.02-1
+- Update to 555.58.02
+
* Thu Jun 27 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:555.58-1
- Update to 555.58 release
diff --git a/sources b/sources
index 4b976f0..4e35203 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nvidia-xconfig-555.58.tar.bz2) = 5f7810977a238fff15849b0fab5b31177b358275328789c581fc64459a71fed0ec12ce372b32fc927f00327d41ff83e1ebe26351c989056e19fa1a38a661a5b6
+SHA512 (nvidia-xconfig-555.58.02.tar.bz2) = 673bea01fe39687ba34e19b743c61898d2ed8f34710c3a1afc8f2e71e0903950f253408b0fcf0b6306a98ddc2438cacd92fafd1d1662136b18058017dfb783c4
4 months, 3 weeks