Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7083ba8aaa4756f645092110eaae989aaf5acf84
commit 7083ba8aaa4756f645092110eaae989aaf5acf84 Author: voroskoi <[EMAIL PROTECTED]> Date: Tue Apr 29 11:06:27 2008 +0200 motion-3.2.9-2-x86_64 rebuilt with ffmpeg>=20080427 added ffmpeg.diff diff --git a/source/xmultimedia-extra/motion/FrugalBuild b/source/xmultimedia-extra/motion/FrugalBuild index c078906..cad6aef 100644 --- a/source/xmultimedia-extra/motion/FrugalBuild +++ b/source/xmultimedia-extra/motion/FrugalBuild @@ -4,24 +4,27 @@ pkgname=motion pkgver=3.2.9 -pkgrel=1 +pkgrel=2 pkgdesc="Motion is a program that monitors the video signal from one or more cameras and is able to detect if a significant part of the picture has changed. Or in other words, it can detect motion." Finclude sourceforge url="http://www.lavrsen.dk/twiki/bin/view/Motion/"; -depends=('zlib' 'ffmpeg>=20070422' 'jhead' 'libjpeg') +depends=('zlib' 'ffmpeg>=20080427' 'jhead' 'libjpeg') groups=('xmultimedia-extra') install="motion.install" archs=('i686' 'x86_64') up2date="lynx -dump 'http://www.lavrsen.dk/twiki/bin/view/Motion/DownloadFiles' |grep 'Current version is'| sed 's/.*Current version is \(.*\).*/\1/'" -source=($source rc.motion README.Frugalware) +source=($source rc.motion README.Frugalware ffmpeg.diff) sha1sums=('1417529f8c49bdf922caa7d0c746c4a2277fe34a' \ '1d85dce27289f756bdf9c96c78c9587d258190cf' \ - 'b0598b9068e3e136d4a4864f5fc66749c787d7f6') + 'b0598b9068e3e136d4a4864f5fc66749c787d7f6' \ + '06ba5c814fed7feb825751dbf29ed32233344056') Fconfopts="$Fconfopts --without-mysql --without-pgsql" build() { Fcd + Fpatchall + Fautoreconf # DO NOT REMOVE THIS!! Fmake --without-optimizecpu diff --git a/source/xmultimedia-extra/motion/ffmpeg.diff b/source/xmultimedia-extra/motion/ffmpeg.diff new file mode 100644 index 0000000..402465f --- /dev/null +++ b/source/xmultimedia-extra/motion/ffmpeg.diff @@ -0,0 +1,57 @@ +diff -aur motion-3.2.9/configure.in fw_motion-3.2.9/configure.in +--- motion-3.2.9/configure.in 2007-11-06 04:19:30.000000000 +0100 ++++ fw_motion-3.2.9/configure.in 2008-04-29 10:52:40.000000000 +0200 +@@ -383,16 +383,16 @@ + if test "${FFMPEG_CFLAGS_DEB}" != "" ; then + FFMPEG_CFLAGS="${FFMPEG_CFLAGS_DEB}" + AC_MSG_RESULT(found for debian) +- elif test -f ${FFMPEG}/include/avformat.h; then ++ elif test -f ${FFMPEG}/include/libavformat/avformat.h; then + AC_MSG_RESULT(found) + FFMPEG_CFLAGS="-I${FFMPEG}/include" +- elif test -f ${FFMPEG}/avformat.h; then ++ elif test -f ${FFMPEG}/libavformat/avformat.h; then + AC_MSG_RESULT(found) + FFMPEG_CFLAGS="-I${FFMPEG}" +- elif test -f `AS_DIRNAME([${FFMPEG}])`/include/avformat.h; then ++ elif test -f `AS_DIRNAME([${FFMPEG}])`/include/libavformat/avformat.h; then + AC_MSG_RESULT(found) + FFMPEG_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include" +- elif test -f `AS_DIRNAME([${FFMPEG}])`/include/ffmpeg/avformat.h; then ++ elif test -f `AS_DIRNAME([${FFMPEG}])`/include/libavformat/avformat.h; then + AC_MSG_RESULT(found) + FFMPEG_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include/ffmpeg" + else +@@ -432,7 +432,7 @@ + + AC_COMPILE_IFELSE( + [ +- #include <avformat.h> ++ #include <libavformat/avformat.h> + URLProtocol test_file_protocol; + int main(void){ + test_file_protocol.url_read = file_protocol.url_read; +diff -aur motion-3.2.9/ffmpeg.c fw_motion-3.2.9/ffmpeg.c +--- motion-3.2.9/ffmpeg.c 2007-11-06 04:50:07.000000000 +0100 ++++ fw_motion-3.2.9/ffmpeg.c 2008-04-29 10:56:35.000000000 +0200 +@@ -121,7 +121,7 @@ + * + */ + +-#include "avstring.h" ++#include "libavutil/avstring.h" + + static int file_open(URLContext *h, const char *filename, int flags) + { +diff -aur motion-3.2.9/ffmpeg.h fw_motion-3.2.9/ffmpeg.h +--- motion-3.2.9/ffmpeg.h 2007-07-18 09:18:05.000000000 +0200 ++++ fw_motion-3.2.9/ffmpeg.h 2008-04-29 10:54:13.000000000 +0200 +@@ -2,7 +2,7 @@ + #define _INCLUDE_FFMPEG_H_ + + #ifdef HAVE_FFMPEG +-#include <avformat.h> ++#include <libavformat/avformat.h> + #endif + + #include <stdio.h> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
