diff options
Diffstat (limited to 'package/freetype')
| -rw-r--r-- | package/freetype/Makefile | 20 | ||||
| -rw-r--r-- | package/freetype/patches/patch-builds_unix_freetype-config_in | 16 | ||||
| -rw-r--r-- | package/freetype/patches/patch-builds_unix_freetype2_in | 15 |
3 files changed, 22 insertions, 29 deletions
diff --git a/package/freetype/Makefile b/package/freetype/Makefile index da2c0a71e..5db6dea81 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= freetype -PKG_VERSION:= 2.7 -PKG_RELEASE:= 1 -PKG_HASH:= 7b657d5f872b0ab56461f3bd310bd1c5ec64619bd15f0d8e08282d494d9cfea4 +PKG_VERSION:= 2.11.1 +PKG_RELEASE:= 2 +PKG_HASH:= f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b PKG_DESCR:= free, high-quality and portable font engine PKG_SECTION:= libs/fonts PKG_DEPENDS:= zlib @@ -26,12 +26,22 @@ $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE} HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --with-zlib \ + --with-brotli=no \ --without-png \ - --without-bzip2 + --without-bzip2 \ + --enable-freetype-config CONFIGURE_ARGS+= --with-zlib \ --without-png \ --with-harfbuzz=no \ - --without-bzip2 + --with-brotli=no \ + --without-bzip2 \ + --enable-freetype-config + +hostpost-install: + $(SED) 's:^includedir=.*:includedir="$${prefix}/include":' \ + -e 's:^libdir=.*:libdir="$${exec_prefix}/lib":' \ + $(STAGING_HOST_DIR)/usr/bin/freetype-config + libfreetype-install: ${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib diff --git a/package/freetype/patches/patch-builds_unix_freetype-config_in b/package/freetype/patches/patch-builds_unix_freetype-config_in deleted file mode 100644 index 74135b0fd..000000000 --- a/package/freetype/patches/patch-builds_unix_freetype-config_in +++ /dev/null @@ -1,16 +0,0 @@ ---- freetype-2.6.1.orig/builds/unix/freetype-config.in 2015-09-25 07:58:57.000000000 +0200 -+++ freetype-2.6.1/builds/unix/freetype-config.in 2015-10-23 10:37:49.000000000 +0200 -@@ -13,10 +13,10 @@ LC_ALL=C - export LC_ALL - - prefix="%prefix%" --exec_prefix="%exec_prefix%" -+exec_prefix="${prefix}/bin" - exec_prefix_set="no" --includedir="%includedir%" --libdir="%libdir%" -+includedir="${prefix}/include" -+libdir="${prefix}/lib" - - usage() - { diff --git a/package/freetype/patches/patch-builds_unix_freetype2_in b/package/freetype/patches/patch-builds_unix_freetype2_in index 306057eb3..9dc78c081 100644 --- a/package/freetype/patches/patch-builds_unix_freetype2_in +++ b/package/freetype/patches/patch-builds_unix_freetype2_in @@ -1,14 +1,13 @@ ---- freetype-2.6.1.orig/builds/unix/freetype2.in 2015-09-25 07:58:57.000000000 +0200 -+++ freetype-2.6.1/builds/unix/freetype2.in 2015-10-23 10:43:36.000000000 +0200 -@@ -1,7 +1,8 @@ +--- freetype-2.11.1.orig/builds/unix/freetype2.in 2021-02-13 09:16:54.000000000 +0100 ++++ freetype-2.11.1/builds/unix/freetype2.in 2022-03-01 21:51:10.996321135 +0100 +@@ -1,7 +1,7 @@ prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% -+exec_prefix=${prefix} -+libdir=${prefix}/lib -+includedir=${prefix}/include -+ ++exec_prefix=%prefix% ++libdir=%prefix%/lib ++includedir=%prefix%/include Name: FreeType 2 - URL: http://freetype.org + URL: https://freetype.org |