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

2020-01-11 Thread David Runge via arch-commits 
Date: Saturday, January 11, 2020 @ 15:31:02
  Author: dvzrv
Revision: 373253

upgpkg: faac 1.30-2: Updating maintainer info. Switching to (more or less) 
correct license (GPL2, but actually GNU Library General Public License, which 
is *not* GNU Lesser General Public License).
Dropping libmp4v2, as faac upstream implemented their own mp4 output module 
(cfaac) from scratch and therefore libmp4v2 is not required anymore.
Adding libfaac.so to provides. Running autoreconf in prepare() (instead of 
custom bootstrap script, which did the same). Installing additional docs. 
Simplifying installation.

Modified:
  faac/trunk/PKGBUILD

--+
 PKGBUILD |   33 -
 1 file changed, 20 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-11 14:38:24 UTC (rev 373252)
+++ PKGBUILD2020-01-11 15:31:02 UTC (rev 373253)
@@ -1,4 +1,5 @@
-# Maintainer: Tom Gundersen 
+# Maintainer: David Runge 
+# Contributor: Tom Gundersen 
 # Contributor: Hugo Doria 
 # Contributor: Sarah Hay 
 # Contributor: dorphell 
@@ -5,26 +6,32 @@
 
 pkgname=faac
 pkgver=1.30
-pkgrel=1
-pkgdesc="An AAC audio encoder"
+pkgrel=2
+pkgdesc="Freeware Advanced Audio Coder"
 arch=('x86_64')
 url="https://www.audiocoding.com/;
-license=('GPL' 'custom')
-depends=('libmp4v2')
-source=($pkgname-$pkgver.tar.gz::"https://github.com/knik0/faac/archive/${pkgver/./_}.tar.gz;)
-sha256sums=('adc387ce588cca16d98c03b6ec1e58f0ffd9fc6eadb00e254157d6b16203b2d2')
+license=('GPL2' 'custom')
+depends=('glibc')
+provides=('libfaac.so')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/knik0/${pkgname}/archive/${pkgver/./_}.tar.gz;)
+sha512sums=('8582cd580dba2a347d15dc4fab42020d7120d0552c54ab74cfaf59ba1b270abb94c67e39d42459a14cbc6e98f3fd00cbda589e1b4f0c7278e41bdef6ae7b6554')
 
+prepare() {
+  mv -v "${pkgname}-${pkgver/./_}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
+  autoreconf -vfi
+}
+
 build() {
-  cd ${pkgname}-${pkgver/./_}
-  ./bootstrap
+  cd "${pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver/./_}
+  cd "${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}"/${pkgname}-${pkgver/./_}/COPYING \
-"${pkgdir}"/usr/share/licenses/faac/LICENSE
+  install -vDm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -vDm 644 {AUTHORS,ChangeLog,NEWS,README,TODO} \
+-t "${pkgdir}/usr/share/doc/${pkgname}"
 }

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

2019-11-09 Thread Antonio Rojas via arch-commits 
Date: Saturday, November 9, 2019 @ 17:41:04
  Author: arojas
Revision: 367291

Update to 1.30

Modified:
  faac/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-09 17:25:28 UTC (rev 367290)
+++ PKGBUILD2019-11-09 17:41:04 UTC (rev 367291)
@@ -4,7 +4,7 @@
 # Contributor: dorphell 
 
 pkgname=faac
-pkgver=1.29.9.2
+pkgver=1.30
 pkgrel=1
 pkgdesc="An AAC audio encoder"
 arch=('x86_64')
@@ -11,19 +11,20 @@
 url="https://www.audiocoding.com/;
 license=('GPL' 'custom')
 depends=('libmp4v2')
-source=("https://sourceforge.net/projects/faac/files/faac-src/faac-${pkgver:0:4}/faac-$pkgver.tar.gz;)
-sha256sums=('d45f209d837c49dae6deebcdd87b8cc3b04ea290880358faecf5e7737740c771')
+source=($pkgname-$pkgver.tar.gz::"https://github.com/knik0/faac/archive/${pkgver/./_}.tar.gz;)
+sha256sums=('adc387ce588cca16d98c03b6ec1e58f0ffd9fc6eadb00e254157d6b16203b2d2')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver/./_}
+  ./bootstrap
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver/./_}
   make DESTDIR="${pkgdir}" install
 
-  install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/COPYING \
+  install -Dm644 "${srcdir}"/${pkgname}-${pkgver/./_}/COPYING \
 "${pkgdir}"/usr/share/licenses/faac/LICENSE
 }

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

2019-04-09 Thread Antonio Rojas via arch-commits 
Date: Tuesday, April 9, 2019 @ 16:19:02
  Author: arojas
Revision: 350468

https

Modified:
  faac/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-09 16:18:11 UTC (rev 350467)
+++ PKGBUILD2019-04-09 16:19:02 UTC (rev 350468)
@@ -8,7 +8,7 @@
 pkgrel=1
 pkgdesc="An AAC audio encoder"
 arch=('x86_64')
-url="http://www.audiocoding.com/;
+url="https://www.audiocoding.com/;
 license=('GPL' 'custom')
 depends=('libmp4v2')
 
source=("https://sourceforge.net/projects/faac/files/faac-src/faac-${pkgver:0:4}/faac-$pkgver.tar.gz;)

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

2018-02-14 Thread Antonio Rojas via arch-commits 
Date: Wednesday, February 14, 2018 @ 23:14:32
  Author: arojas
Revision: 317064

Update to 1.29.9.2

Modified:
  faac/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-14 23:12:54 UTC (rev 317063)
+++ PKGBUILD2018-02-14 23:14:32 UTC (rev 317064)
@@ -5,7 +5,7 @@
 # Contributor: dorphell 
 
 pkgname=faac
-pkgver=1.29.7.7
+pkgver=1.29.9.2
 pkgrel=1
 pkgdesc="An AAC audio encoder"
 arch=('x86_64')
@@ -13,7 +13,7 @@
 license=('GPL' 'custom')
 depends=('libmp4v2')
 
source=("https://sourceforge.net/projects/faac/files/faac-src/faac-${pkgver:0:4}/faac-$pkgver.tar.gz;)
-sha256sums=('b898fcf55e7b52f964ee62d077f56fe9b3b35650e228f006fbef4ce903b4d731')
+sha256sums=('d45f209d837c49dae6deebcdd87b8cc3b04ea290880358faecf5e7737740c771')
 
 build() {
   cd ${pkgname}-${pkgver}

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

2017-10-01 Thread Antonio Rojas 
Date: Sunday, October 1, 2017 @ 09:42:30
  Author: arojas
Revision: 306507

Update to 1.29.7.7

Modified:
  faac/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2017-10-01 09:41:19 UTC (rev 306506)
+++ PKGBUILD2017-10-01 09:42:30 UTC (rev 306507)
@@ -5,7 +5,7 @@
 # Contributor: dorphell 
 
 pkgname=faac
-pkgver=1.29.7.6
+pkgver=1.29.7.7
 pkgrel=1
 pkgdesc="An AAC audio encoder"
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@
 url="http://www.audiocoding.com/;
 license=('GPL' 'custom')
 depends=('libmp4v2')
-source=("https://sourceforge.net/projects/faac/files/faac-src/faac-${pkgver:0:3}/faac-$pkgver.tar.gz;)
-sha256sums=('36298549deab66b4b9bb274ecbe74514bb7c83f309265f8f649cf49a44b9bd9f')
+source=("https://sourceforge.net/projects/faac/files/faac-src/faac-${pkgver:0:4}/faac-$pkgver.tar.gz;)
+sha256sums=('b898fcf55e7b52f964ee62d077f56fe9b3b35650e228f006fbef4ce903b4d731')
 
 build() {
   cd ${pkgname}-${pkgver}

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

2017-09-27 Thread Antonio Rojas 
Date: Wednesday, September 27, 2017 @ 18:44:53
  Author: arojas
Revision: 306284

Update to 1.29.7.6

Modified:
  faac/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-27 18:11:46 UTC (rev 306283)
+++ PKGBUILD2017-09-27 18:44:53 UTC (rev 306284)
@@ -5,7 +5,7 @@
 # Contributor: dorphell 
 
 pkgname=faac
-pkgver=1.29.3
+pkgver=1.29.7.6
 pkgrel=1
 pkgdesc="An AAC audio encoder"
 arch=('i686' 'x86_64')
@@ -12,20 +12,19 @@
 url="http://www.audiocoding.com/;
 license=('GPL' 'custom')
 depends=('libmp4v2')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
+source=("https://sourceforge.net/projects/faac/files/faac-src/faac-${pkgver:0:3}/faac-$pkgver.tar.gz;)
+sha256sums=('36298549deab66b4b9bb274ecbe74514bb7c83f309265f8f649cf49a44b9bd9f')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  ./bootstrap
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
-  install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \
+  install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/COPYING \
 "${pkgdir}"/usr/share/licenses/faac/LICENSE
 }
-md5sums=('20108ccff238813937ae1fec6eb80e7c')

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

2013-10-24 Thread Allan McRae 
Date: Friday, October 25, 2013 @ 03:29:40
  Author: allan
Revision: 197295

upgpkg: faac 1.28-5

remove static libraries

Modified:
  faac/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-25 01:27:15 UTC (rev 197294)
+++ PKGBUILD2013-10-25 01:29:40 UTC (rev 197295)
@@ -6,13 +6,12 @@
 
 pkgname=faac
 pkgver=1.28
-pkgrel=4
+pkgrel=5
 pkgdesc=An AAC audio encoder
 arch=('i686' 'x86_64')
 url=http://www.audiocoding.com/;
 license=('GPL' 'custom')
 depends=('libmp4v2' 'glibc')
-options=('!libtool')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz;
 'altivec.patch' 'mp4v2-1.9.patch' 'mp4v2-2.0.0.patch')

[arch-commits] Commit in faac/trunk (PKGBUILD altivec.patch mp4v2-2.0.0.patch)

2012-05-22 Thread Tom Gundersen 
Date: Tuesday, May 22, 2012 @ 14:38:37
  Author: tomegun
Revision: 159363

upgpkg: faac 1.28-4

libmp4v2 rebuild

many thanks to Samuli Suominen from Gentoo for pointing me to their patches

Added:
  faac/trunk/altivec.patch
  faac/trunk/mp4v2-2.0.0.patch
Modified:
  faac/trunk/PKGBUILD

---+
 PKGBUILD  |   18 --
 altivec.patch |   40 +++
 mp4v2-2.0.0.patch |  138 
 3 files changed, 189 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-22 18:01:41 UTC (rev 159362)
+++ PKGBUILD2012-05-22 18:38:37 UTC (rev 159363)
@@ -1,12 +1,12 @@
 # $Id$
-# Maintainer:
+# Maintainer: Tom Gundersen t...@jklm.no
 # Contributor: Hugo Doria h...@archlinux.org
 # Contributor: Sarah Hay sa...@archlinux.org
 # Contributor: dorphell dorph...@archlinux.org
 
 pkgname=faac
 pkgver=1.28
-pkgrel=3
+pkgrel=4
 pkgdesc=An AAC audio encoder
 arch=('i686' 'x86_64')
 url=http://www.audiocoding.com/;
@@ -14,16 +14,16 @@
 depends=('libmp4v2' 'glibc')
 options=('!libtool')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz;
-'mp4v2-1.9.patch')
-md5sums=('80763728d392c7d789cde25614c878f6'
- '9d52a17e68fa15ca94e88e1457b94b74')
+'altivec.patch' 'mp4v2-1.9.patch' 'mp4v2-2.0.0.patch')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 -i ${srcdir}/mp4v2-1.9.patch
+  patch -p1 -i ../mp4v2-1.9.patch
+  patch -p0 -i ../mp4v2-2.0.0.patch
+  patch -p0 -i ../altivec.patch
   find . -type f -print0 | xargs -0 sed -i 's/\r//g'
   ./bootstrap
-  ./configure --prefix=/usr --with-mp4v2
+  ./configure --prefix=/usr
   make
 }
 
@@ -34,3 +34,7 @@
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \
 ${pkgdir}/usr/share/licenses/faac/LICENSE
 }
+md5sums=('80763728d392c7d789cde25614c878f6'
+ 'e1ee422ab524fb1f78d178700c3a0e7f'
+ '9d52a17e68fa15ca94e88e1457b94b74'
+ '979ff4f13f36217cb15c92df9fd75f0c')

Added: altivec.patch
===
--- altivec.patch   (rev 0)
+++ altivec.patch   2012-05-22 18:38:37 UTC (rev 159363)
@@ -0,0 +1,40 @@
+http://bugs.gentoo.org/306881
+
+--- configure.in
 configure.in
+@@ -33,7 +33,12 @@
+ AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
+AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
+ external_mp4v2=no, -lstdc++),
+-   external_mp4v2=no, [#include mp4v2/mp4v2.h])
++   external_mp4v2=no, [
++ #if defined(__ALTIVEC__)
++ #undef bool
++ #endif
++ #include mp4v2/mp4v2.h
++ ])
+ 
+ if test x$external_mp4v2 = xyes; then
+   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
+--- frontend/main.c
 frontend/main.c
+@@ -30,6 +30,9 @@
+ #endif
+ 
+ #ifdef HAVE_LIBMP4V2
++#if defined(__ALTIVEC__)
++# undef bool
++#endif
+ # include mp4v2/mp4v2.h
+ #endif
+ 
+--- common/mp4v2/mpeg4ip.h
 common/mp4v2/mpeg4ip.h
+@@ -123,7 +123,6 @@
+ #ifdef __cplusplus
+ extern C {
+ #endif
+-char *strcasestr(const char *haystack, const char *needle);
+ #ifdef __cplusplus
+ }
+ #endif

Added: mp4v2-2.0.0.patch
===
--- mp4v2-2.0.0.patch   (rev 0)
+++ mp4v2-2.0.0.patch   2012-05-22 18:38:37 UTC (rev 159363)
@@ -0,0 +1,138 @@
+http://bugs.gentoo.org/397575
+http://sourceforge.net/tracker/?func=detailaid=3476707group_id=704atid=100704
+
+--- configure.in
 configure.in
+@@ -33,8 +33,8 @@ AC_CHECK_LIB(gnugetopt, getopt_long)
+ AM_CONDITIONAL(WITH_MP4V2, false)
+ AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false)
+ 
+-AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
+-   AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
++AC_CHECK_DECLS([MP4Create],
++   AC_CHECK_LIB(mp4v2, MP4Create, external_mp4v2=yes,
+ external_mp4v2=no, -lstdc++),
+external_mp4v2=no, [#include mp4v2/mp4v2.h])
+ 
+@@ -42,6 +42,7 @@ if test x$external_mp4v2 = xyes; then
+   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
+   MY_DEFINE(HAVE_EXTERNAL_LIBMP4V2)
+   AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true)
++  AC_CHECK_DECLS([MP4TagsAlloc], [], [], [#include mp4v2/mp4v2.h])
+ else
+   if test x$WITHMP4V2 = xyes; then
+  AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
+--- frontend/main.c
 frontend/main.c
+@@ -873,8 +873,12 @@ int main(int argc, char *argv[])
+ if (!faacEncSetConfiguration(hEncoder, myFormat)) {
+ fprintf(stderr, Unsupported output format!\n);
+ #ifdef HAVE_LIBMP4V2
++#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */
++if (container == MP4_CONTAINER) MP4Close(MP4hFile, 0);
++#else
+ if (container == MP4_CONTAINER) MP4Close(MP4hFile);
+

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

2011-09-11 Thread Pierre Schmitz 
Date: Sunday, September 11, 2011 @ 17:04:22
  Author: pierre
Revision: 137831

upgpkg: faac 1.28-3

rebuild old package

Modified:
  faac/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-11 21:00:49 UTC (rev 137830)
+++ PKGBUILD2011-09-11 21:04:22 UTC (rev 137831)
@@ -6,13 +6,12 @@
 
 pkgname=faac
 pkgver=1.28
-pkgrel=2
+pkgrel=3
 pkgdesc=An AAC audio encoder
 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/${pkgname}/${pkgname}-${pkgver}.tar.gz;
 'mp4v2-1.9.patch')

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

2011-05-13 Thread Andrea Scarpino 
Date: Friday, May 13, 2011 @ 19:58:06
  Author: andrea
Revision: 123865

fix description

Modified:
  faac/trunk/PKGBUILD

--+
 PKGBUILD |   21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-13 20:58:47 UTC (rev 123864)
+++ PKGBUILD2011-05-13 23:58:06 UTC (rev 123865)
@@ -1,12 +1,13 @@
 # $Id$
-# Maintainer: Hugo Doria h...@archlinux.org
+# Maintainer:
+# Contributor: Hugo Doria h...@archlinux.org
 # Contributor: Sarah Hay sa...@archlinux.org
 # Contributor: dorphell dorph...@archlinux.org
 
 pkgname=faac
 pkgver=1.28
 pkgrel=2
-pkgdesc=FAAC is an AAC audio encoder
+pkgdesc=An AAC audio encoder
 arch=('i686' 'x86_64')
 url=http://www.audiocoding.com/;
 license=('GPL' 'custom')
@@ -14,23 +15,23 @@
 makedepends=('automake' 'autoconf' 'libtool')
 options=('!libtool')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz;
-   'mp4v2-1.9.patch')
+'mp4v2-1.9.patch')
 md5sums=('80763728d392c7d789cde25614c878f6'
  '9d52a17e68fa15ca94e88e1457b94b74')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/mp4v2-1.9.patch || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p1 -i ${srcdir}/mp4v2-1.9.patch
   find . -type f -print0 | xargs -0 sed -i 's/\r//g'
   ./bootstrap
   ./configure --prefix=/usr --with-mp4v2
-  make || return 1
+  make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
 
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \
-${pkgdir}/usr/share/licenses/faac/LICENSE
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \
+${pkgdir}/usr/share/licenses/faac/LICENSE
 }

[arch-commits] Commit in faac/trunk (PKGBUILD libmp4v2.patch mp4v2-1.9.patch)

2010-03-06 Thread Andrea Scarpino 
Date: Saturday, March 6, 2010 @ 13:43:34
  Author: andrea
Revision: 71335

upgpkg: faac 1.28-2
rebuilt and patched for mp4v2 1.9.1

Added:
  faac/trunk/mp4v2-1.9.patch
Modified:
  faac/trunk/PKGBUILD
Deleted:
  faac/trunk/libmp4v2.patch

-+
 PKGBUILD|   22 ++
 libmp4v2.patch  |   11 ---
 mp4v2-1.9.patch |   47 +++
 3 files changed, 61 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-06 18:42:26 UTC (rev 71334)
+++ PKGBUILD2010-03-06 18:43:34 UTC (rev 71335)
@@ -2,29 +2,35 @@
 # Maintainer: Hugo Doria h...@archlinux.org
 # Contributor: Sarah Hay sa...@archlinux.org
 # Contributor: dorphell dorph...@archlinux.org
+
 pkgname=faac
 pkgver=1.28
-pkgrel=1
-pkgdesc=FAAC is an AAC audio encoder.
+pkgrel=2
+pkgdesc=FAAC is an AAC audio encoder
 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/${pkgname}/${pkgname}-${pkgver}.tar.gz;
+   'mp4v2-1.9.patch')
+md5sums=('80763728d392c7d789cde25614c878f6'
+ '9d52a17e68fa15ca94e88e1457b94b74')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/libmp4v2.patch || return 1
+  patch -Np1 -i ${srcdir}/mp4v2-1.9.patch || return 1
   find . -type f -print0 | xargs -0 sed -i 's/\r//g'
   ./bootstrap
   ./configure --prefix=/usr --with-mp4v2
   make || return 1
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 
-  install -D -m644 ${srcdir}/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \
-   ${pkgdir}/usr/share/licenses/faac/COPYING.kiss_fft
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \
+${pkgdir}/usr/share/licenses/faac/LICENSE
 }
-md5sums=('80763728d392c7d789cde25614c878f6'
- 'cce9b24cecc90d9b157adbf94176a454')

Deleted: libmp4v2.patch
===
--- libmp4v2.patch  2010-03-06 18:42:26 UTC (rev 71334)
+++ libmp4v2.patch  2010-03-06 18:43:34 UTC (rev 71335)
@@ -1,11 +0,0 @@
 faac/configure.in   2008-03-02 17:27:47.0 +0100
-+++ faac/configure.in   2008-03-02 17:30:15.0 +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 ***])

Added: mp4v2-1.9.patch
===
--- mp4v2-1.9.patch (rev 0)
+++ mp4v2-1.9.patch 2010-03-06 18:43:34 UTC (rev 71335)
@@ -0,0 +1,47 @@
+diff -ur faac-1.28.orig/configure.in faac-1.28/configure.in
+--- faac-1.28.orig/configure.in2009-02-05 02:55:38.0 +0200
 faac-1.28/configure.in 2009-07-10 13:21:34.0 +0300
+@@ -28,14 +28,17 @@
+ AC_CHECK_LIB(gnugetopt, getopt_long)
+ 
+ AM_CONDITIONAL(WITH_MP4V2, false)
++AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false)
+ 
+ AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
+AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
+ external_mp4v2=no, -lstdc++),
+-   external_mp4v2=no, [#include mp4.h])
++   external_mp4v2=no, [#include mp4v2/mp4v2.h])
+ 
+ if test x$external_mp4v2 = xyes; then
+   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
++  MY_DEFINE(HAVE_LIBMP4V2)
++  AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true)
+ else
+   if test x$WITHMP4V2 = xyes; then
+  AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
+diff -ur faac-1.28.orig/frontend/main.c faac-1.28/frontend/main.c
+--- faac-1.28.orig/frontend/main.c 2009-01-24 03:10:20.0 +0200
 faac-1.28/frontend/main.c  2009-07-10 13:22:18.0 +0300
+@@ -30,7 +30,7 @@
+ #endif
+ 
+ #ifdef HAVE_LIBMP4V2
+-# include mp4.h
++# include mp4v2/mp4v2.h
+ #endif
+ 
+ #define DEFAULT_TNS 0
+diff -ur faac-1.28.orig/frontend/Makefile.am faac-1.28/frontend/Makefile.am
+--- faac-1.28.orig/frontend/Makefile.am2008-12-16 02:56:00.0 
+0200
 faac-1.28/frontend/Makefile.am 2009-07-10 13:21:55.0 +0300
+@@ -8,5 +8,9 @@
+ LDADD = $(top_builddir)/libfaac/libfaac.la 
$(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
+ else
+ INCLUDES = -I$(top_srcdir)/include 
++if WITH_EXTERNAL_MP4V2
++LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2
++else
+ LDADD = $(top_builddir)/libfaac/libfaac.la -lm
+ endif
++endif