2.8.3-1: Upstream update

4 files changed, 10 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1dc017775274..ea8c75403240 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,17 @@
 # Generated by mksrcinfo v8
-# Sat Aug  5 16:20:54 UTC 2017
+# Sat Sep 30 16:07:42 UTC 2017
 pkgbase = lib32-faad2
 	pkgdesc = ISO AAC audio decoder (32 bit)
-	pkgver = 2.8.1
+	pkgver = 2.8.3
 	pkgrel = 1
-	url = http://www.audiocoding.com/
+	url = http://faac.sourceforge.net/
 	arch = x86_64
 	license = GPL
-	license = custom:FAAD2
 	depends = lib32-glibc
 	depends = faad2
 	options = !makeflags
-	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
-	md5sums = c0c0d1e6d66de38c40ae56a1981321f9
-	md5sums = b33354022bc1696a89b3ccc1ab94c54f
-	md5sums = b23d2853fec6f07ae7769fd4eabd8f42
+	source = http://downloads.sourceforge.net/sourceforge/faac/faad2-2.8.3.tar.gz
+	md5sums = e8b373d17de8a8145dec39e9712d3bf8
 
 pkgname = lib32-faad2
 
diff --git a/PKGBUILD b/PKGBUILD
index a96d3ed766ca..2ed4277d27d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,28 +4,16 @@
 
 _pkgname=faad2
 pkgname=lib32-${_pkgname}
-pkgver=2.8.1
+pkgver=2.8.3
 pkgrel=1
 pkgdesc="ISO AAC audio decoder (32 bit)"
 arch=('x86_64')
-url="http://www.audiocoding.com/"
-license=('GPL' 'custom:FAAD2')
+url="http://faac.sourceforge.net/"
+license=('GPL')
 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')
-md5sums=('c0c0d1e6d66de38c40ae56a1981321f9'
-         'b33354022bc1696a89b3ccc1ab94c54f'
-         '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"
-#autoreconf --force --install
-}
+source=("http://downloads.sourceforge.net/sourceforge/faac/${_pkgname}-${pkgver}.tar.gz")
+md5sums=('e8b373d17de8a8145dec39e9712d3bf8')
 
 build() {
 export CC='gcc -m32'
@@ -33,7 +21,6 @@ export CXX='g++ -m32'
 export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
     
 cd ${_pkgname}-${pkgver}
-./bootstrap
 ./configure --prefix=/usr --libdir=/usr/lib32
 make
 }
diff --git a/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch b/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
deleted file mode 100644
index 5d39cad95d7e..000000000000
--- a/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
- 
diff --git a/faad2-2.7-libmp4ff-shared-lib.patch b/faad2-2.7-libmp4ff-shared-lib.patch
deleted file mode 100644
index 56a131192969..000000000000
--- a/faad2-2.7-libmp4ff-shared-lib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 \