* Some QT patches @ 2011-09-15 9:26 Denis Carikli 2011-09-15 9:26 ` [PATCH 1/2] qt4.inc: package qtdemo's docs in a separate package Denis Carikli 2011-09-15 9:26 ` [PATCH 2/2] qt4(embedded and x11): disable neon for armv6-vfp Denis Carikli 0 siblings, 2 replies; 6+ messages in thread From: Denis Carikli @ 2011-09-15 9:26 UTC (permalink / raw) To: openembedded-core hi, here are 2 QT patches, they are done on top of the following patches (that were sent to the mailing list): 1) qt4: fix generated sdk 2) qt4: add blacklist-diginotar-certs patch 3) qt4: update to latest version 4.7.4 Denis. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] qt4.inc: package qtdemo's docs in a separate package 2011-09-15 9:26 Some QT patches Denis Carikli @ 2011-09-15 9:26 ` Denis Carikli 2011-09-15 16:08 ` Eric Bénard 2011-09-15 9:26 ` [PATCH 2/2] qt4(embedded and x11): disable neon for armv6-vfp Denis Carikli 1 sibling, 1 reply; 6+ messages in thread From: Denis Carikli @ 2011-09-15 9:26 UTC (permalink / raw) To: openembedded-core The documentation was 285M and doesn't fit on the NAND of many machines, but in another had part of the documentation is needed for the QT demos, so we split the documentation: so qt demo only RRECOMMAND the documentation that it really needs. Thanks to Eric Bénard for explaining me how to split it. Signed-off-by: Denis Carikli <denis@eukrea.com> --- meta/recipes-qt/qt4/qt4-embedded.inc | 2 +- meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +- meta/recipes-qt/qt4/qt4.inc | 57 +++++++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 3 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index 9914c61..1ede922 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "LGPLv2.1 | GPLv3" HOMEPAGE = "http://qt.nokia.com" DEPENDS += "directfb tslib" -INC_PR = "r30" +INC_PR = "r31" QT_BASE_NAME ?= "qt4-embedded" QT_BASE_LIB ?= "libqt-embedded" diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 0a714be..a360ec3 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com" SECTION = "x11/libs" DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" -INC_PR = "r27" +INC_PR = "r28" QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl" diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 5545be7..585df83 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -101,6 +101,8 @@ OTHER_PACKAGES = "\ ${QT_BASE_NAME}-qt3to4 \ ${QT_BASE_NAME}-qml-plugins" +#We prepend so ${QT_BASE_NAME}-demos-doc comes before ${PN}-doc,so the packaging of FILES_ get done before. +PACKAGES =+ "${QT_BASE_NAME}-demos-doc" PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}" PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-*" @@ -125,13 +127,15 @@ RRECOMMENDS_${QT_BASE_NAME}-demos += " \ ${QT_BASE_NAME}-plugin-imageformat-jpeg \ ${QT_BASE_NAME}-qml-plugins \ ${QT_BASE_NAME}-assistant \ - ${PN}-doc" + ${QT_BASE_NAME}-demos-doc" RRECOMMENDS_${QT_BASE_NAME}-examples += " \ ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ ${QT_BASE_NAME}-plugin-imageformat-jpeg \ ${QT_BASE_NAME}-qml-plugins" RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \ ${QT_BASE_NAME}-qml-plugins" +RRECOMMENDS_${QT_BASE_NAME}-doc += " \ + ${QT_BASE_NAME}-demos-doc" FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc*" FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*" @@ -272,6 +276,57 @@ python populate_packages_prepend() { qtopia_split('styles', 'style', '^libq(.*)\.so$') qtopia_split('phonon_backend','phonon-backend','^libphonon_(.*)\.so$') qtopia_split('bearer', 'bearer', '^libq(.*)bearer\.so$') + + #handle the QT documentation split: + #only a small part of the documentation is needed for qt-doc + import xml.parsers.expat + curdir = [] + + class handler: + def __init__(self): + self.allfiles = [] + def add(self,name,attrs): + if name == 'demos' and 'dirname' in attrs: + if (attrs['dirname'] != '.'): + curdir.append(attrs['dirname'].replace('/','-')) + else: + curdir.append(name.replace('/','-')) + if name == 'category' and 'dirname' in attrs: + curdir.append(attrs['dirname'].replace('/','-')) + if name == 'example' and 'filename' in attrs: + path = (attrs['filename'].replace('/','-')) + if (len(curdir) is 0): + self.allfiles.append(path) + else: + self.allfiles.append("-".join(curdir) + '-' + path) + def clean(self,name): + if (len(curdir) is not 0 ) and (name == 'category' or name == 'demos'): + curdir.remove(curdir[-1]) + def __repr__(self): + return repr(self.allfiles) + def result(self): + return self.allfiles + h = handler() + # 3 handler functions + def start_element(name, attrs): + h.add(name,attrs) + def end_element(name): + h.clean(name) + def char_data(data): + pass + + p = xml.parsers.expat.ParserCreate() + p.StartElementHandler = start_element + p.EndElementHandler = end_element + p.CharacterDataHandler = char_data + + f = open("%s/%s/qtopia/demos/qtdemo/xml/examples.xml" % ( bb.data.getVar("D",d,1) , bb.data.getVar("bindir",d,1) ) ,'r'); + p.ParseFile(f) + + docs = [] + for element in h.result(): + docs.append("${docdir}/qtopia/html/" + element + "*") + bb.data.setVar("FILES_%s-demos-doc" % bb.data.getVar("QT_BASE_NAME",d,1) ,str(" ".join(docs)),d) } do_install() { -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] qt4.inc: package qtdemo's docs in a separate package 2011-09-15 9:26 ` [PATCH 1/2] qt4.inc: package qtdemo's docs in a separate package Denis Carikli @ 2011-09-15 16:08 ` Eric Bénard 2011-09-15 16:19 ` [PATCH v2] " Denis Carikli 0 siblings, 1 reply; 6+ messages in thread From: Eric Bénard @ 2011-09-15 16:08 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Hi, Le 15/09/2011 11:26, Denis Carikli a écrit : > The documentation was 285M and doesn't fit on the NAND of many machines, > but in another had part of the documentation is needed for the > QT demos, so we split the documentation: so qt demo only RRECOMMAND > the documentation that it really needs. > > Thanks to Eric Bénard for explaining me how to split it. > and in fact after testing, my initial guess was wrong so Denis will post an updated patch which works. Eric ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] qt4.inc: package qtdemo's docs in a separate package 2011-09-15 16:08 ` Eric Bénard @ 2011-09-15 16:19 ` Denis Carikli 0 siblings, 0 replies; 6+ messages in thread From: Denis Carikli @ 2011-09-15 16:19 UTC (permalink / raw) To: openembedded-core The documentation was 285M and doesn't fit on the NAND of many machines, but in another had part of the documentation is needed for the QT demos, so we split the documentation: so qt demo only RRECOMMAND the documentation that it really needs. Thanks to Eric Bénard for explaining me how to split it. Signed-off-by: Denis Carikli <denis@eukrea.com> --- meta/recipes-qt/qt4/qt4-embedded.inc | 2 +- meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +- meta/recipes-qt/qt4/qt4.inc | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index 9914c61..1ede922 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "LGPLv2.1 | GPLv3" HOMEPAGE = "http://qt.nokia.com" DEPENDS += "directfb tslib" -INC_PR = "r30" +INC_PR = "r31" QT_BASE_NAME ?= "qt4-embedded" QT_BASE_LIB ?= "libqt-embedded" diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 0a714be..a360ec3 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com" SECTION = "x11/libs" DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" -INC_PR = "r27" +INC_PR = "r28" QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl" diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 5545be7..ae616f7 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -101,6 +101,8 @@ OTHER_PACKAGES = "\ ${QT_BASE_NAME}-qt3to4 \ ${QT_BASE_NAME}-qml-plugins" +#We prepend so ${QT_BASE_NAME}-demos-doc comes before ${PN}-doc,so the packaging of FILES_ get done before. +PACKAGES =+ "${QT_BASE_NAME}-demos-doc" PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}" PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-*" @@ -109,6 +111,7 @@ ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1" FILES_${PN} = "" FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*" FILES_${PN}-dbg = "${exec_prefix}/src/debug/" +FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/qtopia/qch/qt.qch" RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}" RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}" RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}" @@ -125,13 +128,15 @@ RRECOMMENDS_${QT_BASE_NAME}-demos += " \ ${QT_BASE_NAME}-plugin-imageformat-jpeg \ ${QT_BASE_NAME}-qml-plugins \ ${QT_BASE_NAME}-assistant \ - ${PN}-doc" + ${QT_BASE_NAME}-demos-doc" RRECOMMENDS_${QT_BASE_NAME}-examples += " \ ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ ${QT_BASE_NAME}-plugin-imageformat-jpeg \ ${QT_BASE_NAME}-qml-plugins" RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \ ${QT_BASE_NAME}-qml-plugins" +RRECOMMENDS_${QT_BASE_NAME}-doc += " \ + ${QT_BASE_NAME}-demos-doc" FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc*" FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*" -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] qt4(embedded and x11): disable neon for armv6-vfp 2011-09-15 9:26 Some QT patches Denis Carikli 2011-09-15 9:26 ` [PATCH 1/2] qt4.inc: package qtdemo's docs in a separate package Denis Carikli @ 2011-09-15 9:26 ` Denis Carikli 2011-09-16 1:31 ` Marc Reilly 1 sibling, 1 reply; 6+ messages in thread From: Denis Carikli @ 2011-09-15 9:26 UTC (permalink / raw) To: openembedded-core without the -no-neon flag, neon is "autodetected" by looking if the compiler is capable of compiling a neon test, and succeed, and neon is then enabled during the compilation. Signed-off-by: Denis Carikli <denis@eukrea.com> --- meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | 3 ++- meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb index c3f6713..61c679e 100644 --- a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb +++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb @@ -1,9 +1,10 @@ require qt-${PV}.inc require qt4-embedded.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" QT_CONFIG_FLAGS_append_armv6 = " -no-neon " +QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon " QT_CONFIG_FLAGS += " \ -exceptions \ diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb index 75c6314..6c8db17 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb +++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb @@ -1,9 +1,10 @@ require qt4-x11-free.inc require qt-${PV}.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" QT_CONFIG_FLAGS_append_armv6 = " -no-neon " +QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon " QT_CONFIG_FLAGS += " \ -no-embedded \ -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] qt4(embedded and x11): disable neon for armv6-vfp 2011-09-15 9:26 ` [PATCH 2/2] qt4(embedded and x11): disable neon for armv6-vfp Denis Carikli @ 2011-09-16 1:31 ` Marc Reilly 0 siblings, 0 replies; 6+ messages in thread From: Marc Reilly @ 2011-09-16 1:31 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 809 bytes --] On Thursday, September 15, 2011 07:26:16 PM Denis Carikli wrote: > without the -no-neon flag, neon is "autodetected" > by looking if the compiler is capable of compiling > a neon test, and succeed, and neon is then enabled > during the compilation. > > Signed-off-by: Denis Carikli <denis@eukrea.com> > QT_CONFIG_FLAGS_append_armv6 = " -no-neon " > +QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon " I also ran into this problem, with the same fix. There are a couple of other places with armv6 overrides that could misbehave, notably: TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__" (python_2.6.6.bb) QEMU_OPTIONS_armv6 = "-cpu arm1136" (bitbake.conf) Is there a way to do this more generically?, something like: QT_CONFIG_FLAGS_append_armv6* = " ... " Cheers Marc [-- Attachment #2: Type: text/html, Size: 5452 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-09-16 1:55 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-09-15 9:26 Some QT patches Denis Carikli 2011-09-15 9:26 ` [PATCH 1/2] qt4.inc: package qtdemo's docs in a separate package Denis Carikli 2011-09-15 16:08 ` Eric Bénard 2011-09-15 16:19 ` [PATCH v2] " Denis Carikli 2011-09-15 9:26 ` [PATCH 2/2] qt4(embedded and x11): disable neon for armv6-vfp Denis Carikli 2011-09-16 1:31 ` Marc Reilly
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox