* [Buildroot] [PATCH 1/3] package/freetype: drop libpng workaround
@ 2020-10-01 20:26 Fabrice Fontaine
2020-10-01 20:26 ` [Buildroot] [PATCH 2/3] package/freetype: add harfbuzz optional dependency Fabrice Fontaine
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Fabrice Fontaine @ 2020-10-01 20:26 UTC (permalink / raw)
To: buildroot
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
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/freetype/freetype.mk | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 516d1c0cfc..428531ed08 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -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))
--
2.28.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 2/3] package/freetype: add harfbuzz optional dependency
2020-10-01 20:26 [Buildroot] [PATCH 1/3] package/freetype: drop libpng workaround Fabrice Fontaine
@ 2020-10-01 20:26 ` Fabrice Fontaine
2020-10-03 6:50 ` Peter Korsgaard
2020-10-01 20:26 ` [Buildroot] [PATCH 3/3] package/freetype: add brotli " Fabrice Fontaine
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Fabrice Fontaine @ 2020-10-01 20:26 UTC (permalink / raw)
To: buildroot
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
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/freetype/freetype.mk | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 428531ed08..b0aba78c51 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -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
--
2.28.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 3/3] package/freetype: add brotli optional dependency
2020-10-01 20:26 [Buildroot] [PATCH 1/3] package/freetype: drop libpng workaround Fabrice Fontaine
2020-10-01 20:26 ` [Buildroot] [PATCH 2/3] package/freetype: add harfbuzz optional dependency Fabrice Fontaine
@ 2020-10-01 20:26 ` Fabrice Fontaine
2020-10-03 6:49 ` Peter Korsgaard
2020-10-01 20:58 ` [Buildroot] [PATCH 1/3] package/freetype: drop libpng workaround Yann E. MORIN
2020-10-03 6:49 ` Peter Korsgaard
3 siblings, 1 reply; 7+ messages in thread
From: Fabrice Fontaine @ 2020-10-01 20:26 UTC (permalink / raw)
To: buildroot
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=9443a1bc3e6cfa315db976ff80f6c5e91b12b387
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/freetype/freetype.mk | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index b0aba78c51..e6463c30b6 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -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
--
2.28.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/3] package/freetype: drop libpng workaround
2020-10-01 20:26 [Buildroot] [PATCH 1/3] package/freetype: drop libpng workaround Fabrice Fontaine
2020-10-01 20:26 ` [Buildroot] [PATCH 2/3] package/freetype: add harfbuzz optional dependency Fabrice Fontaine
2020-10-01 20:26 ` [Buildroot] [PATCH 3/3] package/freetype: add brotli " Fabrice Fontaine
@ 2020-10-01 20:58 ` Yann E. MORIN
2020-10-03 6:49 ` Peter Korsgaard
3 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2020-10-01 20:58 UTC (permalink / raw)
To: buildroot
Fabrice, All,
On 2020-10-01 22:26 +0200, Fabrice Fontaine spake thusly:
> 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
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Series applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/freetype/freetype.mk | 13 +------------
> 1 file changed, 1 insertion(+), 12 deletions(-)
>
> diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
> index 516d1c0cfc..428531ed08 100644
> --- a/package/freetype/freetype.mk
> +++ b/package/freetype/freetype.mk
> @@ -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))
> --
> 2.28.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/3] package/freetype: drop libpng workaround
2020-10-01 20:26 [Buildroot] [PATCH 1/3] package/freetype: drop libpng workaround Fabrice Fontaine
` (2 preceding siblings ...)
2020-10-01 20:58 ` [Buildroot] [PATCH 1/3] package/freetype: drop libpng workaround Yann E. MORIN
@ 2020-10-03 6:49 ` Peter Korsgaard
3 siblings, 0 replies; 7+ messages in thread
From: Peter Korsgaard @ 2020-10-03 6:49 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> 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
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2020.02.x, 2020.05.x and 2020.08.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-10-03 6:50 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-01 20:26 [Buildroot] [PATCH 1/3] package/freetype: drop libpng workaround Fabrice Fontaine
2020-10-01 20:26 ` [Buildroot] [PATCH 2/3] package/freetype: add harfbuzz optional dependency Fabrice Fontaine
2020-10-03 6:50 ` Peter Korsgaard
2020-10-01 20:26 ` [Buildroot] [PATCH 3/3] package/freetype: add brotli " Fabrice Fontaine
2020-10-03 6:49 ` Peter Korsgaard
2020-10-01 20:58 ` [Buildroot] [PATCH 1/3] package/freetype: drop libpng workaround Yann E. MORIN
2020-10-03 6:49 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox