Skip to contentSkip to conversation

qt: package examples

PATCH In review Eric Bénard 2 participants 21 messages May 27, 2013 – May 28, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/8 qt: package examples

---
 recipes-qt/qt5/qt5.inc |   29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)
recipes-qt/qt5/qt5.inc +28 -1
index d370844..87bf5e8 100644
@@ -20,7 +20,7 @@ OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}"
 OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}"
 OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}"
 
-PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs "
+PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
 
 # extra -dbg packages
 FILES_${PN}-qmlplugins-dbg = " \
@@ -98,3 +98,30 @@ FILES_${PN}-dbg += " \
 FILES_${PN}-staticdev += " \
     ${OE_QMAKE_PATH_LIBS}/*.a \
 "
+FILES_${PN}-examples = " \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/* \
+"
+FILES_${PN}-examples-dev = " \
+    ${OE_QMAKE_PATH_EXAMPLES}/*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/*/*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*${SOLIBSDEV} \
+"
+FILES_${PN}-examples-dbg = " \
+    ${OE_QMAKE_PATH_EXAMPLES}/.debug \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/.debug \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/*/.debug \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/.debug \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/.debug \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/.debug \
+"
+FILES_${PN}-examples-staticdev = " \
+    ${OE_QMAKE_PATH_EXAMPLES}/*.a \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/*.a \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/*/*.a \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*.a \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*.a \
+    ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*.a \
+"
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 2/8 qtjsbackend: fix hardfloat detection in v8

---
 recipes-qt/qt5/qtjsbackend.inc                     |    1 +
 .../qtjsbackend/0001-Fix-hardfloat-detection.patch |   33 ++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 recipes-qt/qt5/qtjsbackend/0001-Fix-hardfloat-detection.patch
recipes-qt/qt5/qtjsbackend.inc +1 -0
index 4479654..a0dc632 100644
@@ -13,4 +13,5 @@ INC_PR = "r0"
 
 SRC_URI += " \
     file://0002-v8.pro-respect-external-host-bindir-when-set.patch \
+    file://0001-Fix-hardfloat-detection.patch \
 "
recipes-qt/qt5/qtjsbackend/0001-Fix-hardfloat-detection.patch new file +33 -0
new file mode 100644
index 0000000..3d86fbf
@@ -0,0 +1,33 @@
+From 05a87fccb76447ce3cb4b926128af929f26469bb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]>
+Date: Wed, 22 May 2013 18:50:01 +0200
+Subject: [PATCH] Fix hardfloat detection
+
+based on the same patch for nodejs which says :
+
+gcc has a builtin define to denote hard abi when in use, e.g. when
+using -mfloat-abi=hard it will define __ARM_PCS_VFP to 1 and therefore
+we should check that to determine which calling convention is in use
+and not __VFP_FP__ which merely indicates presence of VFP unit
+
+The fix has been provided by Khem Raj <[email protected]>
+---
+ src/3rdparty/v8/src/platform-linux.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/v8/src/platform-linux.cc b/src/3rdparty/v8/src/platform-linux.cc
+index f6db423..8ae2249 100644
+--- a/src/3rdparty/v8/src/platform-linux.cc
++++ b/src/3rdparty/v8/src/platform-linux.cc
+@@ -167,7 +167,7 @@ bool OS::ArmCpuHasFeature(CpuFeature feature) {
+ // calling this will return 1.0 and otherwise 0.0.
+ static void ArmUsingHardFloatHelper() {
+   asm("mov r0, #0":::"r0");
+-#if defined(__VFP_FP__) && !defined(__SOFTFP__)
++#if defined(__ARM_PCS_VFP) && !defined(__SOFTFP__)
+   // Load 0x3ff00000 into r1 using instructions available in both ARM
+   // and Thumb mode.
+   asm("mov r1, #3":::"r1");
+-- 
+1.7.10.4
+
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 3/8 qtbase: add 0004-Disable-mkv8snapshot.patch to 5.0.1

In reply to Eric Bénard

else qml application segfault.

---
 recipes-qt/qt5/qtbase_5.0.1.bb |    2 ++
 1 file changed, 2 insertions(+)
recipes-qt/qt5/qtbase_5.0.1.bb +2 -0
index 2dce2c1..dfcb742 100644
@@ -3,5 +3,7 @@ require ${PN}.inc
 
 PR = "${INC_PR}.0"
 
+SRC_URI += "file://0004-Disable-mkv8snapshot.patch"
+
 SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df"
 SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8"
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH 4/8 qtbase: remove non existing parts

In reply to Eric Bénard

make/nomake demos doesn't exist in qt5.

---
 recipes-qt/qt5/qtbase-native.inc |    1 -
 recipes-qt/qt5/qtbase.inc        |    2 --
 2 files changed, 3 deletions(-)
recipes-qt/qt5/qtbase-native.inc +0 -1
index c742858..b50d446 100644
@@ -69,7 +69,6 @@ EXTRA_OECONF = " \
     -silent \
     -nomake examples \
     -nomake tests \
-    -nomake demos \
     -no-rpath \
     -platform linux-oe-g++ \
 "
recipes-qt/qt5/qtbase.inc +0 -2
index cabe0b7..81cc2e1 100644
@@ -52,7 +52,6 @@ QT_STL ?= "-stl"
 QT_SYSTEM_LIBS ?= "-system-libjpeg -system-libpng -system-zlib"
 QT_TESTS ?= "-nomake tests"
 QT_EXAMPLES ?= "-nomake examples"
-QT_DEMOS ?= "-nomake demos"
 QT_RELEASE ?= "-release"
 
 QT_CONFIG_FLAGS += " \
@@ -73,7 +72,6 @@ QT_CONFIG_FLAGS += " \
     ${QT_GLFLAGS} \
     ${QT_TESTS} \
     ${QT_EXAMPLES} \
-    ${QT_DEMOS} \
 "
 
 INC_PR = "r1"
Signature · 1 line
1.7.10.4
#4 lore raw

PATCH 5/8 qtbase-5.0.2: fix v8 and allow build of examples

In reply to Eric Bénard

- fix v8 segfault (at least on armv7)
- examples are only provided as sources but in our case, binaries are more interesting for user to test the features on the target.

---
 .../0001-qtbase-allow-build-of-examples.patch      |   49 ++++++++++++++++++++
 recipes-qt/qt5/qtbase_5.0.2.bb                     |    4 ++
 2 files changed, 53 insertions(+)
 create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch
recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch new file +49 -0
new file mode 100644
index 0000000..17b951a
@@ -0,0 +1,49 @@
+From 66558b78b5ff8c8ae9fa00a33d1d89285b8e3a00 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]>
+Date: Sat, 25 May 2013 17:34:32 +0200
+Subject: [PATCH] qtbase: allow build of examples
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+this revert the following commit :
+
+commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61
+Author: Oswald Buddenhagen <[email protected]>
+Date:   Fri Dec 21 19:36:12 2012 +0100
+
+    do not actually build examples in production builds
+
+    -developer-build enables an actual build of examples, based on the
+    assumption that developers want to test it (it can be still disabled
+    with -nomake examples). regular users otoh want only the examples
+    sources installed.
+
+    Change-Id: Ifc6a108099929175a3960480802b271a758fdd38
+    Reviewed-by: Joerg Bornemann <[email protected]>
+
+Signed-off-by: Eric Bénard <[email protected]>
+---
+ mkspecs/features/qt_example_installs.prf | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
+index 479a16a..ca1b0c7 100644
+--- a/mkspecs/features/qt_example_installs.prf
++++ b/mkspecs/features/qt_example_installs.prf
+@@ -92,12 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
+         allfiles -= doc
+         !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
+     }
+-
+-    # Do not actually build the examples in production builds with -prefix
+-    !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) {
+-        TEMPLATE = aux
+-        CONFIG -= have_target qt staticlib dll
+-        SOURCES =
+-        INSTALLS -= target
+-    }
+ }
+-- 
+1.8.1.4
+
recipes-qt/qt5/qtbase_5.0.2.bb +4 -0
index 3df434e..357c06e 100644
@@ -3,5 +3,9 @@ require ${PN}.inc
 
 PR = "${INC_PR}.0"
 
+SRC_URI += "file://0004-Disable-mkv8snapshot.patch \
+    file://0001-qtbase-allow-build-of-examples.patch \
+    "
+
 SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0"
 SRC_URI[sha256sum] = "31851ee2f844c100554506a9a446d4b6abb5270bca799c2a683e5f937456a9c8"
Signature · 1 line
1.7.10.4
#5 lore raw

PATCH 6/8 qtdeclarative-5.0.2: fix examples compilation

In reply to Eric Bénard
---
 .../0001-qmltestexample-fix-link.patch             |   34 ++++++++++++++++++++
 recipes-qt/qt5/qtdeclarative_5.0.2.bb              |    4 +++
 2 files changed, 38 insertions(+)
 create mode 100644 recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch new file +34 -0
new file mode 100644
index 0000000..7ed95e4
@@ -0,0 +1,34 @@
+From e22cb54286083886be5081332de2f64ab0b78b4b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]>
+Date: Sun, 26 May 2013 14:26:19 +0200
+Subject: [PATCH] qmltestexample: fix link
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+else we get :
+ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Eric Bénard <[email protected]>
+---
+ examples/qmltest/qmltest/qmltest.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
+index b5893c5..1b00e6c 100644
+--- a/examples/qmltest/qmltest/qmltest.pro
++++ b/examples/qmltest/qmltest/qmltest.pro
+@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml
+ # This code exists solely for the purpose of building this example
+ # inside the examples/ hierarchy.
+ 
+-QT += qml qmltest
++QT += qml qmltest quick
+ 
+ macx: CONFIG -= app_bundle
+ 
+-- 
+1.8.1.4
+
recipes-qt/qt5/qtdeclarative_5.0.2.bb +4 -0
index 5853c96..e992c15 100644
@@ -3,5 +3,9 @@ require ${PN}.inc
 
 PR = "${INC_PR}.0"
 
+SRC_URI += " \
+    file://0001-qmltestexample-fix-link.patch \
+    "
+
 SRC_URI[md5sum] = "55ab45a7a17db5b202b225603a35a37c"
 SRC_URI[sha256sum] = "dcfcc6c0d1913d285dd7b42dd9bc457c304f3e3074a1e0d875fff1e9a8318520"
Signature · 1 line
1.7.10.4
#6 lore raw

PATCH 7/8 qtbase: install and split package fonts

In reply to Eric Bénard

- fonts were not installed (at least in qt 5.0.2) so install them manually.
- split the font package in smaller package as done in qt4 to save space on the target.

---
 recipes-qt/qt5/qtbase.inc |   30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)
recipes-qt/qt5/qtbase.inc +28 -2
index 81cc2e1..4b4fb10 100644
@@ -161,7 +161,33 @@ do_install_append() {
     # qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed
     # ERROR: objcopy failed with exit code 1 (cmd was 'arm-oe-linux-gnueabi-objcopy' --only-keep-debug '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/qmake' '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/.debug/qmake')
     rm -f ${D}/${bindir}/${QT_DIR_NAME}/qmake
+    # install fonts manually if they are missing
+    if [ ! -d ${D}/${libdir}/fonts ]; then
+        cp -a ${S}/lib/fonts ${D}/${libdir}
+    fi
 }
 
-PACKAGES =. "${PN}-fonts "
-FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts ${libdir}/fonts"
+PACKAGES =. "${PN}-fonts \
+             ${PN}-fonts-ttf-vera \
+             ${PN}-fonts-ttf-dejavu \
+             ${PN}-fonts-pfa \
+             ${PN}-fonts-pfb \
+             ${PN}-fonts-qpf "
+
+RRECOMMENDS_${PN}-fonts = " \
+             ${PN}-fonts-ttf-vera \
+             ${PN}-fonts-ttf-dejavu \
+             ${PN}-fonts-pfa \
+             ${PN}-fonts-pfb \
+             ${PN}-fonts-qpf "
+
+ALLOW_EMPTY_${PN}-fonts = "1"
+PACKAGES_DYNAMIC += "^${PN}-fonts-.*"
+
+FILES_${PN}-fonts-ttf-vera       = "${libdir}/${QT_DIR_NAME}/fonts/Vera*.ttf ${libdir}/fonts/Vera*.ttf"
+FILES_${PN}-fonts-ttf-dejavu     = "${libdir}/${QT_DIR_NAME}/fonts/DejaVu*.ttf ${libdir}/fonts/DejaVu*.ttf"
+FILES_${PN}-fonts-pfa            = "${libdir}/${QT_DIR_NAME}/fonts/*.pfa ${libdir}/fonts/*.pfa"
+FILES_${PN}-fonts-pfb            = "${libdir}/${QT_DIR_NAME}/fonts/*.pfb ${libdir}/fonts/*.pfb"
+FILES_${PN}-fonts-qpf            = "${libdir}/${QT_DIR_NAME}/fonts/*.qpf* ${libdir}/fonts/*.qpf*"
+FILES_${PN}-fonts                = "${libdir}/${QT_DIR_NAME}/fonts/README ${libdir}/fonts/README \
+                                    ${libdir}/${QT_DIR_NAME}/fonts/fontdir ${libdir}/fonts/fontdir"
Signature · 1 line
1.7.10.4
#7 lore raw

Re: [meta-qt5][PATCH 7/8] qtbase: install and split package fonts

Quoted 32 lines · Eric Bénard

- fonts were not installed (at least in qt 5.0.2) so install them manually.
- split the font package in smaller package as done in qt4 to save space on the target.

---
 recipes-qt/qt5/qtbase.inc |   30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)
recipes-qt/qt5/qtbase.inc +10 -2
index 81cc2e1..4b4fb10 100644
@@ -161,7 +161,33 @@ do_install_append() {
     # qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed
     # ERROR: objcopy failed with exit code 1 (cmd was 'arm-oe-linux-gnueabi-objcopy' --only-keep-debug '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/qmake' '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/.debug/qmake')
     rm -f ${D}/${bindir}/${QT_DIR_NAME}/qmake
+    # install fonts manually if they are missing
+    if [ ! -d ${D}/${libdir}/fonts ]; then
+        cp -a ${S}/lib/fonts ${D}/${libdir}
+    fi
 }
 
-PACKAGES =. "${PN}-fonts "
-FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts ${libdir}/fonts"
+PACKAGES =. "${PN}-fonts \
+             ${PN}-fonts-ttf-vera \
+             ${PN}-fonts-ttf-dejavu \
+             ${PN}-fonts-pfa \
+             ${PN}-fonts-pfb \
+             ${PN}-fonts-qpf "

recipes-qt/qt5/qtbase.inc do_install_append() { · line 185

Quoted 10 lines
recipes-qt/qt5/qtbase.inc +10 -0
+
+RRECOMMENDS_${PN}-fonts = " \
+             ${PN}-fonts-ttf-vera \
+             ${PN}-fonts-ttf-dejavu \
+             ${PN}-fonts-pfa \
+             ${PN}-fonts-pfb \
+             ${PN}-fonts-qpf "
+
+ALLOW_EMPTY_${PN}-fonts = "1"
+PACKAGES_DYNAMIC += "^${PN}-fonts-.*"

Is this line needed? You're creating all ${PN}-fonts manually, I don't see any do_split_packages which would require PACKAGES_DYNAMIC.

Quoted 15 lines
recipes-qt/qt5/qtbase.inc +8 -0
+
+FILES_${PN}-fonts-ttf-vera       = "${libdir}/${QT_DIR_NAME}/fonts/Vera*.ttf ${libdir}/fonts/Vera*.ttf"
+FILES_${PN}-fonts-ttf-dejavu     = "${libdir}/${QT_DIR_NAME}/fonts/DejaVu*.ttf ${libdir}/fonts/DejaVu*.ttf"
+FILES_${PN}-fonts-pfa            = "${libdir}/${QT_DIR_NAME}/fonts/*.pfa ${libdir}/fonts/*.pfa"
+FILES_${PN}-fonts-pfb            = "${libdir}/${QT_DIR_NAME}/fonts/*.pfb ${libdir}/fonts/*.pfb"
+FILES_${PN}-fonts-qpf            = "${libdir}/${QT_DIR_NAME}/fonts/*.qpf* ${libdir}/fonts/*.qpf*"
+FILES_${PN}-fonts                = "${libdir}/${QT_DIR_NAME}/fonts/README ${libdir}/fonts/README \
+                                    ${libdir}/${QT_DIR_NAME}/fonts/fontdir ${libdir}/fonts/fontdir"
Signature · 6 lines
1.7.10.4

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#8 lore raw

Re: [meta-qt5][PATCH 7/8] qtbase: install and split package fonts

Quoted 38 lines · Martin Jansa
Quoted 37 lines · Eric Bénard

- fonts were not installed (at least in qt 5.0.2) so install them manually.
- split the font package in smaller package as done in qt4 to save space on the target.

---
 recipes-qt/qt5/qtbase.inc |   30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)
recipes-qt/qt5/qtbase.inc +15 -2
index 81cc2e1..4b4fb10 100644
@@ -161,7 +161,33 @@ do_install_append() {
     # qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed
     # ERROR: objcopy failed with exit code 1 (cmd was 'arm-oe-linux-gnueabi-objcopy' --only-keep-debug '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/qmake' '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/.debug/qmake')
     rm -f ${D}/${bindir}/${QT_DIR_NAME}/qmake
+    # install fonts manually if they are missing
+    if [ ! -d ${D}/${libdir}/fonts ]; then
+        cp -a ${S}/lib/fonts ${D}/${libdir}
+    fi
 }
 
-PACKAGES =. "${PN}-fonts "
-FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts ${libdir}/fonts"
+PACKAGES =. "${PN}-fonts \
+             ${PN}-fonts-ttf-vera \
+             ${PN}-fonts-ttf-dejavu \
+             ${PN}-fonts-pfa \
+             ${PN}-fonts-pfb \
+             ${PN}-fonts-qpf "
+
+RRECOMMENDS_${PN}-fonts = " \
+             ${PN}-fonts-ttf-vera \
+             ${PN}-fonts-ttf-dejavu \
+             ${PN}-fonts-pfa \
Quoted 9 lines

recipes-qt/qt5/qtbase.inc do_install_append() { · line 185

Quoted 5 lines
recipes-qt/qt5/qtbase.inc +5 -0
+             ${PN}-fonts-pfb \
+             ${PN}-fonts-qpf "
+
+ALLOW_EMPTY_${PN}-fonts = "1"
+PACKAGES_DYNAMIC += "^${PN}-fonts-.*"

Is this line needed? You're creating all ${PN}-fonts manually, I don't see any do_split_packages which would require PACKAGES_DYNAMIC.

true, this comes from qt4 package and I blindly copied those lines.

Eric

#9 lore raw

Re: [meta-qt5][PATCH 7/8] qtbase: install and split package fonts

In reply to Eric Bénard
Quoted 40 lines · Eric Bénard

- fonts were not installed (at least in qt 5.0.2) so install them manually.
- split the font package in smaller package as done in qt4 to save space on the target.

---
 recipes-qt/qt5/qtbase.inc |   30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)
recipes-qt/qt5/qtbase.inc +18 -2
index 81cc2e1..4b4fb10 100644
@@ -161,7 +161,33 @@ do_install_append() {
     # qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed
     # ERROR: objcopy failed with exit code 1 (cmd was 'arm-oe-linux-gnueabi-objcopy' --only-keep-debug '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/qmake' '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/.debug/qmake')
     rm -f ${D}/${bindir}/${QT_DIR_NAME}/qmake
+    # install fonts manually if they are missing
+    if [ ! -d ${D}/${libdir}/fonts ]; then
+        cp -a ${S}/lib/fonts ${D}/${libdir}
+    fi
 }
 
-PACKAGES =. "${PN}-fonts "
-FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts ${libdir}/fonts"
+PACKAGES =. "${PN}-fonts \
+             ${PN}-fonts-ttf-vera \
+             ${PN}-fonts-ttf-dejavu \
+             ${PN}-fonts-pfa \
+             ${PN}-fonts-pfb \
+             ${PN}-fonts-qpf "
+
+RRECOMMENDS_${PN}-fonts = " \
+             ${PN}-fonts-ttf-vera \
+             ${PN}-fonts-ttf-dejavu \
+             ${PN}-fonts-pfa \
+             ${PN}-fonts-pfb \
+             ${PN}-fonts-qpf "
+

recipes-qt/qt5/qtbase.inc do_install_append() { · line 193

Quoted 10 lines
recipes-qt/qt5/qtbase.inc +10 -0
+ALLOW_EMPTY_${PN}-fonts = "1"
+PACKAGES_DYNAMIC += "^${PN}-fonts-.*"
+
+FILES_${PN}-fonts-ttf-vera       = "${libdir}/${QT_DIR_NAME}/fonts/Vera*.ttf ${libdir}/fonts/Vera*.ttf"
+FILES_${PN}-fonts-ttf-dejavu     = "${libdir}/${QT_DIR_NAME}/fonts/DejaVu*.ttf ${libdir}/fonts/DejaVu*.ttf"
+FILES_${PN}-fonts-pfa            = "${libdir}/${QT_DIR_NAME}/fonts/*.pfa ${libdir}/fonts/*.pfa"
+FILES_${PN}-fonts-pfb            = "${libdir}/${QT_DIR_NAME}/fonts/*.pfb ${libdir}/fonts/*.pfb"
+FILES_${PN}-fonts-qpf            = "${libdir}/${QT_DIR_NAME}/fonts/*.qpf* ${libdir}/fonts/*.qpf*"
+FILES_${PN}-fonts                = "${libdir}/${QT_DIR_NAME}/fonts/README ${libdir}/fonts/README \
+                                    ${libdir}/${QT_DIR_NAME}/fonts/fontdir ${libdir}/fonts/fontdir"

maybe we could improve this by using OE_QMAKE_PATH_ARCHDATA (to cover version with and without QT_DIR_NAME), but please
check if fonts are really installed into ArchData directory

OE_QMAKE_PATH_QT_ARCHDATA = "${libdir}/${QT_DIR_NAME}"

I'm going to merge other qt5 changes, so only this one will need an update.

Cheers,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#10 lore raw

Re: [meta-qt5][PATCH 7/8] qtbase: install and split package fonts

Quoted 12 lines · Martin Jansa

recipes-qt/qt5/qtbase.inc do_install_append() { · line 193

Quoted 7 lines
recipes-qt/qt5/qtbase.inc +7 -0
+FILES_${PN}-fonts-ttf-vera       = "${libdir}/${QT_DIR_NAME}/fonts/Vera*.ttf ${libdir}/fonts/Vera*.ttf"
+FILES_${PN}-fonts-ttf-dejavu     = "${libdir}/${QT_DIR_NAME}/fonts/DejaVu*.ttf ${libdir}/fonts/DejaVu*.ttf"
+FILES_${PN}-fonts-pfa            = "${libdir}/${QT_DIR_NAME}/fonts/*.pfa ${libdir}/fonts/*.pfa"
+FILES_${PN}-fonts-pfb            = "${libdir}/${QT_DIR_NAME}/fonts/*.pfb ${libdir}/fonts/*.pfb"
+FILES_${PN}-fonts-qpf            = "${libdir}/${QT_DIR_NAME}/fonts/*.qpf* ${libdir}/fonts/*.qpf*"
+FILES_${PN}-fonts                = "${libdir}/${QT_DIR_NAME}/fonts/README ${libdir}/fonts/README \
+                                    ${libdir}/${QT_DIR_NAME}/fonts/fontdir ${libdir}/fonts/fontdir"

maybe we could improve this by using OE_QMAKE_PATH_ARCHDATA (to cover version with and without QT_DIR_NAME), but please
check if fonts are really installed into ArchData directory

Quoted 2 lines

OE_QMAKE_PATH_QT_ARCHDATA = "${libdir}/${QT_DIR_NAME}"

from what I saw fonts are installed (and searched at runtime) in ${libdir}/fonts
I don't know why ${libdir}/${QT_DIR_NAME} was used in qtbase.inc so I blindly followed ;-)

Eric

#11 lore raw

PATCH v2 1/1 qtbase: install and split package fonts

In reply to Martin Jansa

- fonts were not installed (at least in qt 5.0.2) so install them manually.
- split the font package in smaller package as done in qt4 to save space on the target.

---
v2 : remove unecessary PACKAGES_DYNAMIC

 recipes-qt/qt5/qtbase.inc |   29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)
recipes-qt/qt5/qtbase.inc +27 -2
index f286274..b252e17 100644
@@ -170,7 +170,32 @@ do_install_append() {
     # qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed
     # ERROR: objcopy failed with exit code 1 (cmd was 'arm-oe-linux-gnueabi-objcopy' --only-keep-debug '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/qmake' '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/.debug/qmake')
     rm -f ${D}/${bindir}/${QT_DIR_NAME}/qmake
+    # install fonts manually if they are missing
+    if [ ! -d ${D}/${libdir}/fonts ]; then
+        cp -a ${S}/lib/fonts ${D}/${libdir}
+    fi
 }
 
-PACKAGES =. "${PN}-fonts "
-FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts ${libdir}/fonts"
+PACKAGES =. "${PN}-fonts \
+             ${PN}-fonts-ttf-vera \
+             ${PN}-fonts-ttf-dejavu \
+             ${PN}-fonts-pfa \
+             ${PN}-fonts-pfb \
+             ${PN}-fonts-qpf "
+
+RRECOMMENDS_${PN}-fonts = " \
+             ${PN}-fonts-ttf-vera \
+             ${PN}-fonts-ttf-dejavu \
+             ${PN}-fonts-pfa \
+             ${PN}-fonts-pfb \
+             ${PN}-fonts-qpf "
+
+ALLOW_EMPTY_${PN}-fonts = "1"
+
+FILES_${PN}-fonts-ttf-vera       = "${libdir}/${QT_DIR_NAME}/fonts/Vera*.ttf ${libdir}/fonts/Vera*.ttf"
+FILES_${PN}-fonts-ttf-dejavu     = "${libdir}/${QT_DIR_NAME}/fonts/DejaVu*.ttf ${libdir}/fonts/DejaVu*.ttf"
+FILES_${PN}-fonts-pfa            = "${libdir}/${QT_DIR_NAME}/fonts/*.pfa ${libdir}/fonts/*.pfa"
+FILES_${PN}-fonts-pfb            = "${libdir}/${QT_DIR_NAME}/fonts/*.pfb ${libdir}/fonts/*.pfb"
+FILES_${PN}-fonts-qpf            = "${libdir}/${QT_DIR_NAME}/fonts/*.qpf* ${libdir}/fonts/*.qpf*"
+FILES_${PN}-fonts                = "${libdir}/${QT_DIR_NAME}/fonts/README ${libdir}/fonts/README \
+                                    ${libdir}/${QT_DIR_NAME}/fonts/fontdir ${libdir}/fonts/fontdir"
Signature · 1 line
1.7.10.4
#12 lore raw

PATCH 8/8 qtbase: add option to enable tslib support

In reply to Eric Bénard

- the tslib support is not enabled by default and configure doesn't have any option to active it, so add the option to the build system,
- patch tslib support to get the device from the environment variable
(patch taken from https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch
- provide variable to enable tslib support in a bbappend (disabled by default)
- tested on an i.MX5x target with qt 5.0.2

TODO : test with 5.0, 5.0.1 and _git

---
 .../0001-configure-add-tslib-support.patch         |   78 ++++++++++++++++++++
 ...tslib-device-to-be-read-from-env-variable.patch |   34 +++++++++
 recipes-qt/qt5/qtbase.inc                          |    8 +-
 recipes-qt/qt5/qtbase_5.0.2.bb                     |    2 +
 4 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0001-configure-add-tslib-support.patch
 create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0001-enables-tslib-device-to-be-read-from-env-variable.patch
recipes-qt/qt5/qtbase-5.0.2/0001-configure-add-tslib-support.patch new file +78 -0
new file mode 100644
index 0000000..3407f60
@@ -0,0 +1,78 @@
+From b4edefdc1fb5ba67b202fad7df5a8def554d16fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]>
+Date: Mon, 27 May 2013 18:45:03 +0200
+Subject: [PATCH] configure: add tslib support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Eric Bénard <[email protected]>
+---
+ configure                       | 24 ++++++++++++++++++++++++
+ src/plugins/generic/generic.pro |  4 ++++
+ 2 files changed, 28 insertions(+)
+
+diff --git a/configure b/configure
+index 2ea1ea4..727fed9 100755
+--- a/configure
++++ b/configure
+@@ -810,6 +810,7 @@ CFG_KMS=auto
+ CFG_LIBUDEV=auto
+ CFG_OBSOLETE_WAYLAND=no
+ CFG_EVDEV=auto
++CFG_TSLIB=auto
+ CFG_NIS=auto
+ CFG_CUPS=auto
+ CFG_ICONV=auto
+@@ -1782,6 +1783,13 @@ while [ "$#" -gt 0 ]; do
+             UNKNOWN_OPT=yes
+         fi
+         ;;
++    tslib)
++        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
++            CFG_TSLIB="$VAL"
++        else
++            UNKNOWN_OPT=yes
++        fi
++        ;;
+     cups)
+         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+             CFG_CUPS="$VAL"
+@@ -4775,6 +4783,22 @@ if [ "$CFG_EVDEV" = "no" ]; then
+     QMakeVar add DEFINES QT_NO_EVDEV
+ fi
+ 
++if [ "$CFG_TSLIB" != "no" ]; then
++    if compileTest unix/tslib "tslib"; then
++        CFG_TSLIB=yes
++        QT_CONFIG="$QT_CONFIG tslib"
++    elif [ "$CFG_TSLIB" = "yes" ]; then
++        echo "The tslib functionality test failed!"
++        exit 1
++    else
++        CFG_TSLIB=no
++    fi
++fi
++if [ "$CFG_TSLIB" = "no" ]; then
++    QMakeVar add DEFINES QT_NO_TSLIB
++fi
++
++
+ # Check we actually have X11 :-)
+ if compileTest x11/xlib "XLib"; then
+     QT_CONFIG="$QT_CONFIG xlib"
+diff --git a/src/plugins/generic/generic.pro b/src/plugins/generic/generic.pro
+index 078db2f..18a8295 100644
+--- a/src/plugins/generic/generic.pro
++++ b/src/plugins/generic/generic.pro
+@@ -5,3 +5,7 @@ TEMPLATE = subdirs
+ contains(QT_CONFIG, evdev) {
+     SUBDIRS += evdevmouse evdevtouch evdevkeyboard evdevtablet
+ }
++
++contains(QT_CONFIG, tslib) {
++    SUBDIRS += tslib
++}
+-- 
+1.8.1.4
+
recipes-qt/qt5/qtbase-5.0.2/0001-enables-tslib-device-to-be-read-from-env-variable.patch new file +34 -0
new file mode 100644
index 0000000..77ddcba
@@ -0,0 +1,34 @@
+From cb7d4b978d7b29e3f4ef5dba1ca1319ccd289a0d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]>
+Date: Mon, 27 May 2013 18:32:37 +0200
+Subject: [PATCH] enables tslib device to be read from env variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+from :
+https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch
+
+Signed-off-by: Eric Bénard <[email protected]>
+---
+ src/plugins/generic/tslib/qtslib.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp
+index 6986fd5..2ed4a69 100644
+--- a/src/plugins/generic/tslib/qtslib.cpp
++++ b/src/plugins/generic/tslib/qtslib.cpp
+@@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key,
+     qDebug() << "QTsLibMouseHandler" << key << specification;
+     setObjectName(QLatin1String("TSLib Mouse Handler"));
+ 
+-    QByteArray device = "/dev/input/event1";
++    QByteArray device = qgetenv("TSLIB_TSDEVICE");
++    if(device.isEmpty())
++       device = "/dev/input/event1";
+     if (specification.startsWith("/dev/"))
+         device = specification.toLocal8Bit();
+ 
+-- 
+1.8.1.4
+
recipes-qt/qt5/qtbase.inc +7 -1
index 4b4fb10..12d1a7f 100644
@@ -15,7 +15,7 @@ SRC_URI += " \
     file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
 "
 
-DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS}"
+DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS} ${TSLIB_DEPENDS}"
 
 # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h
 # XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus"
@@ -40,6 +40,11 @@ QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -p
 GL_DEPENDS ?= "virtual/libgl"
 QT_GLFLAGS ?= "-opengl"
 
+# if you want to enable tslib in your .bbappend, don't forget to add tslib dependencies
+# TSLIB_DEPENDS = "tslib"
+# QT_TSLIB = "-tslib"
+QT_TSLIB ?= "-no-tslib"
+
 QT_XML ?= "-xmlpatterns"
 QT_WEBKIT ?= "-webkit"
 QT_PHONON ?= "-phonon"
@@ -72,6 +77,7 @@ QT_CONFIG_FLAGS += " \
     ${QT_GLFLAGS} \
     ${QT_TESTS} \
     ${QT_EXAMPLES} \
+    ${QT_TSLIB} \
 "
 
 INC_PR = "r1"
recipes-qt/qt5/qtbase_5.0.2.bb +2 -0
index 357c06e..2cd94dd 100644
@@ -5,6 +5,8 @@ PR = "${INC_PR}.0"
 
 SRC_URI += "file://0004-Disable-mkv8snapshot.patch \
     file://0001-qtbase-allow-build-of-examples.patch \
+    file://0001-enables-tslib-device-to-be-read-from-env-variable.patch \
+    file://0001-configure-add-tslib-support.patch \
     "
 
 SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0"
Signature · 1 line
1.7.10.4
#13 lore raw

Re: [meta-qt5][PATCH 8/8] qtbase: add option to enable tslib support

Quoted 157 lines · Eric Bénard

- the tslib support is not enabled by default and configure doesn't have any option to active it, so add the option to the build system,
- patch tslib support to get the device from the environment variable
(patch taken from https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch
- provide variable to enable tslib support in a bbappend (disabled by default)
- tested on an i.MX5x target with qt 5.0.2

TODO : test with 5.0, 5.0.1 and _git

---
 .../0001-configure-add-tslib-support.patch         |   78 ++++++++++++++++++++
 ...tslib-device-to-be-read-from-env-variable.patch |   34 +++++++++
 recipes-qt/qt5/qtbase.inc                          |    8 +-
 recipes-qt/qt5/qtbase_5.0.2.bb                     |    2 +
 4 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0001-configure-add-tslib-support.patch
 create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0001-enables-tslib-device-to-be-read-from-env-variable.patch
recipes-qt/qt5/qtbase-5.0.2/0001-configure-add-tslib-support.patch new file +78 -0
new file mode 100644
index 0000000..3407f60
@@ -0,0 +1,78 @@
+From b4edefdc1fb5ba67b202fad7df5a8def554d16fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]>
+Date: Mon, 27 May 2013 18:45:03 +0200
+Subject: [PATCH] configure: add tslib support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Eric Bénard <[email protected]>
+---
+ configure                       | 24 ++++++++++++++++++++++++
+ src/plugins/generic/generic.pro |  4 ++++
+ 2 files changed, 28 insertions(+)
+
+diff --git a/configure b/configure
+index 2ea1ea4..727fed9 100755
+--- a/configure
++++ b/configure
+@@ -810,6 +810,7 @@ CFG_KMS=auto
+ CFG_LIBUDEV=auto
+ CFG_OBSOLETE_WAYLAND=no
+ CFG_EVDEV=auto
++CFG_TSLIB=auto
+ CFG_NIS=auto
+ CFG_CUPS=auto
+ CFG_ICONV=auto
+@@ -1782,6 +1783,13 @@ while [ "$#" -gt 0 ]; do
+             UNKNOWN_OPT=yes
+         fi
+         ;;
++    tslib)
++        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
++            CFG_TSLIB="$VAL"
++        else
++            UNKNOWN_OPT=yes
++        fi
++        ;;
+     cups)
+         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+             CFG_CUPS="$VAL"
+@@ -4775,6 +4783,22 @@ if [ "$CFG_EVDEV" = "no" ]; then
+     QMakeVar add DEFINES QT_NO_EVDEV
+ fi
+ 
++if [ "$CFG_TSLIB" != "no" ]; then
++    if compileTest unix/tslib "tslib"; then
++        CFG_TSLIB=yes
++        QT_CONFIG="$QT_CONFIG tslib"
++    elif [ "$CFG_TSLIB" = "yes" ]; then
++        echo "The tslib functionality test failed!"
++        exit 1
++    else
++        CFG_TSLIB=no
++    fi
++fi
++if [ "$CFG_TSLIB" = "no" ]; then
++    QMakeVar add DEFINES QT_NO_TSLIB
++fi
++
++
+ # Check we actually have X11 :-)
+ if compileTest x11/xlib "XLib"; then
+     QT_CONFIG="$QT_CONFIG xlib"
+diff --git a/src/plugins/generic/generic.pro b/src/plugins/generic/generic.pro
+index 078db2f..18a8295 100644
+--- a/src/plugins/generic/generic.pro
++++ b/src/plugins/generic/generic.pro
+@@ -5,3 +5,7 @@ TEMPLATE = subdirs
+ contains(QT_CONFIG, evdev) {
+     SUBDIRS += evdevmouse evdevtouch evdevkeyboard evdevtablet
+ }
++
++contains(QT_CONFIG, tslib) {
++    SUBDIRS += tslib
++}
+-- 
+1.8.1.4
+
recipes-qt/qt5/qtbase-5.0.2/0001-enables-tslib-device-to-be-read-from-env-variable.patch new file +34 -0
new file mode 100644
index 0000000..77ddcba
@@ -0,0 +1,34 @@
+From cb7d4b978d7b29e3f4ef5dba1ca1319ccd289a0d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]>
+Date: Mon, 27 May 2013 18:32:37 +0200
+Subject: [PATCH] enables tslib device to be read from env variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+from :
+https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch
+
+Signed-off-by: Eric Bénard <[email protected]>
+---
+ src/plugins/generic/tslib/qtslib.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp
+index 6986fd5..2ed4a69 100644
+--- a/src/plugins/generic/tslib/qtslib.cpp
++++ b/src/plugins/generic/tslib/qtslib.cpp
+@@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key,
+     qDebug() << "QTsLibMouseHandler" << key << specification;
+     setObjectName(QLatin1String("TSLib Mouse Handler"));
+ 
+-    QByteArray device = "/dev/input/event1";
++    QByteArray device = qgetenv("TSLIB_TSDEVICE");
++    if(device.isEmpty())
++       device = "/dev/input/event1";
+     if (specification.startsWith("/dev/"))
+         device = specification.toLocal8Bit();
+ 
+-- 
+1.8.1.4
+
recipes-qt/qt5/qtbase.inc +1 -1
index 4b4fb10..12d1a7f 100644
@@ -15,7 +15,7 @@ SRC_URI += " \
     file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
 "
 
-DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS}"
+DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS} ${TSLIB_DEPENDS}"
 
 # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h
 # XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus"

recipes-qt/qt5/qtbase.inc QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -p · line 45

Quoted 6 lines
recipes-qt/qt5/qtbase.inc +3 -0
@@ -40,6 +40,11 @@ QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -p
 GL_DEPENDS ?= "virtual/libgl"
 QT_GLFLAGS ?= "-opengl"
 
+# if you want to enable tslib in your .bbappend, don't forget to add tslib dependencies
+# TSLIB_DEPENDS = "tslib"
+# QT_TSLIB = "-tslib"

I've added
TSLIB_DEPENDS ?= ""
here, otherwise it's uninitialized for DEPENDS.

Quoted 33 lines
recipes-qt/qt5/qtbase.inc +3 -0
+QT_TSLIB ?= "-no-tslib"
+
 QT_XML ?= "-xmlpatterns"
 QT_WEBKIT ?= "-webkit"
 QT_PHONON ?= "-phonon"
@@ -72,6 +77,7 @@ QT_CONFIG_FLAGS += " \
     ${QT_GLFLAGS} \
     ${QT_TESTS} \
     ${QT_EXAMPLES} \
+    ${QT_TSLIB} \
 "
 
 INC_PR = "r1"
recipes-qt/qt5/qtbase_5.0.2.bb +2 -0
index 357c06e..2cd94dd 100644
@@ -5,6 +5,8 @@ PR = "${INC_PR}.0"
 
 SRC_URI += "file://0004-Disable-mkv8snapshot.patch \
     file://0001-qtbase-allow-build-of-examples.patch \
+    file://0001-enables-tslib-device-to-be-read-from-env-variable.patch \
+    file://0001-configure-add-tslib-support.patch \
     "
 
 SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0"
Signature · 6 lines
1.7.10.4

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#14 lore raw

Re: [meta-qt5][PATCH 8/8] qtbase: add option to enable tslib support

Quoted 8 lines · Martin Jansa

recipes-qt/qt5/qtbase.inc QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -p · line 45

Quoted 3 lines
recipes-qt/qt5/qtbase.inc +3 -0
+# if you want to enable tslib in your .bbappend, don't forget to add tslib dependencies
+# TSLIB_DEPENDS = "tslib"
+# QT_TSLIB = "-tslib"

I've added
TSLIB_DEPENDS ?= ""
here, otherwise it's uninitialized for DEPENDS.

true do you want a v2 ?

Eric

#15 lore raw

Re: [meta-qt5][PATCH 8/8] qtbase: add option to enable tslib support

Quoted 11 lines · Eric Bénard
Quoted 8 lines · Martin Jansa

recipes-qt/qt5/qtbase.inc QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -p · line 45

Quoted 3 lines
recipes-qt/qt5/qtbase.inc +3 -0
+# if you want to enable tslib in your .bbappend, don't forget to add tslib dependencies
+# TSLIB_DEPENDS = "tslib"
+# QT_TSLIB = "-tslib"

I've added
TSLIB_DEPENDS ?= ""
here, otherwise it's uninitialized for DEPENDS.

true do you want a v2 ?

No, I've already added it and merged it :)

Normally I would take longer for testing it, but I know about other people starting to work on 5.0.2 so I wanted them to start with your fixes included.

Cheers,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#16 lore raw

Re: [meta-qt5][PATCH 8/8] qtbase: add option to enable tslib support

Quoted 5 lines · Martin Jansa
Quoted 1 line · Eric Bénard

true do you want a v2 ?

No, I've already added it and merged it :)

perfect.

Quoted 4 lines

Normally I would take longer for testing it, but I know about other people starting to work on 5.0.2 so I wanted them to start with your fixes included.

FWIW all my tests were done with you patch e7a477a171bf0560939196eb7ebe8e0b05061072 applied so maybe it's interesting to also apply it.

Eric

#17 lore raw

Re: [meta-qt5][PATCH 8/8] qtbase: add option to enable tslib support

Quoted 9 lines · Eric Bénard
Quoted 5 lines · Martin Jansa
Quoted 1 line · Eric Bénard

true do you want a v2 ?

No, I've already added it and merged it :)

perfect.

Quoted 7 lines
Quoted 4 lines

Normally I would take longer for testing it, but I know about other people starting to work on 5.0.2 so I wanted them to start with your fixes included.

FWIW all my tests were done with you patch e7a477a171bf0560939196eb7ebe8e0b05061072 applied so maybe it's interesting to also apply it.

But that will require to abandon 5.0.0 and 5.0.1, well I can at least update that pull request to remove 5.0.0 and 5.0.1 together with this SRCREV bump.

Cheers,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#18 lore raw

Re: [meta-qt5][PATCH 8/8] qtbase: add option to enable tslib support

Quoted 14 lines · Martin Jansa
Quoted 13 lines · Eric Bénard
Quoted 5 lines · Martin Jansa
Quoted 1 line · Eric Bénard

true do you want a v2 ?

No, I've already added it and merged it :)

perfect.

Quoted 4 lines

Normally I would take longer for testing it, but I know about other people starting to work on 5.0.2 so I wanted them to start with your fixes included.

Quoted 8 lines
Quoted 3 lines

FWIW all my tests were done with you patch e7a477a171bf0560939196eb7ebe8e0b05061072 applied so maybe it's interesting to also apply it.

But that will require to abandon 5.0.0 and 5.0.1, well I can at least update that pull request to remove 5.0.0 and 5.0.1 together with this SRCREV bump.

maybe you can create a dylan branch with 5.0.0 and 5.0.1 and switch master to 5.0.2 ?

Eric

#19 lore raw

Re: [meta-qt5][PATCH 8/8] qtbase: add option to enable tslib support

Quoted 21 lines · Eric Bénard
Quoted 18 lines · Martin Jansa
Quoted 16 lines · Eric Bénard
Quoted 5 lines · Martin Jansa
Quoted 1 line · Eric Bénard

true do you want a v2 ?

No, I've already added it and merged it :)

perfect.

Quoted 4 lines

Normally I would take longer for testing it, but I know about other people starting to work on 5.0.2 so I wanted them to start with your fixes included.

FWIW all my tests were done with you patch e7a477a171bf0560939196eb7ebe8e0b05061072 applied so maybe it's interesting to also apply it.

Quoted 6 lines
Quoted 4 lines

But that will require to abandon 5.0.0 and 5.0.1, well I can at least update that pull request to remove 5.0.0 and 5.0.1 together with this SRCREV bump.

maybe you can create a dylan branch with 5.0.0 and 5.0.1 and switch master to 5.0.2 ?

Sounds good, will do

Btw is this patch backport of
commit bb4e2e4faf76d4b2992231891a9d640cfdac5196

Author: Michael Brasser <[email protected]>
Date:   Tue Mar 26 09:22:51 2013 -0500

Allow tslib to be specified at configure time.
?

I'm forward porting patches needed for qtbase_git and this one seems to be resolved in upstream.

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#20 lore raw

Re: [meta-qt5][PATCH 8/8] qtbase: add option to enable tslib support

Quoted 33 lines · Martin Jansa
Quoted 21 lines · Eric Bénard
Quoted 18 lines · Martin Jansa
Quoted 16 lines · Eric Bénard
Quoted 5 lines · Martin Jansa
Quoted 1 line · Eric Bénard

true do you want a v2 ?

No, I've already added it and merged it :)

perfect.

Quoted 4 lines

Normally I would take longer for testing it, but I know about other people starting to work on 5.0.2 so I wanted them to start with your fixes included.

FWIW all my tests were done with you patch e7a477a171bf0560939196eb7ebe8e0b05061072 applied so maybe it's interesting to also apply it.

Quoted 6 lines
Quoted 4 lines

But that will require to abandon 5.0.0 and 5.0.1, well I can at least update that pull request to remove 5.0.0 and 5.0.1 together with this SRCREV bump.

maybe you can create a dylan branch with 5.0.0 and 5.0.1 and switch master to 5.0.2 ?

Sounds good, will do

Btw is this patch backport of
commit bb4e2e4faf76d4b2992231891a9d640cfdac5196

Quoted 9 lines
Author: Michael Brasser <[email protected]>
Date:   Tue Mar 26 09:22:51 2013 -0500

Allow tslib to be specified at configure time.
?

I'm forward porting patches needed for qtbase_git and this one seems to be resolved in upstream.

no that was not a backport else I would have made a patch of this commit if I had seen it ...

Eric