[arch-commits] Commit in faad2/trunk (8 files)

Eric Bélanger eric at archlinux.org
Sun Feb 22 02:14:53 UTC 2009


    Date: Saturday, February 21, 2009 @ 21:14:53
  Author: eric
Revision: 27453

upgpkg: faad2 2.7-1
    Upstream update, Updated LICENSE file, Compiled with -fPIC option, Removed old patches

Modified:
  faad2/trunk/ChangeLog
  faad2/trunk/LICENSE
  faad2/trunk/PKGBUILD
Deleted:
  faad2/trunk/faad2-2.6.1-abi_has_changed.patch
  faad2/trunk/faad2-2.6.1-broken-pipe.patch
  faad2/trunk/faad2-2.6.1-implicitdeclar.patch
  faad2/trunk/faad2-2.6.1-libtool22.patch
  faad2/trunk/faad2-2.6.1-main-overflow.patch

-----------------------------------+
 ChangeLog                         |    7 ++++++
 LICENSE                           |   28 ++++++++++++++++++------
 PKGBUILD                          |   41 ++++++++----------------------------
 faad2-2.6.1-abi_has_changed.patch |   14 ------------
 faad2-2.6.1-broken-pipe.patch     |   22 -------------------
 faad2-2.6.1-implicitdeclar.patch  |   11 ---------
 faad2-2.6.1-libtool22.patch       |   13 -----------
 faad2-2.6.1-main-overflow.patch   |   13 -----------
 8 files changed, 38 insertions(+), 111 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-02-22 02:10:25 UTC (rev 27452)
+++ ChangeLog	2009-02-22 02:14:53 UTC (rev 27453)
@@ -1,3 +1,10 @@
+2009-02-16  Eric Belanger  <eric at archlinux.org>
+
+	* faad2 2.7-1
+	* Upstream update
+	* Updated LICENSE file
+	* Compiled with -fPIC option
+
 2009-01-05  Eric Belanger  <eric at archlinux.org>
 
 	* faad2 2.6.1-2

Modified: LICENSE
===================================================================
--- LICENSE	2009-02-22 02:10:25 UTC (rev 27452)
+++ LICENSE	2009-02-22 02:14:53 UTC (rev 27453)
@@ -1,19 +1,24 @@
-/*
+__________
+COPYRIGHTS
+
+For FAAD2 the following license applies:
+
+******************************************************************************
 ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
 ** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
+**
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
 ** the Free Software Foundation; either version 2 of the License, or
 ** (at your option) any later version.
-** 
+**
 ** This program is distributed in the hope that it will be useful,
 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ** GNU General Public License for more details.
-** 
+**
 ** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
+** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
@@ -24,5 +29,14 @@
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through Mpeg4AAClicense at nero.com.
-**
-*/
+******************************************************************************
+
+
+Please note that the use of this software may require the payment of
+patent royalties. You need to consider this issue before you start
+building derivative works. We are not warranting or indemnifying you in
+any way for patent royalities! YOU ARE SOLELY RESPONSIBLE FOR YOUR OWN
+ACTIONS!
+
+
+______

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-02-22 02:10:25 UTC (rev 27452)
+++ PKGBUILD	2009-02-22 02:14:53 UTC (rev 27453)
@@ -3,44 +3,23 @@
 # Contributor: Sarah Hay <sarah at archlinux.org>
 
 pkgname=faad2
-pkgver=2.6.1
-pkgrel=2
+pkgver=2.7
+pkgrel=1
 pkgdesc="ISO AAC audio decoder"
 arch=('i686' 'x86_64')
 url="http://www.audiocoding.com/"
 license=('custom:GPL')
 depends=('glibc')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.gz \
-        faad2-2.6.1-libtool22.patch faad2-2.6.1-broken-pipe.patch \
-        faad2-2.6.1-implicitdeclar.patch faad2-2.6.1-abi_has_changed.patch \
-	faad2-2.6.1-main-overflow.patch LICENSE)
-md5sums=('74e92df40c270f216a8305fc87603c8a' 'ca9515b6617d7fd060d0d172616eb192'\
-         'bb6a345dd2e6c4df6609e6a374134066' 'bc43fd3f8cd582a8bc092b9b5e611865'\
-         '06e83633c609d20436794b62a382b3dc' '2f76d3c6a77a551cdb5113dd7be0188b'\
-         'b6a1c72534807b8a038b71e784f57e32')
-sha1sums=('b4ad33d3c4dfa6dbf3011a3da34c631926cabfad'
-          'ca4ee04aa1757b8f9deeef52b5bf35dc823da844'
-          '0b03728f40d00e552f738900e2f6215177af5417'
-          'd4ab5d38c9b75ed6417529c4d1a7ca204293c224'
-          'f7e9d89fc551e0b61a7b7555749ed7a3129a4ce8'
-          '3c1172e62198db30f0d7fbabff41b0b942947dee'
-          '6225fd997671206f5222c4a86d9e092359552c43')
+options=('!libtool' '!makeflags')
+source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.bz2 LICENSE)
+md5sums=('4c332fa23febc0e4648064685a3d4332' 'ec95f38142e14fb46c849503897a37a0')
+sha1sums=('b0e80481d27ae9faf9e46c8c8dfb617a0adb91b5' '00edd9b30d8d5098b5e91c03c595d96a3bbe56fd')
 
 build() {
-  cd ${srcdir}/${pkgname}
-  patch -p1 < ../faad2-2.6.1-libtool22.patch || return 1
-  patch -p1 < ../faad2-2.6.1-broken-pipe.patch || return 1
-  patch -p1 < ../faad2-2.6.1-implicitdeclar.patch || return 1
-  patch -p1 < ../faad2-2.6.1-abi_has_changed.patch || return 1
-  patch -p1 < ../faad2-2.6.1-main-overflow.patch || return 1
-
-  autoreconf -vif || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -m644 ${srcdir}/${pkgname}/common/mp4ff/mp4ff.h ${pkgdir}/usr/include/ || return 1
-  install -m644 ${srcdir}/${pkgname}/common/mp4ff/mp4ff_int_types.h ${pkgdir}/usr/include/ || return 1
-  install -m644 ${srcdir}/${pkgname}/common/mp4ff/.libs/*.a ${pkgdir}/usr/lib/ || 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
 }

Deleted: faad2-2.6.1-abi_has_changed.patch
===================================================================
--- faad2-2.6.1-abi_has_changed.patch	2009-02-22 02:10:25 UTC (rev 27452)
+++ faad2-2.6.1-abi_has_changed.patch	2009-02-22 02:14:53 UTC (rev 27453)
@@ -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 \

Deleted: faad2-2.6.1-broken-pipe.patch
===================================================================
--- faad2-2.6.1-broken-pipe.patch	2009-02-22 02:10:25 UTC (rev 27452)
+++ faad2-2.6.1-broken-pipe.patch	2009-02-22 02:14:53 UTC (rev 27453)
@@ -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)

Deleted: faad2-2.6.1-implicitdeclar.patch
===================================================================
--- faad2-2.6.1-implicitdeclar.patch	2009-02-22 02:10:25 UTC (rev 27452)
+++ faad2-2.6.1-implicitdeclar.patch	2009-02-22 02:14:53 UTC (rev 27453)
@@ -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>

Deleted: faad2-2.6.1-libtool22.patch
===================================================================
--- faad2-2.6.1-libtool22.patch	2009-02-22 02:10:25 UTC (rev 27452)
+++ faad2-2.6.1-libtool22.patch	2009-02-22 02:14:53 UTC (rev 27453)
@@ -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

Deleted: faad2-2.6.1-main-overflow.patch
===================================================================
--- faad2-2.6.1-main-overflow.patch	2009-02-22 02:10:25 UTC (rev 27452)
+++ faad2-2.6.1-main-overflow.patch	2009-02-22 02:14:53 UTC (rev 27453)
@@ -1,13 +0,0 @@
-Index: faad2/frontend/main.c
-===================================================================
---- faad2.orig/frontend/main.c
-+++ faad2/frontend/main.c
-@@ -916,6 +916,8 @@ int decodeMP4file(char *mp4file, char *s
-                 sample_count = frameInfo.samples;
-             } else {
-                 sample_count = (unsigned int)(dur * frameInfo.channels);
-+                if (sample_count > frameInfo.samples)
-+                    sample_count = frameInfo.samples;
- 
-                 if (!useAacLength && !initial && (sampleId < numSamples/2) && (sample_count != frameInfo.samples))
-                 {




More information about the arch-commits mailing list