Add meta-toolchain-qte from OE

These patches make the necessary changes to add meta-toolchain-qte from OpenEmbedded (and make it build successfully). Amongst other things this required some tweaking of avahi to avoid dependency of avahi-dev / avahi-utils on gtk+, which in turn required the addition of a flag to control automatic RRECOMMENDS_ generation in package.bbclass.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: paule/qt-fixes2
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/qt-fixes2

Thanks,
Paul Eggleton <[email protected]>
---

Paul Eggleton (8):
Add directfb 1.4.6 from OpenEmbedded
qt4: add qt4-embedded 4.6.3 from OpenEmbedded glib-2.0: extend to nativesdk
dbus: extend to nativesdk
Add qt4-tools-nativesdk 4.6.3 based on qt4-tools-sdk from
OpenEmbedded
package.bbclass: add nodeprrecs flag to RRECOMMENDS_pkgname
avahi: prevent unnecessary runtime dependency on gtk+ Add meta-toolchain-qte and dependent tasks from OpenEmbedded

 meta/classes/package.bbclass                       |    2 +
 meta/classes/qt4e.bbclass                          |   17 +++
 meta/recipes-connectivity/avahi/avahi.inc          |    9 ++-
 meta/recipes-connectivity/avahi/avahi_0.6.28.bb    |    2 +-
 meta/recipes-core/dbus/dbus.inc                    |    3 +-
 meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb      |    2 +-
 meta/recipes-core/glib-2.0/glib.inc                |    1 +
 .../directfb/directfb-1.4.6/mkdfiff.patch          |   24 ++++
 meta/recipes-graphics/directfb/directfb.inc        |   71 ++++++++++++
 meta/recipes-graphics/directfb/directfb_1.4.6.bb   |   29 +++++
 .../directfb-1.2.x-fix-pkgconfig-cflags.patch      |   47 ++++++++
 .../directfb/files/dont-use-linux-config.patch     |   12 ++
 meta/recipes-qt/meta/meta-toolchain-qte.bb         |   32 ++++++
 .../recipes-qt/qt4/files/compile.test-lflags.patch |   13 +++
 meta/recipes-qt/qt4/files/configure-lflags.patch   |   13 +++
 meta/recipes-qt/qt4/files/configure-paths.patch    |   21 ++++
 meta/recipes-qt/qt4/files/qmake-exists-check.patch |   18 +++
 .../qt4/files/qthelp-lib-qtclucene.patch           |   86 +++++++++++++++
 meta/recipes-qt/qt4/qt4-embedded-4.6.3/qte.sh      |    7 ++
 meta/recipes-qt/qt4/qt4-embedded.inc               |   53 +++++++++
 meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb          |    6 +
 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb   |  112 ++++++++++++++++++++
 meta/recipes-qt/tasks/task-qte-toolchain-host.bb   |    7 ++
 meta/recipes-qt/tasks/task-qte-toolchain-target.bb |   39 +++++++
 24 files changed, 622 insertions(+), 4 deletions(-)
 create mode 100644 meta/classes/qt4e.bbclass
 create mode 100644 meta/recipes-graphics/directfb/directfb-1.4.6/mkdfiff.patch
 create mode 100644 meta/recipes-graphics/directfb/directfb.inc
 create mode 100644 meta/recipes-graphics/directfb/directfb_1.4.6.bb
 create mode 100644 meta/recipes-graphics/directfb/files/directfb-1.2.x-fix-pkgconfig-cflags.patch
 create mode 100644 meta/recipes-graphics/directfb/files/dont-use-linux-config.patch
 create mode 100644 meta/recipes-qt/meta/meta-toolchain-qte.bb
 create mode 100644 meta/recipes-qt/qt4/files/compile.test-lflags.patch
 create mode 100644 meta/recipes-qt/qt4/files/configure-lflags.patch
 create mode 100644 meta/recipes-qt/qt4/files/configure-paths.patch
 create mode 100644 meta/recipes-qt/qt4/files/qmake-exists-check.patch
 create mode 100644 meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-embedded-4.6.3/qte.sh
 create mode 100644 meta/recipes-qt/qt4/qt4-embedded.inc
 create mode 100644 meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb
 create mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb
 create mode 100644 meta/recipes-qt/tasks/task-qte-toolchain-host.bb
 create mode 100644 meta/recipes-qt/tasks/task-qte-toolchain-target.bb

This package has been added in order to be able to build qt4-embedded from OE. The only difference from the OE version is the addition of LIC_FILES_CHKSUM.

---
 .../directfb/directfb-1.4.6/mkdfiff.patch          |   24 +++++++
 meta/recipes-graphics/directfb/directfb.inc        |   71 ++++++++++++++++++++
 meta/recipes-graphics/directfb/directfb_1.4.6.bb   |   29 ++++++++
 .../directfb-1.2.x-fix-pkgconfig-cflags.patch      |   47 +++++++++++++
 .../directfb/files/dont-use-linux-config.patch     |   12 +++
 5 files changed, 183 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/directfb/directfb-1.4.6/mkdfiff.patch
 create mode 100644 meta/recipes-graphics/directfb/directfb.inc
 create mode 100644 meta/recipes-graphics/directfb/directfb_1.4.6.bb
 create mode 100644 meta/recipes-graphics/directfb/files/directfb-1.2.x-fix-pkgconfig-cflags.patch
 create mode 100644 meta/recipes-graphics/directfb/files/dont-use-linux-config.patch

new file mode 100644
index 0000000..28bd534
@@ -0,0 +1,24 @@
+diff -uNr DirectFB-1.4.6.orig/tools/mkdfiff.c DirectFB-1.4.6/tools/mkdfiff.c
+--- DirectFB-1.4.6.orig/tools/mkdfiff.c 2010-10-15 10:54:57.000000000 +0200
++++ DirectFB-1.4.6/tools/mkdfiff.c      2010-10-15 10:54:15.000000000 +0200
+@@ -50,6 +50,8 @@
+
+ #include <dfiff.h>
+
++#include <unistd.h>
++
+ static DirectFBPixelFormatNames( format_names );
+
+ static const char            *filename;
+diff -uNr DirectFB-1.4.6.orig/tools/mkdgifft.cpp DirectFB-1.4.6/tools/mkdgifft.cpp
+--- DirectFB-1.4.6.orig/tools/mkdgifft.cpp      2010-10-08 14:02:57.000000000 +0200
++++ DirectFB-1.4.6/tools/mkdgifft.cpp   2010-10-15 10:56:06.000000000 +0200
+@@ -40,6 +40,8 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <sys/stat.h>
++#include <sys/types.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>

new file mode 100644
index 0000000..1233a64
@@ -0,0 +1,29 @@
+require directfb.inc
+
+RV = "1.4-5"
+PR = "r2"
+
+DEPENDS += "sysfsutils"
+
+SRC_URI = " \
+    http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${PV}.tar.gz \
+    file://directfb-1.2.x-fix-pkgconfig-cflags.patch \
+    file://mkdfiff.patch \
+    file://dont-use-linux-config.patch \
+   "
+
+EXTRA_OECONF = "\
+  --enable-freetype=yes \
+  --enable-zlib \
+  --with-gfxdrivers=none \
+  --disable-sdl \
+  --disable-vnc \
+  --disable-x11 \
+"
+
+LEAD_SONAME = "libdirectfb-1.4.so.5"
+
+SRC_URI[md5sum] = "dbe1957932f81790742b58b94c1c7b84"
+SRC_URI[sha256sum] = "b18121e60e9a084ee347037a53a46cfaea1c09505bd99d673c2e65eca285e69b"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589"

new file mode 100644
index 0000000..f971660
@@ -0,0 +1,12 @@
+diff -urN DirectFB-1.1.0.orig/lib/direct/ppcasm_memcpy_cachable.S DirectFB-1.1.0/lib/direct/ppcasm_memcpy_cachable.S
+--- DirectFB-1.1.0.orig/lib/direct/ppcasm_memcpy_cachable.S	2007-08-07 21:43:00.000000000 +0200
++++ DirectFB-1.1.0/lib/direct/ppcasm_memcpy_cachable.S	2008-06-07 04:14:26.000000000 +0200
+@@ -34,8 +34,6 @@
+ 
+ #define __ASSEMBLY__
+ 
+-#include <linux/config.h>
+-
+ #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
+ #define L1_CACHE_LINE_SIZE       16
+ #define LG_L1_CACHE_LINE_SIZE     4 

1.7.1

Changes from the OE version:
* Change include order in the .bb file so that embedded takes precedence
* X11 and Embedded Qt were merged into the same source file in 4.6.x:
* Add -embedded configure option to select embedded version
* Fix SRC_URI and S for source archive name change
* Correct LICENSE
* Add hack-out-pg_config.patch
* Add mips-relocate.patch
* Remove obsolete patches

---
 meta/classes/qt4e.bbclass                          |   17 ++++
 .../qt4/files/qthelp-lib-qtclucene.patch           |   86 ++++++++++++++++++++
 meta/recipes-qt/qt4/qt4-embedded-4.6.3/qte.sh      |    7 ++
 meta/recipes-qt/qt4/qt4-embedded.inc               |   53 ++++++++++++
 meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb          |    6 ++
 5 files changed, 169 insertions(+), 0 deletions(-)
 create mode 100644 meta/classes/qt4e.bbclass
 create mode 100644 meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-embedded-4.6.3/qte.sh
 create mode 100644 meta/recipes-qt/qt4/qt4-embedded.inc
 create mode 100644 meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb

new file mode 100644
index 0000000..303b79b
@@ -0,0 +1,17 @@
+DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-embedded')]}"
+inherit qmake2
+
+QT_DIR_NAME = "qtopia"
+QT_LIBINFIX = "E"
+# override variables set by qmake-base to compile Qt/Embedded apps
+#
+export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++"
+export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/${QT_DIR_NAME}"
+export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
+export OE_QMAKE_LIBS_QT = "qt"
+export OE_QMAKE_LIBS_X11 = ""
+export OE_QMAKE_EXTRA_MODULES = "network"
+EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=${QT_LIBINFIX} "
+
+# Qt4 uses atomic instructions not supported in thumb mode
+ARM_INSTRUCTION_SET = "arm"

new file mode 100644
index 0000000..21d6ecb
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -e /dev/input/touchscreen0 ]
+then
+    QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
+    export QWS_MOUSE_PROTO
+fi

new file mode 100644
index 0000000..3d35016
@@ -0,0 +1,6 @@
+PR = "${INC_PR}.1"
+
+QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
+
+require qt-${PV}.inc
+require qt4-embedded.inc

1.7.1

This needs to be added to nativesdk for meta-toolchain-qte.

---
 meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb |    2 +-
 meta/recipes-core/glib-2.0/glib.inc           |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

index 314d942..fb080b9 100644
@@ -12,4 +12,4 @@ SRC_URI[md5sum] = "b7025b581bf78fcd656117bfc113f21f"
 SRC_URI[sha256sum] = "aad3038db865b762e01b1dc455ffd601b4083c069018d290e5fdfe1a61d328dc"
 
 SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"

index b0df84e..ee3f9ad 100644
@@ -17,6 +17,7 @@ require glib-2.0.inc
 
 DEPENDS = "glib-2.0-native gtk-doc-native virtual/libiconv virtual/libintl zip"
 DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native"
+DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
 PACKAGES =+ "glib-2.0-utils "
 
 LEAD_SONAME = "libglib-2.0.*"

1.7.1

BBCLASSEXTEND dbus to nativesdk for meta-toolchain-qte, and disable the dependency on libsm when building in this context (thus avoiding a number of sub-dependencies).

---
 meta/recipes-core/dbus/dbus.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

index 402cf13..57da793 100644
@@ -6,6 +6,7 @@ LICENSE = "AFL2.1 | GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
                     file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5"
 DEPENDS = "expat glib-2.0 virtual/libintl virtual/libx11 libsm"
+DEPENDS_virtclass-nativesdk = "expat glib-2.0 virtual/libintl virtual/libx11"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://tmpdir.patch; \

@@ -88,4 +89,4 @@ do_install_virtclass-native() {
 	# dbus-glib-native and dbus-glib need this xml file
 	./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml
 }
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"

1.7.1

Differences from OE qt4-tools-sdk 4.6.3:

* Convert to nativesdk and make fixes necessary to build
* Add LIC_FILES_CHKSUM

---
 .../recipes-qt/qt4/files/compile.test-lflags.patch |   13 +++
 meta/recipes-qt/qt4/files/configure-lflags.patch   |   13 +++
 meta/recipes-qt/qt4/files/configure-paths.patch    |   21 ++++
 meta/recipes-qt/qt4/files/qmake-exists-check.patch |   18 +++
 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb   |  112 ++++++++++++++++++++
 5 files changed, 177 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-qt/qt4/files/compile.test-lflags.patch
 create mode 100644 meta/recipes-qt/qt4/files/configure-lflags.patch
 create mode 100644 meta/recipes-qt/qt4/files/configure-paths.patch
 create mode 100644 meta/recipes-qt/qt4/files/qmake-exists-check.patch
 create mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb

new file mode 100644
index 0000000..e4b256b
@@ -0,0 +1,13 @@
+Index: qt-everywhere-opensource-src-4.6.3/config.tests/unix/compile.test
+===================================================================
+--- qt-everywhere-opensource-src-4.6.3.orig/config.tests/unix/compile.test	2010-06-02 06:03:18.000000000 +0400
++++ qt-everywhere-opensource-src-4.6.3/config.tests/unix/compile.test	2010-10-04 17:35:07.587783460 +0400
+@@ -11,7 +11,7 @@
+ EXE=`basename "$6"`
+ DESCRIPTION=$7
+ shift 7
+-LFLAGS=""
++LFLAGS="$LDFLAGS"
+ INCLUDEPATH=""
+ CXXFLAGS=""
+ MAC_ARCH_CXXFLAGS=""

new file mode 100644
index 0000000..df19549
@@ -0,0 +1,13 @@
+Index: qtopia-core-opensource-src-4.3.3/configure
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/configure	2008-01-14 08:53:51.000000000 +0000
++++ qtopia-core-opensource-src-4.3.3/configure	2008-01-14 08:54:07.000000000 +0000
+@@ -447,7 +447,7 @@
+ # initalize variables
+ #-------------------------------------------------------------------------------
+ 
+-SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS"
++SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS"
+ for varname in $SYSTEM_VARIABLES; do
+     cmd=`echo \
+ 'if [ -n "\$'${varname}'" ]; then

new file mode 100644
index 0000000..c9259a1
@@ -0,0 +1,21 @@
+Index: qt-everywhere-opensource-src-4.6.3/configure
+===================================================================
+--- qt-everywhere-opensource-src-4.6.3.orig/configure	2011-01-10 15:47:37.100607001 +0000
++++ qt-everywhere-opensource-src-4.6.3/configure	2011-01-10 15:49:14.576606999 +0000
+@@ -7198,11 +7198,11 @@
+ QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
+ 
+ #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
+-QMAKE_MOC        = \$\$QT_BUILD_TREE/bin/moc
+-QMAKE_UIC        = \$\$QT_BUILD_TREE/bin/uic
+-QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
+-QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
+-QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
++QMAKE_MOC        = \${OE_QMAKE_MOC}
++QMAKE_UIC        = \${OE_QMAKE_UIC}
++QMAKE_UIC3       = \${OE_QMAKE_UIC3}
++QMAKE_RCC        = \${OE_QMAKE_RCC}
++QMAKE_QDBUSXML2CPP = \${OE_QMAKE_QDBUSXML2CPP}
+ QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include
+ QMAKE_LIBDIR_QT  = \$\$QT_BUILD_TREE/lib
+ 

new file mode 100644
index 0000000..cc73837
@@ -0,0 +1,18 @@
+qt4-tools-nativesdk: avoid rebuilding qmake
+
+qt4-tools-nativesdk patch to avoids building qmake in configure if it already exists 
+(as it will, since we symlink it in from the native sysroot in do_configure)
+
+Signed-off-by: Paul Eggleton <[email protected]>
+
+--- qt-everywhere-opensource-src-4.6.3.orig/configure	2011-01-10 12:01:56.260607001 +0000
++++ qt-everywhere-opensource-src-4.6.3/configure	2011-01-10 12:02:20.584607015 +0000
+@@ -4286,7 +4286,7 @@
+ }
+ 
+ # build qmake
+-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
++if [ '!' -f "$outpath/bin/qmake" ]; then
+     echo "Creating qmake. Please wait..."
+ 
+     OLD_QCONFIG_H=

1.7.1

Setting this flag disables the normal additions to RRECOMMENDS for a package (useful when splitting dev / dbg packages).

---
 meta/classes/package.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

index d39c694..868c8ae 100644
@@ -1038,6 +1038,8 @@ python package_depchains() {
 
 	for suffix in pkgs:
 		for pkg in pkgs[suffix]:
+			if bb.data.getVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', d):
+				continue
 			(base, func) = pkgs[suffix][pkg]
 			if suffix == "-dev":
 				pkg_adddeprrecs(pkg, base, suffix, func, depends, d)

1.7.1

* Move avahi-discover-standalone to avahi-ui-utils as it's a GUI tool
* Split out avahi-ui dev files from avahi-dev to a libavahi-ui-dev package (using the new nodeprrecs flag to avoid automatic RRECOMMENDS calculation for avahi-dev)

---
 meta/recipes-connectivity/avahi/avahi.inc       |    9 ++++++++-
 meta/recipes-connectivity/avahi/avahi_0.6.28.bb |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

index 5c3b4dd..9f83d8d 100644
@@ -37,11 +37,14 @@ EXTRA_OECONF = "--with-distro=debian \
              --disable-python \
              --disable-doxygen-doc"
 
-PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-gobject avahi-autoipd avahi-utils libavahi-ui avahi-ui-utils"
+PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-gobject avahi-autoipd avahi-ui-utils avahi-utils libavahi-ui libavahi-ui-dev"
 
 FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
 FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
 FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*"
+FILES_libavahi-ui-dev = "${libdir}/libavahi-ui.* \
+                         ${includedir}/avahi-ui/* \
+                         ${libdir}/pkgconfig/avahi-ui.pc"
 FILES_avahi-daemon = "${sbindir}/avahi-daemon \
                       ${sysconfdir}/avahi/avahi-daemon.conf \
                       ${sysconfdir}/avahi/hosts \

@@ -59,9 +62,13 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
 FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*"
 FILES_avahi-utils = "${bindir}/avahi-*"
 FILES_avahi-ui-utils = "${bindir}/bssh ${bindir}/bvnc ${bindir}/bshell \
+                        ${bindir}/avahi-discover-standalone \
                         ${datadir}/applications \
                         ${datadir}/avahi/interfaces"
 
+RRECOMMENDS_avahi-dev = "gettext-dev expat-dev libcap-dev libdaemon-dev dbus-dev glib-2.0-dev update-rc.d-dev"
+RRECOMMENDS_avahi-dev[nodeprrecs] = 1
+
 CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
 
 INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"

index fb339e7..6e034b0 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
 
 RDEPENDS_avahi-daemon = "sysvinit-pidof"
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF += "--disable-gtk3"
 

1.7.1

Differences from OE versions:

task-qte-toolchain-target.bb:
* Depend on task-poky-standalone-sdk-target instead of task-sdk-bare
* Add LIC_FILES_CHKSUM
* Correct libsqlite3-dev dependency for Poky
* Remove dependency on libts-dev

task-qte-toolchain-host.bb
* Fix for Poky directory structure
* qt4-tools-sdk -> qt4-tools-nativesdk

meta-toolchain-qte:
* Fix for Poky directory structure
* Use ${FAKEROOT} instead of fakeroot
* Remove angstrom-specific suffix

---
 meta/recipes-qt/meta/meta-toolchain-qte.bb         |   32 ++++++++++++++++
 meta/recipes-qt/tasks/task-qte-toolchain-host.bb   |    7 ++++
 meta/recipes-qt/tasks/task-qte-toolchain-target.bb |   39 ++++++++++++++++++++
 3 files changed, 78 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-qt/meta/meta-toolchain-qte.bb
 create mode 100644 meta/recipes-qt/tasks/task-qte-toolchain-host.bb
 create mode 100644 meta/recipes-qt/tasks/task-qte-toolchain-target.bb

new file mode 100644
index 0000000..b29c5cf
@@ -0,0 +1,32 @@
+# Qt Embedded toolchain
+PR = "r5"
+TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host"
+TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target"
+
+require recipes-core/meta/meta-toolchain.bb
+SDK_SUFFIX = "toolchain-qte"
+
+QT_DIR_NAME = "qtopia"
+
+do_populate_sdk_append() {
+    script="${SDK_OUTPUT}/${SDKPATH}/environment-setup"
+    touch $script
+    echo 'export OE_QMAKE_CC=${TARGET_SYS}-gcc' >> $script
+    echo 'export OE_QMAKE_CXX=${TARGET_SYS}-g++' >> $script
+    echo 'export OE_QMAKE_LINK=${TARGET_SYS}-g++' >> $script
+    echo 'export OE_QMAKE_AR=${TARGET_SYS}-ar' >> $script
+    echo 'export OE_QMAKE_LIBDIR_QT=${SDKPATH}/${TARGET_SYS}/${libdir}' >> $script
+    echo 'export OE_QMAKE_INCDIR_QT=${SDKPATH}/${TARGET_SYS}/${includedir}/${QT_DIR_NAME}' >> $script
+    echo 'export OE_QMAKE_MOC=${SDKPATH}/bin/moc4' >> $script
+    echo 'export OE_QMAKE_UIC=${SDKPATH}/bin/uic4' >> $script
+    echo 'export OE_QMAKE_UIC3=${SDKPATH}/bin/uic34' >> $script
+    echo 'export OE_QMAKE_RCC=${SDKPATH}/bin/rcc4' >> $script
+    echo 'export OE_QMAKE_QDBUSCPP2XML=${SDKPATH}/bin/qdbuscpp2xml4' >> $script
+    echo 'export OE_QMAKE_QDBUSXML2CPP=${SDKPATH}/bin/qdbusxml2cpp4' >> $script
+    echo 'export OE_QMAKE_QT_CONFIG=${SDKPATH}/${TARGET_SYS}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
+    echo 'export QMAKESPEC=${SDKPATH}/${TARGET_SYS}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script
+
+    # Repack SDK with new environment-setup
+    cd ${SDK_OUTPUT}
+    ${FAKEROOT} tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .       
+}

new file mode 100644
index 0000000..2ab6ccf
@@ -0,0 +1,7 @@
+require recipes-core/tasks/task-sdk-host.bb
+
+DESCRIPTION = "Host packages for Qt Embedded SDK"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS_${PN} += "qt4-tools-nativesdk"

new file mode 100644
index 0000000..03e0e54
@@ -0,0 +1,39 @@
+DESCRIPTION = "Target packages for Qt Embedded SDK"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PR = "r5"
+
+LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+RDEPENDS_${PN} += " \
+        task-poky-standalone-sdk-target \
+        qt4-embedded-mkspecs \
+        libqt-embeddedmultimedia4-dev \
+        libqt-embeddedphonon4-dev \
+        libqt-embedded3support4-dev \
+        libqt-embeddedclucene4-dev \
+        libqt-embeddedcore4-dev \
+        libqt-embeddeddbus4-dev \
+        libqt-embeddeddesignercomponents4-dev \
+        libqt-embeddeddesigner4-dev \
+        libqt-embeddeduitools4-dev \
+        libqt-embeddedgui4-dev \
+        libqt-embeddedhelp4-dev \
+        libqt-embeddednetwork4-dev \
+        libqt-embeddedscript4-dev \
+        libqt-embeddedscripttools4-dev \
+        libqt-embeddedsql4-dev \
+        libqt-embeddedsvg4-dev \
+        libqt-embeddedtest4-dev \
+        libqt-embeddedwebkit4-dev \
+        libqt-embeddedxml4-dev \
+        libsqlite3-dev \
+        expat-dev \
+        "
+
+#Qt Declarative is new in 4.7, try to include it like this.
+#RRECOMMENDS_${PN} += " \
+#        libqt-embeddeddeclarative4-dev \
+#        "

1.7.1

Op 17 jan 2011, om 17:54 heeft Paul Eggleton het volgende geschreven:

FWIW, there's a more comprehensive integration for qt 4.6.3 and qt 4.7.1 available at http://cgit.openembedded.org/cgit.cgi/meta-openembedded/ . It's far from perfect, but it has the following advantages:

1) Working toolchain for usage on the target. For beagleboard.org workshops we hand people a beagle + sd card and that's all they need to create and QT apps.
2) Switching qt/e to qt/x11 is a matter of inheriting classes (recipe builds) or sourcing a different file (target toolchain)
3) full set of plugins. Some buildtime is traded to enable a "full" set of qt plugins people can optionally install. This saves customers^H^H^H^H users from a few hours of rebuilding just to get mysql bindings.

It would be nice to get the feature rich QT stuff from OE into yocto instead of something that lacks features. With my TI hat on: I have customers using the mysql bindings. With my Koen hat on: I use the postgres bindings :)

That being said, I like the poky qt-tools integration of qmake a bit better, but I haven't found the time to integrate the mkspecs feature into that yet.

regards,

Koen

Sounds good, I'll check it out.

(FYI I only skipped 4.7.x for simplicity in this first round of patches, pulling that across from OE master was going to be my next step.)

Awesome :) I think we definitely want to have solid Qt4 support in Yocto, so if what you have in meta-openembedded is more polished then I'll start looking at pulling that in rather than using what's in OE master.

Cheers,
Paul

Op 17 jan 2011, om 18:39 heeft Paul Eggleton het volgende geschreven:

It's a cleaned up version of what's in OE. I based it on the yocto files, so you'll get a lot of whitespace noise when trying to diff with OE, but diffing it with yocto should be reasonably eye-bleed free.

regards,

Koen

Having now set up meta-openembedded as a layer on top of poky master, when I attempt to build qt4-tools-sdk the first thing I run into is a problem I worked around in my patchset (failure at do_configure). Do you not get this error?

------------------ snip -----------------
Which edition of Qt do you want to use ?

Type 'c' if you want to use the Commercial Edition. Type 'o' if you want to use the Open Source Edition.

Determining system architecture... (Linux:2.6.35.6-45.fc14.x86_64:x86_64)

    64-bit AMD 80x86 (x86_64)
    'x86_64' is supported

System architecture: 'x86_64'
Host architecture: 'x86_64'
Precompiled-headers support enabled. /media/large/tmp-meta-oe/work/x86_64-nativesdk-pokysdk-linux/qt4-tools- sdk-4.7.1-r2.0/qt-everywhere-opensource- src-4.7.1/config.tests/unix/fvisibility.test: line 28: ccache x86_64-pokysdk- linux-g++ --sysroot=/media/large/tmp-meta-oe/sysroots/x86_64-nativesdk-
pokysdk-linux: No such file or directory
Symbol visibility control disabled.

This is the Qt for Embedded Linux Open Source Edition.

You are licensed to use this software under the terms of the Lesser GNU General Public License (LGPL) versions 2.1. You are also licensed to use this software under the terms of the GNU General Public License (GPL) versions 3.

Type '3' to view the GNU General Public License version 3. Type 'L' to view the Lesser GNU General Public License version 2.1. Type 'yes' to accept this license offer.
Type 'no' to decline this license offer.

Do you accept the terms of either license?
Creating qmake. Please wait...
ccache x86_64-pokysdk-linux-g++ --sysroot=/media/large/tmp-meta- oe/sysroots/x86_64-nativesdk-pokysdk-linux -c -o project.o -pipe -m64 -m64 - DQMAKE_OPENSOURCE_EDITION -I. -Igenerators -Igenerators/unix - Igenerators/win32 -Igenerators/mac -Igenerators/symbian -I/media/large/tmp- meta-oe/work/x86_64-nativesdk-pokysdk-linux/qt4-tools-sdk-4.7.1-r2.0/qt- everywhere-opensource-src-4.7.1/include -I/media/large/tmp-meta- oe/work/x86_64-nativesdk-pokysdk-linux/qt4-tools-sdk-4.7.1-r2.0/qt-everywhere- opensource-src-4.7.1/include/QtCore -I/media/large/tmp-meta-oe/work/x86_64- nativesdk-pokysdk-linux/qt4-tools-sdk-4.7.1-r2.0/qt-everywhere-opensource- src-4.7.1/src/corelib/global -I/media/large/tmp-meta-oe/work/x86_64-nativesdk- pokysdk-linux/qt4-tools-sdk-4.7.1-r2.0/qt-everywhere-opensource- src-4.7.1/src/corelib/xml -I/media/large/tmp-meta-oe/work/x86_64-nativesdk- pokysdk-linux/qt4-tools-sdk-4.7.1-r2.0/qt-everywhere-opensource- src-4.7.1/tools/shared -DQT_NO_PCRE -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED - DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL - DQT_NO_COMPRESS -I/media/large/tmp-meta-oe/work/x86_64-nativesdk-pokysdk- linux/qt4-tools-sdk-4.7.1-r2.0/qt-everywhere-opensource- src-4.7.1/mkspecs/qws/linux-x86_64-g++ -DHAVE_QCONFIG_CPP -DQT_NO_THREAD - DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT project.cpp
In file included from /media/large/tmp-meta-oe/work/x86_64-nativesdk-pokysdk- linux/qt4-tools-sdk-4.7.1-r2.0/qt-everywhere-opensource- src-4.7.1/include/QtCore/qlist.h:1:0,
from /media/large/tmp-meta-oe/work/x86_64-nativesdk-pokysdk-
linux/qt4-tools-sdk-4.7.1-r2.0/qt-everywhere-opensource- src-4.7.1/include/QtCore/../../src/corelib/tools/qstringlist.h:47,
from /media/large/tmp-meta-oe/work/x86_64-nativesdk-pokysdk-
linux/qt4-tools-sdk-4.7.1-r2.0/qt-everywhere-opensource- src-4.7.1/include/QtCore/qstringlist.h:1,

                 from project.h:45,
                 from project.cpp:42:

/media/large/tmp-meta-oe/work/x86_64-nativesdk-pokysdk-linux/qt4-tools- sdk-4.7.1-r2.0/qt-everywhere-opensource- src-4.7.1/include/QtCore/../../src/corelib/tools/qlist.h:54:15: fatal error:
new: No such file or directory
compilation terminated.
make: *** [project.o] Error 1
FATAL: Configuring qt failed. EXTRA_OECONF was -prefix
/opt/poky/0.9+snapshot/sysroots/x86_64-pokysdk-linux/usr -qt-
libjpeg -qt-gif -system-zlib -no-libjpeg -no-libpng -no-libmng
-no-libtiff -no-accessibility -no-cups
-no-exceptions -no-nas-sound -no-nis -no-
openssl -verbose -release -fast -static -
embedded -no-freetype -no-glib -no-iconv -qt3support
-I/media/large/tmp-meta-oe/sysroots/x86_64-linux/usr/include -
I/media/large/tmp-meta-oe/sysroots/x86_64-linux/usr/include/dbus-1.0 -I/media/large/tmp-meta-oe/sysroots/x86_64-linux/usr/lib/dbus-1.0/include ------------------ snip -----------------

Cheers,
Paul

Op 19 jan 2011, om 13:51 heeft Paul Eggleton het volgende geschreven:

I get the same error, I only built the target bits of qt and same apps, no sdk yet.

regards,

Koen

Koen,

Some questions relating to qt4 in meta-openembedded:

* I notice qt4.inc specifies -embedded in the configure command line and then
qt4-x11-free adds -no-embedded. Is it really a good idea to be specifying - embedded and -no-embedded at the same time?

* Do we need to pull in sqlite 2.x? I assume you have some specific use
cases... ?

Thanks,
Paul

Op 20 jan 2011, om 13:06 heeft Paul Eggleton het volgende geschreven:

That's a leftover, and should be safe to eliminate. We do need to specify -embedded in qt4-tools to avoid some extra build deps.

I personally do not know of any, but I didn't want to loose features at this point. I'm OK dropping it from QT, but other software in OE sadly hasn't caught the sqlite3 train yet, so having sqlite2 in a layer somewhere is unavoidable.

regards,

Koen

Yep I saw that in the tools recipe, makes sense there. I will see about adjusting the inc files for Qt4 itself.

I was just curious really. I can imagine there are commercial users of it out there still, and if we want to bring in an "end-user" app that requires it then of course we would need to bring it across also. A cursory search of OE brings up at least this list:

* asterisk
* balsa
* gpe
* prismstumbler
* txdrug

Of those, I think the only ones of real concern for meta-openembedded are gpe and prismstumbler (balsa and asterisk can apparently be built using sqlite3, assuming there are no problems converting existing databases.)

Cheers,
Paul

Paul,

Over all this patch set looks good.

One minor nit, for some of the new packages you did not include the SRC_URI checksum information for md5 and sha256, can you please add these and re-submit.

Thanks
Sau!

OK, I will ensure all recipes have those in the next revision. (At the moment I am reworking the patchset to incorporate what Koen has done in meta- openembedded.)

Cheers,
Paul