[arch-commits] Commit in motion/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Tuesday, July 1, 2008 @ 14:43:16
  Author: eric
Revision: 3867

fixing svn conflict

Modified:
  motion/repos/extra-x86_64/	(properties)
  motion/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)


Property changes on: motion/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /motion/trunk:1
   + /motion/trunk:1-3866

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-01 17:28:59 UTC (rev 3866)
+++ extra-x86_64/PKGBUILD	2008-07-01 18:43:16 UTC (rev 3867)
@@ -2,23 +2,25 @@
 # Maintainer: Paul Mattal <paul at archlinux.org>
 
 pkgname=motion
-pkgver=3.2.8
-pkgrel=1
+pkgver=3.2.10.1
+pkgrel=3
 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>=20070505' 'libogg' 'libvorbis' 'lame' 'xvidcore')
+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=('9d273df173675f1c523fd092e188dc24' 'fc09828564850824f8549d258053e0b6')
+md5sums=('5ffdc958313345c69d3e0d5ec5c013cd' 'fc09828564850824f8549d258053e0b6')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver || return 1
+
   ./configure --prefix=/usr --without-pgsql --without-mysql \
   	--with-libavcodec=/usr/lib/ --sysconfdir=/etc/$pkgname || return 1
+
   make || return 1
-  make prefix=$startdir/pkg/usr sysconfdir=$startdir/pkg/etc/$pkgname install \
-  	|| return 1
+
+  make DESTDIR=$startdir/pkg install || return 1
   install -D -m755 $startdir/src/rc.motion $startdir/pkg/etc/rc.d/motion \
   	|| return 1
 }