package/freetype: drop libpng workaround
PATCH 1/3 package/freetype: drop libpng workaround
libpng workaround which has been added with commit f7313cadf2ca9e0195a873f62f6b6c38a58a3630 is not needed since version 2.5.3 and
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=00c79ed9680a0d7a367c6914adc7485391299542
--- package/freetype/freetype.mk | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
package/freetype/freetype.mk +1 -12
@@ -37,9 +37,7 @@ endif ifeq ($(BR2_PACKAGE_LIBPNG),y) FREETYPE_DEPENDENCIES += libpng -FREETYPE_CONF_OPTS += LIBPNG_CFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --cflags`" \ - LIBPNG_LDFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --ldflags`" -FREETYPE_LIBPNG_LIBS = "`$(STAGING_DIR)/usr/bin/libpng-config --libs`" +FREETYPE_CONF_OPTS += --with-png else FREETYPE_CONF_OPTS += --without-png endif
@@ -52,14 +50,5 @@ define FREETYPE_FIX_CONFIG_FILE endef FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE -# libpng isn't included in freetype-config & freetype2.pc :-/ -define FREETYPE_FIX_CONFIG_FILE_LIBS - $(SED) "s,^Libs.private:,& $(FREETYPE_LIBPNG_LIBS)," \ - $(STAGING_DIR)/usr/lib/pkgconfig/freetype2.pc - $(SED) "s,-lfreetype,& $(FREETYPE_LIBPNG_LIBS)," \ - $(STAGING_DIR)/usr/bin/freetype-config -endef -FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE_LIBS - $(eval $(autotools-package)) $(eval $(host-autotools-package))
Signature · 1 line
2.28.0
PATCH 2/3 package/freetype: add harfbuzz optional dependency
harfbuzz is an optional dependency (enabled by default) since version 2.5.3 and
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=86026a47b345a8c254dd5e6be77bf116737cdafb
--- package/freetype/freetype.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
package/freetype/freetype.mk +12 -1
@@ -15,7 +15,11 @@ FREETYPE_DEPENDENCIES = host-pkgconf FREETYPE_CONFIG_SCRIPTS = freetype-config HOST_FREETYPE_DEPENDENCIES = host-pkgconf -HOST_FREETYPE_CONF_OPTS = --without-zlib --without-bzip2 --without-png +HOST_FREETYPE_CONF_OPTS = \ + --without-bzip2 \ + --without-harfbuzz \ + --without-png \ + --without-zlib # since 2.9.1 needed for freetype-config install FREETYPE_CONF_OPTS += --enable-freetype-config
@@ -35,6 +39,13 @@ else FREETYPE_CONF_OPTS += --without-bzip2 endif +ifeq ($(BR2_PACKAGE_HARFBUZZ),y) +FREETYPE_DEPENDENCIES += harfbuzz +FREETYPE_CONF_OPTS += --with-harbuzz +else +FREETYPE_CONF_OPTS += --without-harfbuzz +endif + ifeq ($(BR2_PACKAGE_LIBPNG),y) FREETYPE_DEPENDENCIES += libpng FREETYPE_CONF_OPTS += --with-png
Signature · 1 line
2.28.0
PATCH 2/3 package/freetype: add harfbuzz optional dependency
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
harfbuzz is an optional dependency (enabled by default) since version 2.5.3 and
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=86026a47b345a8c254dd5e6be77bf116737cdafbSigned-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.02.x, 2020.05.x and 2020.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/3 package/freetype: add brotli optional dependency
In reply to Fabrice Fontainebrotli is an optional dependency (enabled by default) since version 2.10.2 and
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=9443a1bc3e6cfa315db976ff80f6c5e91b12b387
--- package/freetype/freetype.mk | 8 ++++++++ 1 file changed, 8 insertions(+)
package/freetype/freetype.mk +8 -0
@@ -16,6 +16,7 @@ FREETYPE_CONFIG_SCRIPTS = freetype-config HOST_FREETYPE_DEPENDENCIES = host-pkgconf HOST_FREETYPE_CONF_OPTS = \ + --without-brotli \ --without-bzip2 \ --without-harfbuzz \ --without-png \
@@ -32,6 +33,13 @@ else FREETYPE_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_BROTLI),y) +FREETYPE_DEPENDENCIES += brotli +FREETYPE_CONF_OPTS += --with-brotli +else +FREETYPE_CONF_OPTS += --without-brotli +endif + ifeq ($(BR2_PACKAGE_BZIP2),y) FREETYPE_DEPENDENCIES += bzip2 FREETYPE_CONF_OPTS += --with-bzip2
Signature · 1 line
2.28.0
PATCH 3/3 package/freetype: add brotli optional dependency
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
brotli is an optional dependency (enabled by default) since version 2.10.2 and
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=9443a1bc3e6cfa315db976ff80f6c5e91b12b387Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/3 package/freetype: drop libpng workaround
In reply to Fabrice FontaineFabrice, All,
On 2020-10-01 22:26 +0200, Fabrice Fontaine spake thusly:
Quoted 6 lines
libpng workaround which has been added with commit
f7313cadf2ca9e0195a873f62f6b6c38a58a3630is not needed since version 2.5.3 and
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=00c79ed9680a0d7a367c6914adc7485391299542Signed-off-by Fabrice Fontaine <[email protected]>
Series applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 41 lines
--- package/freetype/freetype.mk | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)package/freetype/freetype.mk +1
-12@@ -37,9 +37,7 @@ endif ifeq ($(BR2_PACKAGE_LIBPNG),y) FREETYPE_DEPENDENCIES += libpng -FREETYPE_CONF_OPTS += LIBPNG_CFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --cflags`" \ - LIBPNG_LDFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --ldflags`" -FREETYPE_LIBPNG_LIBS = "`$(STAGING_DIR)/usr/bin/libpng-config --libs`" +FREETYPE_CONF_OPTS += --with-png else FREETYPE_CONF_OPTS += --without-png endif@@ -52,14 +50,5 @@ define FREETYPE_FIX_CONFIG_FILE endef FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE -# libpng isn't included in freetype-config & freetype2.pc :-/ -define FREETYPE_FIX_CONFIG_FILE_LIBS - $(SED) "s,^Libs.private:,& $(FREETYPE_LIBPNG_LIBS)," \ - $(STAGING_DIR)/usr/lib/pkgconfig/freetype2.pc - $(SED) "s,-lfreetype,& $(FREETYPE_LIBPNG_LIBS)," \ - $(STAGING_DIR)/usr/bin/freetype-config -endef -FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE_LIBS - $(eval $(autotools-package)) $(eval $(host-autotools-package))Signature · 6 lines
2.28.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/3 package/freetype: drop libpng workaround
In reply to Fabrice FontaineQuoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
libpng workaround which has been added with commit
f7313cadf2ca9e0195a873f62f6b6c38a58a3630is not needed since version 2.5.3 and
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=00c79ed9680a0d7a367c6914adc7485391299542Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.02.x, 2020.05.x and 2020.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard