From 170f52d3e6b2fb18e17af7430c447bc56f29d421 Mon Sep 17 00:00:00 2001
From: Fabian Greffrath <fabian@greffrath.com>
Date: Mon, 4 Nov 2019 10:50:44 +0100
Subject: [PATCH] update FAAD2 to version 2.9.0

---
 mingw-w64-faad2/PKGBUILD              | 15 ++++++---------
 mingw-w64-faad2/fix-mingw-build.patch | 13 -------------
 2 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 mingw-w64-faad2/fix-mingw-build.patch

diff --git a/mingw-w64-faad2/PKGBUILD b/mingw-w64-faad2/PKGBUILD
index ea8ce13bb4..6de7d73f6a 100644
--- a/mingw-w64-faad2/PKGBUILD
+++ b/mingw-w64-faad2/PKGBUILD
@@ -3,23 +3,20 @@
 _realname=faad2
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=2.8.8
+pkgver=2.9.0
 pkgrel=1
 pkgdesc="ISO AAC audio decoder (mingw-w64)"
 arch=('any')
-url="https://www.audiocoding.com/"
+url="https://github.com/knik0/faad2"
 license=('GPL')
 options=('staticlibs' 'strip')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 makedepends=("${MINGW_PACKAGE_PREFIX}-yasm" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config")
-source=("https://downloads.sourceforge.net/sourceforge/faac/${_realname}-${pkgver}.tar.gz"
-        "fix-mingw-build.patch")
-sha256sums=('985c3fadb9789d2815e50f4ff714511c79c2710ac27a4aaaf5c0c2662141426d'
-            '02f122391eeca2f79215b785e5ac97d2a24edd25b0e74b8f8f5f985f076a8e1d')
+source=("https://github.com/knik0/${_realname}/archive/${pkgver//\./_}.tar.gz")
+sha256sums=('be30fbb0ea7999fe04ea7a5d5298eec15c256ddff4d5d7c584d5344fb9b0d2d4')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-mingw-build.patch"
+  cd "${srcdir}/${_realname}-${pkgver//\./_}"
 
   WANT_AUTOMAKE=latest autoreconf --force --install
 }
@@ -27,7 +24,7 @@ prepare() {
 build() {
   [[ -d "${srcdir}"/build-${MINGW_CHOST} ]] && rm -rf "${srcdir}"/build-${MINGW_CHOST}
   mkdir -p "${srcdir}"/build-${MINGW_CHOST} && cd "${srcdir}"/build-${MINGW_CHOST}
-  cp -rf ../${_realname}-${pkgver}/* .
+  cp -rf ../${_realname}-${pkgver//\./_}/* .
 
   ./configure \
     --prefix=${MINGW_PREFIX} \
diff --git a/mingw-w64-faad2/fix-mingw-build.patch b/mingw-w64-faad2/fix-mingw-build.patch
deleted file mode 100644
index 1d475d1185..0000000000
--- a/mingw-w64-faad2/fix-mingw-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- faad2-2.8.8/libfaad/decoder.c.orig	2018-06-02 07:58:04.852073000 -0400
-+++ faad2-2.8.8/libfaad/decoder.c	2018-06-02 07:58:09.695726400 -0400
-@@ -53,10 +53,6 @@
- uint16_t dbg_count;
- #endif
- 
--#if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
--#include "win32_ver.h"
--#endif
--
- /* static function declarations */
- static void* aac_frame_decode(NeAACDecStruct *hDecoder,
-                               NeAACDecFrameInfo *hInfo,