Fri Jun 22 00:01:45 UTC 2012

1 files changed, 9 insertions, 45 deletions

diff --git a/community-staging/motion/PKGBUILD b/community-staging/motion/PKGBUILD
index 8387624c0..00edf7064 100644
--- a/community-staging/motion/PKGBUILD
+++ b/community-staging/motion/PKGBUILD
@@ -1,75 +1,39 @@
-# $Id: PKGBUILD 72669 2012-06-18 22:08:51Z spupykin $
+# $Id: PKGBUILD 72698 2012-06-20 10:30:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=motion
 pkgver=3.2.12
-pkgrel=5
+pkgrel=6
 pkgdesc="A software motion detector which 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=('libjpeg' 'v4l-utils')
-
-# ffmpeg workaround
-depends=(${depends[@]} speex libpulse bzip2 lame xvidcore opencore-amr libvpx libva sdl openjpeg rtmpdump gsm schroedinger libtheora x264)
-makedepends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg
-	     rtmpdump schroedinger sdl speex x264 xvidcore zlib yasm libvdpau)
-
+depends=('libjpeg' 'v4l-utils' 'ffmpeg-compat')
 backup=('etc/motion/motion.conf')
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
 	rc.motion
 	ffmpeg-0.8.patch
 	linux-headers.patch
-	ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-20120509.tar.xz)
+	ffmpeg-compat.patch)
 md5sums=('1ba0065ed50509aaffb171594c689f46'
          '2e8c53c4980edddd420f08fdd572c9be'
          'd36687710837d69fbce4608b1345fa34'
          'd8c3c4fdded5cfbd729710475559a21d'
-         'a35359e424608f369d380f03e4dc9966')
+         'e85c596292aceb425fcf17e5072e2fff')
 
 build() {
-  cd $srcdir/ffmpeg
-  ./configure \
-    --prefix=$srcdir/ffmpeg \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-libgsm \
-    --enable-libspeex \
-    --enable-postproc \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-librtmp \
-    --enable-libpulse \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug \
-    --enable-static \
-    --disable-shared
-  make
-  make install
-
-
   cd "${srcdir}/${pkgname}-${pkgver}"
+  export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
   patch -Np1 -i $srcdir/ffmpeg-0.8.patch
   patch -Np1 -i $srcdir/linux-headers.patch
-
-  # ffmpeg workaround
-  export LDFLAGS="-ldl -lX11 -lXext -lXfixes -lva -lasound -lSDL -lpthread -lxvidcore -lx264 -lvpx -lvpx -lvorbisenc -lvorbis -logg -ltheoraenc -ltheoradec -logg -lspeex -lschroedinger-1.0 -lrtmp -lz -lssl -lcrypto -lpulse-simple -lpulse -lopenjpeg -lopencore-amrwb -lopencore-amrnb -lmp3lame -lgsm -lm -pthread -lbz2 -lz"
-
+  patch -Np1 -i $srcdir/ffmpeg-compat.patch
+  autoreconf
   ./configure --prefix=/usr \
     --without-pgsql \
     --without-mysql \
     --sysconfdir=/etc/motion \
-    --with-ffmpeg=$srcdir/ffmpeg
+    --with-ffmpeg
   make
 }