From 6c5dacbb1d62e9d61d39f10ff1cd3d757e7058df Mon Sep 17 00:00:00 2001 From: Mr Dave Date: Thu, 25 Sep 2014 19:11:46 -0700 Subject: [PATCH] Additional packaging fixes --- Makefile.in | 12 ++++++++++-- motion-dist.conf.in | 10 +++++----- thread1.conf.in | 22 +++++++++++++++------- thread2.conf.in | 19 +++++++++++++------ thread3.conf.in | 23 ++++++++++++++--------- thread4.conf.in | 39 +++++++++++++++++++++------------------ 6 files changed, 78 insertions(+), 47 deletions(-) diff --git a/Makefile.in b/Makefile.in index 46dd0abf..32e81f24 100644 --- a/Makefile.in +++ b/Makefile.in @@ -38,7 +38,7 @@ VIDEO_OBJ = @VIDEO@ OBJ = motion.o logger.o conf.o draw.o jpegutils.o vloopback_motion.o $(VIDEO_OBJ) \ netcam.o netcam_ftp.o netcam_jpeg.o netcam_wget.o track.o \ alg.o event.o picture.o rotate.o webhttpd.o \ - stream.o md5.o @FFMPEG_OBJ@ @SDL_OBJ@ @RTPS_OBJ@ + stream.o md5.o netcam_rtsp.o @FFMPEG_OBJ@ @SDL_OBJ@ SRC = $(OBJ:.o=.c) DOC = CHANGELOG COPYING CREDITS README motion_guide.html EXAMPLES = *.conf @@ -203,7 +203,7 @@ install: @echo "--------------------------------------------------------------------------------" mkdir -p $(DESTDIR)$(bindir) mkdir -p $(DESTDIR)$(mandir)/man1 - mkdir -p $(DESTDIR)$(sysconfdir) + mkdir -p $(DESTDIR)$(sysconfdir)/motion mkdir -p $(DESTDIR)$(docdir) mkdir -p $(DESTDIR)$(examplesdir) $(INSTALL_DATA) motion.1 $(DESTDIR)$(mandir)/man1 @@ -211,6 +211,10 @@ install: $(INSTALL_DATA) $(EXAMPLES) $(DESTDIR)$(examplesdir) $(INSTALL) $(EXAMPLES_BIN) $(DESTDIR)$(examplesdir) $(INSTALL_DATA) motion-dist.conf $(DESTDIR)$(sysconfdir)/motion + $(INSTALL_DATA) thread1.conf $(DESTDIR)$(sysconfdir)/motion + $(INSTALL_DATA) thread2.conf $(DESTDIR)$(sysconfdir)/motion + $(INSTALL_DATA) thread3.conf $(DESTDIR)$(sysconfdir)/motion + $(INSTALL_DATA) thread4.conf $(DESTDIR)$(sysconfdir)/motion for prog in $(PROGS); \ do \ ($(INSTALL) $$prog $(DESTDIR)$(bindir) ); \ @@ -234,6 +238,10 @@ uninstall remove: pre-build-info done rm -f $(mandir)/man1/motion.1 rm -f $(sysconfdir)/motion/motion-dist.conf + rm -f $(sysconfdir)/motion/thread1.conf + rm -f $(sysconfdir)/motion/thread2.conf + rm -f $(sysconfdir)/motion/thread3.conf + rm -f $(sysconfdir)/motion/thread4.conf rm -rf $(docdir) rm -rf $(examplesdir) @echo "--------------------------------------------------------------------------------" diff --git a/motion-dist.conf.in b/motion-dist.conf.in index 081d6ba6..1f93f08e 100644 --- a/motion-dist.conf.in +++ b/motion-dist.conf.in @@ -419,7 +419,7 @@ text_double off # Target base directory for pictures and films # Recommended to use absolute path. (Default: current working directory) -target_dir /tmp/motion +#target_dir /tmp/motion # File path for snapshots (jpeg or ppm) relative to target_dir # Default: %v-%Y%m%d%H%M%S-snapshot @@ -729,8 +729,8 @@ quiet on # This motion.conf file AND thread1.conf and thread2.conf. # Only put the options that are unique to each camera in the # thread config files. -; thread @sysconfdir@/motion/thread1.conf -; thread @sysconfdir@/motion/thread2.conf -; thread @sysconfdir@/motion/thread3.conf -; thread @sysconfdir@/motion/thread4.conf +; thread @prefix@/etc/motion/thread1.conf +; thread @prefix@/etc/motion/thread2.conf +; thread @prefix@/etc/motion/thread3.conf +; thread @prefix@/etc/motion/thread4.conf diff --git a/thread1.conf.in b/thread1.conf.in index 3d1620eb..b3d1d57e 100644 --- a/thread1.conf.in +++ b/thread1.conf.in @@ -1,8 +1,6 @@ -# @sysconfdir@/motion/thread1.conf +# @prefix@/etc/motion/thread1.conf # -# This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@ - - +# This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@ ########################################################### # Capture device options @@ -38,7 +36,16 @@ text_left CAMERA 1 # Target base directory for pictures and films # Recommended to use absolute patch. (Default: current working directory) -target_dir /usr/local/apache2/htdocs/cam1 +#target_dir /tmp/motion/cam1 + +# File path for motion triggered images (jpeg or ppm) relative to target_dir +# Default: %v-%Y%m%d%H%M%S-%q +# Default value is equivalent to legacy oldlayout option +# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H/%M/%S-%q +# File extension .jpg or .ppm is automatically added so do not include this +# Set to 'preview' together with best-preview feature enables special naming +# convention for preview shots. See motion guide for details +picture_filename CAM1_%v-%Y%m%d%H%M%S-%q ############################################################ @@ -50,8 +57,9 @@ stream_port 8081 # Command to be executed when a picture (.ppm|.jpg) is saved (default: none) # The filename of the picture is appended as an argument for the command. -on_picture_save /usr/local/motion-extras/camparse1.pl +#on_picture_save /usr/local/motion-extras/camparse2.pl # Command to be executed when a movie file (.mpg|.avi) is closed. (default: none) # Filename of movie is appended as an argument for the command. -on_movie_end /usr/local/motion-extras/mpegparse1.pl +#on_movie_end /usr/local/motion-extras/mpegparse2.pl + diff --git a/thread2.conf.in b/thread2.conf.in index fade2f9b..d6d81ff4 100644 --- a/thread2.conf.in +++ b/thread2.conf.in @@ -1,9 +1,7 @@ -# @sysconfdir@/motion/thread2.conf +# @prefix@/etc/motion/thread2.conf # # This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@ - - ########################################################### # Capture device options ############################################################ @@ -38,7 +36,16 @@ text_left CAMERA 2 # Target base directory for pictures and films # Recommended to use absolute patch. (Default: current working directory) -target_dir /usr/local/apache2/htdocs/cam2 +#target_dir /tmp/motion/cam2 + +# File path for motion triggered images (jpeg or ppm) relative to target_dir +# Default: %v-%Y%m%d%H%M%S-%q +# Default value is equivalent to legacy oldlayout option +# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H/%M/%S-%q +# File extension .jpg or .ppm is automatically added so do not include this +# Set to 'preview' together with best-preview feature enables special naming +# convention for preview shots. See motion guide for details +picture_filename CAM2_%v-%Y%m%d%H%M%S-%q ############################################################ @@ -50,9 +57,9 @@ stream_port 8082 # Command to be executed when a picture (.ppm|.jpg) is saved (default: none) # The filename of the picture is appended as an argument for the command. -on_picture_save /usr/local/motion-extras/camparse2.pl +#on_picture_save /usr/local/motion-extras/camparse2.pl # Command to be executed when a movie file (.mpg|.avi) is closed. (default: none) # Filename of movie is appended as an argument for the command. -on_movie_end /usr/local/motion-extras/mpegparse2.pl +#on_movie_end /usr/local/motion-extras/mpegparse2.pl diff --git a/thread3.conf.in b/thread3.conf.in index 0910ab66..14a26557 100644 --- a/thread3.conf.in +++ b/thread3.conf.in @@ -1,8 +1,6 @@ -# @sysconfdir@/motion/thread3.conf +# @prefix@/etc/motion/thread3.conf # -# This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@ - - +# This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@ ########################################################### # Capture device options @@ -38,7 +36,16 @@ text_left CAMERA 3 # Target base directory for pictures and films # Recommended to use absolute patch. (Default: current working directory) -target_dir /usr/local/apache2/htdocs/cam3 +#target_dir /tmp/motion/cam3 + +# File path for motion triggered images (jpeg or ppm) relative to target_dir +# Default: %v-%Y%m%d%H%M%S-%q +# Default value is equivalent to legacy oldlayout option +# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H/%M/%S-%q +# File extension .jpg or .ppm is automatically added so do not include this +# Set to 'preview' together with best-preview feature enables special naming +# convention for preview shots. See motion guide for details +picture_filename CAM3_%v-%Y%m%d%H%M%S-%q ############################################################ @@ -50,11 +57,9 @@ stream_port 8083 # Command to be executed when a picture (.ppm|.jpg) is saved (default: none) # The filename of the picture is appended as an argument for the command. -on_picture_save /usr/local/motion-extras/camparse3.pl +#on_picture_save /usr/local/motion-extras/camparse2.pl # Command to be executed when a movie file (.mpg|.avi) is closed. (default: none) # Filename of movie is appended as an argument for the command. -on_movie_end /usr/local/motion-extras/mpegparse3.pl - - +#on_movie_end /usr/local/motion-extras/mpegparse2.pl diff --git a/thread4.conf.in b/thread4.conf.in index 9bc4e3d4..b22235ea 100644 --- a/thread4.conf.in +++ b/thread4.conf.in @@ -1,31 +1,25 @@ -# @sysconfdir@/motion/thread4.conf +# @prefix@/etc/motion/thread4.conf # -# This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@ +# This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@ ########################################################### # Capture device options ############################################################ -# URL to use if you are using a network camera, size will be autodetected (incl http:// ftp:// or file:///) -# Must be a URL that returns single jpeg pictures or a raw mjpeg stream. Default: Not defined -netcam_url http://192.168.1.6:8093/ +# Videodevice to be used for capturing (default /dev/video0) +# for FreeBSD default is /dev/bktr0 +videodevice /dev/video3 -# The setting for keep-alive of network socket, should improve performance on compatible net cameras. -# off: The historical implementation using HTTP/1.0, closing the socket after each http request. -# force: Use HTTP/1.0 requests with keep alive header to reuse the same connection. -# on: Use HTTP/1.1 requests that support keep alive as default. -# Default: off -netcam_keepalive force - -# Set less strict jpeg checks for network cameras with a poor/buggy firmware. -# Default: off -netcam_tolerant_check on +# The video input to be used (default: -1) +# Should normally be set to 1 for video/TV cards, and -1 for USB cameras +input -1 # Draw a user defined text on the images using same options as C function strftime(3) # Default: Not defined = no text # Text is placed in lower left corner text_left CAMERA 4 + ############################################################ # Target Directories and filenames For Images And Films # For the options snapshot_, picture_, mpeg_ and timelapse_filename @@ -42,7 +36,16 @@ text_left CAMERA 4 # Target base directory for pictures and films # Recommended to use absolute patch. (Default: current working directory) -target_dir /usr/local/apache2/htdocs/cam4 +#target_dir /tmp/motion/cam4 + +# File path for motion triggered images (jpeg or ppm) relative to target_dir +# Default: %v-%Y%m%d%H%M%S-%q +# Default value is equivalent to legacy oldlayout option +# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H/%M/%S-%q +# File extension .jpg or .ppm is automatically added so do not include this +# Set to 'preview' together with best-preview feature enables special naming +# convention for preview shots. See motion guide for details +picture_filename CAM4_%v-%Y%m%d%H%M%S-%q ############################################################ @@ -54,9 +57,9 @@ stream_port 8084 # Command to be executed when a picture (.ppm|.jpg) is saved (default: none) # The filename of the picture is appended as an argument for the command. -on_picture_save /usr/local/motion-extras/camparse4.pl +#on_picture_save /usr/local/motion-extras/camparse2.pl # Command to be executed when a movie file (.mpg|.avi) is closed. (default: none) # Filename of movie is appended as an argument for the command. -on_movie_end /usr/local/motion-extras/mpegparse4.pl +#on_movie_end /usr/local/motion-extras/mpegparse2.pl