From 219a6dab8995aad9ac4860cc1a84d6f3509a03a4 Mon Sep 17 00:00:00 2001 From: wbx Date: Sun, 17 May 2009 14:41:34 +0200 Subject: Initial import --- package/motion/Config.in | 10 +++++++ package/motion/Makefile | 30 ++++++++++++++++++++ package/motion/ipkg/motion.control | 5 ++++ package/motion/patches/01-ffmpeg.patch | 38 ++++++++++++++++++++++++++ package/motion/patches/02-honor_cppflags.patch | 20 ++++++++++++++ 5 files changed, 103 insertions(+) create mode 100644 package/motion/Config.in create mode 100644 package/motion/Makefile create mode 100644 package/motion/ipkg/motion.control create mode 100644 package/motion/patches/01-ffmpeg.patch create mode 100644 package/motion/patches/02-honor_cppflags.patch (limited to 'package/motion') diff --git a/package/motion/Config.in b/package/motion/Config.in new file mode 100644 index 000000000..3b3861036 --- /dev/null +++ b/package/motion/Config.in @@ -0,0 +1,10 @@ +config ADK_PACKAGE_MOTION + prompt "motion............................ webcam motion sensing and logging" + tristate + default n + select ADK_PACKAGE_LIBJPEG + select ADK_PACKAGE_LIBPTHREAD + help + Motion is a software motion detector + + http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome diff --git a/package/motion/Makefile b/package/motion/Makefile new file mode 100644 index 000000000..302cb8a84 --- /dev/null +++ b/package/motion/Makefile @@ -0,0 +1,30 @@ +# $Id$ +#- +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include ${TOPDIR}/rules.mk + +PKG_NAME:= motion +PKG_VERSION:= 3.2.6 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 71e6bd13fcca70372e9b7c7806d62b30 +MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=motion/} + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,MOTION,motion,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) + +CONFIGURE_STYLE:= gnu +CONFIGURE_ARGS+= --without-ffmpeg \ + --without-jpeg-mmx \ + --without-mysql \ + --without-pgsql +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_MOTION}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/motion ${IDIR_MOTION}/usr/bin/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/motion/ipkg/motion.control b/package/motion/ipkg/motion.control new file mode 100644 index 000000000..44a0c2b91 --- /dev/null +++ b/package/motion/ipkg/motion.control @@ -0,0 +1,5 @@ +Package: motion +Priority: optional +Section: multimedia +Depends: libjpeg, libpthread +Description: Webcam motion sensing and logging diff --git a/package/motion/patches/01-ffmpeg.patch b/package/motion/patches/01-ffmpeg.patch new file mode 100644 index 000000000..1f4c73eaf --- /dev/null +++ b/package/motion/patches/01-ffmpeg.patch @@ -0,0 +1,38 @@ +diff -ur motion-3.2.5.1-old/motion.c motion-3.2.5.1/motion.c +--- motion-3.2.5.1-old/motion.c 2006-03-17 10:05:13.490000000 -0800 ++++ motion-3.2.5.1/motion.c 2006-03-17 10:03:38.020000000 -0800 +@@ -1246,10 +1246,10 @@ + * Note: Negative value means SIGALRM snaps are enabled + * httpd-control snaps are always enabled. + */ +- ++#ifdef HAVE_FFMPEG + /* time_current_frame is used both for snapshot and timelapse features */ + time_current_frame = cnt->currenttime; +- ++ + if ( (cnt->conf.snapshot_interval > 0 && cnt->shots == 0 && + time_current_frame % cnt->conf.snapshot_interval <= time_last_frame % cnt->conf.snapshot_interval) || + cnt->snapshot) { +@@ -1257,7 +1257,7 @@ + cnt->snapshot = 0; + } + +- ++#endif /* HAVE_FFMPEG */ + /***** MOTION LOOP - TIMELAPSE FEATURE SECTION *****/ + + #ifdef HAVE_FFMPEG +@@ -1331,10 +1331,9 @@ + event(cnt, EVENT_TIMELAPSEEND, NULL, NULL, NULL, cnt->currenttime_tm); + + +-#endif /* HAVE_FFMPEG */ + + time_last_frame = time_current_frame; +- ++#endif /* HAVE_FFMPEG */ + + /***** MOTION LOOP - VIDEO LOOPBACK SECTION *****/ + +Only in motion-3.2.5.1-old/: motion.c.orig diff --git a/package/motion/patches/02-honor_cppflags.patch b/package/motion/patches/02-honor_cppflags.patch new file mode 100644 index 000000000..322fb772d --- /dev/null +++ b/package/motion/patches/02-honor_cppflags.patch @@ -0,0 +1,20 @@ +diff -ruN motion-3.2.5.1-old/Makefile.in motion-3.2.5.1-new/Makefile.in +--- motion-3.2.5.1-old/Makefile.in 2006-03-07 22:52:49.000000000 +0100 ++++ motion-3.2.5.1-new/Makefile.in 2006-03-27 22:04:34.000000000 +0200 +@@ -32,6 +32,7 @@ + ################################################################################ + CFLAGS = @CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -D_REENTRANT \ + -Dsysconfdir=\"$(sysconfdir)\" ++CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + VIDEO_OBJ = @VIDEO@ +@@ -115,7 +116,7 @@ + ################################################################################ + $(DEPEND_FILE): *.h $(SRC) + @echo "Generating dependencies, please wait..." +- @$(CC) $(CFLAGS) -M $(SRC) > .tmp ++ @$(CC) $(CFLAGS) $(CPPFLAGS) -M $(SRC) > .tmp + @mv -f .tmp $(DEPEND_FILE) + @echo + -- cgit v1.2.3