diff --git a/media-libs/freetype/freetype-2.5.3.recipe b/media-libs/freetype/freetype-2.5.3.recipe index 0e40730f9..172435104 100644 --- a/media-libs/freetype/freetype-2.5.3.recipe +++ b/media-libs/freetype/freetype-2.5.3.recipe @@ -9,7 +9,7 @@ LICENSE="FreeType" COPYRIGHT="1996-2013 David Turner, Robert Wilhelm, Werner Lemberg, et al." SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-$portVersion.tar.bz2" CHECKSUM_SHA256="c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -24,13 +24,13 @@ REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libbz2$secondaryArchSuffix lib:libz$secondaryArchSuffix >= 1 - lib:libpng15$secondaryArchSuffix + lib:libpng16$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libbz2$secondaryArchSuffix devel:libz$secondaryArchSuffix - devel:libpng15$secondaryArchSuffix + devel:libpng16$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal @@ -67,10 +67,10 @@ INSTALL() # creates a lot of confusion. Fix them so correct paths are used. local develPackageName="${portName}_devel-$portFullVersion" local packageLinksDir=$(dirname $portPackageLinksDir) - local linksDir="$packageLinksDir/${develPackageName}/devel~libpng15$secondaryArchSuffix/$relativeDevelopLibDir" + local linksDir="$packageLinksDir/${develPackageName}/devel~libpng16$secondaryArchSuffix/$relativeDevelopLibDir" sed -i -e "s,^\(Libs.private.*\)-L.* \(-l.*\)$,\1-L$linksDir \2," \ $developLibDir/pkgconfig/freetype2.pc - sed -i -e "s,^\(dependency_libs.*\)-L.* \(-l.*\)$,\1-L$linksDir $linksDir/libpng15.la \2," \ + sed -i -e "s,^\(dependency_libs.*\)-L.* \(-l.*\)$,\1-L$linksDir $linksDir/libpng16.la \2," \ $developLibDir/libfreetype.la # devel package @@ -91,5 +91,5 @@ REQUIRES_devel=" freetype${secondaryArchSuffix} == $portVersion base devel:libbz2$secondaryArchSuffix devel:libz$secondaryArchSuffix - devel:libpng15$secondaryArchSuffix + devel:libpng16$secondaryArchSuffix "