From 1109466025eec8f857557fd45da7e9a334756a0a Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 31 Oct 2013 02:08:15 -0700 Subject: [PATCH] Updated sdl_mixer to support secondaryArchSuffix --- media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 60 ++++++++++---------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe index e39e5f55a..c7e88ab23 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -7,48 +7,49 @@ LICENSE="Zlib" COPYRIGHT="1997-2012 Sam Lantinga" REVISION="1" -ARCHITECTURES="x86 x86_gcc2" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - sdl_mixer = $portVersion - lib:libSDL_mixer_1.2 = $portVersion compat >= 1.2 - devel:libSDL_mixer = $portVersion compat >= 1.2 + sdl_mixer$secondaryArchSuffix = $portVersion compat >= 1.2 + lib:libSDL_mixer_1.2$secondaryArchSuffix = 0.12.0 compat >= 0 + devel:libSDL_mixer$secondaryArchSuffix = 0.12.0 compat >= 0 " REQUIRES=" - haiku - libsdl - flac - libmad - libvorbis - libogg - libmikmod - smpeg + haiku$secondaryArchSuffix >= $haikuVersion + libsdl$secondaryArchSuffix + flac$secondaryArchSuffix + libmad$secondaryArchSuffix + libvorbis$secondaryArchSuffix + libogg$secondaryArchSuffix + libmikmod$secondaryArchSuffix + smpeg$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libsdl + devel:libsdl$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtool cmd:make cmd:pkg_config - cmd:sdl_config - cmd:smpeg_config - cmd:libmikmod_config - devel:libogg - devel:flac - devel:libmad - devel:libvorbis - devel:libogg - devel:libmikmod - devel:smpeg + cmd:sdl_config$secondaryArchSuffix + cmd:smpeg_config$secondaryArchSuffix + cmd:libmikmod_config$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:flac$secondaryArchSuffix + devel:libmad$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libmikmod$secondaryArchSuffix + devel:smpeg$secondaryArchSuffix " SOURCE_DIR="SDL_mixer-$portVersion" @@ -74,10 +75,11 @@ INSTALL() } PROVIDES_devel=" - devel:SDL_mixer = 0.0.0 compat >= 0 - devel:libSDL_mixer = 0.0.0 compat >= 0 + sdl_mixer${secondaryArchSuffix}_devel = $portVersion compat >= 1.2 + devel:SDL_mixer$secondaryArchSuffix = 0.12.0 compat >= 0 + devel:libSDL_mixer$secondaryArchSuffix = 0.12.0 compat >= 0 " REQUIRES_devel=" - sdl_mixer == $portVersion base + sdl_mixer$secondaryArchSuffix == $portVersion base "