https://gitlab.freedesktop.org/freetype/freetype/-/blob/de8b92dd7ec634e9e2b25ef534c54a3537555c11/docs/CHANGES I've refrained from adding harfbuzz support as they are currently circular dependant on eachother. Seems to be an ongoing discussion.
* License changed. Files added that add AND MIT to the SPDX identifier. * LICENSE.TXT changed. New files that are MIT licensed. * Add the two files in the project that are from harfbuzz and MIT. * Change url to https. * Disable librsvg explicitly. * Add with-png option. This is controlled by a knob in the kconfig. png is often enabled, so might aswell give freetype the capability if one wants. * Minor whitespace removal. * Forward port patches, a minor offset now corrected. Signed-off-by: Christian Melki <christian.me...@t2data.com> --- ...pe-config-and-freetype2.pc-correctly.patch | 8 ++++---- .../autogen.sh | 0 .../series | 0 rules/freetype.in | 15 ++++++++++++-- rules/freetype.make | 20 ++++++++++--------- 5 files changed, 28 insertions(+), 15 deletions(-) rename patches/{freetype-2.12.1 => freetype-2.13.0}/0001-generate-freetype-config-and-freetype2.pc-correctly.patch (95%) rename patches/{freetype-2.12.1 => freetype-2.13.0}/autogen.sh (100%) rename patches/{freetype-2.12.1 => freetype-2.13.0}/series (100%) diff --git a/patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.13.0/0001-generate-freetype-config-and-freetype2.pc-correctly.patch similarity index 95% rename from patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch rename to patches/freetype-2.13.0/0001-generate-freetype-config-and-freetype2.pc-correctly.patch index 961b984fe..1110f457b 100644 --- a/patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch +++ b/patches/freetype-2.13.0/0001-generate-freetype-config-and-freetype2.pc-correctly.patch @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> 4 files changed, 18 insertions(+), 26 deletions(-) diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac -index 393ec3bb69a7..c58607c69fbd 100644 +index a98865a432d9..45c3bcbcd770 100644 --- a/builds/unix/configure.ac +++ b/builds/unix/configure.ac -@@ -1147,7 +1147,9 @@ AC_CONFIG_HEADERS([ftconfig.h]) +@@ -1140,7 +1140,9 @@ AC_CONFIG_HEADERS([ftconfig.h]) # and `builds/unix/unix-cc.mk' that will be used by the build system # AC_CONFIG_FILES([unix-cc.mk:unix-cc.in @@ -26,7 +26,7 @@ index 393ec3bb69a7..c58607c69fbd 100644 AC_OUTPUT diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in -index c076bc1f8222..166afc685009 100644 +index 58561126f2bd..5d7cc4f36dfa 100644 --- a/builds/unix/freetype-config.in +++ b/builds/unix/freetype-config.in @@ -16,13 +16,6 @@ export LC_ALL @@ -96,7 +96,7 @@ index fe389f4b6fef..885444efebf7 100644 +Libs.private: @PKGCONFIG_LIBS_PRIVATE@ Cflags: -I${includedir}/freetype2 diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in -index 8e298ac59107..519d5958dce5 100644 +index d50994f3c928..ba02b00c742d 100644 --- a/builds/unix/unix-def.in +++ b/builds/unix/unix-def.in @@ -157,7 +157,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in diff --git a/patches/freetype-2.12.1/autogen.sh b/patches/freetype-2.13.0/autogen.sh similarity index 100% rename from patches/freetype-2.12.1/autogen.sh rename to patches/freetype-2.13.0/autogen.sh diff --git a/patches/freetype-2.12.1/series b/patches/freetype-2.13.0/series similarity index 100% rename from patches/freetype-2.12.1/series rename to patches/freetype-2.13.0/series diff --git a/rules/freetype.in b/rules/freetype.in index 5176ea91b..57731e88c 100644 --- a/rules/freetype.in +++ b/rules/freetype.in @@ -1,9 +1,10 @@ ## SECTION=multimedia_libs -config FREETYPE +menuconfig FREETYPE tristate - prompt "freetype" + prompt "freetype " select ZLIB + select LIBPNG if FREETYPE_LIBPNG help The FreeType project is a team of volunteers who develop free, portable and high-quality software solutions for digital typography. @@ -13,3 +14,13 @@ config FREETYPE library only supports true type fonts, since version 2 it supports all types of scalable fonts. If you intent to use this library in an X environment, its only needed on client side, not on server side. + +if FREETYPE + +config FREETYPE_LIBPNG + bool + prompt "enable png support" + help + libpng is optional for freetype. + +endif diff --git a/rules/freetype.make b/rules/freetype.make index 7008ebb78..696f779b1 100644 --- a/rules/freetype.make +++ b/rules/freetype.make @@ -15,23 +15,25 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype # # Paths and names # -FREETYPE_VERSION := 2.12.1 -FREETYPE_MD5 := 7f7cd7c706d8e402354305c1c59e3ff2 +FREETYPE_VERSION := 2.13.0 +FREETYPE_MD5 := fe73327ebbf0b629f3ad24be656d59de FREETYPE := freetype-$(FREETYPE_VERSION) FREETYPE_SUFFIX := tar.xz FREETYPE_SOURCE := $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX) FREETYPE_DIR := $(BUILDDIR)/$(FREETYPE) -FREETYPE_LICENSE := BSD-2-Clause AND FTL AND GPL-2.0-or-later +FREETYPE_LICENSE := BSD-2-Clause AND FTL AND GPL-2.0-or-later AND MIT FREETYPE_LICENSE_FILES := \ - file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \ + file://LICENSE.TXT;md5=843b6efc16f6b1652ec97f89d5a516c0 \ file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec \ file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \ file://src/bdf/README;startline=98;endline=140;md5=fef9416f085f0834b3ba93a5dc5a622c \ - file://src/pcf/README;startline=69;endline=88;md5=e0f11f550450e58753f2d54ddaf17d34 + file://src/pcf/README;startline=69;endline=88;md5=e0f11f550450e58753f2d54ddaf17d34 \ + file://src/autofit/ft-hb.c;md5=946b0e667b5fb58de5e675bc52ce047a \ + file://src/autofit/ft-hb.h;md5=3d5637ee2e72430693a37599f2eea714 FREETYPE_URL := \ - http://download.savannah.gnu.org/releases/freetype/$(FREETYPE).$(FREETYPE_SUFFIX) \ - http://download.savannah.gnu.org/releases/freetype/freetype-old/$(FREETYPE).$(FREETYPE_SUFFIX) + https://download.savannah.gnu.org/releases/freetype/$(FREETYPE).$(FREETYPE_SUFFIX) \ + https://download.savannah.gnu.org/releases/freetype/freetype-old/$(FREETYPE).$(FREETYPE_SUFFIX) # ---------------------------------------------------------------------------- # Prepare @@ -48,9 +50,10 @@ FREETYPE_CONF_OPT := \ --enable-mmap \ --with-zlib \ --without-bzip2 \ - --without-png \ + --$(call ptx/wwo,PTXCONF_FREETYPE_LIBPNG)-png \ --without-harfbuzz \ --without-brotli \ + --without-librsvg \ --without-old-mac-fonts \ --without-fsspec \ --without-fsref \ @@ -58,7 +61,6 @@ FREETYPE_CONF_OPT := \ --without-quickdraw-carbon \ --without-ats - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -- 2.34.1