From b311f063acade22e3459a6da07813ea38da0f8ab Mon Sep 17 00:00:00 2001
From: Spencer Bull <Spencer.Bull@Dell.com>
Date: Tue, 17 Mar 2026 10:54:07 -0500
Subject: [PATCH] fix(intel-ipu7-camera): fix service enable, remove broken
 PipeWire browser flags

- Replace su - with systemctl --global enable + runuser; su - fails silently
  in pacman install scripts, leaving camera-feed-watch.service disabled
- Remove _add_pipewire_camera(): adding PipeWireCamera/WebRtcPipeWireCamera
  to browser flags routes camera through PipeWire which is non-functional for
  this setup; V4L2 direct access to /dev/video50 works correctly
- Fix disable-libcamera.conf: replace broken /dev/null script override with
  correct WirePlumber 0.5 wireplumber.profiles syntax

Closes #56
---
 .../intel-ipu7-camera/disable-libcamera.conf  | 20 +++-------
 .../intel-ipu7-camera.install                 | 38 +++++++++----------
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/pkgbuilds/edge/intel-ipu7-camera/disable-libcamera.conf b/pkgbuilds/edge/intel-ipu7-camera/disable-libcamera.conf
index 5892238..2d9f9cc 100644
--- a/pkgbuilds/edge/intel-ipu7-camera/disable-libcamera.conf
+++ b/pkgbuilds/edge/intel-ipu7-camera/disable-libcamera.conf
@@ -1,16 +1,6 @@
-# Disable libcamera monitor - make it a no-op to prevent crash
-# Camera is provided via v4l2loopback + icamerasrc instead
-wireplumber.components.rules = [
-  {
-    matches = [
-      {
-        name = "monitors/libcamera/enumerate-device.lua"
-      }
-    ]
-    actions = {
-      override = {
-        name = /dev/null, type = script/lua
-      }
-    }
+# Disable libcamera monitor - camera is provided via v4l2loopback + icamerasrc instead
+wireplumber.profiles = {
+  main = {
+    "monitor.libcamera" = disabled
   }
-]
+}
diff --git a/pkgbuilds/edge/intel-ipu7-camera/intel-ipu7-camera.install b/pkgbuilds/edge/intel-ipu7-camera/intel-ipu7-camera.install
index 45cbe22..13d881b 100644
--- a/pkgbuilds/edge/intel-ipu7-camera/intel-ipu7-camera.install
+++ b/pkgbuilds/edge/intel-ipu7-camera/intel-ipu7-camera.install
@@ -1,15 +1,3 @@
-_add_pipewire_camera() {
-    local conf="$1"
-    if [ -f "$conf" ] && grep -q 'enable-features=' "$conf" && ! grep -q 'PipeWireCamera' "$conf"; then
-        sed -i 's/--enable-features=\([^ ]*\)/--enable-features=\1,PipeWireCamera/' "$conf"
-    fi
-}
-
-_remove_pipewire_camera() {
-    local conf="$1"
-    [ -f "$conf" ] && sed -i 's/,PipeWireCamera//g' "$conf"
-}
-
 _install_sleep_hook() {
     cp /usr/share/intel-ipu7-camera/camera-sleep-hook /usr/lib/systemd/system-sleep/camera-sleep-hook
     chmod 755 /usr/lib/systemd/system-sleep/camera-sleep-hook
@@ -19,14 +7,21 @@ post_install() {
     _install_sleep_hook
     systemctl daemon-reload
     systemctl enable camera-init.service
+    systemctl --global enable camera-feed-watch.service
     udevadm control --reload-rules 2>/dev/null || true
 
     if [ -n "$SUDO_USER" ]; then
         usermod -aG video "$SUDO_USER" 2>/dev/null || true
-        su - "$SUDO_USER" -c "systemctl --user daemon-reload; systemctl --user enable camera-feed-watch.service" 2>/dev/null || true
 
-        _add_pipewire_camera "/home/$SUDO_USER/.config/chromium-flags.conf"
-        _add_pipewire_camera "/home/$SUDO_USER/.config/brave-flags.conf"
+        # Start the service in the current user session if one is active
+        local uid
+        uid=$(id -u "$SUDO_USER" 2>/dev/null)
+        if [ -n "$uid" ] && [ -d "/run/user/$uid" ]; then
+            XDG_RUNTIME_DIR="/run/user/$uid" \
+            DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$uid/bus" \
+            runuser -u "$SUDO_USER" -- \
+                systemctl --user start camera-feed-watch.service 2>/dev/null || true
+        fi
     fi
 }
 
@@ -37,14 +32,19 @@ post_upgrade() {
 }
 
 pre_remove() {
+    systemctl --global disable camera-feed-watch.service 2>/dev/null || true
     systemctl disable camera-init.service 2>/dev/null || true
     systemctl stop camera-init.service 2>/dev/null || true
 
     if [ -n "$SUDO_USER" ]; then
-        su - "$SUDO_USER" -c "systemctl --user stop camera-feed-watch.service; systemctl --user disable camera-feed-watch.service" 2>/dev/null || true
-
-        _remove_pipewire_camera "/home/$SUDO_USER/.config/chromium-flags.conf"
-        _remove_pipewire_camera "/home/$SUDO_USER/.config/brave-flags.conf"
+        local uid
+        uid=$(id -u "$SUDO_USER" 2>/dev/null)
+        if [ -n "$uid" ] && [ -d "/run/user/$uid" ]; then
+            XDG_RUNTIME_DIR="/run/user/$uid" \
+            DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$uid/bus" \
+            runuser -u "$SUDO_USER" -- \
+                systemctl --user stop camera-feed-watch.service 2>/dev/null || true
+        fi
     fi
 }