cinematicexperience: add example
PATCH 1/21 cinematicexperience: add example
for more informations on this demo :
http://kgronholm.blogspot.fr/2012/08/qt5-cinematic-experience.html
http://quitcoding.com/?page=work#cinex
--- recipes-qt/examples/cinematicexperience_1.0.bb | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 recipes-qt/examples/cinematicexperience_1.0.bb
recipes-qt/examples/cinematicexperience_1.0.bb new file +40 -0
@@ -0,0 +1,40 @@ +SUMMARY = "Qt5 technology demo" +DESCRIPTION = "Cinematic Experience collects many of the new Qt5 QtQuick 2.0 features into the same UX demo application. It uses particles, sprites, path animation, custom shaders etc. features which Qt5 introduces for QML UIs." +HOMEPAGE = "http://quitcoding.com/?page=work#cinex" +LICENSE = "CC-BY-3.0" +LIC_FILES_CHKSUM = "file://README;beginline=38;endline=50;md5=51babd597624b70752069953876aaa18" + +SRC_URI = "http://quitcoding.com/download/Qt5_CinematicExperience_rpi_1.0.tgz" + +SRC_URI[md5sum] = "935a5db0a6b2a72c67236e72f52be7d1" +SRC_URI[sha256sum] = "0dd602983ced5f7c0cfd5ad0fbfe2b0b7e3c9ff715e4ef23eef818ccc2b6c60b" + +S = "${WORKDIR}/Qt5_CinematicExperience_rpi_${PV}/" + +# other version available for small screens +#SRC_URI = "http://quitcoding.com/download/Qt5_CinematicExperience_1.0.tgz" +#SRC_URI[md5sum] = "1c4f9bf5411c985fc5d3dbfc5d826a29" +#SRC_URI[sha256sum] = "0e547e0259667915a24e84ade5efdcd0c553f81786734452c2c8dbce19a19f44" +#S = "${WORKDIR}/Qt5_CinematicExperience_${PV}/" + +DEPENDS = "qtdeclarative qtgraphicaleffects" +RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" + +require recipes-qt/qt5/qt5.inc + +do_install() { + install -d ${D}${datadir}/${P} + install -m 0755 ${B}/Qt5_CinematicExperience ${D}${datadir}/${P} + cp -a ${S}/content ${D}${datadir}/${P} + install -m 0644 ${S}/Qt5_CinematicExperience.qml ${D}${datadir}/${P} + + install -d ${D}${bindir} + echo "#!/bin/sh" > ${D}${bindir}/Qt5_CinematicExperience + echo "export QML_IMPORT_PATH=${datadir}/${P}" >> ${D}${bindir}/Qt5_CinematicExperience + echo "export QML2_IMPORT_PATH=${datadir}/${P}" >> ${D}${bindir}/Qt5_CinematicExperience + echo "${datadir}/${P}/Qt5_CinematicExperiencea \$* " >> ${D}${bindir}/Qt5_CinematicExperience + chmod +x ${D}${bindir}/Qt5_CinematicExperience +} + +FILES_${PN}-dbg += "${datadir}/${P}/.debug" +FILES_${PN} += "${datadir}"
Signature · 1 line
1.8.4.rc3
PATCH 2/21 qtbase: update to 5.1.1
- patch 10 was update
- patch 19 & 25 are merged so no more needed
Conflicts:
recipes-qt/qt5/qtbase_5.0.2.bb
---
recipes-qt/qt5/{qt5-5.1.0.inc => qt5-5.1.1.inc} | 0
...0010-wayland-scanner-disable-silent-rules.patch | 82 ----------------------
...FBO-restoring-in-QOpenGLTextureGlyphCache.patch | 49 -------------
...art-fix-data-corruption-in-readData-metho.patch | 41 -----------
.../0001-Add-linux-oe-g-platform.patch | 22 +++---
.../0001-Always-build-uic.patch | 6 +-
...o-allow-to-set-qt.conf-from-the-outside-u.patch | 8 +--
.../0003-Add-external-hostbindir-option.patch | 51 +++++++-------
..._functions-temporary-remove-isEmpty-check.patch | 10 +--
...5-qmake-is-already-built-in-qtbase-native.patch | 10 +--
...-building-a-separate-qmake-for-the-target.patch | 10 +--
...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 10 +--
.../0008-qt_module-Fix-pkgconfig-replacement.patch | 8 +--
.../0009-qt_module-Fix-paths-in-.prl-files.patch | 8 +--
...0010-wayland-scanner-disable-silent-rules.patch | 82 ++++++++++++++++++++++
...on-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | 10 +--
....prf-Allow-to-add-extra-arguments-to-make.patch | 6 +-
.../0013-Disable-mkv8snapshot.patch | 12 ++--
...tslib-device-to-be-read-from-env-variable.patch | 6 +-
.../0015-qtbase-allow-build-of-examples.patch | 6 +-
.../0018-QOpenGLPaintDevice-sub-area-support.patch | 22 +++---
.../0020-Use-BGRA-extension-in-bindTexture.patch | 6 +-
...ure-make-pulseaudio-a-configurable-option.patch | 10 +--
...configure-make-alsa-a-configurable-option.patch | 10 +--
...igure-make-freetype-a-configurable-option.patch | 10 +--
...E_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch | 14 ++--
...base-native_5.1.0.bb => qtbase-native_5.1.1.bb} | 4 +-
recipes-qt/qt5/qtbase.inc | 1 -
recipes-qt/qt5/qtbase_5.1.0.bb | 9 ---
recipes-qt/qt5/qtbase_5.1.1.bb | 5 ++
30 files changed, 217 insertions(+), 311 deletions(-)
rename recipes-qt/qt5/{qt5-5.1.0.inc => qt5-5.1.1.inc} (100%)
delete mode 100644 recipes-qt/qt5/qtbase-5.1.0/0010-wayland-scanner-disable-silent-rules.patch
delete mode 100644 recipes-qt/qt5/qtbase-5.1.0/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch
delete mode 100644 recipes-qt/qt5/qtbase-5.1.0/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0001-Add-linux-oe-g-platform.patch (95%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0001-Always-build-uic.patch (91%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch (87%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0003-Add-external-hostbindir-option.patch (79%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0004-qt_functions-temporary-remove-isEmpty-check.patch (90%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0005-qmake-is-already-built-in-qtbase-native.patch (74%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0006-Allow-building-a-separate-qmake-for-the-target.patch (74%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch (84%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0008-qt_module-Fix-pkgconfig-replacement.patch (94%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0009-qt_module-Fix-paths-in-.prl-files.patch (93%)
create mode 100644 recipes-qt/qt5/qtbase-5.1.1/0010-wayland-scanner-disable-silent-rules.patch
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch (85%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch (91%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0013-Disable-mkv8snapshot.patch (86%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0014-enables-tslib-device-to-be-read-from-env-variable.patch (89%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0015-qtbase-allow-build-of-examples.patch (92%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0018-QOpenGLPaintDevice-sub-area-support.patch (89%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0020-Use-BGRA-extension-in-bindTexture.patch (90%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0021-configure-make-pulseaudio-a-configurable-option.patch (78%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0022-configure-make-alsa-a-configurable-option.patch (76%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0023-configure-make-freetype-a-configurable-option.patch (77%)
rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch (93%)
rename recipes-qt/qt5/{qtbase-native_5.1.0.bb => qtbase-native_5.1.1.bb} (64%)
delete mode 100644 recipes-qt/qt5/qtbase_5.1.0.bb
create mode 100644 recipes-qt/qt5/qtbase_5.1.1.bbrecipes-qt/qt5/qt5-5.1.1.inc renamed from recipes-qt/qt5/qt5-5.1.0.inc +0 -0
recipes-qt/qt5/qtbase-5.1.0/0010-wayland-scanner-disable-silent-rules.patch deleted +0 -82
82 lines not on this page · raw message
recipes-qt/qt5/qtbase-5.1.0/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch deleted +0 -49
49 lines not on this page · raw message
recipes-qt/qt5/qtbase-5.1.0/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch deleted +0 -41
41 lines not on this page · raw message
recipes-qt/qt5/qtbase-5.1.1/0001-Add-linux-oe-g-platform.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0001-Add-linux-oe-g-platform.patch +11 -11
@@ -1,7 +1,7 @@ -From 7244ed3ca9326f3521de8961dbe7f9759f8e8041 Mon Sep 17 00:00:00 2001 +From b91e232e603df102a1d305aceb0dbedc6ce3e89c Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/23] Add linux-oe-g++ platform +Subject: [PATCH 01/22] Add linux-oe-g++ platform * This qmake.conf unlike other platforms reads most variables from shell environment, because it's easier for qt recipes to export
@@ -41,10 +41,10 @@ Signed-off-by: Martin Jansa <[email protected]> create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index d7c9674..45e0586 100755 +index 140c7b4..397d53f 100755 --- a/configure +++ b/configure -@@ -284,6 +284,16 @@ getQMakeConf() +@@ -291,6 +291,16 @@ getQMakeConf() getSingleQMakeVariable "$1" "$specvals" }
@@ -61,7 +61,7 @@ index d7c9674..45e0586 100755 getXQMakeConf() { if [ -z "$xspecvals" ]; then -@@ -293,6 +303,16 @@ getXQMakeConf() +@@ -300,6 +310,16 @@ getXQMakeConf() getSingleQMakeVariable "$1" "$xspecvals" }
@@ -78,7 +78,7 @@ index d7c9674..45e0586 100755 compilerSupportsFlag() { cat >conftest.cpp <<EOF -@@ -809,6 +829,18 @@ fi +@@ -816,6 +836,18 @@ fi # initalize variables #-------------------------------------------------------------------------------
@@ -97,7 +97,7 @@ index d7c9674..45e0586 100755 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" for varname in $SYSTEM_VARIABLES; do qmakevarname="${varname}" -@@ -2836,7 +2868,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then +@@ -2894,7 +2926,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then CFG_QGTKSTYLE=no fi
@@ -106,7 +106,7 @@ index d7c9674..45e0586 100755 TEST_COMPILER=$QMAKE_CONF_COMPILER -@@ -2871,7 +2903,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +@@ -2929,7 +2961,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then exit 1 fi fi
@@ -115,7 +115,7 @@ index d7c9674..45e0586 100755 GCC_MACHINE_DUMP= case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac -@@ -3909,6 +3941,14 @@ setBootstrapVariable() +@@ -3959,6 +3991,14 @@ setBootstrapVariable() getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" }
@@ -130,7 +130,7 @@ index d7c9674..45e0586 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -3947,11 +3987,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -3997,11 +4037,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
@@ -300,5 +300,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0001-Always-build-uic.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0001-Always-build-uic.patch +3 -3
@@ -1,7 +1,7 @@ -From 28cb656a49b80364f4bfc4387849f1e9ac56fbf2 Mon Sep 17 00:00:00 2001 +From f794542b10ccbf9c4cecaf23cf24658d64594cf3 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa <[email protected]> Date: Tue, 27 Nov 2012 12:46:44 -0800 -Subject: [PATCH] Always build uic +Subject: [PATCH 22/22] Always build uic Even if we are not building gui or widgets. This tool is needed later as a native tool when compiling the target.
@@ -36,5 +36,5 @@ index b4c9602..f30ec1f 100644 nacl: SUBDIRS -= src_network src_testlib -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +4 -4
@@ -1,7 +1,7 @@ -From 6eb6d141309bc5a42218fbc755545ead70a88b55 Mon Sep 17 00:00:00 2001 +From a899fba459928c7e5196f15dcea4d561807dc825 Mon Sep 17 00:00:00 2001 From: Holger Freyther <[email protected]> Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/23] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/22] qlibraryinfo: allow to set qt.conf from the outside using the environment Allow to set a qt.conf from the outside using the environment. This allows
@@ -16,7 +16,7 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 1eaebe5..bda2ffe 100644 +index 53a3ebb..8ca2102 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings()
@@ -32,5 +32,5 @@ index 1eaebe5..bda2ffe 100644 if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0003-Add-external-hostbindir-option.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0003-Add-external-hostbindir-option.patch +26 -25
139 lines not on this page · raw message
recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch +5 -5
@@ -1,7 +1,7 @@ -From ad252e21f737536027aebbf63217188a80d108ba Mon Sep 17 00:00:00 2001 +From 21c573762a168f874f32c8bf49f75442e608e08a Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 04/23] qt_functions: temporary remove isEmpty check +Subject: [PATCH 04/22] qt_functions: temporary remove isEmpty check * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value * isEmpty works correctly only with qmake variables (e.g. $$FOO -
@@ -16,10 +16,10 @@ Signed-off-by: Martin Jansa <[email protected]> 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index d581367..2bc6533 100644 +index 4e12d3d..e20ad9d 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) { +@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) { $$1 = $$eval(QT_TOOL.$${2}.binary) isEmpty($$1) { $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
@@ -47,5 +47,5 @@ index 83ef3a0..21c9eb7 100644 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, ) -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0005-qmake-is-already-built-in-qtbase-native.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0005-qmake-is-already-built-in-qtbase-native.patch +5 -5
@@ -1,7 +1,7 @@ -From bd7521ebc01feedde14e3e5e037ebd66b994db06 Mon Sep 17 00:00:00 2001 +From 777d4bfc7a94256ec46f61bd80bc6058cdf55ebb Mon Sep 17 00:00:00 2001 From: Michael Krelin <[email protected]> Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 05/23] qmake is already built in qtbase-native +Subject: [PATCH 05/22] qmake is already built in qtbase-native Ported from OE by: Yu Ke <[email protected]> Upstream-Status: Inappropriate [configuration]
@@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index dbe7360..f8f0e9a 100755 +index 39a5deb..40f2b02 100755 --- a/configure +++ b/configure -@@ -3963,7 +3963,7 @@ setBootstrapEvalVariable() +@@ -4014,7 +4014,7 @@ setBootstrapEvalVariable() # build qmake
@@ -26,5 +26,5 @@ index dbe7360..f8f0e9a 100755 mkdir -p "$outpath/qmake" || exit -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0006-Allow-building-a-separate-qmake-for-the-target.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0006-Allow-building-a-separate-qmake-for-the-target.patch +5 -5
@@ -1,7 +1,7 @@ -From 00997b0cf46d6b6c362c48ee31f886c553a3fb4f Mon Sep 17 00:00:00 2001 +From c36477f621c7d682ee7140156127ad32e91a40ad Mon Sep 17 00:00:00 2001 From: Paul Eggleton <[email protected]> Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 06/23] Allow building a separate qmake for the target +Subject: [PATCH 06/22] Allow building a separate qmake for the target Upstream-Status: Inappropriate [config]
@@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 1 insertion(+) diff --git a/qmake/qmake.pro b/qmake/qmake.pro -index 0d92ac2..9be0e9b 100644 +index a81d0cd..ed7aebf 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro -@@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic +@@ -8,6 +8,7 @@ CONFIG -= qt shared app_bundle uic DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ PROEVALUATOR_FULL PROEVALUATOR_DEBUG DESTDIR = ../bin/
@@ -25,5 +25,5 @@ index 0d92ac2..9be0e9b 100644 OBJECTS_DIR = . MOC_DIR = . -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +5 -5
@@ -1,7 +1,7 @@ -From 662115f5e837fc397533810ca659af0f66749ce4 Mon Sep 17 00:00:00 2001 +From c2cc1f9251953f680191c5cf53b019d5d480c79e Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 07/23] configureapp: Prefix default LIBDIRS and INCDIRS with +Subject: [PATCH 07/22] configureapp: Prefix default LIBDIRS and INCDIRS with SYSROOT Upstream-Status: Pending
@@ -10,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 8f0bd0e..f7ff15c 100644 +index aed85ce..0575520 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -3118,8 +3118,8 @@ void Configure::generateQConfigPri() +@@ -3111,8 +3111,8 @@ void Configure::generateQConfigPri() configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { // FIXME: add detection
@@ -25,5 +25,5 @@ index 8f0bd0e..f7ff15c 100644 if (dictionary["QT_EDITION"].contains("OPENSOURCE")) configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0008-qt_module-Fix-pkgconfig-replacement.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0008-qt_module-Fix-pkgconfig-replacement.patch +4 -4
@@ -1,7 +1,7 @@ -From 1db1ad1ef3c57f531bf67be33a4cc43528864543 Mon Sep 17 00:00:00 2001 +From 0089c1ecba912aed6a8cd6126297300e0f7ffcb9 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 08/23] qt_module: Fix pkgconfig replacement +Subject: [PATCH 08/22] qt_module: Fix pkgconfig replacement * in situation like this: QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
@@ -27,7 +27,7 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 53a5499..9dfc1dd 100644 +index 390fb49..e85c2a8 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -140,18 +140,30 @@ unix|win32-g++* {
@@ -66,5 +66,5 @@ index 53a5499..9dfc1dd 100644 unix|win32-g++* { -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0009-qt_module-Fix-paths-in-.prl-files.patch +4 -4
@@ -1,7 +1,7 @@ -From 036a2be171a0bf6fea5eaa7383e19f2559a37dce Mon Sep 17 00:00:00 2001 +From d4f6f5afa36d87d991051f0079f129d2682455d9 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 09/23] qt_module: Fix paths in .prl files +Subject: [PATCH 09/22] qt_module: Fix paths in .prl files * qmake does not prefix them with QT_SYSROOT when using them so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
@@ -19,7 +19,7 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 9dfc1dd..5cedb8f 100644 +index e85c2a8..7fcfcfe 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -144,17 +144,23 @@ unix|win32-g++* {
@@ -58,5 +58,5 @@ index 9dfc1dd..5cedb8f 100644 QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0010-wayland-scanner-disable-silent-rules.patch new file +82 -0
82 lines not on this page · raw message
recipes-qt/qt5/qtbase-5.1.1/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +5 -5
@@ -1,7 +1,7 @@ -From 7a24e90118a0d81d76b68d3bd0dafcad0966e49e Mon Sep 17 00:00:00 2001 +From 05fc8b21f40d2e6bc35fa717ea340ef26f922d32 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 11/23] configure: don't export SYSTEM_VARIABLES to .qmake.vars +Subject: [PATCH 11/22] configure: don't export SYSTEM_VARIABLES to .qmake.vars * linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is causing issues as we need g++ to be used as linker
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/configure b/configure -index f8f0e9a..3c80d5f 100755 +index 40f2b02..11c11c4 100755 --- a/configure +++ b/configure -@@ -842,20 +842,7 @@ fi'` +@@ -849,20 +849,7 @@ fi'` done SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
@@ -40,5 +40,5 @@ index f8f0e9a..3c80d5f 100755 mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +3 -3
@@ -1,7 +1,7 @@ -From b115685d8c684181a0af79e44a1d170a5a8bfd05 Mon Sep 17 00:00:00 2001 +From b4f8c636cb265951979868a65006ce49f442e5e7 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 12/23] configure.prf: Allow to add extra arguments to make +Subject: [PATCH 12/22] configure.prf: Allow to add extra arguments to make * sometimes we would like to add -e or define some variable and respect it from both Makefiles used in configure tests and also Makefiles to build the application
@@ -33,5 +33,5 @@ index b4569df..d189e50 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0013-Disable-mkv8snapshot.patch +6 -6
@@ -1,7 +1,7 @@ -From 7455bfff17483c19d7eef3ad81a95f6996ff0ce8 Mon Sep 17 00:00:00 2001 +From 70669010c6f8a541db6f87f96aee3ff50ec8483f Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa <[email protected]> Date: Tue, 8 Jan 2013 15:58:29 -0800 -Subject: [PATCH 13/23] Disable mkv8snapshot +Subject: [PATCH 13/22] Disable mkv8snapshot It seems to generate code that throws SIGILL, so disabling it
@@ -30,11 +30,11 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 3c80d5f..50dbebf 100755 +index 11c11c4..521e374 100755 --- a/configure +++ b/configure -@@ -902,7 +902,7 @@ CFG_SKIP_MODULES="" - CFG_COMPILE_EXAMPLES=auto +@@ -910,7 +910,7 @@ CFG_SKIP_MODULES="" + CFG_COMPILE_EXAMPLES=yes CFG_RELEASE_QMAKE=no CFG_AUDIO_BACKEND=auto -CFG_V8SNAPSHOT=auto
@@ -43,5 +43,5 @@ index 3c80d5f..50dbebf 100755 CFG_JAVASCRIPTCORE_JIT=auto CFG_PKGCONFIG=auto -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0014-enables-tslib-device-to-be-read-from-env-variable.patch +3 -3
@@ -1,7 +1,7 @@ -From 6da394a759ada8c3dcc6649dbbdf89918d675ae7 Mon Sep 17 00:00:00 2001 +From 3642ea2f7eff14c0835385f28a13514b806eba32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]> Date: Mon, 27 May 2013 18:32:37 +0200 -Subject: [PATCH 14/23] enables tslib device to be read from env variable +Subject: [PATCH 14/22] enables tslib device to be read from env variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
@@ -31,5 +31,5 @@ index 6986fd5..2ed4a69 100644 device = specification.toLocal8Bit(); -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0015-qtbase-allow-build-of-examples.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0015-qtbase-allow-build-of-examples.patch +3 -3
@@ -1,7 +1,7 @@ -From 94a5ed9c22ed927123df3007d426de5d19e4f692 Mon Sep 17 00:00:00 2001 +From 52172f09d646949c32f7b70188f1ffc779adbdef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]> Date: Sat, 25 May 2013 17:34:32 +0200 -Subject: [PATCH 15/23] qtbase: allow build of examples +Subject: [PATCH 15/22] qtbase: allow build of examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
@@ -44,5 +44,5 @@ index 2db752c..ca1b0c7 100644 - } } -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0018-QOpenGLPaintDevice-sub-area-support.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0018-QOpenGLPaintDevice-sub-area-support.patch +11 -11
@@ -1,7 +1,7 @@ -From 41a9c47ca820502d98039273f7465605464cdf9c Mon Sep 17 00:00:00 2001 +From cc2bdb0bbbbeb4eb630d82b7274d13922eb06da2 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas <[email protected]> Date: Thu, 16 May 2013 09:52:07 +0300 -Subject: [PATCH 18/23] QOpenGLPaintDevice sub-area support +Subject: [PATCH 16/22] QOpenGLPaintDevice sub-area support Allows creating QOpenGLPaintDevice targetting sub-area of binded framebuffer.
@@ -76,10 +76,10 @@ index c05571c..01eb1bc 100644 void setSize(const QSize &size); void setDevicePixelRatio(qreal devicePixelRatio); diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp -index 0782e42..52afc60 100644 +index 78f5080..20db620 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp -@@ -1978,7 +1978,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) +@@ -2004,7 +2004,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) d->vertexAttributeArraysEnabledState[i] = false;
@@ -90,7 +90,7 @@ index 0782e42..52afc60 100644 d->width = sz.width(); d->height = sz.height(); d->mode = BrushDrawingMode; -@@ -2066,7 +2069,7 @@ void QOpenGL2PaintEngineEx::ensureActive() +@@ -2092,7 +2095,7 @@ void QOpenGL2PaintEngineEx::ensureActive() d->device->ensureActiveTarget(); d->transferMode(BrushDrawingMode);
@@ -99,7 +99,7 @@ index 0782e42..52afc60 100644 d->needsSync = false; d->lastMaskTextureUsed = 0; d->shaderManager->setDirty(); -@@ -2109,6 +2112,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2135,6 +2138,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() if (bounds == QRect(0, 0, width, height)) { glDisable(GL_SCISSOR_TEST); } else {
@@ -107,7 +107,7 @@ index 0782e42..52afc60 100644 glEnable(GL_SCISSOR_TEST); setScissor(bounds); } -@@ -2117,14 +2121,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2143,14 +2147,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) {
@@ -137,11 +137,11 @@ index d51f0e5..0d4b38d 100644 QOpenGLContext *ctx; EngineMode mode; diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 83f4075..ec29900 100644 +index 7d49c03..d9eb3fe 100644 --- a/src/gui/opengl/qopengltextureglyphcache.cpp +++ b/src/gui/opengl/qopengltextureglyphcache.cpp -@@ -268,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) - funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo); +@@ -271,7 +271,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) + funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); if (pex != 0) { - glViewport(0, 0, pex->width, pex->height);
@@ -150,5 +150,5 @@ index 83f4075..ec29900 100644 } else { m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR)); -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0020-Use-BGRA-extension-in-bindTexture.patch +3 -3
@@ -1,7 +1,7 @@ -From fb16e96ffef959e45c9cbcbef4cc4f51065f2e47 Mon Sep 17 00:00:00 2001 +From 5aaec8299901e0093cec2b704a724bc3254b8b8d Mon Sep 17 00:00:00 2001 From: Jani Hautakangas <[email protected]> Date: Mon, 27 May 2013 15:25:25 -0700 -Subject: [PATCH 20/23] Use BGRA extension in bindTexture +Subject: [PATCH 17/22] Use BGRA extension in bindTexture Upstream-Status: Pending
@@ -30,5 +30,5 @@ index 94b8288..5c8aa3c 100644 int cost = tx.width() * tx.height() * 4 / 1024; m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost); -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0021-configure-make-pulseaudio-a-configurable-option.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0021-configure-make-pulseaudio-a-configurable-option.patch +5 -5
@@ -1,7 +1,7 @@ -From 9f79c8047289b9c5bff025a46757bfd5f9bfec4b Mon Sep 17 00:00:00 2001 +From 0bc48cdb5e3556a96320ea963d2e031b0810d0d4 Mon Sep 17 00:00:00 2001 From: Paul Eggleton <[email protected]> Date: Tue, 28 Feb 2012 15:10:24 +0000 -Subject: [PATCH 21/23] configure: make pulseaudio a configurable option +Subject: [PATCH 18/22] configure: make pulseaudio a configurable option Allows disabling pulseaudio support at configure time.
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 7 insertions(+) diff --git a/configure b/configure -index 50dbebf..3b511d4 100755 +index 521e374..896e012 100755 --- a/configure +++ b/configure -@@ -1980,6 +1980,13 @@ while [ "$#" -gt 0 ]; do +@@ -2039,6 +2039,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;;
@@ -32,5 +32,5 @@ index 50dbebf..3b511d4 100755 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_QGTKSTYLE="$VAL" -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0022-configure-make-alsa-a-configurable-option.patch +5 -5
@@ -1,7 +1,7 @@ -From a51b5c64a33a0c8b411aa4317356c7dfcb99e452 Mon Sep 17 00:00:00 2001 +From e6430c64e4dcc48ae59e48fa303bbea33b253011 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Fri, 19 Jul 2013 23:21:28 +0200 -Subject: [PATCH 22/23] configure: make alsa a configurable option +Subject: [PATCH 19/22] configure: make alsa a configurable option Allows disabling alsa support at configure time.
@@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 7 insertions(+) diff --git a/configure b/configure -index 3b511d4..2a0be04 100755 +index 896e012..3470b32 100755 --- a/configure +++ b/configure -@@ -1987,6 +1987,13 @@ while [ "$#" -gt 0 ]; do +@@ -2046,6 +2046,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;;
@@ -31,5 +31,5 @@ index 3b511d4..2a0be04 100755 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_QGTKSTYLE="$VAL" -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0023-configure-make-freetype-a-configurable-option.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0023-configure-make-freetype-a-configurable-option.patch +5 -5
@@ -1,7 +1,7 @@ -From eef64dc5f4d998518c314a765bc0a9db7f6fdf9b Mon Sep 17 00:00:00 2001 +From 98201094967e2e4224c394d0c92c0be7d39582a6 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 20 Jul 2013 10:56:37 +0200 -Subject: [PATCH 23/23] configure: make freetype a configurable option +Subject: [PATCH 20/22] configure: make freetype a configurable option Allows disabling freetype support at configure time.
@@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 7 insertions(+) diff --git a/configure b/configure -index 2a0be04..64fbaeb 100755 +index 3470b32..b0ec977 100755 --- a/configure +++ b/configure -@@ -1994,6 +1994,13 @@ while [ "$#" -gt 0 ]; do +@@ -2053,6 +2053,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;;
@@ -31,5 +31,5 @@ index 2a0be04..64fbaeb 100755 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_QGTKSTYLE="$VAL" -- -1.8.3.2 +1.8.3.1
recipes-qt/qt5/qtbase-5.1.1/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch renamed from recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch +7 -7
@@ -1,8 +1,8 @@ -From ac4f17fd4c9145c54d9b10aa794cabe0d044b4fc Mon Sep 17 00:00:00 2001 +From b4d383bf47374c7132ecbcaec2c6aea31f858f54 Mon Sep 17 00:00:00 2001 From: Simon Busch <[email protected]> Date: Mon, 22 Jul 2013 21:09:41 +0000 -Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to - host binaries +Subject: [PATCH 21/22] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path + to host binaries Upstream-Status: Inappropiate (configuration)
@@ -14,7 +14,7 @@ Signed-off-by: Simon Busch <[email protected]> 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index a804278..b6fbbea 100644 +index e01b448..5382730 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
@@ -45,7 +45,7 @@ index a804278..b6fbbea 100644 _qt5_Core_check_file_exists(${imported_location}) diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d94715..3209e42 100644 +index 1d94715..301af8f 100644 --- a/src/dbus/Qt5DBusConfigExtras.cmake.in +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
@@ -67,7 +67,7 @@ index 1d94715..3209e42 100644 _qt5_DBus_check_file_exists(${imported_location}) diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index e5650ff..7fb8b21 100644 +index e5650ff..16ff007 100644 --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic)
@@ -80,5 +80,5 @@ index e5650ff..7fb8b21 100644 _qt5_Widgets_check_file_exists(${imported_location}) -- -1.8.1.2 +1.8.3.1
recipes-qt/qt5/qtbase-native_5.1.1.bb renamed from recipes-qt/qt5/qtbase-native_5.1.0.bb +2 -2
@@ -7,5 +7,5 @@ do_install_append() { ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRC_URI[md5sum] = "0f8d14bb4039a2996c501a376ca7dae0" -SRC_URI[sha256sum] = "1fa8c591adab9d45e4f322edea9a55a517ebf1a006dd481eace0236623adc90a" +SRC_URI[md5sum] = "955d1e4da875f3872ef3208f21a757dd" +SRC_URI[sha256sum] = "d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9"
recipes-qt/qt5/qtbase.inc +0 -1
@@ -22,7 +22,6 @@ SRC_URI += " \ file://0022-configure-make-alsa-a-configurable-option.patch \ file://0023-configure-make-freetype-a-configurable-option.patch \ file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \ - file://0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch \ " DEPENDS += "qtbase-native"
recipes-qt/qt5/qtbase_5.1.0.bb deleted +0 -9
@@ -1,9 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI += " \ - file://0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch \ -" - -SRC_URI[md5sum] = "0f8d14bb4039a2996c501a376ca7dae0" -SRC_URI[sha256sum] = "1fa8c591adab9d45e4f322edea9a55a517ebf1a006dd481eace0236623adc90a"
recipes-qt/qt5/qtbase_5.1.1.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "955d1e4da875f3872ef3208f21a757dd" +SRC_URI[sha256sum] = "d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9"
Signature · 1 line
1.8.4.rc3
PATCH 3/21 qtjsbackend: update to 5.1.1
In reply to Eric Bénard---
.../0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch | 0
.../0002-v8.pro-respect-external-host-bindir-when-set.patch | 0
recipes-qt/qt5/qtjsbackend-native_5.1.0.bb | 5 -----
recipes-qt/qt5/qtjsbackend-native_5.1.1.bb | 5 +++++
recipes-qt/qt5/qtjsbackend_5.1.0.bb | 5 -----
recipes-qt/qt5/qtjsbackend_5.1.1.bb | 5 +++++
6 files changed, 10 insertions(+), 10 deletions(-)
rename recipes-qt/qt5/{qtjsbackend-5.1.0 => qtjsbackend-5.1.1}/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch (100%)
rename recipes-qt/qt5/{qtjsbackend-5.1.0 => qtjsbackend-5.1.1}/0002-v8.pro-respect-external-host-bindir-when-set.patch (100%)
delete mode 100644 recipes-qt/qt5/qtjsbackend-native_5.1.0.bb
create mode 100644 recipes-qt/qt5/qtjsbackend-native_5.1.1.bb
delete mode 100644 recipes-qt/qt5/qtjsbackend_5.1.0.bb
create mode 100644 recipes-qt/qt5/qtjsbackend_5.1.1.bbrecipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch renamed from recipes-qt/qt5/qtjsbackend-5.1.0/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch +0 -0
recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch renamed from recipes-qt/qt5/qtjsbackend-5.1.0/0002-v8.pro-respect-external-host-bindir-when-set.patch +0 -0
recipes-qt/qt5/qtjsbackend-native_5.1.0.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "bb4a74f3cd1db59274c9f4aaca0912af" -SRC_URI[sha256sum] = "8df057d527f98b1c2aa2941ff22adaf9b9c6441ea0e6c44f91f49bbcdbab57ce"
recipes-qt/qt5/qtjsbackend-native_5.1.1.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "7225169d7d166cc5660384a85e4d4a2f" +SRC_URI[sha256sum] = "42628eac133738df30e9104c2014eb70478e8fcf2cc86c1f500359c12216b192"
recipes-qt/qt5/qtjsbackend_5.1.0.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "bb4a74f3cd1db59274c9f4aaca0912af" -SRC_URI[sha256sum] = "8df057d527f98b1c2aa2941ff22adaf9b9c6441ea0e6c44f91f49bbcdbab57ce"
recipes-qt/qt5/qtjsbackend_5.1.1.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "7225169d7d166cc5660384a85e4d4a2f" +SRC_URI[sha256sum] = "42628eac133738df30e9104c2014eb70478e8fcf2cc86c1f500359c12216b192"
Signature · 1 line
1.8.4.rc3
PATCH 5/21 qtxmlpatterns: update to 5.1.1
In reply to Eric Bénard--- recipes-qt/qt5/qtxmlpatterns_5.1.0.bb | 5 ----- recipes-qt/qt5/qtxmlpatterns_5.1.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtxmlpatterns_5.1.0.bb create mode 100644 recipes-qt/qt5/qtxmlpatterns_5.1.1.bb
recipes-qt/qt5/qtxmlpatterns_5.1.0.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "1d1ebc4d6efa4d05368c0c716858d314" -SRC_URI[sha256sum] = "9d06493a4387d19e561f79f79c0a9c4c333eb764d64af54dc05f13a978694537"
recipes-qt/qt5/qtxmlpatterns_5.1.1.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "0db5f74de2a2e93bc2747a609ff81d5f" +SRC_URI[sha256sum] = "bc7b48347ce3ab5d6a22223c001659f3d898cbd3ef9e35688d7ad1bf8e7510b5"
Signature · 1 line
1.8.4.rc3
PATCH 6/21 qtdeclarative: update to 5.1.1
In reply to Eric Bénard---
.../0001-qmltestexample-fix-link.patch | 0
.../0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch | 0
recipes-qt/qt5/{qtdeclarative_5.1.0.bb => qtdeclarative_5.1.1.bb} | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename recipes-qt/qt5/{qtdeclarative-5.1.0 => qtdeclarative-5.1.1}/0001-qmltestexample-fix-link.patch (100%)
rename recipes-qt/qt5/{qtdeclarative-5.1.0 => qtdeclarative-5.1.1}/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch (100%)
rename recipes-qt/qt5/{qtdeclarative_5.1.0.bb => qtdeclarative_5.1.1.bb} (68%)recipes-qt/qt5/qtdeclarative-5.1.1/0001-qmltestexample-fix-link.patch renamed from recipes-qt/qt5/qtdeclarative-5.1.0/0001-qmltestexample-fix-link.patch +0 -0
recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch renamed from recipes-qt/qt5/qtdeclarative-5.1.0/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch +0 -0
recipes-qt/qt5/qtdeclarative_5.1.1.bb renamed from recipes-qt/qt5/qtdeclarative_5.1.0.bb +2 -2
@@ -6,8 +6,8 @@ SRC_URI += " \ file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ " -SRC_URI[md5sum] = "604a6e3ae051a21aac0024694d55cb3b" -SRC_URI[sha256sum] = "d8849755c17fca9bb44c09c442001bc5593c24986ea616c536719414e85d90cc" +SRC_URI[md5sum] = "486fc16ad7b7d0c1488ba5482536d66c" +SRC_URI[sha256sum] = "0ee989a5d45a94e927609b22e2413c7f2788a7b4a23af66ecfa15c31db2a9b31" # /usr/lib/qt5/qml/QtQuick/Dialogs/images/*.png FILES_${PN}-qmlplugins += " \
Signature · 1 line
1.8.4.rc3
PATCH 4/21 qtsvg: update to 5.1.1
In reply to Eric Bénard--- recipes-qt/qt5/qtsvg_5.1.0.bb | 5 ----- recipes-qt/qt5/qtsvg_5.1.1.bb | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtsvg_5.1.0.bb create mode 100644 recipes-qt/qt5/qtsvg_5.1.1.bb
recipes-qt/qt5/qtsvg_5.1.0.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "394d33cc5d6b7aafbaae5a4f1d9e6652" -SRC_URI[sha256sum] = "50fc66ada43472e42245c18095e9eac84b496a634736cf55aac81326e4aad54a"
recipes-qt/qt5/qtsvg_5.1.1.bb new file +6 -0
@@ -0,0 +1,6 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "9db8209602b0ea942273e01a874ea5b7" +SRC_URI[sha256sum] = "6bfe7705ff58391205ca797d84ca6dda57ebcce106fdff52d4908b0e443567bf" +
Signature · 1 line
1.8.4.rc3
PATCH 7/21 qtgraphicaleffects: update to 5.1.1
In reply to Eric Bénard--- recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb | 5 ----- recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb create mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb
recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "0e38ef686197fbf1207a9510f07d0656" -SRC_URI[sha256sum] = "ea30ed7c3523d1a800a63cb888096cef89c61b590bfc81ba815ab9b12e283a89"
recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "40d0989d68fb08c1184b7d5088da9c48" +SRC_URI[sha256sum] = "347c33ee496d67d98d64b6fa43797c45eae85752bb0026eb234bfb420f77febf"
Signature · 1 line
1.8.4.rc3
PATCH 8/21 qtimageformats: update to 5.1.1
In reply to Eric Bénard--- recipes-qt/qt5/qtimageformats_5.1.0.bb | 5 ----- recipes-qt/qt5/qtimageformats_5.1.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtimageformats_5.1.0.bb create mode 100644 recipes-qt/qt5/qtimageformats_5.1.1.bb
recipes-qt/qt5/qtimageformats_5.1.0.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "6dfab2e481e90ce74e89c646b91a11ca" -SRC_URI[sha256sum] = "c740442a46715e32a45f60e42fda76afd8430bf0004ee1f7147aa77cf92ed846"
recipes-qt/qt5/qtimageformats_5.1.1.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "209edddd5899b36ea7ea7ad52204a593" +SRC_URI[sha256sum] = "3bbb7825c0298c7d95d26b205e48da02c5bac3b35d66a601f939f8ee8b3463a4"
Signature · 1 line
1.8.4.rc3
PATCH 9/21 qtmultimedia: update to 5.1.1
In reply to Eric Bénard--- recipes-qt/qt5/qtmultimedia_5.1.0.bb | 5 ----- recipes-qt/qt5/qtmultimedia_5.1.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtmultimedia_5.1.0.bb create mode 100644 recipes-qt/qt5/qtmultimedia_5.1.1.bb
recipes-qt/qt5/qtmultimedia_5.1.0.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "ae0301809ca504b4b67d817fd46f9a2e" -SRC_URI[sha256sum] = "1df262e4d8d16f83511a096974a5a14af21d366493c5302d549e3dc52fa0b00f"
recipes-qt/qt5/qtmultimedia_5.1.1.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "4b6e74bd7752bc241617f41539632bba" +SRC_URI[sha256sum] = "df907a81c4ef15c9aec216c1f57aa72a7a7b274ea3cb3950f87fa1b04e369ebe"
Signature · 1 line
1.8.4.rc3
PATCH 10/21 qtscript: update to 5.1.1
In reply to Eric Bénard--- recipes-qt/qt5/qtscript_5.1.0.bb | 5 ----- recipes-qt/qt5/qtscript_5.1.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtscript_5.1.0.bb create mode 100644 recipes-qt/qt5/qtscript_5.1.1.bb
recipes-qt/qt5/qtscript_5.1.0.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "c9348cdc39826c717c75b930a7b5a3bf" -SRC_URI[sha256sum] = "0cbe2e472657673ec8bd2f1ad133140b498292065159e67355f427e903c46d9b"
recipes-qt/qt5/qtscript_5.1.1.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "5c0e8633fbf560f711b7af689f8bcb99" +SRC_URI[sha256sum] = "d80061f7652ae3992e2b9ffbc7052d54872f6042a7a258b50d22eadf0175f364"
Signature · 1 line
1.8.4.rc3
PATCH 11/21 qtsensors: update to 5.1.1
In reply to Eric Bénard--- recipes-qt/qt5/qtsensors_5.1.0.bb | 5 ----- recipes-qt/qt5/qtsensors_5.1.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtsensors_5.1.0.bb create mode 100644 recipes-qt/qt5/qtsensors_5.1.1.bb
recipes-qt/qt5/qtsensors_5.1.0.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "bcb4b546d1d39f2e27425b48bae90ac2" -SRC_URI[sha256sum] = "5cfd74323e8145a282fe840c47c639c064e832263744a24270f326a1464830ee"
recipes-qt/qt5/qtsensors_5.1.1.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "219607895e15348d723fa67324d7061a" +SRC_URI[sha256sum] = "07f2d94964b47786a33ba1e24049c81b29e95b791647f9116ea350dc4cbc814f"
Signature · 1 line
1.8.4.rc3
PATCH 12/21 qtsystems: doesn't depends on qtjsondb
In reply to Eric Bénard--- recipes-qt/qt5/qtsystems.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-qt/qt5/qtsystems.inc +1 -1
@@ -1,6 +1,6 @@ require qt5.inc -DEPENDS += "qtbase qtdeclarative qtjsondb udev bluez4 gconf" +DEPENDS += "qtbase qtdeclarative udev bluez4 gconf" LICENSE = "BSD & LGPL-2.1 & GFDL-1.3" # LICENSE files are missing in 5.0.0
Signature · 1 line
1.8.4.rc3
PATCH 13/21 qtquick1: update to 5.1.1
In reply to Eric Bénard---
recipes-qt/qt5/{qtquick1_5.1.0.bb => qtquick1_5.1.1.bb} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename recipes-qt/qt5/{qtquick1_5.1.0.bb => qtquick1_5.1.1.bb} (100%)recipes-qt/qt5/qtquick1_5.1.1.bb renamed from recipes-qt/qt5/qtquick1_5.1.0.bb +0 -0
Signature · 1 line
1.8.4.rc3
Hi,
sorry for the noise, I forget the good subject.
New serie is following.
It updates Qt to 5.1.1 on master branch of meta-qt5.
BTW : Martin, the serie I sent yesterday is good for dora branch (except the cinematicexperience which was missing the SUMMARY), that'll avoid cherry-pick issues if you want to apply it on dora.
Eric
Quoted 3 lines · Eric Bénard
for more informations on this demo :
http://kgronholm.blogspot.fr/2012/08/qt5-cinematic-experience.html
http://quitcoding.com/?page=work#cinex
All merged in master as well as dora, thanks!
Quoted 60 lines
Signed-off-by Eric Bénard <[email protected]>--- recipes-qt/examples/cinematicexperience_1.0.bb | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 recipes-qt/examples/cinematicexperience_1.0.bbrecipes-qt/examples/cinematicexperience_1.0.bb new file +40
-0@@ -0,0 +1,40 @@ +SUMMARY = "Qt5 technology demo" +DESCRIPTION = "Cinematic Experience collects many of the new Qt5 QtQuick 2.0 features into the same UX demo application. It uses particles, sprites, path animation, custom shaders etc. features which Qt5 introduces for QML UIs." +HOMEPAGE = "http://quitcoding.com/?page=work#cinex" +LICENSE = "CC-BY-3.0" +LIC_FILES_CHKSUM = "file://README;beginline=38;endline=50;md5=51babd597624b70752069953876aaa18" + +SRC_URI = "http://quitcoding.com/download/Qt5_CinematicExperience_rpi_1.0.tgz" + +SRC_URI[md5sum] = "935a5db0a6b2a72c67236e72f52be7d1" +SRC_URI[sha256sum] = "0dd602983ced5f7c0cfd5ad0fbfe2b0b7e3c9ff715e4ef23eef818ccc2b6c60b" + +S = "${WORKDIR}/Qt5_CinematicExperience_rpi_${PV}/" + +# other version available for small screens +#SRC_URI = "http://quitcoding.com/download/Qt5_CinematicExperience_1.0.tgz" +#SRC_URI[md5sum] = "1c4f9bf5411c985fc5d3dbfc5d826a29" +#SRC_URI[sha256sum] = "0e547e0259667915a24e84ade5efdcd0c553f81786734452c2c8dbce19a19f44" +#S = "${WORKDIR}/Qt5_CinematicExperience_${PV}/" + +DEPENDS = "qtdeclarative qtgraphicaleffects" +RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" + +require recipes-qt/qt5/qt5.inc + +do_install() { + install -d ${D}${datadir}/${P} + install -m 0755 ${B}/Qt5_CinematicExperience ${D}${datadir}/${P} + cp -a ${S}/content ${D}${datadir}/${P} + install -m 0644 ${S}/Qt5_CinematicExperience.qml ${D}${datadir}/${P} + + install -d ${D}${bindir} + echo "#!/bin/sh" > ${D}${bindir}/Qt5_CinematicExperience + echo "export QML_IMPORT_PATH=${datadir}/${P}" >> ${D}${bindir}/Qt5_CinematicExperience + echo "export QML2_IMPORT_PATH=${datadir}/${P}" >> ${D}${bindir}/Qt5_CinematicExperience + echo "${datadir}/${P}/Qt5_CinematicExperiencea \$* " >> ${D}${bindir}/Qt5_CinematicExperience + chmod +x ${D}${bindir}/Qt5_CinematicExperience +} + +FILES_${PN}-dbg += "${datadir}/${P}/.debug" +FILES_${PN} += "${datadir}"Signature · 6 lines
1.8.4.rc3 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]