From 59dba2688a0df19ce7eb4d0fad3939d67e988d4c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 5 Mar 2024 09:24:51 +0100 Subject: motion: update to 4.6.0 --- package/motion/Makefile | 18 ++++++------ package/motion/patches/patch-config_h | 33 ---------------------- package/motion/patches/patch-configure | 20 ------------- package/motion/patches/patch-motion_init-Debian | 11 -------- .../motion/patches/patch-motion_init-FreeBSD_sh | 11 -------- 5 files changed, 10 insertions(+), 83 deletions(-) delete mode 100644 package/motion/patches/patch-config_h delete mode 100644 package/motion/patches/patch-configure delete mode 100644 package/motion/patches/patch-motion_init-Debian delete mode 100644 package/motion/patches/patch-motion_init-FreeBSD_sh diff --git a/package/motion/Makefile b/package/motion/Makefile index 4e2c7d4f7..f88db12bd 100644 --- a/package/motion/Makefile +++ b/package/motion/Makefile @@ -4,22 +4,24 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= motion -# actually a svn version from 25.06.2014 checkout -PKG_VERSION:= 4.0 -PKG_RELEASE:= 2 -PKG_HASH:= ff2931b0af037da126fed3e496430944132528132e71473aae478ff2e7f78e0d +PKG_VERSION:= 4.6.0 +PKG_RELEASE:= 1 +PKG_HASH:= 9268df31a5ebeaf8daca4747cdcd01c86e223625b6f971e9bcec98edf35ec06f PKG_DESCR:= webcam motion sensing and logging PKG_SECTION:= mm/video -PKG_DEPENDS:= libjpeg-turbo libsdl -PKG_BUILDDEP:= libjpeg-turbo sdl +PKG_DEPENDS:= libjpeg-turbo libmicrohttpd +PKG_BUILDDEP:= libjpeg-turbo libmicrohttpd PKG_NEEDS:= threads -PKG_URL:= http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome -PKG_SITES:= http://distfiles.openadk.org/ +PKG_SITES:= https://github.com/Motion-Project/motion/archive/refs/tags/ + +DISTFILES:= release-$(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}-release-${PKG_VERSION} include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,MOTION,motion,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --without-ffmpeg \ --without-jpeg-mmx \ --without-optimizecpu \ diff --git a/package/motion/patches/patch-config_h b/package/motion/patches/patch-config_h deleted file mode 100644 index 7c6d32ce8..000000000 --- a/package/motion/patches/patch-config_h +++ /dev/null @@ -1,33 +0,0 @@ ---- motion-4.0.orig/config.h 2011-09-18 22:49:29.000000000 +0200 -+++ motion-4.0/config.h 2012-07-25 14:54:50.000000000 +0200 -@@ -14,7 +14,7 @@ - #define HAVE_LINUX_VIDEODEV2_H 1 - - /* Define to 1 if you have the header file. */ --#define HAVE_LINUX_VIDEODEV_H 1 -+/* #undef HAVE_LINUX_VIDEODEV_H */ - - /* Define to 1 if you have the header file. */ - #define HAVE_MEMORY_H 1 -@@ -89,10 +89,10 @@ - #define SIZEOF_INT 4 - - /* The size of `int *', as computed by sizeof. */ --#define SIZEOF_INT_P 8 -+#define SIZEOF_INT_P 4 - - /* The size of `long int', as computed by sizeof. */ --#define SIZEOF_LONG_INT 8 -+#define SIZEOF_LONG_INT 4 - - /* The size of `long long', as computed by sizeof. */ - #define SIZEOF_LONG_LONG 8 -@@ -101,7 +101,7 @@ - #define SIZEOF_SHORT 2 - - /* The size of `void *', as computed by sizeof. */ --#define SIZEOF_VOID_P 8 -+#define SIZEOF_VOID_P 4 - - /* Define to 1 if you have the ANSI C header files. */ - #define STDC_HEADERS 1 diff --git a/package/motion/patches/patch-configure b/package/motion/patches/patch-configure deleted file mode 100644 index e4f923ce8..000000000 --- a/package/motion/patches/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- motion-4.0.orig/configure 2011-09-18 22:48:41.000000000 +0200 -+++ motion-4.0/configure 2012-07-25 15:29:03.000000000 +0200 -@@ -2395,7 +2395,7 @@ fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Darwin" >&5 - $as_echo_n "checking for Darwin... " >&6; } --Darwin=`uname -a | grep "Darwin"` -+Darwin= - - if test "${Darwin}" = ""; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -@@ -2403,7 +2403,7 @@ $as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for *BSD" >&5 - $as_echo_n "checking for *BSD... " >&6; } - -- FreeBSD=`uname -a | grep "BSD"` -+ FreeBSD= - if test "${FreeBSD}" = ""; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } diff --git a/package/motion/patches/patch-motion_init-Debian b/package/motion/patches/patch-motion_init-Debian deleted file mode 100644 index 18f9ef1a3..000000000 --- a/package/motion/patches/patch-motion_init-Debian +++ /dev/null @@ -1,11 +0,0 @@ ---- motion-4.0.orig/motion.init-Debian 2011-09-18 22:49:29.000000000 +0200 -+++ motion-4.0/motion.init-Debian 2012-07-25 14:54:50.000000000 +0200 -@@ -6,7 +6,7 @@ - - NAME=motion - PATH=/bin:/usr/bin:/sbin:/usr/sbin --DAEMON=/usr/local/bin/motion -+DAEMON=/usr/bin/motion - PIDFILE=/var/run/motion/$NAME.pid - - diff --git a/package/motion/patches/patch-motion_init-FreeBSD_sh b/package/motion/patches/patch-motion_init-FreeBSD_sh deleted file mode 100644 index 64a47fe11..000000000 --- a/package/motion/patches/patch-motion_init-FreeBSD_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- motion-4.0.orig/motion.init-FreeBSD.sh 2011-09-18 22:49:29.000000000 +0200 -+++ motion-4.0/motion.init-FreeBSD.sh 2012-07-25 14:54:50.000000000 +0200 -@@ -18,7 +18,7 @@ motion_enable="${motion_enable-NO}" - name="motion" - rcvar=`set_rcvar` - --command="/usr/local/bin/${name}" -+command="/usr/bin/${name}" - pidfile="/var/run/${name}.pid" - required_files="/usr/local/etc/${name}.conf" - -- cgit v1.2.3