haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 06:28:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

freetype: fixed pkg-config and libtool files.

Browse Source 
to use package links as described by Ingo.
* added devel packages requirements for libpng, zlib, bzip2
This commit is contained in:
Jerome Duval
2014-09-22 22:13:41 +00:00
parent dd83f38203
commit d0ef852764
19 changed files with 48 additions and 1273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media-libs/freetype/freetype-2.5.3.recipe
View File

@@ -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="1"
REVISION="2"
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:libpng$secondaryArchSuffix
lib:libpng15$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libbz2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libpng15$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
@@ -62,6 +62,12 @@ INSTALL()
# freetype with pkg-config.
sed -i -e "s,^includedir=.*,includedir=$prefix/$relativeIncludeDir/freetype2," \
$developLibDir/pkgconfig/freetype2.pc
local develPackageName="${portName}_devel-$portFullVersion"
local linksDir="/packages$packageLinksDir/${develPackageName}/devel~libpng15/develop/lib"
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," \
$developLibDir/libfreetype.la
# devel package
packageEntries devel \
@@ -79,4 +85,7 @@ PROVIDES_devel="
"
REQUIRES_devel="
freetype${secondaryArchSuffix} == $portVersion base
devel:libbz2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
devel:libpng15$secondaryArchSuffix
"

18
media-libs/ilmbase/ilmbase-2.2.0.recipe
View File

@@ -14,16 +14,12 @@ SRC_URI="http://download.savannah.nongnu.org/releases/openexr/ilmbase-$portVersi
CHECKSUM_SHA256="ecf815b60695555c1fbc73679e84c7c9902f4e8faa6e8000d2f905b8b86cedc7"
REVISION="1"
ARCHITECTURES="x86 x86_64"
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"
else
ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86 x86_gcc2"
if [ $effectiveTargetArchitecture == x86_gcc2 ]; then
PATCHES="ilmbase-$portVersion.patchset"
fi
PROVIDES="
ilmbase$secondaryArchSuffix = $portVersion
lib:libHalf$secondaryArchSuffix = 12.0.0 compat >= 12
@@ -35,7 +31,6 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libstdc++$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
@@ -53,6 +48,9 @@ BUILD_PREREQUIRES="
BUILD()
{
./bootstrap
if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
export CPPFLAGS="-Dios_base=ios -ftemplate-depth-24"
fi
runConfigure ./configure
make
}

9
media-libs/openexr/openexr-2.2.0.recipe
View File

@@ -21,9 +21,11 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
else
ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
SECONDARY_ARCHITECTURES="x86 x86_gcc2"
PATCHES="openexr-$portVersion.patchset"
PROVIDES="
openexr$secondaryArchSuffix = $portVersion
@@ -81,6 +83,9 @@ ${pathSecondaryArchSuffix}/pkgconfig/IlmBase.pc | sed s/IlmBase\.pc//g)
export PKG_CONFIG_PATH+=:$IlmBasePkgconfig
./bootstrap
if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
export CPPFLAGS="-Dios_base=ios -ftemplate-depth-24"
fi
runConfigure ./configure
make $jobArgs
}