freetype: bump version

build with harfbuzz
This commit is contained in:
Jerome Duval
2021-01-15 15:05:00 +01:00
parent 13c4aea137
commit 88807852d3
4 changed files with 100 additions and 16 deletions

View File

@@ -5,9 +5,9 @@ output (glyph images) of most vector and bitmap font formats."
HOMEPAGE="https://www.freetype.org/"
COPYRIGHT="1996-2018 David Turner, Robert Wilhelm, Werner Lemberg, et al."
LICENSE="FreeType"
REVISION="2"
SOURCE_URI="https://download.savannah.gnu.org/releases/freetype/freetype-$portVersion.tar.bz2"
CHECKSUM_SHA256="db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"
REVISION="1"
SOURCE_URI="https://download.savannah.gnu.org/releases/freetype/freetype-$portVersion.tar.xz"
CHECKSUM_SHA256="86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784"
PATCHES="enable-validation-modules.patchset"
#PATCHES="freetype-subpixel.patchset" # enable patented subpixel rendering
@@ -16,11 +16,12 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
freetype$secondaryArchSuffix = $portVersion
lib:libfreetype$secondaryArchSuffix = 6.16.0 compat >= 6
lib:libfreetype$secondaryArchSuffix = 6.17.4 compat >= 6
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libharfbuzz$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libz$secondaryArchSuffix >= 1
"
@@ -28,11 +29,12 @@ REQUIRES="
PROVIDES_devel="
freetype${secondaryArchSuffix}_devel = $portVersion
cmd:freetype_config${secondaryArchSuffix} = $portVersion
devel:libfreetype${secondaryArchSuffix} = 6.16.0 compat >= 6
devel:libfreetype${secondaryArchSuffix} = 6.17.4 compat >= 6
"
REQUIRES_devel="
freetype${secondaryArchSuffix} == $portVersion base
devel:libbz2$secondaryArchSuffix
devel:libharfbuzz$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
@@ -40,6 +42,7 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libbz2$secondaryArchSuffix
devel:libharfbuzz$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
@@ -51,11 +54,12 @@ BUILD_PREREQUIRES="
cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix >= 2.4.2
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:which
"
defineDebugInfoPackage freetype$secondaryArchSuffix \
$libDir/libfreetype.so.6.16.1
$libDir/libfreetype.so.6.17.4
BUILD()
{

View File

@@ -0,0 +1,79 @@
SUMMARY="A free, high-quality, and portable font engine"
DESCRIPTION="FreeType is written in C, designed to be small, efficient, \
highly customizable, and portable while capable of producing high-quality \
output (glyph images) of most vector and bitmap font formats."
HOMEPAGE="https://www.freetype.org/"
COPYRIGHT="1996-2018 David Turner, Robert Wilhelm, Werner Lemberg, et al."
LICENSE="FreeType"
REVISION="1"
SOURCE_URI="https://download.savannah.gnu.org/releases/freetype/freetype-$portVersion.tar.xz"
CHECKSUM_SHA256="86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784"
SOURCE_DIR="freetype-$portVersion"
PATCHES="enable-validation-modules.patchset"
#PATCHES="freetype-subpixel.patchset" # enable patented subpixel rendering
ARCHITECTURES="x86_gcc2 x86 x86_64 arm sparc m68k"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
freetype_bootstrap$secondaryArchSuffix = $portVersion
cmd:freetype_config${secondaryArchSuffix} = $portVersion
devel:libfreetype${secondaryArchSuffix} = 6.17.4 compat >= 6
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libz$secondaryArchSuffix >= 1
devel:libbz2$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
CONFLICTS="
freetype${secondaryArchSuffix}_devel
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libbz2$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix >= 2.4.2
cmd:make
cmd:which
"
BUILD()
{
./autogen.sh
runConfigure ./configure --enable-freetype-config
make $jobArgs
}
INSTALL()
{
make install
rm $libDir/libfreetype.la $libDir/libfreetype.a
prepareInstalledDevelLibs libfreetype
fixPkgconfig
# The libtool files reference other libraries using the wrong paths, which
# creates a lot of confusion. Fix them so correct paths are used.
local packageName="${portName}-$portFullVersion"
local packageLinksDir=$(dirname $portPackageLinksDir)
local linksDir="$packageLinksDir/${packageName}/devel~libpng16$secondaryArchSuffix/$relativeDevelopLibDir"
sed -i -e "s,^\(Libs.private.*\)-L.* \(-l.*\)$,\1-L$linksDir \2," \
$developLibDir/pkgconfig/freetype2.pc
mv $libDir/* $developLibDir/
rmdir $libDir
}

View File

@@ -5,22 +5,23 @@ Subject: Enable validation modules
diff --git a/modules.cfg b/modules.cfg
index 4bf3445..f9aa44b 100644
diff --git a/modules.cfg b/modules.cfg
index d6cdbe5..181f915 100644
--- a/modules.cfg
+++ b/modules.cfg
@@ -120,7 +120,7 @@ AUX_MODULES += cache
@@ -111,7 +111,7 @@ AUX_MODULES += cache
# TrueType GX/AAT table validation. Needs `ftgxval.c' below.
#
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += gxvalid
+AUX_MODULES += gxvalid
# Support for streams compressed with gzip (files with suffix .gz).
#
@@ -143,7 +143,7 @@ AUX_MODULES += bzip2
@@ -130,7 +130,7 @@ AUX_MODULES += bzip2
# OpenType table validation. Needs `ftotval.c' below.
#
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += otvalid
+AUX_MODULES += otvalid

View File

@@ -8,15 +8,15 @@ diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftopti
index 90c123e..67a361d 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
/* This is done to allow FreeType clients to run unmodified, forcing */
/* them to display normal gray-level anti-aliased glyphs. */
/* */
@@ -124,7 +124,7 @@ FT_BEGIN_HEADER
* When this macro is not defined, FreeType offers alternative LCD
* rendering technology that produces excellent output.
*/
-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
/*************************************************************************/
/**************************************************************************
--
2.7.0