[arch-commits] Commit in faac/repos (8 files)
Pierre Schmitz
pierre at archlinux.org
Sun Sep 11 21:05:12 UTC 2011
Date: Sunday, September 11, 2011 @ 17:05:11
Author: pierre
Revision: 137832
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
faac/repos/extra-i686/PKGBUILD
(from rev 137831, faac/trunk/PKGBUILD)
faac/repos/extra-i686/mp4v2-1.9.patch
(from rev 137831, faac/trunk/mp4v2-1.9.patch)
faac/repos/extra-x86_64/PKGBUILD
(from rev 137831, faac/trunk/PKGBUILD)
faac/repos/extra-x86_64/mp4v2-1.9.patch
(from rev 137831, faac/trunk/mp4v2-1.9.patch)
Deleted:
faac/repos/extra-i686/PKGBUILD
faac/repos/extra-i686/mp4v2-1.9.patch
faac/repos/extra-x86_64/PKGBUILD
faac/repos/extra-x86_64/mp4v2-1.9.patch
------------------------------+
extra-i686/PKGBUILD | 72 +++++++++++++++----------------
extra-i686/mp4v2-1.9.patch | 94 ++++++++++++++++++++---------------------
extra-x86_64/PKGBUILD | 72 +++++++++++++++----------------
extra-x86_64/mp4v2-1.9.patch | 94 ++++++++++++++++++++---------------------
4 files changed, 166 insertions(+), 166 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-09-11 21:04:22 UTC (rev 137831)
+++ extra-i686/PKGBUILD 2011-09-11 21:05:11 UTC (rev 137832)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Hugo Doria <hugo at archlinux.org>
-# Contributor: Sarah Hay <sarah at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=faac
-pkgver=1.28
-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/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'mp4v2-1.9.patch')
-md5sums=('80763728d392c7d789cde25614c878f6'
- '9d52a17e68fa15ca94e88e1457b94b74')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- 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 -Dm644 ${srcdir}/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \
- ${pkgdir}/usr/share/licenses/faac/LICENSE
-}
Copied: faac/repos/extra-i686/PKGBUILD (from rev 137831, faac/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-11 21:05:11 UTC (rev 137832)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer:
+# Contributor: Hugo Doria <hugo at archlinux.org>
+# Contributor: Sarah Hay <sarah at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=faac
+pkgver=1.28
+pkgrel=3
+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"
+ 'mp4v2-1.9.patch')
+md5sums=('80763728d392c7d789cde25614c878f6'
+ '9d52a17e68fa15ca94e88e1457b94b74')
+
+build() {
+ 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
+}
+
+package() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \
+ "${pkgdir}"/usr/share/licenses/faac/LICENSE
+}
Deleted: extra-i686/mp4v2-1.9.patch
===================================================================
--- extra-i686/mp4v2-1.9.patch 2011-09-11 21:04:22 UTC (rev 137831)
+++ extra-i686/mp4v2-1.9.patch 2011-09-11 21:05:11 UTC (rev 137832)
@@ -1,47 +0,0 @@
-diff -ur faac-1.28.orig/configure.in faac-1.28/configure.in
---- faac-1.28.orig/configure.in 2009-02-05 02:55:38.000000000 +0200
-+++ faac-1.28/configure.in 2009-07-10 13:21:34.000000000 +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.000000000 +0200
-+++ faac-1.28/frontend/main.c 2009-07-10 13:22:18.000000000 +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.am 2008-12-16 02:56:00.000000000 +0200
-+++ faac-1.28/frontend/Makefile.am 2009-07-10 13:21:55.000000000 +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
Copied: faac/repos/extra-i686/mp4v2-1.9.patch (from rev 137831, faac/trunk/mp4v2-1.9.patch)
===================================================================
--- extra-i686/mp4v2-1.9.patch (rev 0)
+++ extra-i686/mp4v2-1.9.patch 2011-09-11 21:05:11 UTC (rev 137832)
@@ -0,0 +1,47 @@
+diff -ur faac-1.28.orig/configure.in faac-1.28/configure.in
+--- faac-1.28.orig/configure.in 2009-02-05 02:55:38.000000000 +0200
++++ faac-1.28/configure.in 2009-07-10 13:21:34.000000000 +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.000000000 +0200
++++ faac-1.28/frontend/main.c 2009-07-10 13:22:18.000000000 +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.am 2008-12-16 02:56:00.000000000 +0200
++++ faac-1.28/frontend/Makefile.am 2009-07-10 13:21:55.000000000 +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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-09-11 21:04:22 UTC (rev 137831)
+++ extra-x86_64/PKGBUILD 2011-09-11 21:05:11 UTC (rev 137832)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Hugo Doria <hugo at archlinux.org>
-# Contributor: Sarah Hay <sarah at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=faac
-pkgver=1.28
-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/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'mp4v2-1.9.patch')
-md5sums=('80763728d392c7d789cde25614c878f6'
- '9d52a17e68fa15ca94e88e1457b94b74')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- 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 -Dm644 ${srcdir}/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \
- ${pkgdir}/usr/share/licenses/faac/LICENSE
-}
Copied: faac/repos/extra-x86_64/PKGBUILD (from rev 137831, faac/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-09-11 21:05:11 UTC (rev 137832)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer:
+# Contributor: Hugo Doria <hugo at archlinux.org>
+# Contributor: Sarah Hay <sarah at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=faac
+pkgver=1.28
+pkgrel=3
+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"
+ 'mp4v2-1.9.patch')
+md5sums=('80763728d392c7d789cde25614c878f6'
+ '9d52a17e68fa15ca94e88e1457b94b74')
+
+build() {
+ 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
+}
+
+package() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \
+ "${pkgdir}"/usr/share/licenses/faac/LICENSE
+}
Deleted: extra-x86_64/mp4v2-1.9.patch
===================================================================
--- extra-x86_64/mp4v2-1.9.patch 2011-09-11 21:04:22 UTC (rev 137831)
+++ extra-x86_64/mp4v2-1.9.patch 2011-09-11 21:05:11 UTC (rev 137832)
@@ -1,47 +0,0 @@
-diff -ur faac-1.28.orig/configure.in faac-1.28/configure.in
---- faac-1.28.orig/configure.in 2009-02-05 02:55:38.000000000 +0200
-+++ faac-1.28/configure.in 2009-07-10 13:21:34.000000000 +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.000000000 +0200
-+++ faac-1.28/frontend/main.c 2009-07-10 13:22:18.000000000 +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.am 2008-12-16 02:56:00.000000000 +0200
-+++ faac-1.28/frontend/Makefile.am 2009-07-10 13:21:55.000000000 +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
Copied: faac/repos/extra-x86_64/mp4v2-1.9.patch (from rev 137831, faac/trunk/mp4v2-1.9.patch)
===================================================================
--- extra-x86_64/mp4v2-1.9.patch (rev 0)
+++ extra-x86_64/mp4v2-1.9.patch 2011-09-11 21:05:11 UTC (rev 137832)
@@ -0,0 +1,47 @@
+diff -ur faac-1.28.orig/configure.in faac-1.28/configure.in
+--- faac-1.28.orig/configure.in 2009-02-05 02:55:38.000000000 +0200
++++ faac-1.28/configure.in 2009-07-10 13:21:34.000000000 +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.000000000 +0200
++++ faac-1.28/frontend/main.c 2009-07-10 13:22:18.000000000 +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.am 2008-12-16 02:56:00.000000000 +0200
++++ faac-1.28/frontend/Makefile.am 2009-07-10 13:21:55.000000000 +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
More information about the arch-commits
mailing list