From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/3] package/freetype: drop libpng workaround
Date: Thu, 1 Oct 2020 22:58:27 +0200 [thread overview]
Message-ID: <20201001205827.GI11621@scaer> (raw)
In-Reply-To: <20201001202626.1354496-1-fontaine.fabrice@gmail.com>
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. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2020-10-01 20:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Yann E. MORIN [this message]
2020-10-03 6:49 ` [Buildroot] [PATCH 1/3] package/freetype: drop libpng workaround Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201001205827.GI11621@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox