Switch to using precompiled camera-streamer

Fetched from apt.octoprint.org

Author: foosel

README.md

@@ -9,9 +9,9 @@ and provides the resulting image ready to flash. Checkout the [releases](https:/
 
 A bunch of simple update scripts are run via [CustoPiZer](https://github.com/OctoPrint/CustoPiZer):
 
-  * `01-update-octoprint`: Updates OctoPrint to the latest version
-  * `02-update-boot`: Updates bootloader and kernel to the latest version
-  * `03-update-libcamera-apps`: Updates the the libcamera apps to the latest version
+  * `01-add-octoprint-apt-repo`: Adds `apt.octoprint.org` to the apt sources
+  * `02-update-octoprint`: Updates OctoPrint to the latest version
+  * `03-update-boot`: Updates bootloader and kernel to the latest version
   * `10-install-camera-streamer`: Installs the new [camera-streamer](https://github.com/ayufan/camera-streamer) based webcam stack, replacing mjpg-streamer and webcamd. The new stack supports libcamera based cameras like the RPi Cam v3 and newer Arducams, and is also more performant. See [the FAQ](https://faq.octoprint.org/camera-streamer-config) for more details.
   * `11-install-pb`: Installs a small script under `/usr/local/bin/pb` that allows to easily share stdin or a text file to paste.octoprint.org.
   * `80-install-user-fix`: Installs a compatibility layer to support renaming the `pi` user, if needed.

scripts/01-add-octoprint-apt-repo

@@ -0,0 +1,11 @@
+set -x
+set -e
+
+export LC_ALL=C
+
+source /common.sh
+install_cleanup_trap
+
+curl -s --compressed "https://apt.octoprint.org/octoprint.gpg.key" | gpg --dearmor > /etc/apt/trusted.gpg.d/octoprint.gpg
+curl -s --compressed -o /etc/apt/sources.list.d/octoprint-rpi.list "https://apt.octoprint.org/octoprint-bullseye-rpi.list"
+apt-get update

scripts/01-update-octoprint scripts/02-update-octoprintscripts/01-update-octoprint renamed to scripts/02-update-octoprint

@@ -6,21 +6,8 @@ export LC_ALL=C
 source /common.sh
 install_cleanup_trap
 
-[ -n "$CAMERA_STREAMER_ARCHIVE" ] || CAMERA_STREAMER_ARCHIVE="https://github.com/OctoPrint/camera-streamer-archive/releases/download/master-20230309133708/camera-streamer.zip"
-
-# install dependencies
-apt-get install --yes libavformat-dev libavutil-dev libavcodec-dev libcamera-dev liblivemedia-dev v4l-utils pkg-config xxd build-essential cmake libssl-dev
-
-# install camera-streamer
-curl -L -o /tmp/camera-streamer.zip "$CAMERA_STREAMER_ARCHIVE"
-unzip /tmp/camera-streamer.zip -d /tmp/camera-streamer
-rm /tmp/camera-streamer.zip
-
-pushd /tmp/camera-streamer/camera-streamer
-  make -j$(nproc)
-  make install
-popd
-rm -rf /tmp/camera-streamer
+# install our precompiled camera-streamer from apt.octoprint.org
+apt-get install --yes camera-streamer libcamera-apps-lite
 
 # enable camera auto-detection
 sed -i 's/^camera_auto_detect=0/camera_auto_detect=1/' /boot/config.txt

scripts/02-update-boot scripts/03-update-bootscripts/02-update-boot renamed to scripts/03-update-boot

@@ -6,7 +6,7 @@ export LC_ALL=C
 source /common.sh
 install_cleanup_trap
 
-# if input_raspi.so is there, we don't need to do anything
+# if pb is there, we don't need to do anything
 [ -f /usr/local/bin/pb ] && exit 0
 
 cp /files/pb /usr/local/bin/pb

scripts/03-update-libcamera-apps

@@ -9,7 +9,7 @@ StartLimitBurst=10
 EnvironmentFile=/boot/camera-streamer/libcamera.conf
 ExecCondition=/bin/sh -c "/usr/bin/libcamera-hello --list-cameras | grep -o '/base/soc/[^)]*'"
 ExecCondition=/bin/sh -c "! ss -ltn src :$PORT | grep -q LISTEN"
-ExecStart=/bin/sh -c "exec /usr/local/bin/camera-streamer \
+ExecStart=/bin/sh -c "exec /usr/bin/camera-streamer \
   -http-port=${PORT} \
   -camera-type=libcamera \
   -camera-path=$(/usr/bin/libcamera-hello --list-cameras | grep -o '/base/soc/[^)]*' | head -n1) \

scripts/10-install-camera-streamer

@@ -12,7 +12,7 @@ StartLimitBurst=10
 EnvironmentFile=/boot/camera-streamer/usb-%i.conf
 ExecCondition=/bin/sh -c "[ -e $DEVICE ]"
 ExecCondition=/bin/sh -c "! ss -ltn src :$PORT | grep -q LISTEN"
-ExecStart=/bin/sh -c "exec /usr/local/bin/camera-streamer \
+ExecStart=/bin/sh -c "exec /usr/bin/camera-streamer \
   -http-port=${PORT} \
   -camera-type=v4l2 \
   -camera-path=$(ls -b $DEVICE | head -n1) \