Added more support for secondaryArchSuffix in sdl libs

This commit is contained in:
Scott McCreary
2013-11-12 17:14:40 -08:00
parent 33860b3437
commit 97f653e057
5 changed files with 29 additions and 26 deletions

View File

@@ -13,7 +13,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
sdl_gfx$secondaryArchSuffix = $portVersion compat >= 2
lib:libSDL_gfx = 14.9.1 compat >= 14
lib:libSDL_gfx$secondaryArchSuffix = 14.9.1 compat >= 14
"
REQUIRES="
@@ -34,7 +34,7 @@ BUILD_PREREQUIRES="
cmd:libtool
cmd:make
cmd:pkg_config
cmd:sdl_config$secondaryArchSuffix
cmd:sdl_config
"
SOURCE_DIR="SDL_gfx-$portVersion"

View File

@@ -3,7 +3,7 @@ DESCRIPTION="Simple Direct Media Layer Image Library"
HOMEPAGE="http://www.libsdl.org/projects/SDL_image"
SRC_URI="http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz"
CHECKSUM_MD5="a0f9098ebe5400f0bdc9b62e60797ecb"
REVISION="2"
REVISION="1"
LICENSE="Zlib"
COPYRIGHT="1997-2012 Sam Lantinga"
@@ -12,7 +12,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
sdl_image$secondaryArchSuffix = $portVersion compat >= 1.2
lib:libSDL_image#secondaryArchSuffix = 1.2_0.8.4 compat >= 1.2_0
lib:libSDL_image$secondaryArchSuffix = 1.2_0.8.4 compat >= 1.2_0
lib:libSDL_image_1.2 = $portVersion compat >= 0
"
@@ -21,18 +21,19 @@ REQUIRES="
libsdl$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libtiff
# lib:giflib
# lib:libwebp
lib:libtiff$secondaryArchSuffix
lib:libgif$secondaryArchSuffix
lib:libwebp$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libsdl$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
# devel:libtiff
# devel:giflib
# devel:libwebp "
devel:libpng$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libgif$secondaryArchSuffix
devel:libwebp$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
@@ -56,7 +57,7 @@ BUILD()
runConfigure ./configure \
--enable-bmp --enable-lbm --enable-pcx \
--enable-pnm --enable-tga --enable-xcf --enable-xpm --enable-xv \
--enable-gif --enable-jpg --disable-jpg-shared
--enable-gif --enable-jpg --disable-jpg-shared --enable-webp
make
}

View File

@@ -41,9 +41,9 @@ BUILD_PREREQUIRES="
cmd:libtool
cmd:make
cmd:pkg_config
cmd:sdl_config$secondaryArchSuffix
cmd:smpeg_config$secondaryArchSuffix
cmd:libmikmod_config$secondaryArchSuffix
cmd:sdl_config
cmd:smpeg_config
cmd:libmikmod_config
devel:libogg$secondaryArchSuffix
devel:flac$secondaryArchSuffix
# devel:fluidsynth$secondaryArchSuffix

View File

@@ -37,8 +37,8 @@ BUILD_PREREQUIRES="
cmd:aclocal
cmd:automake
cmd:autoconf
cmd:gcc
cmd:ld
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:sdl_config
cmd:make
cmd:freetype_config
@@ -76,5 +76,5 @@ PROVIDES_devel="
"
REQUIRES_devel="
sdl_ttf$secondaryArchSuffix == $portVersion base
sdl_ttf$secondaryArchSuffix == $portVersion base
"

View File

@@ -18,23 +18,25 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
libsdl$secondaryArchSuffix
sdl_image$secondaryArchSuffix
freetype
lib:libsdl$secondaryArchSuffix
lib:libSDL_image_1.2$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
#TODO get freetype to work in sge as well
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libsdl$secondaryArchSuffix
devel:sdl_image$secondaryArchSuffix
# devel:freetype
devel:libSDL_image_1.2$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:sdl_config$secondaryArchSuffix
cmd:sdl_config
"
SOURCE_DIR="sge030809"
@@ -43,7 +45,7 @@ PATCHES="sge-030809.patch"
BUILD()
{
make
make $jobArgs
}
INSTALL()