diff --git a/media-libs/sdl2_ttf/sdl2_ttf-2.0.14.recipe b/media-libs/sdl2_ttf/sdl2_ttf-2.0.14.recipe index cb90509de..efdb65c37 100644 --- a/media-libs/sdl2_ttf/sdl2_ttf-2.0.14.recipe +++ b/media-libs/sdl2_ttf/sdl2_ttf-2.0.14.recipe @@ -9,7 +9,7 @@ without much effort." HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf" COPYRIGHT="1997-2013 Sam Lantinga" LICENSE="Zlib" -REVISION="2" +REVISION="3" SOURCE_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-$portVersion.tar.gz" CHECKSUM_SHA256="34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276" SOURCE_DIR="SDL2_ttf-$portVersion" @@ -18,24 +18,22 @@ ARCHITECTURES="x86 x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="?x86 ?x86_gcc2" PROVIDES=" - sdl2_ttf${secondaryArchSuffix} = $portVersion compat >= 2.0 - lib:libSDL2_ttf${secondaryArchSuffix} = $portVersion compat >= 2.0 - lib:libSDL2_ttf_2.0${secondaryArchSuffix} = 0.14.0 compat >= 0 + sdl2_ttf$secondaryArchSuffix = $portVersion compat >= 2.0 + lib:libSDL2_ttf$secondaryArchSuffix = $portVersion compat >= 2.0 + lib:libSDL2_ttf_2.0$secondaryArchSuffix = 0.14.0 compat >= 0 " REQUIRES=" haiku${secondaryArchSuffix} - lib:libfreetype${secondaryArchSuffix} - lib:libSDL2_2.0${secondaryArchSuffix} - lib:libz${secondaryArchSuffix} - lib:libbz2${secondaryArchSuffix} - lib:libpng${secondaryArchSuffix} - lib:libGL${secondaryArchSuffix} - lib:libltdl${secondaryArchSuffix} + lib:libfreetype$secondaryArchSuffix + lib:libSDL2_2.0$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libglu$secondaryArchSuffix " PROVIDES_devel=" - sdl2_ttf${secondaryArchSuffix}_devel = ${portVersion} compat >= 2.0 - devel:libSDL2_ttf$secondaryArchSuffix = ${portVersion} compat >= 2.0 + sdl2_ttf${secondaryArchSuffix}_devel = $portVersion compat >= 2.0 + devel:libSDL2_ttf$secondaryArchSuffix = $portVersion compat >= 2.0 devel:libSDL2_ttf_2.0$secondaryArchSuffix = 0.14.0 compat >= 0 " REQUIRES_devel=" @@ -44,11 +42,11 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libfreetype${secondaryArchSuffix} - devel:libSDL2${secondaryArchSuffix} - devel:libz${secondaryArchSuffix} - devel:libbz2${secondaryArchSuffix} - devel:libpng${secondaryArchSuffix} + devel:libfreetype$secondaryArchSuffix + devel:libSDL2$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libGL$secondaryArchSuffix + devel:libglu$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:libtoolize$secondaryArchSuffix @@ -58,6 +56,7 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " BUILD() @@ -75,6 +74,9 @@ INSTALL() { make install + # remove libtool library file + rm $libDir/libSDL2_ttf.la + prepareInstalledDevelLibs libSDL2_ttf fixPkgconfig 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 a3f3e8ccf..435baa7e7 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -8,7 +8,7 @@ without much effort." HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/release-1.2.html" COPYRIGHT="1997-2012 Sam Lantinga" LICENSE="Zlib" -REVISION="4" +REVISION="5" SOURCE_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz" CHECKSUM_SHA256="724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7" SOURCE_DIR="SDL_ttf-$portVersion" @@ -27,8 +27,7 @@ REQUIRES=" lib:libfreetype$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libGL$secondaryArchSuffix - lib:libpng$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix + lib:libglu$secondaryArchSuffix " PROVIDES_devel=" @@ -46,8 +45,7 @@ BUILD_REQUIRES=" devel:libsdl$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libz$secondaryArchSuffix - devel:libbz2$secondaryArchSuffix - devel:libpng$secondaryArchSuffix + devel:libglu$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:libtoolize$secondaryArchSuffix @@ -56,9 +54,8 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:sdl_config$secondaryArchSuffix cmd:make - cmd:freetype_config$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix " BUILD()