* [PATCH 0/8] Add meta-toolchain-qte from OE
@ 2011-01-17 16:54 Paul Eggleton
2011-01-17 16:54 ` [PATCH 1/8] Add directfb 1.4.6 from OpenEmbedded Paul Eggleton
` (9 more replies)
0 siblings, 10 replies; 19+ messages in thread
From: Paul Eggleton @ 2011-01-17 16:54 UTC (permalink / raw)
To: poky
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 <paul.eggleton@linux.intel.com>
---
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
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 1/8] Add directfb 1.4.6 from OpenEmbedded
2011-01-17 16:54 [PATCH 0/8] Add meta-toolchain-qte from OE Paul Eggleton
@ 2011-01-17 16:54 ` Paul Eggleton
2011-01-17 16:54 ` [PATCH 2/8] qt4: add qt4-embedded 4.6.3 " Paul Eggleton
` (8 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Paul Eggleton @ 2011-01-17 16:54 UTC (permalink / raw)
To: poky
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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../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
diff --git a/meta/recipes-graphics/directfb/directfb-1.4.6/mkdfiff.patch b/meta/recipes-graphics/directfb/directfb-1.4.6/mkdfiff.patch
new file mode 100644
index 0000000..28bd534
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb-1.4.6/mkdfiff.patch
@@ -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>
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
new file mode 100644
index 0000000..d07d58c
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -0,0 +1,71 @@
+DESCRIPTION = "DirectFB is a thin library that provides developers \
+with hardware graphics acceleration, input device handling and \
+abstraction, an integrated windowing system with support for \
+translucent windows and multiple display layers on top of the \
+Linux framebuffer device."
+SECTION = "libs"
+LICENSE = "LGPL"
+HOMEPAGE = "http://directfb.org"
+DEPENDS = "jpeg libpng freetype zlib tslib"
+
+SRC_URI = " \
+ http://www.directfb.org/downloads/Old/DirectFB-${PV}.tar.gz \
+ file://fix-pkgconfig-cflags.patch \
+ file://fix-font-missing-char.patch \
+ file://getpagesize.patch \
+ file://mkdfiff.patch \
+ file://dont-use-linux-config.patch \
+ file://ts_lib_autotools.patch \
+"
+S = "${WORKDIR}/DirectFB-${PV}"
+
+LDFLAGS_append =" -lts -lm"
+
+inherit autotools binconfig pkgconfig
+
+EXTRA_OECONF = "\
+ --with-gfxdrivers=none \
+ --enable-libmpeg3=no \
+ --enable-freetype=yes \
+ --enable-sdl=no \
+ --enable-vnc=no \
+ --disable-x11 \
+"
+
+do_install() {
+ oe_runmake 'DESTDIR=${D}' install
+}
+
+
+#PACKAGES_DYNAMIC = "directfb-inputdrivers-*"
+#
+#python populate_packages_prepend () {
+# import os.path
+# inputdrivers_libdir = bb.data.expand('${libdir}/directfb-${RV}/inputdrivers', d)
+# do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s')
+#}
+
+# NOTE: monolithic packaging for now, should improve that eventually
+
+
+
+FILES_${PN}-dbg += "\
+ ${libdir}/directfb-${RV}/*/*/.debug/*.so \
+ ${libdir}/directfb-${RV}/*/.debug/*.so \
+"
+
+FILES_${PN}-dev += "\
+ ${bindir}/directfb-config \
+ ${libdir}/directfb-${RV}/systems/*.la \
+ ${libdir}/directfb-${RV}/inputdrivers/*.la \
+ ${libdir}/directfb-${RV}/interfaces/*/*.la \
+ ${libdir}/directfb-${RV}/wm/*.la \
+"
+
+FILES_${PN} += "\
+ ${libdir}/directfb-${RV}/systems/*.so \
+ ${libdir}/directfb-${RV}/inputdrivers/*.so \
+ ${libdir}/directfb-${RV}/interfaces/*/*.so \
+ ${libdir}/directfb-${RV}/wm/*.so \
+ ${datadir}/directfb-${PV} \
+"
diff --git a/meta/recipes-graphics/directfb/directfb_1.4.6.bb b/meta/recipes-graphics/directfb/directfb_1.4.6.bb
new file mode 100644
index 0000000..1233a64
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb_1.4.6.bb
@@ -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"
diff --git a/meta/recipes-graphics/directfb/files/directfb-1.2.x-fix-pkgconfig-cflags.patch b/meta/recipes-graphics/directfb/files/directfb-1.2.x-fix-pkgconfig-cflags.patch
new file mode 100644
index 0000000..745c561
--- /dev/null
+++ b/meta/recipes-graphics/directfb/files/directfb-1.2.x-fix-pkgconfig-cflags.patch
@@ -0,0 +1,47 @@
+Index: DirectFB-1.1.1/directfb-internal.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/directfb-internal.pc.in 2007-08-07 21:43:00.000000000 +0200
++++ DirectFB-1.1.1/directfb-internal.pc.in 2008-07-17 21:00:47.424654304 +0200
+@@ -2,10 +2,10 @@
+ exec_prefix=@exec_prefix@
+ moduledir=@MODULEDIR@
+ moduledirname=@MODULEDIRNAME@
+-includedir=@INTERNALINCLUDEDIR@
++includedir=@includedir@
+
+ Name: DirectFB-Internal
+ Description: Third party module support package for DirectFB.
+ Version: @VERSION@
+ Requires: directfb = @VERSION@
+-Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@
++Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir}
+Index: DirectFB-1.1.1/directfb.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/directfb.pc.in 2007-12-15 16:23:16.000000000 +0100
++++ DirectFB-1.1.1/directfb.pc.in 2008-07-17 20:59:58.044985193 +0200
+@@ -9,4 +9,4 @@
+ Requires: fusion direct
+ Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@
+ Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@
+-Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
++Cflags: @THREADFLAGS@ -I${includedir}/directfb
+Index: DirectFB-1.1.1/lib/fusion/fusion.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/lib/fusion/fusion.pc.in 2007-08-07 21:43:00.000000000 +0200
++++ DirectFB-1.1.1/lib/fusion/fusion.pc.in 2008-07-17 20:58:07.051338866 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: direct
+ Libs: -L${libdir} -lfusion
+-Cflags: -I@INCLUDEDIR@
++Cflags: -I${includedir}/directfb -I${includedir}
+Index: DirectFB-1.1.1/lib/voodoo/voodoo.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/lib/voodoo/voodoo.pc.in 2007-08-07 21:43:00.000000000 +0200
++++ DirectFB-1.1.1/lib/voodoo/voodoo.pc.in 2008-07-17 20:58:07.054671842 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: direct
+ Libs: -L${libdir} -lvoodoo
+-Cflags: -I@INCLUDEDIR@
++Cflags: -I${includedir}/directfb -I${includedir}
diff --git a/meta/recipes-graphics/directfb/files/dont-use-linux-config.patch b/meta/recipes-graphics/directfb/files/dont-use-linux-config.patch
new file mode 100644
index 0000000..f971660
--- /dev/null
+++ b/meta/recipes-graphics/directfb/files/dont-use-linux-config.patch
@@ -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
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 2/8] qt4: add qt4-embedded 4.6.3 from OpenEmbedded
2011-01-17 16:54 [PATCH 0/8] Add meta-toolchain-qte from OE Paul Eggleton
2011-01-17 16:54 ` [PATCH 1/8] Add directfb 1.4.6 from OpenEmbedded Paul Eggleton
@ 2011-01-17 16:54 ` Paul Eggleton
2011-01-17 16:54 ` [PATCH 3/8] glib-2.0: extend to nativesdk Paul Eggleton
` (7 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Paul Eggleton @ 2011-01-17 16:54 UTC (permalink / raw)
To: poky
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
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
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
diff --git a/meta/classes/qt4e.bbclass b/meta/classes/qt4e.bbclass
new file mode 100644
index 0000000..303b79b
--- /dev/null
+++ b/meta/classes/qt4e.bbclass
@@ -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"
diff --git a/meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch b/meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch
new file mode 100644
index 0000000..1d250d8
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch
@@ -0,0 +1,86 @@
+qt-embedded: fix linker error in do_compile
+
+This patch ensures that we link to libQtCLucene where required (i.e. when
+linking to libQtHelp) avoiding a linker error.
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+
+Index: qt-everywhere-opensource-src-4.6.3/demos/qtdemo/qtdemo.pro
+===================================================================
+--- qt-everywhere-opensource-src-4.6.3.orig/demos/qtdemo/qtdemo.pro 2011-01-11 16:06:47.382828004 +0000
++++ qt-everywhere-opensource-src-4.6.3/demos/qtdemo/qtdemo.pro 2011-01-11 16:10:06.906828001 +0000
+@@ -76,3 +76,10 @@
+ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES qtdemo.pro images xml *.ico *.icns *.rc *.plist
+ sources.path = $$[QT_INSTALL_DEMOS]/qtdemo
+
++qclucene = QtCLucene$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qclucene = $${qclucene}_debug
++ win32:qclucene = $${qclucene}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
++LIBS_PRIVATE += -l$$qclucene
+Index: qt-everywhere-opensource-src-4.6.3/examples/help/contextsensitivehelp/contextsensitivehelp.pro
+===================================================================
+--- qt-everywhere-opensource-src-4.6.3.orig/examples/help/contextsensitivehelp/contextsensitivehelp.pro 2011-01-11 16:05:56.598828002 +0000
++++ qt-everywhere-opensource-src-4.6.3/examples/help/contextsensitivehelp/contextsensitivehelp.pro 2011-01-11 16:09:57.762828002 +0000
+@@ -18,3 +18,11 @@
+ INSTALLS += target sources
+
+ symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
++
++qclucene = QtCLucene$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qclucene = $${qclucene}_debug
++ win32:qclucene = $${qclucene}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
++LIBS_PRIVATE += -l$$qclucene
+Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/assistant/assistant.pro
+===================================================================
+--- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/assistant/assistant.pro 2011-01-11 14:56:50.902828001 +0000
++++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/assistant/assistant.pro 2011-01-11 16:09:39.914828003 +0000
+@@ -85,3 +85,11 @@
+ DEFINES += USE_STATIC_SQLITE_PLUGIN
+ }
+ }
++
++qclucene = QtCLucene$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qclucene = $${qclucene}_debug
++ win32:qclucene = $${qclucene}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
++LIBS_PRIVATE += -l$$qclucene
+Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
+===================================================================
+--- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro 2011-01-11 14:56:50.918828002 +0000
++++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro 2011-01-11 16:09:44.538828001 +0000
+@@ -12,3 +12,11 @@
+ main.cpp
+
+ HEADERS += ../shared/helpgenerator.h
++
++qclucene = QtCLucene$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qclucene = $${qclucene}_debug
++ win32:qclucene = $${qclucene}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
++LIBS_PRIVATE += -l$$qclucene
+Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro
+===================================================================
+--- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro 2011-01-11 14:56:50.930828002 +0000
++++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro 2011-01-11 16:09:50.274828003 +0000
+@@ -12,3 +12,11 @@
+ main.cpp
+
+ HEADERS += ../shared/helpgenerator.h
++
++qclucene = QtCLucene$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qclucene = $${qclucene}_debug
++ win32:qclucene = $${qclucene}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
++LIBS_PRIVATE += -l$$qclucene
diff --git a/meta/recipes-qt/qt4/qt4-embedded-4.6.3/qte.sh b/meta/recipes-qt/qt4/qt4-embedded-4.6.3/qte.sh
new file mode 100644
index 0000000..21d6ecb
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-embedded-4.6.3/qte.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -e /dev/input/touchscreen0 ]
+then
+ QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
+ export QWS_MOUSE_PROTO
+fi
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
new file mode 100644
index 0000000..2978059
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -0,0 +1,53 @@
+SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version."
+SECTION = "libs"
+LICENSE = "LGPLv2.1 | GPLv3"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+DEPENDS += "directfb tslib"
+INC_PR = "r26"
+
+QT_BASE_NAME ?= "qt4-embedded"
+QT_BASE_LIB ?= "libqt-embedded"
+QT_DIR_NAME = "qtopia"
+QT_LIBINFIX = "E"
+
+SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+ file://0001-cross-compile.patch \
+ file://0002-fix-resinit-declaration.patch \
+ file://0004-no-qmake.patch \
+ file://0006-freetype-host-includes.patch \
+ file://0008-qt-lib-infix.patch \
+ file://0009-support-2bpp.patch \
+ file://fix-config-tests.patch \
+ file://hack-out-pg_config.patch \
+ file://mips-relocate.patch \
+ file://qthelp-lib-qtclucene.patch \
+ file://g++.conf \
+ file://linux.conf \
+ "
+
+# Set necessary variables in the profile
+SRC_URI += "file://qte.sh"
+
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+QT_CONFIG_FLAGS += " \
+ -embedded \
+ -qtlibinfix ${QT_LIBINFIX} \
+ -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \
+ -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
+ -qt-kbd-tty \
+ -DQT_KEYPAD_NAVIGATION \
+ "
+
+require qt4.inc
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/profile.d/
+ install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/
+}
+
+FILES_${PN} += " ${sysconfdir}/profile.d/qte.sh"
+
+inherit qt4e
+
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb b/meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb
new file mode 100644
index 0000000..3d35016
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb
@@ -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
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 3/8] glib-2.0: extend to nativesdk
2011-01-17 16:54 [PATCH 0/8] Add meta-toolchain-qte from OE Paul Eggleton
2011-01-17 16:54 ` [PATCH 1/8] Add directfb 1.4.6 from OpenEmbedded Paul Eggleton
2011-01-17 16:54 ` [PATCH 2/8] qt4: add qt4-embedded 4.6.3 " Paul Eggleton
@ 2011-01-17 16:54 ` Paul Eggleton
2011-01-17 16:54 ` [PATCH 4/8] dbus: " Paul Eggleton
` (6 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Paul Eggleton @ 2011-01-17 16:54 UTC (permalink / raw)
To: poky
This needs to be added to nativesdk for meta-toolchain-qte.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
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(-)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
index 314d942..fb080b9 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
@@ -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"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index b0df84e..ee3f9ad 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -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
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 4/8] dbus: extend to nativesdk
2011-01-17 16:54 [PATCH 0/8] Add meta-toolchain-qte from OE Paul Eggleton
` (2 preceding siblings ...)
2011-01-17 16:54 ` [PATCH 3/8] glib-2.0: extend to nativesdk Paul Eggleton
@ 2011-01-17 16:54 ` Paul Eggleton
2011-01-17 16:54 ` [PATCH 5/8] Add qt4-tools-nativesdk 4.6.3 based on qt4-tools-sdk from OpenEmbedded Paul Eggleton
` (5 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Paul Eggleton @ 2011-01-17 16:54 UTC (permalink / raw)
To: poky
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).
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-core/dbus/dbus.inc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 402cf13..57da793 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -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
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 5/8] Add qt4-tools-nativesdk 4.6.3 based on qt4-tools-sdk from OpenEmbedded
2011-01-17 16:54 [PATCH 0/8] Add meta-toolchain-qte from OE Paul Eggleton
` (3 preceding siblings ...)
2011-01-17 16:54 ` [PATCH 4/8] dbus: " Paul Eggleton
@ 2011-01-17 16:54 ` Paul Eggleton
2011-01-17 16:54 ` [PATCH 6/8] package.bbclass: add nodeprrecs flag to RRECOMMENDS_pkgname Paul Eggleton
` (4 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Paul Eggleton @ 2011-01-17 16:54 UTC (permalink / raw)
To: poky
Differences from OE qt4-tools-sdk 4.6.3:
* Convert to nativesdk and make fixes necessary to build
* Add LIC_FILES_CHKSUM
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../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
diff --git a/meta/recipes-qt/qt4/files/compile.test-lflags.patch b/meta/recipes-qt/qt4/files/compile.test-lflags.patch
new file mode 100644
index 0000000..e4b256b
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/compile.test-lflags.patch
@@ -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=""
diff --git a/meta/recipes-qt/qt4/files/configure-lflags.patch b/meta/recipes-qt/qt4/files/configure-lflags.patch
new file mode 100644
index 0000000..df19549
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/configure-lflags.patch
@@ -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
diff --git a/meta/recipes-qt/qt4/files/configure-paths.patch b/meta/recipes-qt/qt4/files/configure-paths.patch
new file mode 100644
index 0000000..c9259a1
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/configure-paths.patch
@@ -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
+
diff --git a/meta/recipes-qt/qt4/files/qmake-exists-check.patch b/meta/recipes-qt/qt4/files/qmake-exists-check.patch
new file mode 100644
index 0000000..cc73837
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qmake-exists-check.patch
@@ -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 <paul.eggleton@linux.intel.com>
+
+--- 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=
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb
new file mode 100644
index 0000000..050bcb2
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb
@@ -0,0 +1,112 @@
+DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "zlib-nativesdk dbus-nativesdk libx11-nativesdk qt4-tools-native"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "LGPLv2.1 GPLv3"
+
+PR = "r1"
+
+DEFAULT_PREFERENCE = "-1"
+inherit nativesdk qmake2
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+ file://configure-lflags.patch \
+ file://compile.test-lflags.patch \
+ file://qt-config.patch \
+ file://qmake-exists-check.patch \
+ file://configure-paths.patch \
+ file://g++.conf \
+ file://linux.conf"
+
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
+ file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
+ file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
+
+# FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1"
+EXTRA_OECONF = "-prefix ${prefix} \
+ -qt-libjpeg -qt-gif -system-zlib \
+ -no-libjpeg -no-libpng \
+ -no-accessibility \
+ -no-cups \
+ -no-exceptions \
+ -no-nas-sound \
+ -no-nis \
+ -verbose -release -fast -static \
+ -platform ${TARGET_OS}-oe-g++ \
+ -xplatform ${TARGET_OS}-oe-g++ \
+ -qt3support \
+ -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include \
+ -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/freetype2 \
+ -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/dbus-1.0 \
+ -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/lib/dbus-1.0/include \
+ -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++ \
+ -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++/${TARGET_SYS} \
+ -L${STAGING_DIR_HOST}${SDKPATHNATIVE}/lib \
+ -L${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/lib"
+
+# yank default -e, otherwise we get the following error:
+# moc_qbuffer.cpp: No such file or directory
+EXTRA_OEMAKE = " "
+
+do_configure() {
+ if [ ! -e bin/qmake ]; then
+ ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
+ fi
+
+ if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then
+ ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++
+ fi
+
+ cp ../g++.conf mkspecs/common
+ cp ../linux.conf mkspecs/common
+
+ (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+ src/tools/bootstrap \
+ src/tools/moc \
+ src/corelib \
+ src/sql \
+ src/dbus \
+ src/qt3support \
+ src/xml \
+ src/tools/uic \
+ src/tools/rcc \
+ src/network \
+ src/gui \
+ src/tools/uic3 \
+ tools/linguist/lrelease \
+ tools/linguist/lupdate \
+ tools/qdbus \
+"
+
+do_compile() {
+ for i in ${TOBUILD}; do
+ cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+ done
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 bin/qmake ${D}${bindir}/qmake2
+ for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
+ install -m 0755 bin/${i} ${D}${bindir}/${i}4
+ done
+
+ (cd ${D}${bindir}; \
+ ln -s qmake2 qmake; \
+ for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do \
+ ln -s ${i}4 ${i}; \
+ done)
+
+ # make a symbolic link to mkspecs for compatibility with Nokia's SDK
+ # and QTCreator
+ (cd ${D}${bindir}/..; ln -s ${TARGET_SYS}/usr/share/qtopia/mkspecs mkspecs;)
+}
+
+SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
+SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
--
1.7.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 6/8] package.bbclass: add nodeprrecs flag to RRECOMMENDS_pkgname
2011-01-17 16:54 [PATCH 0/8] Add meta-toolchain-qte from OE Paul Eggleton
` (4 preceding siblings ...)
2011-01-17 16:54 ` [PATCH 5/8] Add qt4-tools-nativesdk 4.6.3 based on qt4-tools-sdk from OpenEmbedded Paul Eggleton
@ 2011-01-17 16:54 ` Paul Eggleton
2011-01-17 16:54 ` [PATCH 7/8] avahi: prevent unnecessary runtime dependency on gtk+ Paul Eggleton
` (3 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Paul Eggleton @ 2011-01-17 16:54 UTC (permalink / raw)
To: poky
Setting this flag disables the normal additions to RRECOMMENDS for a package
(useful when splitting dev / dbg packages).
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/package.bbclass | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index d39c694..868c8ae 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -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
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 7/8] avahi: prevent unnecessary runtime dependency on gtk+
2011-01-17 16:54 [PATCH 0/8] Add meta-toolchain-qte from OE Paul Eggleton
` (5 preceding siblings ...)
2011-01-17 16:54 ` [PATCH 6/8] package.bbclass: add nodeprrecs flag to RRECOMMENDS_pkgname Paul Eggleton
@ 2011-01-17 16:54 ` Paul Eggleton
2011-01-17 16:54 ` [PATCH 8/8] Add meta-toolchain-qte and dependent tasks from OpenEmbedded Paul Eggleton
` (2 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Paul Eggleton @ 2011-01-17 16:54 UTC (permalink / raw)
To: poky
* 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)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-connectivity/avahi/avahi.inc | 9 ++++++++-
meta/recipes-connectivity/avahi/avahi_0.6.28.bb | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 5c3b4dd..9f83d8d 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -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"
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.28.bb b/meta/recipes-connectivity/avahi/avahi_0.6.28.bb
index fb339e7..6e034b0 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.28.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.28.bb
@@ -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
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 8/8] Add meta-toolchain-qte and dependent tasks from OpenEmbedded
2011-01-17 16:54 [PATCH 0/8] Add meta-toolchain-qte from OE Paul Eggleton
` (6 preceding siblings ...)
2011-01-17 16:54 ` [PATCH 7/8] avahi: prevent unnecessary runtime dependency on gtk+ Paul Eggleton
@ 2011-01-17 16:54 ` Paul Eggleton
2011-01-17 17:14 ` [PATCH 0/8] Add meta-toolchain-qte from OE Koen Kooi
2011-01-18 20:25 ` Saul Wold
9 siblings, 0 replies; 19+ messages in thread
From: Paul Eggleton @ 2011-01-17 16:54 UTC (permalink / raw)
To: poky
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
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
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
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb
new file mode 100644
index 0000000..b29c5cf
--- /dev/null
+++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb
@@ -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 .
+}
diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-host.bb b/meta/recipes-qt/tasks/task-qte-toolchain-host.bb
new file mode 100644
index 0000000..2ab6ccf
--- /dev/null
+++ b/meta/recipes-qt/tasks/task-qte-toolchain-host.bb
@@ -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"
diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb b/meta/recipes-qt/tasks/task-qte-toolchain-target.bb
new file mode 100644
index 0000000..03e0e54
--- /dev/null
+++ b/meta/recipes-qt/tasks/task-qte-toolchain-target.bb
@@ -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
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 0/8] Add meta-toolchain-qte from OE
2011-01-17 16:54 [PATCH 0/8] Add meta-toolchain-qte from OE Paul Eggleton
` (7 preceding siblings ...)
2011-01-17 16:54 ` [PATCH 8/8] Add meta-toolchain-qte and dependent tasks from OpenEmbedded Paul Eggleton
@ 2011-01-17 17:14 ` Koen Kooi
2011-01-17 17:39 ` Paul Eggleton
2011-01-19 12:51 ` Paul Eggleton
2011-01-18 20:25 ` Saul Wold
9 siblings, 2 replies; 19+ messages in thread
From: Koen Kooi @ 2011-01-17 17:14 UTC (permalink / raw)
To: Paul Eggleton; +Cc: poky
Op 17 jan 2011, om 17:54 heeft Paul Eggleton het volgende geschreven:
> 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.
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
>
> 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 <paul.eggleton@linux.intel.com>
> ---
>
>
> 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
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/8] Add meta-toolchain-qte from OE
2011-01-17 17:14 ` [PATCH 0/8] Add meta-toolchain-qte from OE Koen Kooi
@ 2011-01-17 17:39 ` Paul Eggleton
2011-01-17 17:49 ` Koen Kooi
2011-01-19 12:51 ` Paul Eggleton
1 sibling, 1 reply; 19+ messages in thread
From: Paul Eggleton @ 2011-01-17 17:39 UTC (permalink / raw)
To: poky, Koen Kooi
On Monday 17 January 2011 17:14:59 Koen Kooi wrote:
> 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/ .
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.)
> 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 :)
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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/8] Add meta-toolchain-qte from OE
2011-01-17 17:39 ` Paul Eggleton
@ 2011-01-17 17:49 ` Koen Kooi
0 siblings, 0 replies; 19+ messages in thread
From: Koen Kooi @ 2011-01-17 17:49 UTC (permalink / raw)
To: Paul Eggleton; +Cc: poky
Op 17 jan 2011, om 18:39 heeft Paul Eggleton het volgende geschreven:
> On Monday 17 January 2011 17:14:59 Koen Kooi wrote:
>> 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/ .
>
> 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.)
>
>> 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 :)
>
> 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.=
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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/8] Add meta-toolchain-qte from OE
2011-01-17 16:54 [PATCH 0/8] Add meta-toolchain-qte from OE Paul Eggleton
` (8 preceding siblings ...)
2011-01-17 17:14 ` [PATCH 0/8] Add meta-toolchain-qte from OE Koen Kooi
@ 2011-01-18 20:25 ` Saul Wold
2011-01-20 15:09 ` Paul Eggleton
9 siblings, 1 reply; 19+ messages in thread
From: Saul Wold @ 2011-01-18 20:25 UTC (permalink / raw)
To: poky
On 01/17/2011 08:54 AM, Paul Eggleton wrote:
> 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.
>
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!
> 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<paul.eggleton@linux.intel.com>
> ---
>
>
> 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
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/8] Add meta-toolchain-qte from OE
2011-01-17 17:14 ` [PATCH 0/8] Add meta-toolchain-qte from OE Koen Kooi
2011-01-17 17:39 ` Paul Eggleton
@ 2011-01-19 12:51 ` Paul Eggleton
2011-01-19 13:15 ` Koen Kooi
1 sibling, 1 reply; 19+ messages in thread
From: Paul Eggleton @ 2011-01-19 12:51 UTC (permalink / raw)
To: Koen Kooi; +Cc: poky
On Monday 17 January 2011 17:14:59 Koen Kooi wrote:
> 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/ .
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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/8] Add meta-toolchain-qte from OE
2011-01-19 12:51 ` Paul Eggleton
@ 2011-01-19 13:15 ` Koen Kooi
2011-01-20 12:06 ` Paul Eggleton
0 siblings, 1 reply; 19+ messages in thread
From: Koen Kooi @ 2011-01-19 13:15 UTC (permalink / raw)
To: Paul Eggleton; +Cc: poky
Op 19 jan 2011, om 13:51 heeft Paul Eggleton het volgende geschreven:
> On Monday 17 January 2011 17:14:59 Koen Kooi wrote:
>> 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/ .
>
> 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?
I get the same error, I only built the target bits of qt and same apps, no sdk yet.
regards,
Koen
>
> ------------------ 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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/8] Add meta-toolchain-qte from OE
2011-01-19 13:15 ` Koen Kooi
@ 2011-01-20 12:06 ` Paul Eggleton
2011-01-20 12:17 ` Koen Kooi
0 siblings, 1 reply; 19+ messages in thread
From: Paul Eggleton @ 2011-01-20 12:06 UTC (permalink / raw)
To: Koen Kooi; +Cc: poky
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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/8] Add meta-toolchain-qte from OE
2011-01-20 12:06 ` Paul Eggleton
@ 2011-01-20 12:17 ` Koen Kooi
2011-01-20 13:50 ` Paul Eggleton
0 siblings, 1 reply; 19+ messages in thread
From: Koen Kooi @ 2011-01-20 12:17 UTC (permalink / raw)
To: Paul Eggleton; +Cc: poky
Op 20 jan 2011, om 13:06 heeft Paul Eggleton het volgende geschreven:
> 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?
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.
> * Do we need to pull in sqlite 2.x? I assume you have some specific use
> cases... ?
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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/8] Add meta-toolchain-qte from OE
2011-01-20 12:17 ` Koen Kooi
@ 2011-01-20 13:50 ` Paul Eggleton
0 siblings, 0 replies; 19+ messages in thread
From: Paul Eggleton @ 2011-01-20 13:50 UTC (permalink / raw)
To: Koen Kooi; +Cc: poky
On Thursday 20 January 2011 12:17:39 Koen Kooi wrote:
> > * 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?
>
> 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.
Yep I saw that in the tools recipe, makes sense there. I will see about
adjusting the inc files for Qt4 itself.
> 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.
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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/8] Add meta-toolchain-qte from OE
2011-01-18 20:25 ` Saul Wold
@ 2011-01-20 15:09 ` Paul Eggleton
0 siblings, 0 replies; 19+ messages in thread
From: Paul Eggleton @ 2011-01-20 15:09 UTC (permalink / raw)
To: poky
On Tuesday 18 January 2011 20:25:44 Saul Wold wrote:
> 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.
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
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2011-01-20 15:10 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-17 16:54 [PATCH 0/8] Add meta-toolchain-qte from OE Paul Eggleton
2011-01-17 16:54 ` [PATCH 1/8] Add directfb 1.4.6 from OpenEmbedded Paul Eggleton
2011-01-17 16:54 ` [PATCH 2/8] qt4: add qt4-embedded 4.6.3 " Paul Eggleton
2011-01-17 16:54 ` [PATCH 3/8] glib-2.0: extend to nativesdk Paul Eggleton
2011-01-17 16:54 ` [PATCH 4/8] dbus: " Paul Eggleton
2011-01-17 16:54 ` [PATCH 5/8] Add qt4-tools-nativesdk 4.6.3 based on qt4-tools-sdk from OpenEmbedded Paul Eggleton
2011-01-17 16:54 ` [PATCH 6/8] package.bbclass: add nodeprrecs flag to RRECOMMENDS_pkgname Paul Eggleton
2011-01-17 16:54 ` [PATCH 7/8] avahi: prevent unnecessary runtime dependency on gtk+ Paul Eggleton
2011-01-17 16:54 ` [PATCH 8/8] Add meta-toolchain-qte and dependent tasks from OpenEmbedded Paul Eggleton
2011-01-17 17:14 ` [PATCH 0/8] Add meta-toolchain-qte from OE Koen Kooi
2011-01-17 17:39 ` Paul Eggleton
2011-01-17 17:49 ` Koen Kooi
2011-01-19 12:51 ` Paul Eggleton
2011-01-19 13:15 ` Koen Kooi
2011-01-20 12:06 ` Paul Eggleton
2011-01-20 12:17 ` Koen Kooi
2011-01-20 13:50 ` Paul Eggleton
2011-01-18 20:25 ` Saul Wold
2011-01-20 15:09 ` Paul Eggleton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.