[v2] motion: Update to 4.3.0

Message ID 20200405132710.7555-1-matthias.fischer@ipfire.org
State Accepted
Headers
Series [v2] motion: Update to 4.3.0 |

Commit Message

Matthias Fischer April 5, 2020, 1:27 p.m. UTC
  For details see:
https://github.com/Motion-Project/motion/releases

This update is needed for 'ffmpeg 4.2.2' and 'libmicrohttpd 0.9.70' (new package).

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 config/rootfiles/packages/motion | 42 ++++++++++++++++++++------------
 lfs/motion                       | 14 +++++------
 2 files changed, 33 insertions(+), 23 deletions(-)
  

Patch

diff --git a/config/rootfiles/packages/motion b/config/rootfiles/packages/motion
index 82a80973f..f93b24a91 100644
--- a/config/rootfiles/packages/motion
+++ b/config/rootfiles/packages/motion
@@ -5,30 +5,40 @@  etc/motion/camera2-dist.conf
 etc/motion/camera3-dist.conf
 etc/motion/camera4-dist.conf
 #etc/motion/motion-dist.conf
+etc/rc.d/init.d/motion
+etc/rc.d/rc0.d/K01motion
+etc/rc.d/rc6.d/K01motion
+etc/rc.d/rc3.d/S99motion
 usr/bin/motion
 #usr/share/doc/motion
-#usr/share/doc/motion/CHANGELOG
 #usr/share/doc/motion/COPYING
 #usr/share/doc/motion/CREDITS
-#usr/share/doc/motion/README.md
 #usr/share/doc/motion/mask1.png
+#usr/share/doc/motion/motion_build.html
+#usr/share/doc/motion/motion_config.html
 #usr/share/doc/motion/motion_guide.html
+#usr/share/doc/motion/motion_stylesheet.css
 #usr/share/doc/motion/normal.jpg
 #usr/share/doc/motion/outputmotion1.jpg
 #usr/share/doc/motion/outputnormal1.jpg
+#usr/share/locale/da/LC_MESSAGES/motion.mo
+#usr/share/locale/de/LC_MESSAGES/motion.mo
+#usr/share/locale/es/LC_MESSAGES/motion.mo
+#usr/share/locale/fi/LC_MESSAGES/motion.mo
+#usr/share/locale/fr/LC_MESSAGES/motion.mo
+#usr/share/locale/it/LC_MESSAGES/motion.mo
+#usr/share/locale/ja/LC_MESSAGES/motion.mo
+#usr/share/locale/ko/LC_MESSAGES/motion.mo
+#usr/share/locale/li
+#usr/share/locale/li/LC_MESSAGES
+#usr/share/locale/li/LC_MESSAGES/motion.mo
+#usr/share/locale/nl/LC_MESSAGES/motion.mo
+#usr/share/locale/no
+#usr/share/locale/no/LC_MESSAGES
+#usr/share/locale/no/LC_MESSAGES/motion.mo
+#usr/share/locale/pt/LC_MESSAGES/motion.mo
+#usr/share/locale/sk/LC_MESSAGES/motion.mo
+#usr/share/locale/sv/LC_MESSAGES/motion.mo
+#usr/share/locale/zh/LC_MESSAGES/motion.mo
 #usr/share/man/man1/motion.1
-#usr/share/motion
-#usr/share/motion/examples
-#usr/share/motion/examples/camera1-dist.conf
-#usr/share/motion/examples/camera2-dist.conf
-#usr/share/motion/examples/camera3-dist.conf
-#usr/share/motion/examples/camera4-dist.conf
-#usr/share/motion/examples/motion-dist.conf
-#usr/share/motion/examples/motion.init-Debian
-#usr/share/motion/examples/motion.init-FreeBSD.sh
-#usr/share/motion/examples/motion.service
 var/ipfire/backup/addons/includes/motion
-etc/rc.d/init.d/motion
-etc/rc.d/rc0.d/K01motion
-etc/rc.d/rc6.d/K01motion
-etc/rc.d/rc3.d/S99motion
diff --git a/lfs/motion b/lfs/motion
index c00fde89e..f28e4ba99 100644
--- a/lfs/motion
+++ b/lfs/motion
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,17 +24,17 @@ 
 
 include Config
 
-VER        = 4.0.1
+VER        = 4.3.0
 
-THISAPP    = motion-release-$(VER)
+THISAPP    = motion-Release-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = motion
-PAK_VER    = 2
-DEPS       = ffmpeg
+PAK_VER    = 3
+DEPS       = ffmpeg libmicrohttpd
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5c87f90c4118d8cf0fb14700db69118f
+$(DL_FILE)_MD5 = 297aab6ec3de74ce1a0d2b1711ac9062
 
 install : $(TARGET)
 
@@ -67,7 +67,7 @@  $(patsubst %,$(DIR_DL)/%,$(objects)) :
 $(subst %,%_MD5,$(objects)) :
 	@$(MD5)
 
-dist:
+dist: 
 	@$(PAK)
 
 ###############################################################################