mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 06:28:55 +02:00
freetype: drop libfreetype.la since we've dropped libpng16.la. (WIP) (#757)
* This is required because libfreetype.la was referencing libpng16.la (which has been dropped), causing a build failure of fontconfig. * Sync patch, eventhough it is currently commented out. * Switch HOMEPAGE and SOURCE_URI to https.
This commit is contained in:
@@ -2,12 +2,13 @@ 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="http://www.freetype.org"
|
||||
LICENSE="FreeType"
|
||||
HOMEPAGE="https://www.freetype.org/"
|
||||
COPYRIGHT="1996-2013 David Turner, Robert Wilhelm, Werner Lemberg, et al."
|
||||
SOURCE_URI="http://download.savannah.gnu.org/releases/freetype/freetype-$portVersion.tar.bz2"
|
||||
LICENSE="FreeType"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://download.savannah.gnu.org/releases/freetype/freetype-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="e20a6e1400798fd5e3d831dd821b61c35b1f9a6465d6b18a53a9df4cf441acf0"
|
||||
REVISION="1"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
|
||||
|
||||
@@ -47,7 +48,7 @@ BUILD_PREREQUIRES="
|
||||
cmd:automake
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtool >= 2.4.2
|
||||
cmd:libtoolize$secondaryArchSuffix >= 2.4.2
|
||||
cmd:make
|
||||
cmd:which
|
||||
"
|
||||
@@ -66,6 +67,8 @@ INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
rm $libDir/libfreetype.la
|
||||
|
||||
prepareInstalledDevelLibs libfreetype
|
||||
fixPkgconfig
|
||||
|
||||
@@ -76,8 +79,6 @@ INSTALL()
|
||||
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/libpng16.la \2," \
|
||||
$developLibDir/libfreetype.la
|
||||
|
||||
# devel package
|
||||
packageEntries devel \
|
||||
|
||||
@@ -4,10 +4,10 @@ Date: Fri, 5 Sep 2014 15:43:17 +0400
|
||||
Subject: Enabling subpixel rendering and subpixel hinting
|
||||
|
||||
|
||||
diff --git a/include/config/ftoption.h b/include/config/ftoption.h
|
||||
index 5b11f0e..5042c23 100644
|
||||
--- a/include/config/ftoption.h
|
||||
+++ b/include/config/ftoption.h
|
||||
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
|
||||
index 2556c64..cae8ff1 100644
|
||||
--- a/include/freetype/config/ftoption.h
|
||||
+++ b/include/freetype/config/ftoption.h
|
||||
@@ -92,7 +92,7 @@ FT_BEGIN_HEADER
|
||||
/* This is done to allow FreeType clients to run unmodified, forcing */
|
||||
/* them to display normal gray-level anti-aliased glyphs. */
|
||||
@@ -17,15 +17,15 @@ index 5b11f0e..5042c23 100644
|
||||
|
||||
|
||||
/*************************************************************************/
|
||||
@@ -604,7 +604,7 @@ FT_BEGIN_HEADER
|
||||
/* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */
|
||||
/* defined. */
|
||||
/* */
|
||||
-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
|
||||
+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING
|
||||
|
||||
@@ -633,7 +633,7 @@ FT_BEGIN_HEADER
|
||||
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
|
||||
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
|
||||
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
|
||||
-
|
||||
+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
|
||||
|
||||
/*************************************************************************/
|
||||
/* */
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
Reference in New Issue
Block a user