[arch-commits] Commit in faac/trunk (PKGBUILD)

[Hugo Doria]

    Date: Thursday, February 19, 2009 @ 15:43:15
  Author: hugo
Revision: 27350

resolving conflicts

Modified:
  faac/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-02-19 20:38:24 UTC (rev 27349)
+++ PKGBUILD	2009-02-19 20:43:15 UTC (rev 27350)
@@ -1,30 +1,28 @@
 # $Id$
-# Maintainer: Hugo Doria <hugo at archlinux.org>
+# Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Sarah Hay <sarah at archlinux.org>
 # Contributor: dorphell <dorphell at archlinux.org>
 pkgname=faac
-pkgver=1.28
+pkgver=1.26
 pkgrel=1
 pkgdesc="FAAC is an AAC audio encoder."
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://www.audiocoding.com/"
 license=('GPL' 'custom')
 depends=('libmp4v2' 'glibc')
 makedepends=('automake' 'autoconf' 'libtool')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz libmp4v2.patch)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/libmp4v2.patch || return 1
+  cd ${startdir}/src/${pkgname}
   find . -type f -print0 | xargs -0 sed -i 's/\r//g'
   ./bootstrap
   ./configure --prefix=/usr --with-mp4v2
   make || return 1
-  make DESTDIR=${pkgdir} install
+  make DESTDIR=${startdir}/pkg install
 
-  install -D -m644 ${srcdir}/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \
-                   ${pkgdir}/usr/share/licenses/faac/COPYING.kiss_fft
+  install -D -m644 ${startdir}/src/${pkgname}/libfaac/kiss_fft/COPYING \
+                   ${startdir}/pkg/usr/share/licenses/faac/COPYING.kiss_fft
 }
-md5sums=('80763728d392c7d789cde25614c878f6'
-         'cce9b24cecc90d9b157adbf94176a454')
+md5sums=('1d7c019bd2dbb4f3101b8937ebc59cf6')