[arch-commits] Commit in motion/trunk (PKGBUILD motion-3.2.10.1-ffmpegheaders.patch)

[Eric Belanger]

    Date: Sunday, July 13, 2008 @ 16:06:51
  Author: eric
Revision: 4894

upgpkg: motion 3.2.10.1-4
    rebuilt against ffmpeg and x264 20080625, patched to build with ffmpeg 20080625

Added:
  motion/trunk/motion-3.2.10.1-ffmpegheaders.patch
Modified:
  motion/trunk/PKGBUILD

-------------------------------------+
 PKGBUILD                            |   11 +++++++----
 motion-3.2.10.1-ffmpegheaders.patch |   23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-13 19:58:11 UTC (rev 4893)
+++ PKGBUILD	2008-07-13 20:06:51 UTC (rev 4894)
@@ -3,18 +3,21 @@
 
 pkgname=motion
 pkgver=3.2.10.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Motion is a software motion detector. It grabs images from video4linux devices and/or from webcams."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
-depends=('curl' 'ffmpeg>=20071204' 'libogg' 'libvorbis' 'lame' 'xvidcore' 'x264>=20071202' 'mjpegtools')
-source=(http://dl.sf.net/sourceforge/motion/$pkgname-$pkgver.tar.gz rc.motion)
-md5sums=('5ffdc958313345c69d3e0d5ec5c013cd' 'fc09828564850824f8549d258053e0b6')
+depends=('curl' 'ffmpeg>=20080625' 'libogg' 'libvorbis' 'lame' 'xvidcore' 'x264>=20080625' 'mjpegtools')
+source=(http://dl.sf.net/sourceforge/motion/$pkgname-$pkgver.tar.gz rc.motion motion-3.2.10.1-ffmpegheaders.patch)
+md5sums=('5ffdc958313345c69d3e0d5ec5c013cd' 'fc09828564850824f8549d258053e0b6'\
+         '28bf5e6909fe73e41dde5f8f1101e6dd')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver || return 1
 
+  patch -p1 < ../motion-3.2.10.1-ffmpegheaders.patch
+  autoreconf
   ./configure --prefix=/usr --without-pgsql --without-mysql \
   	--with-libavcodec=/usr/lib/ --sysconfdir=/etc/$pkgname || return 1
 

Added: motion-3.2.10.1-ffmpegheaders.patch
===================================================================
--- motion-3.2.10.1-ffmpegheaders.patch	                        (rev 0)
+++ motion-3.2.10.1-ffmpegheaders.patch	2008-07-13 20:06:51 UTC (rev 4894)
@@ -0,0 +1,23 @@
+Index: motion-3.2.10.1/configure.in
+===================================================================
+--- motion-3.2.10.1.orig/configure.in
++++ motion-3.2.10.1/configure.in
+@@ -415,12 +415,18 @@ if test "${FFMPEG_OK}" = "found"; then
+ 	elif test -f ${FFMPEG}/avformat.h; then
+ 		AC_MSG_RESULT(found ${FFMPEG}/avformat.h)
+ 		FFMPEG_CFLAGS="-I${FFMPEG}"
++	elif test -f ${FFMPEG}/libavformat/avformat.h; then
++		AC_MSG_RESULT(found ${FFMPEG}/libavformat/avformat.h)
++		FFMPEG_CFLAGS="-I${FFMPEG}/libavformat -I${FFMPEG}/libavutil"
+ 	elif test -f `AS_DIRNAME([${FFMPEG}])`/include/avformat.h; then
+ 		AC_MSG_RESULT(found ${FFMPEG}/include/avformat.h)
+ 		FFMPEG_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include"
+ 	elif test -f `AS_DIRNAME([${FFMPEG}])`/include/ffmpeg/avformat.h; then
+ 		AC_MSG_RESULT(found ${FFMPEG}/include/ffmpeg/avformat.h)
+ 		FFMPEG_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include/ffmpeg"
++	elif test -f `AS_DIRNAME([${FFMPEG}])`/include/libavformat/avformat.h; then
++		AC_MSG_RESULT(found ${FFMPEG}/include/libavformat/avformat.h)
++		FFMPEG_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include/libavformat -I`AS_DIRNAME([${FFMPEG}])`/include/libavutil"
+ 	else
+ 		AC_MSG_RESULT(not found)
+ 		FFMPEG_OK="no_found"