# HG changeset patch # User Hans-G?nter Theisgen # Date 1661098068 -3600 # Node ID 67fca929800719e4415f074894738d5bd6f8a457 # Parent fb3f7dcfca435685cde57c63be06cab5048a6644 motion: adapted configuration parameters to version 4.4.0 diff -r fb3f7dcfca43 -r 67fca9298007 motion-lang/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/motion-lang/receipt Sun Aug 21 17:07:48 2022 +0100 @@ -0,0 +1,17 @@ +# SliTaz package receipt. + +PACKAGE="motion-lang" +VERSION="4.4.0" +CATEGORY="localization" +SHORT_DESC="Monitors the video signal from cameras - localised messages." +MAINTAINER="maintainer@slitaz.org" +LICENSE="GPL2" +WEB_SITE="https://motion-project.github.io/" + +WANTED="motion" + +genpkg_rules() +{ + cook_copy_folders locale +} + diff -r fb3f7dcfca43 -r 67fca9298007 motion/receipt --- a/motion/receipt Fri Aug 19 06:34:23 2022 +0000 +++ b/motion/receipt Sun Aug 21 17:07:48 2022 +0100 @@ -11,10 +11,12 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://github.com/Motion-Project/$PACKAGE/archive/release-$VERSION.tar.gz" -DEPENDS="ffmpeg jpeg libmicrohttpd libpthread-stubs libv4l" +DEPENDS="ffmpeg jpeg libatomic libmicrohttpd libpthread-stubs libv4l" BUILD_DEPENDS="automake ffmpeg-dev jpeg-dev libatomic libmicrohttpd-dev libpthread-stubs libtool libv4l-dev" +CONFIG_FILES="/etc/motion/motion.conf" + current_version() { wget -O - ${WGET_URL%/arch*}/releases 2>/dev/null | \ @@ -32,8 +34,7 @@ ./configure \ CFLAGS="$CFLAGS -lvpx" \ LDFLAGS="$LDFLAGS -latomic" \ - --disable-nls \ - --sysconfdir=/etc/motion && + --sysconfdir=/etc && make && make install } @@ -44,9 +45,7 @@ mkdir -p $fs/etc/motion mkdir -p $fs/usr - cp -a $install/usr/bin $fs/usr - cp -a $stuff/motion.conf $fs/etc/motion - cp -a $stuff/init.d $fs/etc - - chmod 0644 $fs/etc/motion/* + cp -a $install/usr/bin $fs/usr + cp -a $stuff/motion-$VERSION.conf $fs/etc/motion/motion.conf + cp -a $stuff/init.d $fs/etc } diff -r fb3f7dcfca43 -r 67fca9298007 motion/stuff/init.d/motion --- a/motion/stuff/init.d/motion Fri Aug 19 06:34:23 2022 +0000 +++ b/motion/stuff/init.d/motion Sun Aug 21 17:07:48 2022 +0100 @@ -1,7 +1,6 @@ #!/bin/sh # /etc/init.d/motion: Start, stop and restart Motion daemon on SliTaz, -# at boot time or with the command line. Daemons options are configured -# with /etc/daemons.conf +# at boot time or with the command line. # . /etc/init.d/rc.functions @@ -30,7 +29,6 @@ fi action 'Stopping %s: %s...' "$DESC" $NAME kill $(cat $PIDFILE) - rm $PIDFILE status ;; (restart) @@ -41,7 +39,6 @@ fi _ 'Restarting %s: %s...' "$DESC" $NAME kill $(cat $PIDFILE) - rm $PIDFILE sleep 2 $DAEMON -p $PIDFILE status diff -r fb3f7dcfca43 -r 67fca9298007 motion/stuff/motion-4.4.0.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/motion/stuff/motion-4.4.0.conf Sun Aug 21 17:07:48 2022 +0100 @@ -0,0 +1,178 @@ +# This distribution example file is renamed to /etc/motion/motion.conf +# and modified for SliTaz. +# +# This config file was generated by motion 4.4.0 +# Documentation: /usr/share/doc/motion/motion_guide.html +# +# This file contains only the basic configuration options to get a +# system working. There are many more options available. Please +# consult the documentation for the complete list of all options. +# + +############################################################ +# System control configuration parameters +############################################################ + +# Start in daemon (background) mode and release terminal. +daemon on + +# Start in Setup-Mode, daemon disabled. +setup_mode off + +# File to store the process ID. +pid_file /run/motion/motion.pid + +# File to write logs messages into. If not defined stderr and syslog is used. +; log_file value + +# Level of log messages [1..9] (EMG, ALR, CRT, ERR, WRN, NTC, INF, DBG, ALL). +log_level 6 + +# Target directory for pictures, snapshots and movies +target_dir /var/lib/motion/cam1 + +# Video device (e.g. /dev/video0) to be used for capturing. +video_device /dev/video0 + +# Parameters to control video device. See motion_guide.html +; vid_control_params value + +# The full URL of the network camera stream. +; netcam_url value + +# Name of mmal camera (e.g. vc.ril.camera for pi camera). +; mmalcam_name value + +# Camera control parameters (see raspivid/raspistill tool documentation) +; mmalcam_control_params value + +############################################################ +# Image Processing configuration parameters +############################################################ + +# Image width in pixels. +# width 640 replaced by +width 320 + +# Image height in pixels. +# height 480 replaced by +height 240 + +# Maximum number of frames to be captured per second. +# framerate 15 replaced by +framerate 2 + +# Text to be overlayed in the lower left corner of images +; text_left CAMERA1 + +# Text to be overlayed in the lower right corner of images. +text_right %Y-%m-%d\n%T-%q + +############################################################ +# Motion detection configuration parameters +############################################################ + +# Always save pictures and movies even if there was no motion. +emulate_motion off + +# Threshold for number of changed pixels that triggers motion. +threshold 1500 + +# Noise threshold for the motion detection. +noise_level 32 + +# Despeckle the image using (E/e)rode or (D/d)ilate or (l)abel. +despeckle_filter EedDl + +# Number of images that must contain motion to trigger an event. +minimum_motion_frames 1 + +# Gap in seconds of no motion detected that triggers the end of an event. +event_gap 60 + +# The number of pre-captured (buffered) pictures from before motion. +# pre_capture 3 replaced by +pre_capture 0 + +# Number of frames to capture after motion is no longer detected. +post_capture 0 + +############################################################ +# Script execution configuration parameters +############################################################ + +# Command to be executed when an event starts. +; on_event_start value + +# Command to be executed when an event ends. +; on_event_end value + +# Command to be executed when a movie file is closed. +; on_movie_end value + +############################################################ +# Picture output configuration parameters +############################################################ + +# Output pictures when motion is detected +picture_output off + +# File name(without extension) for pictures relative to target directory +picture_filename %Y%m%d%H%M%S-%q + +############################################################ +# Movie output configuration parameters +############################################################ + +# Create movies of motion events. +movie_output on + +# Maximum length of movie in seconds. +# movie_max_time 60 replaced by +movie_max_time 0 + +# The encoding quality of the movie. (0=use bitrate. 1=worst quality, 100=best) +# movie_quality 45 replaced by +movie_quality 75 + +# Container/Codec to used for the movie. See motion_guide.html +movie_codec mkv + +# File name(without extension) for movies relative to target directory +movie_filename %t-%v-%Y%m%d%H%M%S + +############################################################ +# Webcontrol configuration parameters +############################################################ + +# Port number used for the webcontrol. +webcontrol_port 8080 + +# Restrict webcontrol connections to the localhost. +webcontrol_localhost on + +# Type of configuration options to allow via the webcontrol. +webcontrol_parms 0 + +############################################################ +# Live stream configuration parameters +############################################################ + +# The port number for the live stream. +stream_port 8081 + +# Restrict stream connections to the localhost. +stream_localhost on + +############################################################## +# Camera config files - One for each camera. +############################################################## +; camera /etc/motion/camera1.conf +; camera /etc/motion/camera2.conf +; camera /etc/motion/camera3.conf +; camera /etc/motion/camera4.conf + +############################################################## +# Directory to read '.conf' files for cameras. +############################################################## +; camera_dir /etc/motion/conf.d