[arch-commits] Commit in faac/repos (4 files)

[Giovanni Scafora]

    Date: Friday, February 20, 2009 @ 11:50:11
  Author: giovanni
Revision: 27409

Merged revisions 356,22907,27349-27351,27353 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/faac/trunk

........
  r356 | aaron | 2008-04-18 15:56:27 -0700 (ven, 18 apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r22907 | hugo | 2008-12-29 14:19:22 -0800 (lun, 29 dic 2008) | 2 lines
  
  upgpkg: faac 1.26-2
      fixing FS#9656
........
  r27349 | hugo | 2009-02-19 12:38:24 -0800 (gio, 19 feb 2009) | 2 lines
  
  upgpkg: faac 1.28-1
      Fixing FS#9656
........
  r27350 | hugo | 2009-02-19 12:43:15 -0800 (gio, 19 feb 2009) | 1 line
  
  resolving conflicts
........
  r27351 | hugo | 2009-02-19 12:44:07 -0800 (gio, 19 feb 2009) | 2 lines
  
  upgpkg: faac 1.28-1
      Fixing FS#9656
........
  r27353 | hugo | 2009-02-19 12:47:53 -0800 (gio, 19 feb 2009) | 1 line
  
  upgpkg: faac 1.28-1
........

Modified:
  faac/repos/extra-x86_64/	(properties)
  faac/repos/extra-x86_64/PKGBUILD
  faac/repos/extra-x86_64/libmp4v2.patch
Deleted:
  faac/repos/extra-x86_64/pipe-output.patch

-------------------+
 PKGBUILD          |   20 +++++++++++---------
 libmp4v2.patch    |   22 +++++++++++-----------
 pipe-output.patch |   18 ------------------
 3 files changed, 22 insertions(+), 38 deletions(-)


Property changes on: faac/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /faac/trunk:1
   + /faac/trunk:1-27408

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-20 16:44:07 UTC (rev 27408)
+++ extra-x86_64/PKGBUILD	2009-02-20 16:50:11 UTC (rev 27409)
@@ -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: extra-x86_64/libmp4v2.patch
===================================================================
--- extra-x86_64/libmp4v2.patch	2009-02-20 16:44:07 UTC (rev 27408)
+++ extra-x86_64/libmp4v2.patch	2009-02-20 16:50:11 UTC (rev 27409)
@@ -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 ***])

Deleted: extra-x86_64/pipe-output.patch
===================================================================
--- extra-x86_64/pipe-output.patch	2009-02-20 16:44:07 UTC (rev 27408)
+++ extra-x86_64/pipe-output.patch	2009-02-20 16:50:11 UTC (rev 27409)
@@ -1,18 +0,0 @@
---- faac/frontend/main.c	2004-12-08 11:07:17.000000000 +0000
-+++ faac-patched/frontend/main.c	2007-01-29 19:17:26.000000000 +0000
-@@ -918,7 +918,14 @@
-     {
- #endif
-         /* open the aac output file */
--        outfile = fopen(aacFileName, "wb");
-+	if (aacFileName[0] == '-')
-+	{
-+		outfile = stdout;
-+	}
-+	else
-+	{
-+		outfile = fopen(aacFileName, "wb");
-+	}
-         if (!outfile)
-         {
-             fprintf(stderr, "Couldn't create output file %s\n", aacFileName);