Merge pull request #49 from popoviciri/motion_update

motion: update to 4.3.1

package/motion/0001-without-nls.patch

@@ -0,0 +1,51 @@
+gist 4d213af40bb4786c3a51535bf7cc1fdd
+Author: Mr-DaveDev
+Date:   Thu Sep 29 22:07:12 2019
+
+diff --git a/Makefile.am b/Makefile.am
+index ecc20f1..8b262c0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,4 @@
+-ACLOCAL_AMFLAGS = -I m4
+-
+-SUBDIRS = src po man
++SUBDIRS = src man
+ 
+ sysconfdir = @sysconfdir@/$(PACKAGE)
+ sysconf_DATA = \
+diff --git a/configure.ac b/configure.ac
+index 6ee2554..42b1c36 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,10 +6,6 @@ AC_GNU_SOURCE
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_SRCDIR([src/motion.c])
+ AC_CANONICAL_HOST
+-AC_CONFIG_MACRO_DIR([m4])
+-
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.19])
+ 
+ ##############################################################################
+ ###  Check additional system headers
+@@ -470,7 +466,6 @@ LDFLAGS="$TEMP_LDFLAGS"
+ AC_CONFIG_FILES([
+ 	Makefile
+ 	src/Makefile
+-  po/Makefile.in
+   man/Makefile
+   data/camera1-dist.conf
+   data/camera2-dist.conf
+diff --git a/src/Makefile.am b/src/Makefile.am
+index bedd1b3..aa253ca 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -4,7 +4,6 @@ if INC_MMAL_SRC
+ MMAL_SRC=raspicam/RaspiCamControl.c raspicam/RaspiCLI.c
+ endif
+ 
+-LIBS = @LIBINTL@ @LIBS@
+ 
+ bin_PROGRAMS = motion
+ 

package/motion/0002-enable-h264-omx-codec.patch

@@ -0,0 +1,17 @@
+Author: jasaw
+
+
+diff --git a/src/ffmpeg.c b/src/ffmpeg.c
+index 3af961a..d59f0e1 100644
+--- a/src/ffmpeg.c
++++ b/src/ffmpeg.c
+@@ -680,7 +680,7 @@ static const char *ffmpeg_codec_is_blacklisted(const char *codec_name){
+          * - remove the "h264_omx" from this blacklist.
+          * More information: https://github.com/Motion-Project/motion/issues/433
+          */
+-        {"h264_omx", "Codec causes lock up on your FFMpeg version"},
++        //{"h264_omx", "Codec causes lock up on your FFMpeg version"},
+ #endif
+ #if (LIBAVFORMAT_VERSION_MAJOR < 57) || ((LIBAVFORMAT_VERSION_MAJOR == 57) && (LIBAVFORMAT_VERSION_MINOR < 41))
+         {"h264_v4l2m2m", "FFMpeg version is too old"},
+

package/motion/Config.in

@@ -2,6 +2,8 @@ config BR2_PACKAGE_MOTION
 	bool "motion"
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_FFMPEG
+	select BR2_PACKAGE_FFMPEG_SWSCALE
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LIBMICROHTTPD
 	help

package/motion/motion.hash

@@ -1,3 +1,3 @@
 # Locally computed:
-sha256	c8d40976b41da8eb9f9f7128599403a312fc26b7226bf3787d75f78cb5a6cc6e	motion-4.2.2.tar.gz
+sha256	545712b10fc4a0134e994b7d8a3773c1c22f0bf4bd7afea7d7ffff357aca9ea5	motion-release-4.3.1.tar.gz
 sha256	91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad	COPYING

package/motion/motion.mk

@@ -4,68 +4,24 @@
 #
 ################################################################################
 
-MOTION_VERSION = 4.2.2
-MOTION_SITE = $(call github,Motion-Project,motion,release-$(MOTION_VERSION))
+MOTION_VERSION = release-4.3.1
+MOTION_SITE = $(call github,Motion-Project,motion,$(MOTION_VERSION))
 MOTION_LICENSE = GPL-2.0
-MOTION_LICENSE_FILES = COPYING
-MOTION_DEPENDENCIES = host-pkgconf jpeg libmicrohttpd $(TARGET_NLS_DEPENDENCIES)
-# From git
+MOTION_LICENSE_FILES = doc/COPYING
 MOTION_AUTORECONF = YES
+MOTION_DEPENDENCIES = host-pkgconf ffmpeg jpeg libmicrohttpd
+MOTION_CONF_OPTS = --without-pgsql \
+                   --without-sqlite3 \
+                   --without-mysql \
+                   --without-mariadb \
+                   --with-ffmpeg=$(STAGING_DIR)/usr/lib
 
-MOTION_CONF_OPTS += --without-optimizecpu
-
-ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
-MOTION_DEPENDENCIES += ffmpeg
-MOTION_CONF_OPTS += --with-ffmpeg
-else
-MOTION_CONF_OPTS += --without-ffmpeg
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+MOTION_DEPENDENCIES += rpi-userland
 endif
 
-ifeq ($(BR2_PACKAGE_MYSQL),y)
-MOTION_DEPENDENCIES += mysql
-MOTION_CONF_OPTS += \
-	--with-mysql \
-	--with-mysql-include=$(STAGING_DIR)/usr/include/mysql \
-	--with-mysql-lib=$(STAGING_DIR)/usr/lib
-else
-MOTION_CONF_OPTS += --without-mysql
-endif
-
-ifeq ($(BR2_PACKAGE_POSTGRESQL),y)
-MOTION_DEPENDENCIES += postgresql
-MOTION_CONF_OPTS += \
-	--with-pgsql \
-	--with-pgsql-include=$(STAGING_DIR)/usr/include \
-	--with-pgsql-lib=$(STAGING_DIR)/usr/lib
-else
-MOTION_CONF_OPTS += --without-pgsql
-endif
-
-ifeq ($(BR2_PACKAGE_SQLITE),y)
-MOTION_DEPENDENCIES += sqlite
-MOTION_CONF_OPTS += --with-sqlite3
-else
-MOTION_CONF_OPTS += --without-sqlite3
-endif
-
-ifeq ($(BR2_PACKAGE_WEBP_MUX),y)
-MOTION_DEPENDENCIES += webp
-MOTION_CONF_OPTS += --with-webp
-else
-MOTION_CONF_OPTS += --without-webp
-endif
-
-# Do not use default install target as it installs many unneeded files and
-# directories: docs, examples and init scripts
 define MOTION_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0644 $(@D)/motion-dist.conf \
-		$(TARGET_DIR)/etc/motion/motion.conf
-	$(INSTALL) -D -m 0755 $(@D)/motion $(TARGET_DIR)/usr/bin/motion
-endef
-
-define MOTION_INSTALL_INIT_SYSV
-	$(INSTALL) -D -m 0755 package/motion/S99motion \
-		$(TARGET_DIR)/etc/init.d/S99motion
+    cp $(@D)/src/motion $(TARGET_DIR)/usr/bin/motion
 endef
 
 define MOTION_INSTALL_INIT_SYSTEMD