[arch-commits] Commit in faac/repos/extra-i686 (PKGBUILD libmp4v2.patch)

[Hugo Doria]

    Date: Thursday, February 19, 2009 @ 15:46:22
  Author: hugo
Revision: 27352

resolving conflicts

Modified:
  faac/repos/extra-i686/PKGBUILD
  faac/repos/extra-i686/libmp4v2.patch

----------------+
 PKGBUILD       |   20 +++++++++++---------
 libmp4v2.patch |   22 +++++++++++-----------
 2 files changed, 22 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-02-19 20:44:07 UTC (rev 27351)
+++ PKGBUILD	2009-02-19 20:46:22 UTC (rev 27352)
@@ -1,28 +1,30 @@
 # $Id$
-# Maintainer: Alexander Baldeck <alexander at archlinux.org>
+# Maintainer: Hugo Doria <hugo at archlinux.org>
 # Contributor: Sarah Hay <sarah at archlinux.org>
 # Contributor: dorphell <dorphell at archlinux.org>
 pkgname=faac
-pkgver=1.26
+pkgver=1.28
 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)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz libmp4v2.patch)
 
 build() {
-  cd ${startdir}/src/${pkgname}
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/libmp4v2.patch || return 1
   find . -type f -print0 | xargs -0 sed -i 's/\r//g'
   ./bootstrap
   ./configure --prefix=/usr --with-mp4v2
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install
 
-  install -D -m644 ${startdir}/src/${pkgname}/libfaac/kiss_fft/COPYING \
-                   ${startdir}/pkg/usr/share/licenses/faac/COPYING.kiss_fft
+  install -D -m644 ${srcdir}/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \
+                   ${pkgdir}/usr/share/licenses/faac/COPYING.kiss_fft
 }
-md5sums=('1d7c019bd2dbb4f3101b8937ebc59cf6')
+md5sums=('80763728d392c7d789cde25614c878f6'
+         'cce9b24cecc90d9b157adbf94176a454')

Modified: libmp4v2.patch
===================================================================
--- libmp4v2.patch	2009-02-19 20:44:07 UTC (rev 27351)
+++ libmp4v2.patch	2009-02-19 20:46:22 UTC (rev 27352)
@@ -1,11 +1,11 @@
---- faac/configure.in	2006-08-13 14:17:26.000000000 +0000
-+++ faac-patched/configure.in	2007-01-29 19:18:45.000000000 +0000
-@@ -35,6 +35,8 @@
- 
- if test x$external_mp4v2 = xyes; then
-   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
-+  MY_DEFINE(HAVE_LIBMP4V2)
-+  LIBS="-lmp4v2 $LIBS"
- else
-   if test x$WITHMP4V2 = xyes; then
-      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
+--- faac/configure.in   2008-03-02 17:27:47.000000000 +0100
++++ faac/configure.in   2008-03-02 17:30:15.000000000 +0100
+@@ -36,6 +36,8 @@
+ 
+ if test x$external_mp4v2 = xyes; then
+   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
++  MY_DEFINE(HAVE_LIBMP4V2)
++  LIBS="-lmp4v2 $LIBS"
+ else
+   if test x$WITHMP4V2 = xyes; then
+      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])