bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update motion (patch from #1868)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@7570 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-06-11 16:11:41 +00:00
parent cd90134923
commit 1e72746174
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
multimedia/motion/Makefile
View File

@ -9,13 +9,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=motion
PKG_VERSION:=20070331-051001
PKG_VERSION:=3.2.7
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.lavrsen.dk/sources/motion-daily \
@SF/motion
PKG_MD5SUM:=16e58186022dfee1c0dcaf03cf5393e5
PKG_SOURCE_URL:=@SF/motion
PKG_MD5SUM:=b4af6e10532fcdec89060bc61a27fc3a
PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

13
multimedia/motion/patches/001-ffmpeg.patch
View File

@ -1,7 +1,8 @@
diff -x .svn -ruN motion-3.2.8.old/motion.c motion-3.2.8/motion.c
--- motion-3.2.8.old/motion.c 2007-03-31 12:54:31.000000000 +0200
+++ motion-3.2.8/motion.c 2007-03-31 13:08:27.000000000 +0200
@@ -1282,6 +1282,7 @@
Index: motion-3.2.7/motion.c
===================================================================
--- motion-3.2.7.orig/motion.c 2007-06-11 08:27:27.000000000 +0100
+++ motion-3.2.7/motion.c 2007-06-11 08:27:35.000000000 +0100
@@ -1279,6 +1279,7 @@
* httpd-control snaps are always enabled.
*/
@ -9,7 +10,7 @@ diff -x .svn -ruN motion-3.2.8.old/motion.c motion-3.2.8/motion.c
/* time_current_frame is used both for snapshot and timelapse features */
time_current_frame = cnt->currenttime;
@@ -1291,7 +1292,7 @@
@@ -1288,7 +1289,7 @@
event(cnt, EVENT_IMAGE_SNAPSHOT, newimg, NULL, NULL, cnt->currenttime_tm);
cnt->snapshot = 0;
}
@ -18,7 +19,7 @@ diff -x .svn -ruN motion-3.2.8.old/motion.c motion-3.2.8/motion.c
/***** MOTION LOOP - TIMELAPSE FEATURE SECTION *****/
@@ -1366,9 +1367,9 @@
@@ -1363,9 +1364,9 @@
event(cnt, EVENT_TIMELAPSEEND, NULL, NULL, NULL, cnt->currenttime_tm);

9
multimedia/motion/patches/002-honor_cppflags.patch
View File

@ -1,6 +1,7 @@
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
Index: motion-3.2.7/Makefile.in
===================================================================
--- motion-3.2.7.orig/Makefile.in 2007-06-11 08:26:33.000000000 +0100
+++ motion-3.2.7/Makefile.in 2007-06-11 08:27:55.000000000 +0100
@@ -32,6 +32,7 @@
################################################################################
CFLAGS = @CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -D_REENTRANT \
@ -9,7 +10,7 @@ diff -ruN motion-3.2.5.1-old/Makefile.in motion-3.2.5.1-new/Makefile.in
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
VIDEO_OBJ = @VIDEO@
@@ -115,7 +116,7 @@
@@ -119,7 +120,7 @@
################################################################################
$(DEPEND_FILE): *.h $(SRC)
@echo "Generating dependencies, please wait..."

6
multimedia/motion/patches/003-sn9c102-common-buffer.patch
View File

@ -1,7 +1,7 @@
Index: motion-3.2.8/motion.c
Index: motion-3.2.7/motion.c
===================================================================
--- motion-3.2.8/motion.c (revision 174)
+++ motion-3.2.8/motion.c (working copy)
--- motion-3.2.7.orig/motion.c 2007-06-11 08:27:35.000000000 +0100
+++ motion-3.2.7/motion.c 2007-06-11 08:28:30.000000000 +0100
@@ -474,8 +474,8 @@
cnt->imgs.shotstamp = mymalloc(sizeof(int));