qt4-embedded.inc: provide PACKAGECONFIG for tslib
PATCH v2 1/2 qt4-embedded.inc: provide PACKAGECONFIG for tslib
make tslib dependency optional
Signed-off-by Maxin B. John <[email protected]>
--- recipes-qt4/qt4/qt4-embedded.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
recipes-qt4/qt4/qt4-embedded.inc +5 -3
@@ -2,7 +2,9 @@ SUMMARY = "Cross-platform UI toolkit and application framework (framebuffer vers DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the embedded (framebuffer) version." SECTION = "libs" HOMEPAGE = "http://qt-project.org/" -DEPENDS += "tslib" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[tslib] = " -plugin-mouse-tslib, ,tslib" QT4EDEPENDS = "" QT_BASE_LIB ?= "libqt-embedded"
@@ -18,8 +20,8 @@ QT_EMBEDDED_FLAGS ?= " \ " QT_EMBEDDED_EXTRA_FLAGS ?= " \ -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc \ - -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \ - -qt-kbd-tty -qt-kbd-linuxinput \ + -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \ + -qt-kbd-tty -qt-kbd-linuxinput ${PACKAGECONFIG_CONFARGS} \ " QT_EMBEDDED_KEYPAD_FLAGS ?= " \ -DQT_KEYPAD_NAVIGATION \
Signature · 1 line
2.4.0
PATCH v2 2/2 packagegroup-core-qt4e: updates based on tslib dependency
Since tslib dependency is optional, update the location of qt4-embedded-plugin-mousedriver-tslib which depends on it.
Signed-off-by Maxin B. John <[email protected]>
--- recipes-qt4/packagegroups/packagegroup-core-qt4e.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
recipes-qt4/packagegroups/packagegroup-core-qt4e.bb +1 -2
@@ -7,7 +7,7 @@ COMPATIBLE_HOST_mips64 = "null" inherit packagegroup -TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' +TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests qt4-embedded-plugin-mousedriver-tslib", "",d)}' RDEPENDS_${PN} = " \ qt4-embedded \
@@ -35,7 +35,6 @@ RDEPENDS_${PN} = " \ qt4-embedded-plugin-imageformat-mng \ qt4-embedded-plugin-imageformat-svg \ qt4-embedded-plugin-imageformat-tiff \ - qt4-embedded-plugin-mousedriver-tslib \ qt4-embedded-plugin-script-dbus \ qt4-embedded-plugin-sqldriver-sqlite \ ${TOUCH} \
Signature · 1 line
2.4.0