Skip to contentSkip to conversation

qt5base: select qt-libpng in case builtin freetype library is used

PATCH New Peter Seiderer 2 participants 3 messages Feb 9, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qt5base: select qt-libpng in case builtin freetype library is used

Fixes [1]:

Project ERROR: Library 'libpng' is not defined. make[3]: *** [sub-3rdparty-freetype-make_first] Error 3

[1] http://autobuild.buildroot.net/results/219162ba616289f799a5053c4dcc6b8574284283

---
 package/qt5/qt5base/qt5base.mk | 5 +++++
 1 file changed, 5 insertions(+)
package/qt5/qt5base/qt5base.mk +5 -0
index 2cf0331b0..afe373123 100644
@@ -149,7 +149,12 @@ QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GIF),,-no-gif)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_JPEG),-system-libjpeg,-no-libjpeg)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_JPEG),jpeg)
+ifeq ($(BR2_QT5_VERSION_5_6)$(BR2_PACKAGE_QT5BASE_FONTCONFIG),)
+# qt-5.8.0 freetype needs libpng support
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_PNG),-system-libpng,-qt-libpng)
+else
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_PNG),-system-libpng,-no-libpng)
+endif
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng)
 
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DBUS),-dbus,-no-dbus)
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 qt5base: select qt-libpng in case builtin freetype library is used

Hello,

package/qt5/qt5base/qt5base.mk QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig) · line 154

Quoted 11 lines · Peter Seiderer
package/qt5/qt5base/qt5base.mk +3 -0
index 2cf0331b0..afe373123 100644
@@ -149,7 +149,12 @@ QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GIF),,-no-gif)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_JPEG),-system-libjpeg,-no-libjpeg)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_JPEG),jpeg)
+ifeq ($(BR2_QT5_VERSION_5_6)$(BR2_PACKAGE_QT5BASE_FONTCONFIG),)
+# qt-5.8.0 freetype needs libpng support
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_PNG),-system-libpng,-qt-libpng)

Are you sure we need -qt-libpng in all cases when there is no fontconfig support? Isn't it only needed when the GUI module is enabled?

Also, why is the builtin freetype library used? We generally don't like to use the builtin libraries. Can we instead rely on external libpng and external freetype?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 qt5base: select qt-libpng in case builtin freetype library is used

Hello Thomas,

Quoted 4 lines · Thomas Petazzoni

Hello,

On Thu, 9 Feb 2017 18:40:08 +0100, Peter Seiderer wrote:

Quoted 15 lines

package/qt5/qt5base/qt5base.mk QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig) · line 154

Quoted 11 lines
package/qt5/qt5base/qt5base.mk +3 -0
index 2cf0331b0..afe373123 100644
@@ -149,7 +149,12 @@ QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GIF),,-no-gif)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_JPEG),-system-libjpeg,-no-libjpeg)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_JPEG),jpeg)
+ifeq ($(BR2_QT5_VERSION_5_6)$(BR2_PACKAGE_QT5BASE_FONTCONFIG),)
+# qt-5.8.0 freetype needs libpng support
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_PNG),-system-libpng,-qt-libpng)

Are you sure we need -qt-libpng in all cases when there is no fontconfig support? Isn't it only needed when the GUI module is enabled?

Interesting question ;-), but I think your are right...

Quoted 3 lines

Also, why is the builtin freetype library used? We generally don't like to use the builtin libraries. Can we instead rely on external libpng and external freetype?

Historic reasons (you did not add this feature back in 2013.... ;-))?

But same as Arnout Vandecappelle pointed out....

Will try to generate a patch...

Regards,
Peter

Quoted 4 lines

Thanks,

Thomas