Use motion package dependency

Duet3D · Apr 30, 2024 · a7aa964 · a7aa964
1 parent e7de9ec
commit a7aa964
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 4 deletions.
diff --git a/pkg/build.sh b/pkg/build.sh
@@ -15,6 +15,10 @@ cp -r ../src/dsf /tmp/motionwebcamserverplugin/motionwebcamserverplugin_$version
 cp -r ../src/sd /tmp/motionwebcamserverplugin/motionwebcamserverplugin_$version/opt/dsf/sd
 cp ../src/plugin.json /tmp/motionwebcamserverplugin/motionwebcamserverplugin_$version/opt/dsf/plugins/MotionWebcamServer.json
 
+# for OEMs
+rm /tmp/motionwebcamserverplugin/motionwebcamserverplugin_$version/DEBIAN/conffiles
+rm /tmp/motionwebcamserverplugin/motionwebcamserverplugin_$version/opt/dsf/sd/sys/motion.conf
+
 echo "- Preparing package index"
 sed -i "s/VERSION/$version/g" /tmp/motionwebcamserverplugin/motionwebcamserverplugin_$version/DEBIAN/control
 sed -i "s/VERSION/$version/g" /tmp/motionwebcamserverplugin/motionwebcamserverplugin_$version/DEBIAN/changelog

diff --git a/src/dsf/arm/motion b/src/dsf/arm/motion
diff --git a/src/dsf/arm64/motion b/src/dsf/arm64/motion
diff --git a/src/dsf/motion b/src/dsf/motion
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+onSigTerm() {
+  kill -TERM "$pid" 2>/dev/null
+}
+
+trap onSigTerm SIGTERM
+
+# Start Motion webcam server
+motion -c /opt/dsf/sd/sys/motion.conf &
+
+pid=$!
+wait "$pid"
+
diff --git a/src/plugin.json b/src/plugin.json
@@ -2,16 +2,15 @@
   "id": "MotionWebcamServer",
   "name": "Motion Webcam Server",
   "author": "Duet3D Ltd",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "license": "GPL-2.0-only",
   "homepage": "https://github.com/Duet3D/MotionWebcamServerPlugin",
   "sbcRequired": true,
   "sbcDsfVersion": "3.5",
   "sbcExecutable": "motion",
-  "sbcExecutableArguments": "-c /opt/dsf/sd/sys/motion.conf",
   "sbcOutputRedirected": false,
   "sbcConfigFiles": ["motion.conf"],
-  "sbcPackageDependencies": ["libavcodec58", "libavdevice58", "libavformat58", "libavutil56", "libc6", "libgnutls30", "libjpeg62-turbo", "libmariadb3", "libmicrohttpd12", "libpq5", "libsqlite3-0", "libswscale5", "libwebp6", "libwebpmux3", "zlib1g"],
+  "sbcPackageDependencies": ["motion"],
   "sbcPermissions": ["launchProcesses", "networkAccess", "webcamAccess", "readSystem"],
   "tags": [
     "motion",

diff --git a/src/sd/sys/motion.conf b/src/sd/sys/motion.conf
@@ -31,7 +31,7 @@ log_level 3
 target_dir /tmp/motion
 
 # Video device (e.g. /dev/video0) to be used for capturing.
-videodevice /dev/video0
+video_device /dev/video0
 
 # Parameters to control video device.  See motion_guide.html
 ; vid_control_params value