captive: Add headline to T&C box

[ipfire-2.x.git] / lfs / motion

diff --git a/lfs/motion b/lfs/motion
index d6d0bcc90cd0c3e1ad647995a29e2c98aedea8bc..d226c1c5802a9fedc0d30881198008c60b9a6eb7 100644 (file)
--- a/lfs/motion
+++ b/lfs/motion
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2017  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # 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,16 +24,16 @@
 
 include Config
 
-VER        = 3.2.11
+VER        = 4.0.1
 
-THISAPP    = motion-$(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    = 1
+PAK_VER    = 2
 DEPS       = "ffmpeg"
 
 ###############################################################################
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3a26c00f3250eacf6fa93c7a7e0249d9
+$(DL_FILE)_MD5 = 5c87f90c4118d8cf0fb14700db69118f
 
 install : $(TARGET)
 
@@ -77,11 +77,24 @@ dist:
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+       #Install obsolete V4L1 videodev.h
+       cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h
+
+       cd $(DIR_APP) && autoreconf -fiv
+
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cp -vf $(DIR_SRC)/config/motion/motion.conf /etc
-       mkdir -pv /srv/motion/cam1
-       echo Folder for cam1 images > /srv/motion/cam1/info
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/motion \
+                        /var/ipfire/backup/addons/includes/motion
+
+       #Remove obsolete V4L1 videodev.h
+       rm -f /usr/include/linux/videodev.h
+
+       #install initscripts
+       $(call INSTALL_INITSCRIPT,motion)
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)