rpms/motion/devel motion-initscript,1.1,1.2

[Steven Moix]

Author: moixs

Update of /cvs/free/rpms/motion/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31758

Modified Files:
	motion-initscript 
Log Message:
* Tue Aug 11 2009 Steven Moix <steven.moix at axianet.ch> - 3.2.11.1-1
- Drop patch for ffmpeg 0.5 compatibility
- Drop ffmpeg detection patch
- Moved default output directory to /var/motion
- New startup script with added v4l2convert to support more cameras - https://bugzilla.rpmfusion.org/show_bug.cgi?id=681
- Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too)
- Fix fd leaks in external pipe
- Avoid possible stack smashing in v4l_open_vidpipe()
- Fix segfault for new libjpeg v7



Index: motion-initscript
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion-initscript,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- motion-initscript	25 Mar 2009 21:43:14 -0000	1.1
+++ motion-initscript	11 Aug 2009 19:26:24 -0000	1.2
@@ -32,13 +32,27 @@
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon $motion 2> /dev/null
+    # We try to determine which architecture we have so we can 
+    # load libv4l to support more USB cameras. x86_64 and ppc64
+    # are both supported by rpmfusion.
+    case $(uname -i) in
+        "x86_64" )
+            #We load libv4l for 64 Bit x86 architectures
+            LD_PRELOAD=/usr/lib64/libv4l/v4l2convert.so daemon $motion 2> /dev/null ;;
+        "ppc64" )
+            #We load libv4l for 64 Bit PPC architectures
+            LD_PRELOAD=/usr/lib64/libv4l/v4l2convert.so daemon $motion 2> /dev/null ;;
+        * )
+            #Default case, we load libv4l for all 32 Bit architectures
+            LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so daemon $motion 2> /dev/null ;;
+    esac
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
     return $retval
 }
 
+
 stop() {
     echo -n $"Stopping $prog: "
     killproc $motion