From 137f2eb19d10b4a58eeadb28a1acadc6e3920e6b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 27 Nov 2014 17:29:40 +0000
Subject: [PATCH] flac: bump version

---
 .../{flac-1.3.0.recipe => flac-1.3.1.recipe}  | 12 +++++-----
 media-libs/flac/patches/flac-1.3.1.patchset   | 24 +++++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)
 rename media-libs/flac/{flac-1.3.0.recipe => flac-1.3.1.recipe} (91%)
 create mode 100644 media-libs/flac/patches/flac-1.3.1.patchset

diff --git a/media-libs/flac/flac-1.3.0.recipe b/media-libs/flac/flac-1.3.1.recipe
similarity index 91%
rename from media-libs/flac/flac-1.3.0.recipe
rename to media-libs/flac/flac-1.3.1.recipe
index 50cac237b..a7310c6bd 100644
--- a/media-libs/flac/flac-1.3.0.recipe
+++ b/media-libs/flac/flac-1.3.1.recipe
@@ -8,9 +8,9 @@ play back compressed FLAC files in your favorite player (or your car or home \
 stereo) just like you would an MP3 file.
 "
 HOMEPAGE="http://flac.sourceforge.net/" 
-SRC_URI="http://downloads.xiph.org/releases/flac/flac-1.3.0.tar.xz"
-CHECKSUM_SHA256="fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc"
-REVISION="3"
+SRC_URI="http://downloads.xiph.org/releases/flac/flac-$portVersion.tar.xz"
+CHECKSUM_SHA256="4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c"
+REVISION="1"
 
 LICENSE="GNU LGPL v2.1
 	GNU GPL v2
@@ -22,6 +22,8 @@ COPYRIGHT="2000-2007 Josh Coalson"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+PATCHES="flac-1.3.1.patchset"
+
 PROVIDES="
 	flac$secondaryArchSuffix = $portVersion compat >= 1
 	lib:libFLAC$secondaryArchSuffix = 8.3.0 compat >= 8
@@ -64,9 +66,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
+	autoreconf -fi
 	runConfigure ./configure
 	make $jobArgs
 }
diff --git a/media-libs/flac/patches/flac-1.3.1.patchset b/media-libs/flac/patches/flac-1.3.1.patchset
new file mode 100644
index 000000000..00ba511e6
--- /dev/null
+++ b/media-libs/flac/patches/flac-1.3.1.patchset
@@ -0,0 +1,24 @@
+From ed7add20356f3ef43c5dd47f3a99828972bec9b4 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
+
+
+diff --git a/configure.ac b/configure.ac
+index 3d647ed..12b6110 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -359,8 +359,8 @@ fi
+ XIPH_GCC_VERSION
+ 
+ if test x$ac_cv_c_compiler_gnu = xyes ; then
+-	CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wnested-externs -Wshadow -Wundef -Wmissing-declarations -Wunreachable-code -Winline " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Wconversion
+-	CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef -Wunreachable-code " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations
++	CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wnested-externs -Wshadow -Wundef -Wmissing-declarations -Winline " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Wconversion
++	CXXFLAGS="$CXXFLAGS -Wall -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations
+ 
+ 	XIPH_ADD_CFLAGS([-Wdeclaration-after-statement])
+ 	XIPH_ADD_CFLAGS([-D_FORTIFY_SOURCE=2])
+-- 
+1.8.3.4
+