From 4cd69eb13fa4fd4f96ef9cdc4a5137d11950407c Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 26 Aug 2017 11:59:19 +0200
Subject: [PATCH] flac: fix gcc2 build.

* fix #1422.
---
 media-libs/flac/flac-1.3.2.recipe           |  2 +-
 media-libs/flac/patches/flac-1.3.2.patchset | 74 ++++++++++++++++++++-
 2 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/media-libs/flac/flac-1.3.2.recipe b/media-libs/flac/flac-1.3.2.recipe
index 68c0a4389..dc2dc4af2 100644
--- a/media-libs/flac/flac-1.3.2.recipe
+++ b/media-libs/flac/flac-1.3.2.recipe
@@ -10,7 +10,7 @@ COPYRIGHT="2000-2007 Josh Coalson"
 LICENSE="GNU LGPL v2.1
 	GNU GPL v2
 	BSD (3-clause)"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="http://downloads.xiph.org/releases/flac/flac-$portVersion.tar.xz"
 CHECKSUM_SHA256="91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f"
 PATCHES="flac-$portVersion.patchset"
diff --git a/media-libs/flac/patches/flac-1.3.2.patchset b/media-libs/flac/patches/flac-1.3.2.patchset
index 14543448b..4da6b8ada 100644
--- a/media-libs/flac/patches/flac-1.3.2.patchset
+++ b/media-libs/flac/patches/flac-1.3.2.patchset
@@ -1,4 +1,4 @@
-From 59d8d0981979f1d376f574d5c624442dde6b4b00 Mon Sep 17 00:00:00 2001
+From 46090c80c97bef8acd7df98d96be6860e1b73648 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Thu, 27 Nov 2014 17:02:30 +0000
 Subject: remove unrecognized gcc flags
@@ -20,5 +20,75 @@ index 070ab35..c438589 100644
  	XIPH_ADD_CFLAGS([-Wdeclaration-after-statement])
  	XIPH_ADD_CFLAGS([-D_FORTIFY_SOURCE=2])
 -- 
-2.10.2
+2.7.0
+
+
+From ccd459faf2ea8541d3020a9a8a57a345a259f32f Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 26 Aug 2017 11:50:31 +0200
+Subject: gcc2 fixes
+
+
+diff --git a/include/FLAC++/decoder.h b/include/FLAC++/decoder.h
+index 0b93906..ed8bd91 100644
+--- a/include/FLAC++/decoder.h
++++ b/include/FLAC++/decoder.h
+@@ -225,11 +225,15 @@ namespace FLAC {
+ 			File();
+ 			virtual ~File();
+ 
++#if __GNUC__ > 2
+ 			using Stream::init;
++#endif
+ 			virtual ::FLAC__StreamDecoderInitStatus init(FILE *file);                      ///< See FLAC__stream_decoder_init_FILE()
+ 			virtual ::FLAC__StreamDecoderInitStatus init(const char *filename);            ///< See FLAC__stream_decoder_init_file()
+ 			virtual ::FLAC__StreamDecoderInitStatus init(const std::string &filename);     ///< See FLAC__stream_decoder_init_file()
++#if __GNUC__ > 2
+ 			using Stream::init_ogg;
++#endif
+ 			virtual ::FLAC__StreamDecoderInitStatus init_ogg(FILE *file);                  ///< See FLAC__stream_decoder_init_ogg_FILE()
+ 			virtual ::FLAC__StreamDecoderInitStatus init_ogg(const char *filename);        ///< See FLAC__stream_decoder_init_ogg_file()
+ 			virtual ::FLAC__StreamDecoderInitStatus init_ogg(const std::string &filename); ///< See FLAC__stream_decoder_init_ogg_file()
+diff --git a/include/FLAC++/encoder.h b/include/FLAC++/encoder.h
+index b01a545..491a1ff 100644
+--- a/include/FLAC++/encoder.h
++++ b/include/FLAC++/encoder.h
+@@ -235,11 +235,15 @@ namespace FLAC {
+ 			File();
+ 			virtual ~File();
+ 
++#if __GNUC__ > 2
+ 			using Stream::init;
++#endif
+ 			virtual ::FLAC__StreamEncoderInitStatus init(FILE *file);                      ///< See FLAC__stream_encoder_init_FILE()
+ 			virtual ::FLAC__StreamEncoderInitStatus init(const char *filename);            ///< See FLAC__stream_encoder_init_file()
+ 			virtual ::FLAC__StreamEncoderInitStatus init(const std::string &filename);     ///< See FLAC__stream_encoder_init_file()
++#if __GNUC__ > 2
+ 			using Stream::init_ogg;
++#endif
+ 			virtual ::FLAC__StreamEncoderInitStatus init_ogg(FILE *file);                  ///< See FLAC__stream_encoder_init_ogg_FILE()
+ 			virtual ::FLAC__StreamEncoderInitStatus init_ogg(const char *filename);        ///< See FLAC__stream_encoder_init_ogg_file()
+ 			virtual ::FLAC__StreamEncoderInitStatus init_ogg(const std::string &filename); ///< See FLAC__stream_encoder_init_ogg_file()
+diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c
+index b9df19a..ee3fc7e 100644
+--- a/src/libFLAC/cpu.c
++++ b/src/libFLAC/cpu.c
+@@ -65,7 +65,6 @@ static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE = 0x02000000;
+ static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE2 = 0x04000000;
+ #endif
+ 
+-#if FLAC__HAS_X86INTRIN || FLAC__AVX_SUPPORTED
+ /* these are flags in ECX of CPUID AX=00000001 */
+ static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE3 = 0x00000001;
+ static const unsigned FLAC__CPUINFO_IA32_CPUID_SSSE3 = 0x00000200;
+@@ -78,7 +77,6 @@ static const unsigned FLAC__CPUINFO_IA32_CPUID_AVX = 0x10000000;
+ static const unsigned FLAC__CPUINFO_IA32_CPUID_FMA = 0x00001000;
+ /* these are flags in EBX of CPUID AX=00000007 */
+ static const unsigned FLAC__CPUINFO_IA32_CPUID_AVX2 = 0x00000020;
+-#endif
+ 
+ #if defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64
+ static uint32_t
+-- 
+2.7.0