2.8.1-1: Upstream update

4 files changed, 19 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 556a75c7b864..1dc017775274 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Sat Aug  5 16:20:54 UTC 2017
 pkgbase = lib32-faad2
 	pkgdesc = ISO AAC audio decoder (32 bit)
-	pkgver = 2.7
-	pkgrel = 5
+	pkgver = 2.8.1
+	pkgrel = 1
 	url = http://www.audiocoding.com/
 	arch = x86_64
 	license = GPL
@@ -9,14 +11,12 @@ pkgbase = lib32-faad2
 	depends = lib32-glibc
 	depends = faad2
 	options = !makeflags
-	source = http://downloads.sourceforge.net/sourceforge/faac/faad2-2.7.tar.bz2
+	source = http://downloads.sourceforge.net/sourceforge/faac/faad2-2.8.1.tar.bz2
 	source = faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
 	source = faad2-2.7-libmp4ff-shared-lib.patch
-	source = faad2-2.7-man1_MANS.patch
-	md5sums = 4c332fa23febc0e4648064685a3d4332
+	md5sums = c0c0d1e6d66de38c40ae56a1981321f9
 	md5sums = b33354022bc1696a89b3ccc1ab94c54f
 	md5sums = b23d2853fec6f07ae7769fd4eabd8f42
-	md5sums = a8cee29241a696ab24d010af35b951b8
 
 pkgname = lib32-faad2
 
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index a16abf6e373c..000000000000
--- a/LICENSE
+++ /dev/null
@@ -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@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!
-
-
-______
diff --git a/PKGBUILD b/PKGBUILD
index 3bbd544c1563..a96d3ed766ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,29 +4,27 @@
 
 _pkgname=faad2
 pkgname=lib32-${_pkgname}
-pkgver=2.7
-pkgrel=5
+pkgver=2.8.1
+pkgrel=1
 pkgdesc="ISO AAC audio decoder (32 bit)"
 arch=('x86_64')
 url="http://www.audiocoding.com/"
 license=('GPL' 'custom:FAAD2')
 depends=('lib32-glibc' ${_pkgname})
 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)
-md5sums=('4c332fa23febc0e4648064685a3d4332'
+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')
+md5sums=('c0c0d1e6d66de38c40ae56a1981321f9'
          'b33354022bc1696a89b3ccc1ab94c54f'
-         'b23d2853fec6f07ae7769fd4eabd8f42'
-         'a8cee29241a696ab24d010af35b951b8')
+         'b23d2853fec6f07ae7769fd4eabd8f42')
+
 
 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
+#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"
+#autoreconf --force --install
 }
 
 build() {
@@ -35,8 +33,9 @@ export CXX='g++ -m32'
 export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
     
 cd ${_pkgname}-${pkgver}
+./bootstrap
 ./configure --prefix=/usr --libdir=/usr/lib32
-make CFLAGS="${CFLAGS} -fPIC"
+make
 }
 
 package() {
diff --git a/faad2-2.7-man1_MANS.patch b/faad2-2.7-man1_MANS.patch
deleted file mode 100644
index 9c1ddb01bc31..000000000000
--- a/faad2-2.7-man1_MANS.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-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