6 files changed, 16 insertions, 99 deletions
diff --git a/abs/core/faad2/ChangeLog b/abs/core/faad2/ChangeLog
deleted file mode 100644
index ed5548b..0000000
--- a/abs/core/faad2/ChangeLog
+++ /dev/null
@@ -1,26 +0,0 @@
-2009-02-16  Eric Belanger  <eric@archlinux.org>
-
-	* faad2 2.7-1
-	* Upstream update
-	* Updated LICENSE file
-	* Compiled with -fPIC option
-
-2009-01-05  Eric Belanger  <eric@archlinux.org>
-
-	* faad2 2.6.1-2
-	* Applied security patch
-
-2008-07-19  Eric Belanger  <eric@archlinux.org>
-
-	* faad2 2.6.1-1
-	* Upstream update
-	* Patched to fix libtool build problem :
-	  faad2-2.6.1-libtool22.patch 
-	* Patched to make faad2 exit if output pipe breaks :
-	  faad2-2.6.1-broken-pipe.patch 
-	* Patched to fix include file implicit declaration :
-	  faad2-2.6.1-implicitdeclar.patch
-	* Patched to bump soname (symbols have been changed) :
-	  faad2-2.6.1-abi_has_changed.patch
-	* Updated license
-	* Added ChangeLog
diff --git a/abs/core/faad2/PKGBUILD b/abs/core/faad2/PKGBUILD
index 729d69b..46a388a 100644
--- a/abs/core/faad2/PKGBUILD
+++ b/abs/core/faad2/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 27494 2009-02-22 04:26:47Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Sarah Hay <sarah@archlinux.org>
+# $Id: PKGBUILD 149405 2012-02-07 15:27:21Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=faad2
 pkgver=2.7
-pkgrel=1
+pkgrel=3
 pkgdesc="ISO AAC audio decoder"
 arch=('i686' 'x86_64')
 url="http://www.audiocoding.com/"
@@ -12,15 +11,19 @@ license=('custom:GPL')
 depends=('glibc')
 options=('!libtool' '!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.bz2 LICENSE)
-md5sums=('4c332fa23febc0e4648064685a3d4332' 'ec95f38142e14fb46c849503897a37a0')
-sha1sums=('b0e80481d27ae9faf9e46c8c8dfb617a0adb91b5' '00edd9b30d8d5098b5e91c03c595d96a3bbe56fd')
+sha1sums=('b0e80481d27ae9faf9e46c8c8dfb617a0adb91b5'
+          '00edd9b30d8d5098b5e91c03c595d96a3bbe56fd')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make CFLAGS="${CFLAGS} -fPIC" || return 1
-  make DESTDIR=${pkgdir} manmdir=/usr/share/man/man1 install || return 1
-  install -m644 common/mp4ff/mp4ff_int_types.h ${pkgdir}/usr/include/mp4ff_int_types.h || return 1
-  install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
-  mv ${pkgdir}/usr/share/man/man1/faad.man ${pkgdir}/usr/share/man/man1/faad.1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make CFLAGS="${CFLAGS} -fPIC"
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" manmdir=/usr/share/man/man1 install
+  mv "${pkgdir}/usr/share/man/man1/faad.man" "${pkgdir}/usr/share/man/man1/faad.1"
+  install -D -m644 common/mp4ff/mp4ff_int_types.h "${pkgdir}/usr/include/mp4ff_int_types.h"
+  install -D -m644 "${srcdir}/LICENSE"  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/abs/core/faad2/faad2-2.6.1-abi_has_changed.patch b/abs/core/faad2/faad2-2.6.1-abi_has_changed.patch
deleted file mode 100644
index 7206e38..0000000
--- a/abs/core/faad2/faad2-2.6.1-abi_has_changed.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: faad2/libfaad/Makefile.am
-===================================================================
---- faad2.orig/libfaad/Makefile.am
-+++ faad2/libfaad/Makefile.am
-@@ -3,7 +3,8 @@ lib_LTLIBRARIES = libfaad.la
- include_HEADERS = $(top_srcdir)/include/faad.h \
-                   $(top_srcdir)/include/neaacdec.h
- 
--libfaad_la_LDFLAGS = -lm
-+libfaad_la_LDFLAGS = -version-info 1:0:0
-+libfaad_la_LIBADD = -lm
- 
- libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
- drm_dec.c error.c filtbank.c \
diff --git a/abs/core/faad2/faad2-2.6.1-broken-pipe.patch b/abs/core/faad2/faad2-2.6.1-broken-pipe.patch
deleted file mode 100644
index 428d7dd..0000000
--- a/abs/core/faad2/faad2-2.6.1-broken-pipe.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- faad2/frontend/main.c~	2007-11-01 06:33:29.000000000 -0600
-+++ faad2/frontend/main.c	2008-01-03 18:05:10.000000000 -0700
-@@ -640,7 +640,8 @@
- 
-         if ((frameInfo.error == 0) && (frameInfo.samples > 0) && (!adts_out))
-         {
--            write_audio_file(aufile, sample_buffer, frameInfo.samples, 0);
-+            if (write_audio_file(aufile, sample_buffer, frameInfo.samples, 0) == 0)
-+                break;
-         }
- 
-         /* fill buffer */
-@@ -976,7 +977,8 @@
- 
-         if ((frameInfo.error == 0) && (sample_count > 0) && (!adts_out))
-         {
--            write_audio_file(aufile, sample_buffer, sample_count, delay);
-+            if (write_audio_file(aufile, sample_buffer, sample_count, delay) == 0)
-+                break;
-         }
- 
-         if (frameInfo.error > 0)
diff --git a/abs/core/faad2/faad2-2.6.1-implicitdeclar.patch b/abs/core/faad2/faad2-2.6.1-implicitdeclar.patch
deleted file mode 100644
index 9379329..0000000
--- a/abs/core/faad2/faad2-2.6.1-implicitdeclar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aur faad2-orig/frontend/main.c faad2/frontend/main.c
---- faad2-orig/frontend/main.c	2007-11-01 08:33:29.000000000 -0400
-+++ faad2/frontend/main.c	2008-06-21 19:33:08.000000000 -0400
-@@ -41,6 +41,7 @@
- #include <stdarg.h>
- #include <stdlib.h>
- #include <getopt.h>
-+#include <string.h>
- 
- #include <neaacdec.h>
- #include <mp4ff.h>
diff --git a/abs/core/faad2/faad2-2.6.1-libtool22.patch b/abs/core/faad2/faad2-2.6.1-libtool22.patch
deleted file mode 100644
index 4eab084..0000000
--- a/abs/core/faad2/faad2-2.6.1-libtool22.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: faad2/configure.in
-===================================================================
---- faad2.orig/configure.in
-+++ faad2/configure.in
-@@ -18,7 +18,7 @@ dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_CPP
- dnl disable for mpeg4ip plugin
--dnl AC_PROG_CXX
-+AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET