[arch-commits] Commit in faad2/trunk (5 files)
Eric Bélanger
eric at nymeria.archlinux.org
Thu Oct 24 15:24:37 UTC 2013
Date: Thursday, October 24, 2013 @ 17:24:37
Author: eric
Revision: 197235
upgpkg: faad2 2.7-4
Rebuild without static libraries, Add shared libmp4ff library, Fix license, Use patches to install header and fix man page name
Added:
faad2/trunk/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
faad2/trunk/faad2-2.7-libmp4ff-shared-lib.patch
faad2/trunk/faad2-2.7-man1_MANS.patch
Modified:
faad2/trunk/PKGBUILD
Deleted:
faad2/trunk/LICENSE
----------------------------------------------------+
LICENSE | 42 -------------------
PKGBUILD | 32 +++++++++-----
faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch | 13 +++++
faad2-2.7-libmp4ff-shared-lib.patch | 29 +++++++++++++
faad2-2.7-man1_MANS.patch | 10 ++++
5 files changed, 73 insertions(+), 53 deletions(-)
Deleted: LICENSE
===================================================================
--- LICENSE 2013-10-24 15:08:14 UTC (rev 197234)
+++ LICENSE 2013-10-24 15:24:37 UTC (rev 197235)
@@ -1,42 +0,0 @@
-__________
-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
-** 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.
-******************************************************************************
-
-
-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 2013-10-24 15:08:14 UTC (rev 197234)
+++ PKGBUILD 2013-10-24 15:24:37 UTC (rev 197235)
@@ -3,27 +3,37 @@
pkgname=faad2
pkgver=2.7
-pkgrel=3
+pkgrel=4
pkgdesc="ISO AAC audio decoder"
arch=('i686' 'x86_64')
url="http://www.audiocoding.com/"
-license=('custom:GPL')
+license=('GPL')
depends=('glibc')
-options=('!libtool' '!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.bz2 LICENSE)
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.bz2
+ faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
+ faad2-2.7-libmp4ff-shared-lib.patch
+ faad2-2.7-man1_MANS.patch)
sha1sums=('b0e80481d27ae9faf9e46c8c8dfb617a0adb91b5'
- '00edd9b30d8d5098b5e91c03c595d96a3bbe56fd')
+ '1cf28cfd32dbae6cc484b149fd6adfea33506544'
+ '247658aa795cd6d44a153fae8c5cb62e427f3ecf'
+ '4b548a08f7611a5f4f395c7c1d4cef5e37368af2')
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}/faad2-2.7-libmp4ff-shared-lib.patch"
+ patch -p0 -i "${srcdir}/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch"
+ patch -p1 -i "${srcdir}/faad2-2.7-man1_MANS.patch"
+ autoreconf --force --install
+}
+
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${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"
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
}
Added: faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
===================================================================
--- faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch (rev 0)
+++ faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch 2013-10-24 15:24:37 UTC (rev 197235)
@@ -0,0 +1,13 @@
+Install mp4ff_int_types.h for mythmusic.
+
+http://bugs.gentoo.org/275008
+
+--- common/mp4ff/Makefile.am
++++ common/mp4ff/Makefile.am
+@@ -1,5 +1,5 @@
+ lib_LTLIBRARIES = libmp4ff.la
+-include_HEADERS = mp4ff.h mp4ffint.h
++include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h
+
+ AM_CFLAGS = -DUSE_TAGGING=1
+
Added: faad2-2.7-libmp4ff-shared-lib.patch
===================================================================
--- faad2-2.7-libmp4ff-shared-lib.patch (rev 0)
+++ faad2-2.7-libmp4ff-shared-lib.patch 2013-10-24 15:24:37 UTC (rev 197235)
@@ -0,0 +1,29 @@
+Ripped from Debian
+
+Patch to create a shared lib for libmp4ff.
+
+--- a/common/mp4ff/Makefile.am
++++ b/common/mp4ff/Makefile.am
+@@ -1,7 +1,8 @@
+-lib_LIBRARIES = libmp4ff.a
++lib_LTLIBRARIES = libmp4ff.la
+ include_HEADERS = mp4ff.h mp4ffint.h
+
+-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
++AM_CFLAGS = -DUSE_TAGGING=1
+
+-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
++libmp4ff_la_LDFLAGS = -version-info 0:0:0
++libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
+ mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
+--- a/frontend/Makefile.am
++++ b/frontend/Makefile.am
+@@ -5,7 +5,7 @@
+ -I$(top_srcdir)/common/mp4ff
+
+ faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
+- $(top_builddir)/common/mp4ff/libmp4ff.a
++ $(top_builddir)/common/mp4ff/libmp4ff.la
+
+ faad_SOURCES = main.c \
+ audio.c audio.h \
Added: faad2-2.7-man1_MANS.patch
===================================================================
--- faad2-2.7-man1_MANS.patch (rev 0)
+++ faad2-2.7-man1_MANS.patch 2013-10-24 15:24:37 UTC (rev 197235)
@@ -0,0 +1,10 @@
+diff -ur faad2-2.7.orig/frontend/Makefile.am faad2-2.7/frontend/Makefile.am
+--- faad2-2.7.orig/frontend/Makefile.am 2009-02-06 18:03:37.000000000 +0200
++++ faad2-2.7/frontend/Makefile.am 2009-07-20 20:27:29.000000000 +0300
+@@ -1,5 +1,5 @@
+ bin_PROGRAMS = faad
+-man_MANS = faad.man
++man1_MANS = faad.man
+
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
+ -I$(top_srcdir)/common/mp4ff
More information about the arch-commits
mailing list