From cf76fe9f1e806d4dd1630cc356787f0724aeb61b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 27 Sep 2014 14:26:58 +0200 Subject: [PATCH] SDL2_image: fix recipe. --- media-libs/sdl2_image/sdl2_image-2.0.0.recipe | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/media-libs/sdl2_image/sdl2_image-2.0.0.recipe b/media-libs/sdl2_image/sdl2_image-2.0.0.recipe index 6f470243e..c089e4877 100644 --- a/media-libs/sdl2_image/sdl2_image-2.0.0.recipe +++ b/media-libs/sdl2_image/sdl2_image-2.0.0.recipe @@ -9,24 +9,30 @@ on both libz and libjpeg. HOMEPAGE="http://www.libsdl.org/projects/SDL_image" SRC_URI="https://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.0.tar.gz" CHECKSUM_SHA256="b29815c73b17633baca9f07113e8ac476ae66412dec0d29a5045825c27a47234" -REVISION="2" +REVISION="3" LICENSE="Zlib" COPYRIGHT="1997-2013 Sam Lantinga" -ARCHITECTURES="x86 ?x86_gcc2" -SECONDARY_ARCHITECTURES="x86 ?x86_gcc2" +ARCHITECTURES="x86" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86 !x86_gcc2" PROVIDES=" sdl2_image${secondaryArchSuffix} = $portVersion - lib:libSDL2_image${secondaryArchSuffix} + lib:libSDL2_image_2.0${secondaryArchSuffix} = 0.0.0 compat >= 0 " REQUIRES=" haiku${secondaryArchSuffix} >= $haikuVersion - lib:libSDL2${secondaryArchSuffix} + lib:libSDL2_2.0${secondaryArchSuffix} lib:libGL$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix lib:libtiff$secondaryArchSuffix lib:libgif$secondaryArchSuffix lib:libwebp$secondaryArchSuffix @@ -54,6 +60,7 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " SOURCE_DIR="SDL2_image-$portVersion" @@ -79,9 +86,9 @@ INSTALL() } PROVIDES_devel=" - sdl2_image${secondaryArchSuffix}_devel = ${portVersion} compat >= 1.2 - devel:sdl2_image$secondaryArchSuffix = ${portVersion} compat >= 1.2 - devel:libSDL2_image$secondaryArchSuffix = 2.0_0.10.1 compat >= 2.0_0 + sdl2_image${secondaryArchSuffix}_devel = ${portVersion} + devel:libSDL2_image_2.0$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libSDL2_image$secondaryArchSuffix " REQUIRES_devel="