Merge pull request #22 from striczkof/icamerasrc-ivsc-fix

Adding icamerasrc-git-fix, removed ivsc-driver, fixed v4l2loopback typo

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
-```
+```

icamerasrc-git/PKGBUILD

@@ -0,0 +1,42 @@
+# Maintainer: Karim Vergnes <me@thesola.io>
+_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')
+conflicts=('icamerasrc-git')
+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
+}

install.sh

@@ -52,8 +52,16 @@ 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=( intel-ivsc-driver-dkms-git intel-ivsc-firmware 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"
+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"
 
@@ -66,8 +74,9 @@ 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"
 
 # Install general dependencies
 echo "# Install general dependencies"
@@ -117,4 +126,4 @@ if [[ "${1}" == "--workaround" ]]; then
     error "Failed to restart: v4l2-relayd.service"
   fi
 fi
-
+echo -e "\n\nAll done.\nRemember to reboot upon succesful installation!"

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')

uninstall.sh

@@ -17,11 +17,12 @@ 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
 
-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}"