SOURCES: motion-config.patch, motion-as_needed.patch, motion-inttypes.patch...

[jezik]

Author: jezik                        Date: Tue Jun 10 17:19:04 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 3.2.10

---- Files affected:
SOURCES:
   motion-config.patch (1.2 -> 1.3) , motion-as_needed.patch (1.1 -> 1.2) , motion-inttypes.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/motion-config.patch
diff -u SOURCES/motion-config.patch:1.2 SOURCES/motion-config.patch:1.3
--- SOURCES/motion-config.patch:1.2	Fri Mar  2 09:55:58 2007
+++ SOURCES/motion-config.patch	Tue Jun 10 19:18:58 2008
@@ -1,33 +1,11 @@
-diff -Nur motion-3.2.7.orig/Makefile.in motion-3.2.7/Makefile.in
---- motion-3.2.7.orig/Makefile.in	2006-10-20 00:21:54.000000000 +0000
-+++ motion-3.2.7/Makefile.in	2007-03-02 08:51:17.000000000 +0000
+--- motion-3.2.10/Makefile.in.orig	2008-06-10 19:01:53.000000000 +0200
++++ motion-3.2.10/Makefile.in	2008-06-10 19:01:57.000000000 +0200
 @@ -31,7 +31,7 @@
  # install.                                                                     #
  ################################################################################
- CFLAGS       = @CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -D_REENTRANT \
--	       -Dsysconfdir=\"$(sysconfdir)\"
-+	       -Dsysconfdir=\"$(sysconfdir)/motion\"
+ CFLAGS       = @CFLAGS@ -Wall -DVERSION=\"@PACKAGE_VERSION@\"  \
+-	       -Dsysconfdir=\"$(sysconfdir)\" -Ddocdir=\"$(docdir)\"
++	       -Dsysconfdir=\"$(sysconfdir)\motion\" -Ddocdir=\"$(docdir)\motion\"
  LDFLAGS      = @LDFLAGS@
  LIBS         = @LIBS@ 
  VIDEO_OBJ    = @VIDEO@
-diff -Nur motion-3.2.7.orig/motion-dist.conf motion-3.2.7/motion-dist.conf
---- motion-3.2.7.orig/motion-dist.conf	2006-10-20 00:21:54.000000000 +0000
-+++ motion-3.2.7/motion-dist.conf	2007-03-02 08:53:12.000000000 +0000
-@@ -11,7 +11,7 @@
- daemon on
- 
- # File to store the process ID, also called pid file. (default: not defined)
--process_id_file /var/run/motion.pid 
-+process_id_file /var/run/motion/motion.pid 
- 
- ############################################################
- # Basic Setup Mode
-@@ -323,7 +323,7 @@
- 
- # Target base directory for pictures and films
- # Recommended to use absolute path. (Default: current working directory)
--target_dir /usr/local/apache2/htdocs/cam1
-+target_dir /home/services/httpd/html/motion/
- 
- # File path for snapshots (jpeg or ppm) relative to target_dir
- # Default: %v-%Y%m%d%H%M%S-snapshot

================================================================
Index: SOURCES/motion-as_needed.patch
diff -u SOURCES/motion-as_needed.patch:1.1 SOURCES/motion-as_needed.patch:1.2
--- SOURCES/motion-as_needed.patch:1.1	Mon Jan  7 11:31:32 2008
+++ SOURCES/motion-as_needed.patch	Tue Jun 10 19:18:59 2008
@@ -1,11 +1,11 @@
---- motion-3.2.9/configure.in.orig	2008-01-07 11:16:15.354694153 +0100
-+++ motion-3.2.9/configure.in	2008-01-07 11:18:44.831890471 +0100
-@@ -277,7 +277,7 @@
-    LDFLAGS=$TEMP_LDFLAGS
- 
-    AC_CHECK_LIB(lavjpeg, decode_jpeg_raw,[
--                TEMP_LDFLAGS="$TEMP_LDFLAGS -lmjpegutils -llavjpeg"
-+                TEMP_LIBS="$TEMP_LIBS -lmjpegutils -llavjpeg"
-                 MJPEG_SUPPORT="yes"
-                 TEMP_CFLAGS="$TEMP_CFLAGS -DMJPEGT"
+--- motion-3.2.10/configure.in.orig	2008-05-18 16:58:52.000000000 +0200
++++ motion-3.2.10/configure.in	2008-06-10 19:08:08.000000000 +0200
+@@ -303,7 +303,7 @@
+    LDFLAGS=$TEMP_LDFLAGS  
+ 	
+    AC_CHECK_LIB(lavjpeg, decode_jpeg_raw,[ 
+-		TEMP_LDFLAGS="$TEMP_LDFLAGS -lmjpegutils -llavjpeg"
++		TEMP_LIBS="$TEMP_LIBS -lmjpegutils -llavjpeg"
+ 		MJPEG_SUPPORT="yes"
+ 		TEMP_CFLAGS="$TEMP_CFLAGS -DMJPEGT"
                   ], , -lmjpegutils)

================================================================
Index: SOURCES/motion-inttypes.patch
diff -u SOURCES/motion-inttypes.patch:1.1 SOURCES/motion-inttypes.patch:1.2
--- SOURCES/motion-inttypes.patch:1.1	Thu Feb 21 18:41:57 2008
+++ SOURCES/motion-inttypes.patch	Tue Jun 10 19:18:59 2008
@@ -1,11 +1,11 @@
---- motion-3.2.9/Makefile.in~	2008-02-21 19:26:19.000000000 +0200
-+++ motion-3.2.9/Makefile.in	2008-02-21 19:31:34.838584137 +0200
-@@ -32,7 +32,7 @@
+--- motion-3.2.10/Makefile.in.orig.inttypes	2008-05-18 16:58:52.000000000 +0200
++++ motion-3.2.10/Makefile.in	2008-06-10 19:11:56.000000000 +0200
+@@ -31,7 +31,7 @@
  # install.                                                                     #
  ################################################################################
- CFLAGS       = @CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -D_REENTRANT \
--	       -Dsysconfdir=\"$(sysconfdir)/motion\"
-+	       -Dsysconfdir=\"$(sysconfdir)/motion\" @DEFS@
+ CFLAGS       = @CFLAGS@ -Wall -DVERSION=\"@PACKAGE_VERSION@\"  \
+-	       -Dsysconfdir=\"$(sysconfdir)\motion\" -Ddocdir=\"$(docdir)\motion\"
++	       -Dsysconfdir=\"$(sysconfdir)\motion\" -Ddocdir=\"$(docdir)\motion\" @DEFS@
  LDFLAGS      = @LDFLAGS@
  LIBS         = @LIBS@ 
  VIDEO_OBJ    = @VIDEO@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/motion-config.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/motion-as_needed.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/motion-inttypes.patch?r1=1.1&r2=1.2&f=u