Commit 9e9a3e6b authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

qt5base: add support for fontconfig, png, jpeg, gif 



Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent d2b86608

package/qt5/qt5base/Config.in

+26 −0
Original line number Diff line number Diff line
@@ -104,6 +104,32 @@ config BR2_PACKAGE_QT5BASE_PRINTSUPPORT 
	help

	  This option enables the Qt5PrintSupport



config BR2_PACKAGE_QT5BASE_FONTCONFIG

	bool "fontconfig support"

	select BR2_PACKAGE_FONTCONFIG

	help

	  This option enables Fontconfig and Freetype support using

	  the system fontconfig and freetype2 libraries.



config BR2_PACKAGE_QT5BASE_GIF

	bool "GIF support"

	help

	  This compiles and installs the plugin for GIF reading support.



config BR2_PACKAGE_QT5BASE_JPEG

	bool "JPEG support"

	select BR2_PACKAGE_JPEG

	help

	  This option enables JPEG support using the system libjpeg

	  library.



config BR2_PACKAGE_QT5BASE_PNG

	bool "PNG support"

	select BR2_PACKAGE_LIBPNG

	help

	  This option enables PNG support using the system libpng

	  library.



endif



endif

package/qt5/qt5base/qt5base.mk

+8 −4
Original line number Diff line number Diff line
@@ -26,10 +26,6 @@ QT5BASE_CONFIGURE_OPTS += \ 
	-no-nis \

	-no-libudev \

	-no-iconv \

	-no-fontconfig \

	-no-gif \

	-no-libpng \

	-no-libjpeg \

	-no-icu \

	-no-dbus \

	-no-gstreamer \
@@ -89,6 +85,14 @@ endif 
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)

QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_OPENSSL),openssl)



QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig)

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)

QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_PNG),-system-libpng,-no-libpng)

QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng)



# Build the list of libraries to be installed on the target

QT5BASE_INSTALL_LIBS_y                                 += Qt5Core

QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK)    += Qt5Network