WIP: libcamera support in webcamd

Author: foosel

README.md

@@ -11,9 +11,9 @@ A bunch of simple update scripts are run via [CustoPiZer](https://github.com/Oct
 
   * `01-update-octoprint`: Updates OctoPrint to the latest version
   * `02-update-boot`: Updates bootloader and kernel to the latest version
-  * `10-install-arducam-mjpg-streamer`: Replaces the existing mjpg-streamer with the Arducam fork available [here](https://github.com/ArduCAM/mjpg-streamer).
+  * `10-install-arducam-mjpg-streamer`: Replaces the existing mjpg-streamer with the Arducam fork available [here](https://github.com/ArduCAM/mjpg-streamer)
+  * `11-install-libcamera-webcamd`: Replaces the existing webcamd script with one capable of using the new libcamera stack for RPi
   * `80-install-user-fix`: Installs a compatibility layer to support renaming the `pi` user, if needed.
-  * `81-fix-octopi-txt`: Replaces `/boot/octopi.txt` with one with updated documentation regarding camera options.
   * `99-write-build`: Writes the build tag to `/etc/octopiuptodate-build`
 
 ## How do I run this?

scripts/11-install-libcamera-webcamd

@@ -0,0 +1,26 @@
+set -x
+set -e
+
+export LC_ALL=C
+
+source /common.sh
+install_cleanup_trap
+
+# already done, so we don't need to do anything
+grep -q "camera_libcamera_options" /boot/octopi.txt && exit 0
+
+# new octopi.txt
+cp /files/octopi.txt /boot/octopi.txt
+
+# new webcamd
+cp /files/webcamd /root/bin/webcamd
+chmod +x /root/bin/webcamd
+
+# enable camera auto detect and slightly increase gpu mem
+sed -i 's/^camera_auto_detect=0/camera_auto_detect=1/' /boot/config.txt
+sed -i 's/^gpu_mem=128/gpu_mem=200/' /boot/config.txt
+
+# update error page
+if grep -q "camera_usb_options" /etc/haproxy/errors/503-no-webcam.http; then
+    sed -i 's/camera_usb_options/camera_uvc_options/g' /etc/haproxy/errors/503-no-webcam.http
+fi

scripts/81-fix-octopi-txt

@@ -4,16 +4,36 @@
 ### MacOSX users: If you use Textedit to edit this file make sure to use 
 ### "plain text format" and "disable smart quotes" in "Textedit > Preferences"
 
-### Heads-up: The "input_raspicam" input module of mjpg-streamer is no longer supported.
-### Raspicam support is now available on the "input_uvc" module.
+### Heads-up: As of OctoPi 1.0.0, the raspi input option has been removed. Instead 
+### there's now the libcamera input option. Additionally, USB webcams are now 
+### configured through camera_uvc_options instead of camera_usb_options.
 
-### Additional options to supply to MJPG Streamer for the USB camera
+### Configure which camera to use
+#
+# Available options are:
+# - auto: tries libcamera if detected, otherwise tries first uvc if available
+# - uvc: only tries uvc
+# - libcamera: only tries libcamera
+#
+# Defaults to auto
+#
+#camera="auto"
+
+### Additional options to supply to MJPG Streamer for libcamera devices
+#
+# See https://faq.octoprint.org/mjpg-streamer-config for available options
+#
+# Defaults to a resolution of 640x480 px and a framerate of 10 fps
+#
+#camera_libcamera_options="-r 640x480 -f 10"
+
+### Additional options to supply to MJPG Streamer for uvc devices
 #
 # See https://faq.octoprint.org/mjpg-streamer-config for available options
 #
 # Defaults to a resolution of 640x480 px and a framerate of 10 fps
 #
-#camera_usb_options="-r 640x480 -f 10"
+#camera_uvc_options="-r 640x480 -f 10"
 
 ### Additional webcam devices known to cause problems with -f
 #