From e45bb6aed0ff18ff2102b0c632561922384cc2d0 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 23 Nov 2019 23:04:58 +0100
Subject: [PATCH] faad2: fix gcc2 build.

---
 media-libs/faad2/faad2-2.9.1.recipe           |  2 +-
 media-libs/faad2/patches/faad2-2.9.1.patchset | 27 +++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/media-libs/faad2/faad2-2.9.1.recipe b/media-libs/faad2/faad2-2.9.1.recipe
index 757008d97..bb7093e55 100644
--- a/media-libs/faad2/faad2-2.9.1.recipe
+++ b/media-libs/faad2/faad2-2.9.1.recipe
@@ -7,7 +7,7 @@ library (libfaad) that may be used by other programs."
 HOMEPAGE="https://www.audiocoding.com/"
 COPYRIGHT="2003-2005 M. Bakker, Nero AG."
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/knik0/faad2/archive/${portVersion//./_}.tar.gz"
 CHECKSUM_SHA256="7fa33cff76abdda5a220ca5de0b2e05a77354f3b97f735193c2940224898aa9a"
 SOURCE_DIR="faad2-${portVersion//./_}"
diff --git a/media-libs/faad2/patches/faad2-2.9.1.patchset b/media-libs/faad2/patches/faad2-2.9.1.patchset
index 5b4026387..7c6b27cbb 100644
--- a/media-libs/faad2/patches/faad2-2.9.1.patchset
+++ b/media-libs/faad2/patches/faad2-2.9.1.patchset
@@ -1,4 +1,4 @@
-From 3ca94abde60d8da2ab91b996970e79be54a0245e Mon Sep 17 00:00:00 2001
+From 3d71c3fc14ae5cd28981c4a756a5c4a4c58db71e Mon Sep 17 00:00:00 2001
 From: Robert Kausch <robert.kausch@freac.org>
 Date: Tue, 4 Dec 2018 20:46:05 +0000
 Subject: Patches for Haiku compatibility.
@@ -35,5 +35,28 @@ index 8ed57ae..aa9c745 100644
  libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
  		     drm_dec.c error.c filtbank.c \
 -- 
-2.24.0
+2.23.0
+
+
+From cb79ebf9a84b20630216ad5815d754d343e06df4 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 23 Nov 2019 23:02:50 +0100
+Subject: gcc2 fix
+
+
+diff --git a/libfaad/hcr.c b/libfaad/hcr.c
+index 3cefe60..ea0d84e 100644
+--- a/libfaad/hcr.c
++++ b/libfaad/hcr.c
+@@ -225,7 +225,7 @@ uint8_t reordered_spectral_data(NeAACDecStruct *hDecoder, ic_stream *ics,
+ 
+     uint16_t sp_offset[8];
+     uint16_t g, i, sortloop, set, bitsread;
+-    /*uint16_t bitsleft, codewordsleft*/;
++    /*uint16_t bitsleft, codewordsleft;*/
+     uint8_t w_idx, sfb, this_CB, last_CB, this_sec_CB; 
+     
+     const uint16_t nshort = hDecoder->frameLength/8;
+-- 
+2.23.0