From bd767330ac7cd56c3275b04af28751b67d479933 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 1 Jul 2015 11:22:17 -0400
Subject: [PATCH] sdl2_mixer: Fix the build yet again.

Also remove playmus/playwav, they aren't included in the build anymore
apparently.
---
 media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe
index c30705f73..4024b7fce 100644
--- a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe
+++ b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe
@@ -5,12 +5,13 @@ number of simultaneously playing channels of 16 bit stereo audio, plus a \
 single channel of music, mixed by the popular FLAC, MikMoD MOD, Timidity MIDI, \
 Ogg Vorbis, and SMPEG MP3 libraries.
 "
-HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/" 
+HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
 SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.0.tar.gz"
 CHECKSUM_SHA256="a8ce0e161793791adeff258ca6214267fdd41b3c073d2581cd5265c8646f725b"
+SOURCE_DIR="SDL2_mixer-$portVersion"
 LICENSE="Zlib"
 COPYRIGHT="1997-2012 Sam Lantinga"
-REVISION="3"
+REVISION="4"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -21,15 +22,10 @@ PROVIDES="
 	sdl2_mixer$secondaryArchSuffix = $portVersion compat >= 2.0
 	lib:libSDL2_mixer$secondaryArchSuffix = 2.0
 	lib:libSDL2_mixer_2.0$secondaryArchSuffix = 0.0
-	cmd:playwave$secondaryArchSuffix
-	cmd:playmus$secondaryArchSuffix	
 "
 
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libGL$secondaryArchSuffix # No clue, it wants it
-	lib:libstdc++$secondaryArchSuffix
-	lib:libgcc_s$secondaryArchSuffix
 	lib:libSDL2_2.0$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	lib:libFLAC$secondaryArchSuffix
@@ -42,7 +38,6 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	devel:libsdl2$secondaryArchSuffix
-	devel:libGL$secondaryArchSuffix # Needed by SDL2, not transitive...
 	devel:libogg$secondaryArchSuffix
 	devel:libflac$secondaryArchSuffix
 	devel:libfluidsynth$secondaryArchSuffix
@@ -52,6 +47,17 @@ BUILD_REQUIRES="
 	devel:libsmpeg$secondaryArchSuffix	# requires libSDL
 "
 
+PROVIDES_devel="
+	sdl2_mixer${secondaryArchSuffix}_devel = $portVersion compat >= 2.0
+	devel:sdl2_mixer$secondaryArchSuffix = $portVersion compat >= 2.0
+	devel:libSDL2_mixer$secondaryArchSuffix = $portVersion compat >= 2.0
+	devel:libSDL2_mixer_2.0$secondaryArchSuffix = $portVersion compat >= 2.0
+	"
+
+REQUIRES_devel="
+	sdl2_mixer$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
@@ -64,8 +70,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 "
 
-SOURCE_DIR="SDL2_mixer-$portVersion"
-
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -86,14 +90,3 @@ INSTALL()
 	packageEntries devel \
 			$developDir
 }
-
-PROVIDES_devel="
-	sdl2_mixer${secondaryArchSuffix}_devel = $portVersion compat >= 2.0
-	devel:sdl2_mixer$secondaryArchSuffix = $portVersion compat >= 2.0
-	devel:libSDL2_mixer$secondaryArchSuffix = $portVersion compat >= 2.0
-	devel:libSDL2_mixer_2.0$secondaryArchSuffix = $portVersion compat >= 2.0
-	"
-
-REQUIRES_devel="
-	sdl2_mixer$secondaryArchSuffix == $portVersion base
-	"