Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- config/rootfiles/common/freetype | 5 ++++- lfs/freetype | 14 ++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/config/rootfiles/common/freetype b/config/rootfiles/common/freetype index 38bff842d..4d72ec357 100644 --- a/config/rootfiles/common/freetype +++ b/config/rootfiles/common/freetype @@ -18,6 +18,8 @@ #usr/include/freetype2/freetype/ftcffdrv.h #usr/include/freetype2/freetype/ftchapters.h #usr/include/freetype2/freetype/ftcid.h +#usr/include/freetype2/freetype/ftcolor.h +#usr/include/freetype2/freetype/ftdriver.h #usr/include/freetype2/freetype/fterrdef.h #usr/include/freetype2/freetype/fterrors.h #usr/include/freetype2/freetype/ftfntfmt.h @@ -36,6 +38,7 @@ #usr/include/freetype2/freetype/ftmoderr.h #usr/include/freetype2/freetype/ftotval.h #usr/include/freetype2/freetype/ftoutln.h +#usr/include/freetype2/freetype/ftparams.h #usr/include/freetype2/freetype/ftpfr.h #usr/include/freetype2/freetype/ftrender.h #usr/include/freetype2/freetype/ftsizes.h @@ -57,7 +60,7 @@ #usr/lib/libfreetype.la #usr/lib/libfreetype.so usr/lib/libfreetype.so.6 -usr/lib/libfreetype.so.6.13.0 +usr/lib/libfreetype.so.6.17.2 #usr/lib/pkgconfig/freetype2.pc #usr/share/aclocal/freetype2.m4 #usr/share/man/man1/freetype-config.1 diff --git a/lfs/freetype b/lfs/freetype index 795ba8378..4106d22ee 100644 --- a/lfs/freetype +++ b/lfs/freetype @@ -24,10 +24,10 @@
include Config
-VER = 2.7.1 +VER = 2.10.2
THISAPP = freetype-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 78701bee8d249578d83bb9a2f3aa3616 +$(DL_FILE)_MD5 = 7c0d5a39f232d7eb9f9d7da76bf08074
install : $(TARGET)
@@ -70,7 +70,13 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && sed -ri "s:.*(AUX_MODULES.*valid):\1:" modules.cfg + cd $(DIR_APP) && sed -r "s:.*(#.*SUBPIXEL_RENDERING) .*:\1:" \ + -i include/freetype/config/ftoption.h + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-freetype-config \ + --disable-static cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP)