diff options
Diffstat (limited to 'package/motion')
| -rw-r--r-- | package/motion/Makefile | 13 | ||||
| -rw-r--r-- | package/motion/ipkg/motion.control | 5 | ||||
| -rw-r--r-- | package/motion/patches/01-ffmpeg.patch | 38 | ||||
| -rw-r--r-- | package/motion/patches/02-honor_cppflags.patch | 20 | ||||
| -rw-r--r-- | package/motion/patches/patch-track_c | 21 |
5 files changed, 30 insertions, 67 deletions
diff --git a/package/motion/Makefile b/package/motion/Makefile index 3b0671f99..5253297cd 100644 --- a/package/motion/Makefile +++ b/package/motion/Makefile @@ -6,18 +6,23 @@ include ${TOPDIR}/rules.mk PKG_NAME:= motion -PKG_VERSION:= 3.2.6 +PKG_VERSION:= 3.2.11 PKG_RELEASE:= 1 -PKG_MD5SUM:= 71e6bd13fcca70372e9b7c7806d62b30 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=motion/} +PKG_MD5SUM:= 3a26c00f3250eacf6fa93c7a7e0249d9 +PKG_DESCR:= Webcam motion sensing and logging +PKG_SECTION:= multimedia +PKG_DEPENDS:= libjpeg libpthread +PKG_URL:= http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=motion/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MOTION,motion,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,MOTION,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-ffmpeg \ --without-jpeg-mmx \ + --without-optimizecpu \ --without-mysql \ --without-pgsql BUILD_STYLE:= auto diff --git a/package/motion/ipkg/motion.control b/package/motion/ipkg/motion.control deleted file mode 100644 index 44a0c2b91..000000000 --- a/package/motion/ipkg/motion.control +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 1f4c73eaf..000000000 --- a/package/motion/patches/01-ffmpeg.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index 322fb772d..000000000 --- a/package/motion/patches/02-honor_cppflags.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 - diff --git a/package/motion/patches/patch-track_c b/package/motion/patches/patch-track_c new file mode 100644 index 000000000..06e580e18 --- /dev/null +++ b/package/motion/patches/patch-track_c @@ -0,0 +1,21 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- motion-3.2.11.orig/track.c 2008-09-22 01:20:58.000000000 +0200 ++++ motion-3.2.11/track.c 2009-05-30 12:45:30.141690363 +0200 +@@ -165,7 +165,7 @@ static unsigned short int stepper_center + return 0; + } + +- bzero (&adtio, sizeof(adtio)); ++ memset (&adtio, 0, sizeof(adtio)); + adtio.c_cflag = STEPPER_BAUDRATE | CS8 | CLOCAL | CREAD; + adtio.c_iflag = IGNPAR; + adtio.c_oflag = 0; +@@ -323,7 +323,7 @@ static unsigned short int iomojo_center( + return 0; + } + +- bzero (&adtio, sizeof(adtio)); ++ memset (&adtio, 0, sizeof(adtio)); + adtio.c_cflag = IOMOJO_BAUDRATE | CS8 | CLOCAL | CREAD; + adtio.c_iflag = IGNPAR; + adtio.c_oflag = 0; |