| Message ID | 20201001202626.1354496-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] package/freetype: drop libpng workaround | expand |
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@busybox.net > http://lists.busybox.net/mailman/listinfo/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.
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))
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(-)