packaging fixes

.gitignore

@@ -1,3 +1,21 @@
 *.log
 .svn/
 *.o
+autom4te.cache
+aclocal.m4
+.depend
+motion
+config.h
+config.status
+config.h.in
+Makefile
+configure
+motion-dist.conf
+motion.init-Debian
+motion.init-FreeBSD.sh
+motion.service
+motion.spec
+camera1-dist.conf
+camera2-dist.conf
+camera3-dist.conf
+camera4-dist.conf

.travis.yml

@@ -0,0 +1,42 @@
+before_script:
+  - autoreconf -fiv
+  - avplay -version
+script: ./configure && make
+
+matrix:
+  include:
+  - os: linux
+    language: c
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+        - libavformat-dev
+        - libavcodec-dev
+        - libav-tools
+        - libavutil-dev
+        - libswscale-dev
+        - ffmpeg
+        - libjpeg8-dev
+        - libv4l-dev
+        - libzip-dev
+  - os: linux
+    language: c
+    compiler: gcc
+    sudo: rquired
+    dist: trusty
+    addons:
+      apt:
+        sources:
+        - sourceline: 'ppa:mc3man/trusty-media'
+        packages:
+        - libavformat-dev
+        - libavcodec-dev
+        - libav-tools
+        - libavutil-dev
+        - libswscale-dev
+        - ffmpeg
+        - libjpeg8-dev
+        - libv4l-dev
+        - libzip-dev
+

CHANGELOG

@@ -1,4 +1,73 @@
-SVN trunk Summary of Changes
+Summary of Changes
+   * ffmpeg_variable_bitrate to values of 0-100 and ffmpeg fixes
+   * Better messages for pkg-config
+   * Fix timelapse crash when selecting mpeg4
+Version 3.4.1 Changes Below
+   * Added suggestion for including pkgconf as part of build requirements
+   * Swap sequence of user ffmpeg path and PKG_CONFIG_PATH
+   * Allow : in non standard locations of netcam_url path.
+   * Eliminated the use of coded_frame (Was a redundant assignment)
+   * Revise HEVC to use H264 for older ffmpeg
+   * Add HEVC codec option for newer ffmpeg (momo-i)
+   * Makefile changes to align with Debian package and fixes from previous changes
+   * Revise description for netcam_url in configuration file.
+   * Change default for ffmpeg in configure.ac (Issue 795002,82)
+     To compile without ffmpeg now requires --without-ffmpeg option
+   * Change prefix to use sysconfdir instead.  Install threadX.conf files to threadx-dist.conf
+   * Revise configure.ac to use pkg-config for ffmpeg(Rex Feany)
+   * Revise PIX_FMT to be able to use older ffmpeg versions.
+   * Revise PIX_FMT for newer ffmpeg(Rex Feany)
+   * Add patch for ports on proxy netcams from GVautier (issue 144906)
+   * Add patch from JonGuess(issue 151452) for treatment of partial netcam images. 
+   * Consolidate the Sqlite3 options into the code standard.
+   * Draft revised motion_guide.html with new options.
+   * Revise manual to have current options. 
+   * Tab/Space cleanup and validation security issue addressed. (issue 071831)
+   * Add preview to webcontrol page(issue 172526)
+   * Additional container fixes(requests/bugs 201900,110304,001656,050731)
+   * Remove depreciated deinterlace option
+   * Remove avformat_network_init call.  Call was not needed and was leaking memory
+   * Add extra container options for ffmpeg videos
+   * Remove extra bytes before SOI marker on netcam images.
+   * Updated handling of lastsnap to permit subdirectory specification.
+   * Handle MJPEG streams from some Logitech webcams which send AVI1 instead of JFIF.
+   * Fix missing header for some builds(Jim Dodgen)
+   * Sqlite3 revisions (Jim Dodgen)
+   * Add new config options to the motion-dist.conf 
+   * Allow text format specifiers to take a width like printf would.  (David Fries)
+   * Allow text format specifiers to take a width like printf would.  (David Fries)
+   * Add power_line_frequency configuration item to improve image quality.  (David Fries)
+   * Fix webhttpd race condition crash with SIGHUP, add it to running thread counter (David Fries)
+   * Fix the GOP size for the created videos
+   * Fix netcam ftp functionality
+   * Fix Typo on the log level
+   * Fixed the network ftp image option.
+   * Lock thread on ffmpeg/libav init and open_codec
+   * Revise version number generated by script to indicate Unofficial-Git-'hash'
+   * Revised Changelog description for version 3.4
+   * Merge OpenBSD fixes from sthen pull request
+   * Revised picture.c to allow for modulo 8 pictures and adjusted netcam modules accordingly as well.(closes 135313)
+   * Changes to ffmpeg.h/ffmpeg.c to allow for compiling without ffmpeg/libav or with older versions.
+   * Merge mymalloc, free and casting changes from Alfred Klomp
+   * Merge bug fix for sizeof from Alfred Klomp
+   * Rewrote timelapse so that it works(closes 180501)
+   * Merge tosiara changes for version number
+   * Add copyright file for features added since 3.2.12
+   * Cleanup ffmpeg.c and plug memory leak
+   * Add support for latest version of ffmpeg/libav
+   * Tidy up packaging changes
+   * Add packaging fixes (infinity0)
+   * Revise version.sh to put out the git commit.
+   * Rollback revision to allow for a formal pull request.
+   * Reimplement changes not to be included in pull request from tosiara commit 9ebee031
+   * Implement requirement of modulo 16 to avoid seg fault when opening stream
+   * Add debian build files from trusty(14.04)
+   * Revise default values for motion.conf
+   * Revise CHANGELOG to conform with debian format
+   * Revised debian packaging files
+   * Implement new sequence for this file (CHANGELOG) newest to oldest.
+
+Summary of Changes that were proposed to maintainer for a version 3.4
 
 Features
    * Insert Blanking frames http://www.lavrsen.dk/twiki/bin/view/Motion/FeatureRequest2007x12x16x132522 (Dag Erlandsson)
@@ -49,6 +118,39 @@ Features
      http://www.lavrsen.dk/foswiki/bin/view/Motion/OggTimelapse (Michael Luich)
    * Added support for ffmpeg 0.11 new API.
    * Added RSTP support for netcam ( merge https://github.com/hyperbolic2346/motion )
+   * Merge tosiara/rtsp branch (commit 46cfcf31d, 2014/05/21) (Mr-Dave)
+     * 3fps bugfix from SVN rev559 (tosiara, Joerg Weber)
+     * Buffer overflow vulnerabilities (hyperbolic2346)
+     * Redundand -- boundary prefix (torao)
+   * Removed compiler warnings:  (Mr-Dave)
+       logger.c,jpegutils.c,netcam_ftp.c,track.c,
+       picture.c,webhttpd.c,stream.c,ffmpeg.c
+   * Bug fix as part of warnings in webhttpd.c fixed(Mr-Dave)
+   * Removed compiler warning regarding ffmpeg being newer than 0.4 version(Mr-Dave)
+   * New configure script and identification of ffmpeg version and additional libs. (Mr-Dave)
+   * Resolve additional compiler warnings in ffmpeg (Mr-Dave)
+   * Revised INSTALL with samples(Mr-Dave)
+   * Revisions for RTSP and code standard.(Mr-Dave)
+   * Plugged most memory leaks in RTSP. (Mr-Dave)
+   * Undo changes caused by code editor and other unnecessary changes (Mr-Dave)
+   * Moved call to netcam_shutdown_rtsp into netcam_cleanup where it belongs. (Mr-Dave)
+   * Regession fix for memory leaks and reconnection (Mr-Dave)
+   * Eliminated requirement to manually build FFMPEG for RTSP support. (Mr-Dave)
+   * Revised RTSP to support version 53 of libavformat (Mr-Dave)
+   * Revised FFMPEG.c to eliminate warnings and functions no longer supported by Libav/FFMPEG(Mr-Dave)
+   * Revised INSTALL to have sample PI configure option.(Mr-Dave)
+   * Revised configure.ac to generate compiler flag AVFMT_V53.(Mr-Dave)
+   * Revised INSTALL to indicate standard APT packages for RTSP (Mr-Dave)
+   * Revised configure.ac to recognize libavformat version 54 RTSP (Mr-Dave)
+   * Clean up the messaging for RTSP.
+   * Additional validations for RTSP connection and corrected free sequences
+   * Removed seg fault on failure to open first image, comments, isolation of RTSP
+   * Add AC_GNU_SOURCE macro to check for GNU C Library, fix compile when no FFMpeg.
+   * Implement inits of AV functions from bcl fork
+   * Add gray image upon disconnection
+   * Added tcp/udp transport config option from hyperbolic2346(commit 423ef7bb3)
+   * Revised comments to be in line with application standard.
+   * Restructure rtsp to handle rescaling and non YUV420 format, rotate, MJPEG input format
 
 Bugfixes
    * Avoid segfault detecting strerror_r() version GNU or SUSv3. (Angel Carpintero)
@@ -98,7 +200,7 @@ Bugfixes
      http://www.lavrsen.dk/foswiki/bin/view/Motion/BugReport2010x04x28x054348
 
 
-3.2.11.1 Sumary of Changes
+3.2.11.1 Summary of Changes
 
 Bugfixes
    * Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too) (Peter Holik)

CREDITS

@@ -473,6 +473,11 @@ Mark Feenstra
 Miguel Freitas
    * Came up with the round robing idea.
 
+David Fries
+   * Fix webhttpd race condition crash with SIGHUP, add it to running thread counter
+   * Allow text format specifiers to take a width like printf would.
+   * Add power_line_frequency configuration item to improve image quality.
+
 Aaron Gage
    * Pointed me to the vid_mmap/int problem when calling SYNC in
      video.c

FAQ

@@ -1,24 +1,2 @@
 This FAQ is no longer kept up to date
-Look at this URL for a more up to date wiki based FAQ
-http://www.lavrsen.dk/twiki/bin/view/Motion/FrequentlyAskedQuestions
-
-Q: motion crashes while parsing the config file.
-
-A: Appearantly the behaviour of strtok in glibc has changed somewhat.
-   This problem should be fixed as of 2.3
-
-
-Q: Were does motion look for the config file?
-
-A: First it will look for 'motion.conf' in the current directory, next it will
-   try to find '.motion/motion.conf' in your home directory (pointed to by
-   the HOME environment variable). If these don't exist it will try to open
-   '/usr/local/etc/motion.conf' if you specified /usr/local as the prefix to
-   configure (this is the default).
-
-Q: What codingstyle is used for motion?
-
-A: Motion follows the same style as the linux kernel.
-   Read Documentation/Codingstyle in the kernel tree for some good reasons.
-   Also be aware that motion is multithreaded and as such all functions should
-   be reentrant, using static variables is usually a bad idea.
+Look at the guide in /usr/share/doc/motion/motion_guide.html

INSTALL

@@ -1,16 +1,46 @@
-Very simple:
+The following is a brief overview of the building and installing instructions.
 
-type:
+For full instructions on how to build and install Motion, see the 
+motion_guide.html that is distributed with this source code.
 
-    ./configure
+The building instructions vary based upon the base system and the desired options.
+For most installs, it will be desired to include either ffmpeg or libav and these will
+have associated dependencies which dictate the configuration options. 
 
-followed by:
+Build Packages:
+    autoconf 
+    automake
+    pkgconf
+    libtool 
+    libjpeg8-dev 
+    build-essential 
+    libzip-dev
 
-    make
+The option to include FFMPEG or Libav functionality in motion is a choice of one OR the other not both.
+The packages and library names change frequently and vary across base operating systems.  If ffmpeg or
+libav are built and installed from source the custom motion configuration options will usually be needed.
 
-And
+FFMPEG Packages
+    ffmpeg
+    libavformat-dev 
+    libavcodec-dev 
+    libavutil-dev 
+    libswscale-dev
+
+Libav Packages
+    libavformat-dev 
+    libavcodec-dev 
+    libavutil-dev 
+    libav-tools 
+    libswscale-dev
 
+Once required packages are installed, execute:
+    autoreconf -fiv
+    ./configure
+    make
     make install
 
-
-Next read the README
+Sample custom configuration options:
+    --prefix               :  Specify the install location for the motion package
+    --with-ffmpeg=[dir]    :  Specify the location in which ffmpeg/libav is installed.
+