From: Fatih Aşıcı Date: Wed, 18 Sep 2013 07:23:32 +0000 (+0300) Subject: qt5webkit: select libXrender if xcb is enabled X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a252d6f4c7b9bc122d6461b3db3f703f5fe1aeea;p=buildroot.git qt5webkit: select libXrender if xcb is enabled [Peter: also add libXext] Signed-off-by: Fatih Aşıcı Signed-off-by: Peter Korsgaard --- diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 48b512504f..9eb5ef8375 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB + select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB # This module does not support static linking depends on !BR2_PREFER_STATIC_LIB help diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index b51f5c5eed..c95f3b460c 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -21,6 +21,10 @@ QT5WEBKIT_LICENSE = Commercial license QT5WEBKIT_REDISTRIBUTE = NO endif +ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) +QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender +endif + define QT5WEBKIT_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef