diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index 9f8c5ea79..befa1a03d 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -11,7 +11,6 @@ ARCHITECTURES="x86 x86_gcc2" PROVIDES=" libsdl = $portVersion compat >= 1.2 - cmd:sdl_config = portVersion compat >= 1.2 lib:libsdl = $portVersion compat >= 1.2 lib:libSDL = $portVersion compat >= 1.2 lib:libSDL_1.2 = 0.11.4 compat >= 0.11 @@ -58,13 +57,14 @@ INSTALL() # devel package prepareInstalledDevelLibs \ - libSDL \ + libSDL libSDL-1.2 \ libSDLmain fixPkgconfig + fixDevelopLibDirReferences $binDir/sdl-config packageEntries devel \ - $developDir + $developDir $binDir/sdl-config } TEST() diff --git a/media-libs/sdl_image/sdl_image-1.2.12.recipe b/media-libs/sdl_image/sdl_image-1.2.12.recipe index ffb93cc00..766d0d14a 100644 --- a/media-libs/sdl_image/sdl_image-1.2.12.recipe +++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe @@ -10,12 +10,15 @@ COPYRIGHT="1997-2012 Sam Lantinga" ARCHITECTURES="x86 x86_gcc2" PROVIDES=" - lib:sdl_image = $portVersion compat >= 1.2 + sdl_image =$portVersion + lib:libSDL_image_1.2 = $portVersion compat >= 1.2 + devel:libSDL_image = $portVersion compat >= 1.2 " REQUIRES=" haiku libsdl + lib:libjpeg " BUILD_REQUIRES=" @@ -56,4 +59,7 @@ BUILD() INSTALL() { make install + + fixPkgconfig + prepareInstalledDevelLib libSDL_image } diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe index 8e2d5fb59..103b3fa53 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -1,33 +1,60 @@ -DESCRIPTION="Simple Direct Media Layer Image Library" -HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf" +SUMMARY="Simple Direct Media Layer Image Library" +HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/release-1.2.html" SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz" CHECKSUM_MD5="61e29bd9da8d245bc2471d1b2ce591aa" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libsdl >= 1.2.12 - dev-util/pkgconfig >= 0.9" +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + sdl_ttf = $portVersion + lib:libSDL_ttf = $portVersion + devel:libSDL_ttf + lib:libSDL_ttf_2.0 = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + libsdl >= 1.2.12 + lib:libfreetype + lib:libz + " + +BUILD_PREREQUIRES=" + cmd:libtoolize + cmd:aclocal + cmd:automake + cmd:autoconf + cmd:gcc + cmd:sdl_config + cmd:make +" + +SOURCE_DIR="SDL_ttf-$portVersion" BUILD() { - cd SDL_ttf-2.0.11 rm -f acinclude.m4 libtoolize --copy --force --install aclocal --install -I acinclude - echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR + runConfigure ./configure make } INSTALL() { - cd SDL_ttf-2.0.11 make install + + fixPkgconfig + prepareInstalledDevelLib libSDL_ttf } LICENSE="Zlib" COPYRIGHT="1997-2012 Sam Lantinga" - +DESCRIPTION=" + SDL_ttf is a TrueType font rendering library that is used with the SDL + library, and almost as portable. It depends on freetype2 to handle the + TrueType font data. It allows a programmer to use multiple TrueType fonts + without having to code a font rendering routine themselves. With the power + of outline fonts and antialiasing, high quality text output can be obtained + without much effort. + "