From 605fb9a85b3a883fcf1d069bd9a17b103fc0e795 Mon Sep 17 00:00:00 2001 From: striczkof Date: Sun, 11 Jun 2023 18:10:09 +1000 Subject: [PATCH 1/7] Removed ivsc-driver-dkms from the scripts intel-ivsc-driver-dkms-git is no longer needed and even conflicts with the intel-ipu6-dkms-git on 'dkms install' due to them being built together into a single package. Also updated the PKGBUILD of ipu6-dkms to signify this, plus making it depend on ivsc-firmware. --- install.sh | 10 +++++++++- intel-ipu6-dkms-git/PKGBUILD | 4 ++-- uninstall.sh | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index c4b22b8..3dced92 100755 --- a/install.sh +++ b/install.sh @@ -53,7 +53,15 @@ if pacman -Qq linux-hardened >/dev/null 2>/dev/null; then fi # General dependencies to make the webcam work: -general_dependencies=( intel-ivsc-driver-dkms-git intel-ivsc-firmware icamerasrc-git gst-plugin-pipewire ) +general_dependencies=( icamerasrc-git gst-plugin-pipewire ) + +# Install dependency for intel-ipu6-dkms-git +echo "# Install dependency for intel-ipu6-dkms-git" +if eval "${PKGMAN} intel-ivsc-firmware"; then + echo "=> SUCCESS" +else + error " Failed to install: intel-ivsc-firmware" +fi build_and_install "intel-ipu6-dkms-git" diff --git a/intel-ipu6-dkms-git/PKGBUILD b/intel-ipu6-dkms-git/PKGBUILD index f898a21..9ceff9a 100644 --- a/intel-ipu6-dkms-git/PKGBUILD +++ b/intel-ipu6-dkms-git/PKGBUILD @@ -7,9 +7,9 @@ arch=('any') url="https://github.com/intel/ipu6-drivers" revision="8c02a846d1afe0e108964a2d3db4acb175712da9" license=('unknown') -depends=('dkms') +depends=('dkms' 'intel-ivsc-firmware') makedepends=('git') -conflicts=('intel-ipu6-dkms-git') +conflicts=('intel-ipu6-dkms-git' 'intel-ivsc-driver-dkms-git') provides=('intel-ipu6-dkms-git') source=("git+${url}.git#commit=${revision}") sha256sums=('SKIP') diff --git a/uninstall.sh b/uninstall.sh index 0327ea0..449cea4 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -17,7 +17,8 @@ PKGSUFFIX=fix sudo systemctl stop v4l2-relayd.service sudo systemctl disable v4l2-relayd.service -eval "${PKGMAN} intel-ivsc-driver-dkms-git" +# Not needed anymore due to being built and installed together with intel-ipu6-dkms +# eval "${PKGMAN} intel-ivsc-driver-dkms-git" # Not needed because it is uninstalled as a dependency of the previous package: #$PKGMAN intel-ivsc-firmware From 3438e447560f2f4c1dea2e70284bd09291745d9b Mon Sep 17 00:00:00 2001 From: striczkof Date: Sun, 11 Jun 2023 18:25:52 +1000 Subject: [PATCH 2/7] Added icamerasrc-git-fix Added the fixed PKGBUILD to build the earlier icamerasrc. Pointed out by @sigboe at: https://github.com/stefanpartheym/archlinux-ipu6-webcam/issues/18#issuecomment-1557720342 --- icamerasrc-git/PKGBUILD | 41 +++++++++++++++++++++++++++++++++++++++++ install.sh | 5 +++-- uninstall.sh | 2 +- 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 icamerasrc-git/PKGBUILD diff --git a/icamerasrc-git/PKGBUILD b/icamerasrc-git/PKGBUILD new file mode 100644 index 0000000..17a6b10 --- /dev/null +++ b/icamerasrc-git/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: Karim Vergnes +_pkgname=icamerasrc +pkgname=${_pkgname}-git-fix +pkgver=r59.17841ab +pkgrel=1 +pkgdesc="Intel IPU6 camera source for GStreamer" +arch=('x86_64') +url="https://github.com/intel/icamerasrc" +license=('LGPL2.1') +depends=('ipu6-camera-hal' + 'gstreamer' + 'libdrm' + 'gst-plugins-base') +makedepends=('git' + 'autoconf' + 'make' + 'gcc') +source=("git+${url}.git#commit=17841ab6249aaa69bd9b3959262bf182dee74111" + "70-ipu6-psys.rules") +sha256sums=('SKIP' + '41f0406f4548f12dd3ec5c4c94c5f6f4590d48ac4c80623682f3d22622a8a9bd') + +pkgver() { + cd $_pkgname + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +build() { + cd "$srcdir/$_pkgname" + export CHROME_SLIM_CAMHAL=ON + export STRIP_VIRTUAL_CHANNEL_CAMHAL=ON + ./autogen.sh + make +} + +package() { + cd "$srcdir/$_pkgname" + mkdir -p $pkgdir/usr/lib/udev/rules.d + make DESTDIR="$pkgdir" install + install -Dm644 $srcdir/70-ipu6-psys.rules $pkgdir/usr/lib/udev/rules.d +} diff --git a/install.sh b/install.sh index 3dced92..5d24a84 100755 --- a/install.sh +++ b/install.sh @@ -52,8 +52,8 @@ if pacman -Qq linux-hardened >/dev/null 2>/dev/null; then eval "${PKGMAN} --needed linux-hardened-headers" fi -# General dependencies to make the webcam work: -general_dependencies=( icamerasrc-git gst-plugin-pipewire ) +# General dependency(-ies?) to make the webcam work: +general_dependencies=( gst-plugin-pipewire ) # Install dependency for intel-ipu6-dkms-git echo "# Install dependency for intel-ipu6-dkms-git" @@ -76,6 +76,7 @@ echo "# Install dependency for intel-ipu6ep-camera-hal-git" build_and_install "intel-ipu6ep-camera-hal-git" build_and_install "v4l2-looback-dkms-git" build_and_install "v4l2-relayd" +build_and_install "icamerasrc-git" # Install general dependencies echo "# Install general dependencies" diff --git a/uninstall.sh b/uninstall.sh index 449cea4..d39dfd6 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -22,7 +22,7 @@ sudo systemctl disable v4l2-relayd.service # Not needed because it is uninstalled as a dependency of the previous package: #$PKGMAN intel-ivsc-firmware -eval "${PKGMAN} icamerasrc-git" +eval "${PKGMAN} icamerasrc-git-${PKGSUFFIX}" eval "${PKGMAN} intel-ipu6ep-camera-hal-git-${PKGSUFFIX}" eval "${PKGMAN} intel-ipu6ep-camera-bin" eval "${PKGMAN} intel-ipu6-dkms-git-${PKGSUFFIX}" From 4277b3b1c3f57e20e824129eea094faf5e161322 Mon Sep 17 00:00:00 2001 From: striczkof Date: Sun, 11 Jun 2023 18:29:21 +1000 Subject: [PATCH 3/7] Fixed v4l2loopback typo Fixed a (possible) typo in the script and folder name to reflect the package name in the PKGBUILD. --- install.sh | 2 +- {v4l2-looback-dkms-git => v4l2loopback-dkms-git}/PKGBUILD | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {v4l2-looback-dkms-git => v4l2loopback-dkms-git}/PKGBUILD (100%) diff --git a/install.sh b/install.sh index 5d24a84..c3b214e 100755 --- a/install.sh +++ b/install.sh @@ -74,7 +74,7 @@ echo "# Install dependency for intel-ipu6ep-camera-hal-git" fi build_and_install "intel-ipu6ep-camera-hal-git" -build_and_install "v4l2-looback-dkms-git" +build_and_install "v4l2loopback-dkms-git" build_and_install "v4l2-relayd" build_and_install "icamerasrc-git" diff --git a/v4l2-looback-dkms-git/PKGBUILD b/v4l2loopback-dkms-git/PKGBUILD similarity index 100% rename from v4l2-looback-dkms-git/PKGBUILD rename to v4l2loopback-dkms-git/PKGBUILD From 6eed6792dec7bcdd679ab894c5949fa31e11e3d9 Mon Sep 17 00:00:00 2001 From: striczkof Date: Sun, 11 Jun 2023 22:20:50 +1000 Subject: [PATCH 4/7] Added a little friendly reminded to reboot --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index c3b214e..ff9d4d5 100755 --- a/install.sh +++ b/install.sh @@ -126,4 +126,4 @@ if [[ "${1}" == "--workaround" ]]; then error "Failed to restart: v4l2-relayd.service" fi fi - +echo "\n\nAll done.\nRemember to reboot upon succesful installation!" From bb49152919d8a32ba0434845d0efd023c4aaa704 Mon Sep 17 00:00:00 2001 From: Alvin Date: Sun, 11 Jun 2023 22:33:30 +1000 Subject: [PATCH 5/7] Forgot -e for the reboot reminder --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index ff9d4d5..7ba9f15 100755 --- a/install.sh +++ b/install.sh @@ -126,4 +126,4 @@ if [[ "${1}" == "--workaround" ]]; then error "Failed to restart: v4l2-relayd.service" fi fi -echo "\n\nAll done.\nRemember to reboot upon succesful installation!" +echo -e "\n\nAll done.\nRemember to reboot upon succesful installation!" From 45813646c5ef0913a6a7f5f9a8b751a1ca1eacd4 Mon Sep 17 00:00:00 2001 From: Alvin Date: Mon, 12 Jun 2023 11:56:56 +1000 Subject: [PATCH 6/7] Made the fixed package conflict with the original icamerasrc-git To make sure both don't get installed together ig --- icamerasrc-git/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/icamerasrc-git/PKGBUILD b/icamerasrc-git/PKGBUILD index 17a6b10..80d05ef 100644 --- a/icamerasrc-git/PKGBUILD +++ b/icamerasrc-git/PKGBUILD @@ -15,6 +15,7 @@ makedepends=('git' 'autoconf' 'make' 'gcc') +conflicts=('icamerasrc-git') source=("git+${url}.git#commit=17841ab6249aaa69bd9b3959262bf182dee74111" "70-ipu6-psys.rules") sha256sums=('SKIP' From d45fee1db1b29a27ae575cf6782bbf3d1b8d6e44 Mon Sep 17 00:00:00 2001 From: Alvin Date: Mon, 12 Jun 2023 11:59:46 +1000 Subject: [PATCH 7/7] Added kernel 6.3.7 on README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7229d26..99ac3cb 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ This repository is supposed to provide an easy installation for the patched Inte - `6.1.4-arch1-1` - `6.1.4-zen2-1-zen` - `6.1.9-arch1-1` +- `6.3.7-arch1-1` All PKGBUILDs in this repository are taken from [this comment](https://bbs.archlinux.org/viewtopic.php?pid=2062371#p2062371) on the Archlinux forums. From `v1.0.0` on, the PKGBUILDs are slightly modified to avoid conflicts with their AUR counter parts. @@ -66,4 +67,4 @@ For example, if you're using paru, you might want to add the following to your ` ``` NoWarn = intel-ipu6-dkms-git-fix intel-ipu6ep-camera-hal-git-fix v4l2-relayd v4l2loopback-dkms-git-fix -``` \ No newline at end of file +```