sdl2_mixer: Fix the build yet again.

Also remove playmus/playwav, they aren't included in the build anymore
apparently.
This commit is contained in:
Augustin Cavalier
2015-07-01 11:22:17 -04:00
parent 7adf01a856
commit bd767330ac

View File

@@ -8,9 +8,10 @@ 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" SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.0.tar.gz"
CHECKSUM_SHA256="a8ce0e161793791adeff258ca6214267fdd41b3c073d2581cd5265c8646f725b" CHECKSUM_SHA256="a8ce0e161793791adeff258ca6214267fdd41b3c073d2581cd5265c8646f725b"
SOURCE_DIR="SDL2_mixer-$portVersion"
LICENSE="Zlib" LICENSE="Zlib"
COPYRIGHT="1997-2012 Sam Lantinga" COPYRIGHT="1997-2012 Sam Lantinga"
REVISION="3" REVISION="4"
ARCHITECTURES="x86_gcc2 x86 x86_64" ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_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 sdl2_mixer$secondaryArchSuffix = $portVersion compat >= 2.0
lib:libSDL2_mixer$secondaryArchSuffix = 2.0 lib:libSDL2_mixer$secondaryArchSuffix = 2.0
lib:libSDL2_mixer_2.0$secondaryArchSuffix = 0.0 lib:libSDL2_mixer_2.0$secondaryArchSuffix = 0.0
cmd:playwave$secondaryArchSuffix
cmd:playmus$secondaryArchSuffix
" "
REQUIRES=" REQUIRES="
haiku$secondaryArchSuffix haiku$secondaryArchSuffix
lib:libGL$secondaryArchSuffix # No clue, it wants it
lib:libstdc++$secondaryArchSuffix
lib:libgcc_s$secondaryArchSuffix
lib:libSDL2_2.0$secondaryArchSuffix lib:libSDL2_2.0$secondaryArchSuffix
lib:libogg$secondaryArchSuffix lib:libogg$secondaryArchSuffix
lib:libFLAC$secondaryArchSuffix lib:libFLAC$secondaryArchSuffix
@@ -42,7 +38,6 @@ REQUIRES="
BUILD_REQUIRES=" BUILD_REQUIRES="
devel:libsdl2$secondaryArchSuffix devel:libsdl2$secondaryArchSuffix
devel:libGL$secondaryArchSuffix # Needed by SDL2, not transitive...
devel:libogg$secondaryArchSuffix devel:libogg$secondaryArchSuffix
devel:libflac$secondaryArchSuffix devel:libflac$secondaryArchSuffix
devel:libfluidsynth$secondaryArchSuffix devel:libfluidsynth$secondaryArchSuffix
@@ -52,6 +47,17 @@ BUILD_REQUIRES="
devel:libsmpeg$secondaryArchSuffix # requires libSDL 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=" BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel haiku${secondaryArchSuffix}_devel
cmd:aclocal cmd:aclocal
@@ -64,8 +70,6 @@ BUILD_PREREQUIRES="
cmd:pkg_config$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix
" "
SOURCE_DIR="SDL2_mixer-$portVersion"
BUILD() BUILD()
{ {
libtoolize --force --copy --install libtoolize --force --copy --install
@@ -86,14 +90,3 @@ INSTALL()
packageEntries devel \ packageEntries devel \
$developDir $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
"