[arch-commits] Commit in faad2/trunk (7 files)
Eric Belanger
eric at archlinux.org
Sun Jul 20 05:06:05 UTC 2008
Date: Sunday, July 20, 2008 @ 01:06:05
Author: eric
Revision: 5668
upgpkg: faad2 2.6.1-1
Upstream update, Updated license, Added ChangeLog, patched for misc. build and run issues
Added:
faad2/trunk/ChangeLog
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
Modified:
faad2/trunk/LICENSE
faad2/trunk/PKGBUILD
-----------------------------------+
ChangeLog | 14 +++++++++
LICENSE | 40 +++++++++++++++++++--------
PKGBUILD | 52 +++++++++++++++++++++---------------
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 +++++++++
7 files changed, 133 insertions(+), 33 deletions(-)
Added: ChangeLog
===================================================================
--- ChangeLog (rev 0)
+++ ChangeLog 2008-07-20 05:06:05 UTC (rev 5668)
@@ -0,0 +1,14 @@
+2008-07-19 Eric Belanger <eric at 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
Modified: LICENSE
===================================================================
--- LICENSE 2008-07-20 05:01:21 UTC (rev 5667)
+++ LICENSE 2008-07-20 05:06:05 UTC (rev 5668)
@@ -1,12 +1,28 @@
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License Version 2, found in the
-file /usr/share/licenses/common/GPL/license.txt when the package "licenses"
-is installed.
-
-Some files in this source distribution also include the following clause in
-addition to the above license:
-
- Software using this code must display the following message visibly in or
- on each copy of the software:
- "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
- in, for example, the about-box or help/startup screen.
+/*
+** 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
+** 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
+** forbidden.
+**
+** The "appropriate copyright message" mentioned in section 2c of the GPLv2
+** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
+**
+** Commercial non-GPL licensing of this software is possible.
+** For more info contact Nero AG through Mpeg4AAClicense at nero.com.
+**
+*/
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-07-20 05:01:21 UTC (rev 5667)
+++ PKGBUILD 2008-07-20 05:06:05 UTC (rev 5668)
@@ -1,35 +1,45 @@
# $Id$
-# Maintainer: Travis Willard <travis at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
# Contributor: Sarah Hay <sarah at archlinux.org>
pkgname=faad2
-pkgver=2.6
+pkgver=2.6.1
pkgrel=1
pkgdesc="ISO AAC audio decoder"
-arch=(i686 x86_64)
-license=('custom')
+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 LICENSE)
+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
+ LICENSE)
+md5sums=('74e92df40c270f216a8305fc87603c8a' 'ca9515b6617d7fd060d0d172616eb192'\
+ 'bb6a345dd2e6c4df6609e6a374134066' 'bc43fd3f8cd582a8bc092b9b5e611865'\
+ '06e83633c609d20436794b62a382b3dc' 'b6a1c72534807b8a038b71e784f57e32')
+sha1sums=('b4ad33d3c4dfa6dbf3011a3da34c631926cabfad'
+ 'ca4ee04aa1757b8f9deeef52b5bf35dc823da844'
+ '0b03728f40d00e552f738900e2f6215177af5417'
+ 'd4ab5d38c9b75ed6417529c4d1a7ca204293c224'
+ 'f7e9d89fc551e0b61a7b7555749ed7a3129a4ce8'
+ '6225fd997671206f5222c4a86d9e092359552c43')
build() {
- cd ${startdir}/src/${pkgname}
- echo "SUBDIRS = libfaad common frontend" > Makefile.am || return 1
+ 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
- echo > plugins/Makefile.am
- echo > plugins/xmms/src/Makefile.am
- sed -i '/E_B/d' configure.in
- autoreconf -vif
- ./configure --prefix=/usr
+ autoreconf -vif || return 1
+ ./configure --prefix=/usr || return 1
make || return 1
- make DESTDIR=${startdir}/pkg install
- install -m644 ${startdir}/src/${pkgname}/common/mp4ff/mp4ff.h ${startdir}/pkg/usr/include/
- install -m644 ${startdir}/src/${pkgname}/common/mp4ff/mp4ff_int_types.h ${startdir}/pkg/usr/include/
- install -m644 ${startdir}/src/${pkgname}/common/mp4ff/.libs/*.a ${startdir}/pkg/usr/lib/
-
- mkdir -p ${startdir}/pkg/usr/share/licenses/${pkgname}
- install -m644 ${startdir}/src/LICENSE ${startdir}/pkg/usr/share/licenses/${pkgname}
+ 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
+ install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
}
-md5sums=('aeeb1e6c2dc70eeb7fb74afd546d8b82'
- '4d8da2d7ce23e1d5f50d3404193bb053')
Added: faad2-2.6.1-abi_has_changed.patch
===================================================================
--- faad2-2.6.1-abi_has_changed.patch (rev 0)
+++ faad2-2.6.1-abi_has_changed.patch 2008-07-20 05:06:05 UTC (rev 5668)
@@ -0,0 +1,14 @@
+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 \
Added: faad2-2.6.1-broken-pipe.patch
===================================================================
--- faad2-2.6.1-broken-pipe.patch (rev 0)
+++ faad2-2.6.1-broken-pipe.patch 2008-07-20 05:06:05 UTC (rev 5668)
@@ -0,0 +1,22 @@
+--- 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)
Added: faad2-2.6.1-implicitdeclar.patch
===================================================================
--- faad2-2.6.1-implicitdeclar.patch (rev 0)
+++ faad2-2.6.1-implicitdeclar.patch 2008-07-20 05:06:05 UTC (rev 5668)
@@ -0,0 +1,11 @@
+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>
Added: faad2-2.6.1-libtool22.patch
===================================================================
--- faad2-2.6.1-libtool22.patch (rev 0)
+++ faad2-2.6.1-libtool22.patch 2008-07-20 05:06:05 UTC (rev 5668)
@@ -0,0 +1,13 @@
+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
More information about the arch-commits
mailing list