Small update of git recipes

PATCH New Martin Jansa 1 participant 5 messages Mar 12, 2014

Share & tools

Martin Jansa

author

2014-03-12 11:48 UTC #0 lore raw

cover Small update of git recipes

Before rebasing git recipes for latest origin/stable (in preparation for 5.3.0 release) here is small update for at least newer origin/release revs.

The following changes since commit fc06fb8ceb8eec4fe64463234ce6aaadd5f8a852:

qtbase.inc: set virtual/mesa and virtual/egl as dependency in PACKAGECONFIG[kms] (2014-03-05 19:28:46 +0100)

are available in the git repository at:

git://github.com/meta-qt5/meta-qt5 tags/5.2.1+origin/release
https://github.com/meta-qt5/meta-qt5/tree/jansa/test

Martin Jansa (4):
qtbase: Replace 0012-qtbase-allow-build-of-examples.patch with
-compile-examples option
qt5-git: bump SRCREVs to latest in 'release' branch
qtdeclarative_git: drop
0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
qtbase: move 0015-Fix-linuxfb-argument-mmsize-parsing.patch to 5.2.1
recipe

 recipes-qt/qt5/qtbase-native_git.bb                |  4 +-
 recipes-qt/qt5/qtbase.inc                          |  4 +-
 .../0012-qtbase-allow-build-of-examples.patch      | 48 ----------------------
 recipes-qt/qt5/qtbase_5.2.1.bb                     |  2 +
 recipes-qt/qt5/qtbase_git.bb                       |  4 +-
 recipes-qt/qt5/qtconnectivity_git.bb               |  4 +-
 recipes-qt/qt5/qtdeclarative.inc                   |  1 -
 recipes-qt/qt5/qtdeclarative_5.2.1.bb              |  4 ++
 recipes-qt/qt5/qtdeclarative_git.bb                |  3 +-
 recipes-qt/qt5/qtgraphicaleffects_git.bb           |  4 +-
 recipes-qt/qt5/qtimageformats_git.bb               |  4 +-
 recipes-qt/qt5/qtlocation_git.bb                   |  4 +-
 recipes-qt/qt5/qtmultimedia_git.bb                 |  4 +-
 recipes-qt/qt5/qtquick1_git.bb                     |  4 +-
 recipes-qt/qt5/qtquickcontrols_git.bb              |  4 +-
 recipes-qt/qt5/qtscript_git.bb                     |  4 +-
 recipes-qt/qt5/qtsensors_git.bb                    |  4 +-
 recipes-qt/qt5/qtserialport_git.bb                 |  3 +-
 recipes-qt/qt5/qtsvg_git.bb                        |  4 +-
 recipes-qt/qt5/qtsystems_git.bb                    |  2 -
 recipes-qt/qt5/qttools-native_git.bb               |  4 +-
 recipes-qt/qt5/qttools_git.bb                      |  4 +-
 recipes-qt/qt5/qtwebkit-examples_git.bb            |  4 +-
 recipes-qt/qt5/qtwebkit_git.bb                     |  4 +-
 recipes-qt/qt5/qtx11extras_git.bb                  |  4 +-
 recipes-qt/qt5/qtxmlpatterns_git.bb                |  4 +-
 26 files changed, 65 insertions(+), 74 deletions(-)
 delete mode 100644 recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch

Signature · 1 line

1.9.0

Martin Jansa

author

2014-03-12 11:48 UTC #1 lore raw

PATCH 1/4 qtbase: Replace 0012-qtbase-allow-build-of-examples.patch with -compile-examples option

* -compile-examples option was added in upstream commit:
commit 8ea19caacf281240411541b5af37c2f9a103a7d1
Author: Oswald Buddenhagen <[email protected]>
Date: Tue May 7 17:10:22 2013 +0200
Subject: add -compile-examples configure option

Signed-off-by Martin Jansa <[email protected]>

---
 recipes-qt/qt5/qtbase.inc                          |  3 +-
 .../0012-qtbase-allow-build-of-examples.patch      | 48 ----------------------
 2 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch

recipes-qt/qt5/qtbase.inc +1 -2

index 2430035..a6fb3b2 100644
@@ -16,7 +16,6 @@ SRC_URI += "\
 SRC_URI += "\
     file://0010-qmake-is-already-built-in-qtbase-native.patch \
     file://0011-Allow-building-a-separate-qmake-for-the-target.patch \
-    file://0012-qtbase-allow-build-of-examples.patch \
     file://0013-QOpenGLPaintDevice-sub-area-support.patch \
     file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
     file://0015-Fix-linuxfb-argument-mmsize-parsing.patch \

@@ -65,7 +64,7 @@ PACKAGECONFIG[release] = "-release,-debug"
 PACKAGECONFIG[developer] = "-developer-build"
 PACKAGECONFIG[sm] = "-sm,-no-sm"
 PACKAGECONFIG[tests] = "-make tests,-nomake tests"
-PACKAGECONFIG[examples] = "-make examples,-nomake examples"
+PACKAGECONFIG[examples] = "-make examples -compile-examples,-nomake examples"
 PACKAGECONFIG[tools] = "-make tools,-nomake tools"
 # only for completeness, configure will add libs even if you try to explicitly remove it
 PACKAGECONFIG[libs] = "-make libs,-nomake libs"

recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch deleted +0 ~~-48~~

48 lines not on this page · raw message

Signature · 1 line

1.9.0

Martin Jansa

author

2014-03-12 11:48 UTC #2 lore raw

PATCH 2/4 qt5-git: bump SRCREVs to latest in 'release' branch

In reply to Martin Jansa

* in some components there was just
Bump MODULE_VERSION to 5.2.2
commit but bump them all for consistencty

* we're testing newer revisions in order to narrow some QML issues we're seeing in runtime

Signed-off-by Martin Jansa <[email protected]>

---
 recipes-qt/qt5/qtbase-native_git.bb      | 4 +++-
 recipes-qt/qt5/qtbase_git.bb             | 4 +++-
 recipes-qt/qt5/qtconnectivity_git.bb     | 4 +++-
 recipes-qt/qt5/qtdeclarative_git.bb      | 3 ++-
 recipes-qt/qt5/qtgraphicaleffects_git.bb | 4 +++-
 recipes-qt/qt5/qtimageformats_git.bb     | 4 +++-
 recipes-qt/qt5/qtlocation_git.bb         | 4 +++-
 recipes-qt/qt5/qtmultimedia_git.bb       | 4 +++-
 recipes-qt/qt5/qtquick1_git.bb           | 4 +++-
 recipes-qt/qt5/qtquickcontrols_git.bb    | 4 +++-
 recipes-qt/qt5/qtscript_git.bb           | 4 +++-
 recipes-qt/qt5/qtsensors_git.bb          | 4 +++-
 recipes-qt/qt5/qtserialport_git.bb       | 3 ++-
 recipes-qt/qt5/qtsvg_git.bb              | 4 +++-
 recipes-qt/qt5/qtsystems_git.bb          | 2 --
 recipes-qt/qt5/qttools-native_git.bb     | 4 +++-
 recipes-qt/qt5/qttools_git.bb            | 4 +++-
 recipes-qt/qt5/qtwebkit-examples_git.bb  | 4 +++-
 recipes-qt/qt5/qtwebkit_git.bb           | 4 +++-
 recipes-qt/qt5/qtx11extras_git.bb        | 4 +++-
 recipes-qt/qt5/qtxmlpatterns_git.bb      | 4 +++-
 21 files changed, 58 insertions(+), 22 deletions(-)

recipes-qt/qt5/qtbase-native_git.bb +3 -1

index c69b631..6f11bf3 100644
@@ -7,4 +7,6 @@ do_install_append() {
     ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
 }
 
-SRCREV = "000ee3d503906c2c20f789b6b9dd95b8647405d0"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 168 commits
+SRCREV = "08cbbde61778276ccdda73d89fd64d02c623779f"

recipes-qt/qt5/qtbase_git.bb +3 -1

index 4d55dbe..1083983 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "000ee3d503906c2c20f789b6b9dd95b8647405d0"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 168 commits
+SRCREV = "08cbbde61778276ccdda73d89fd64d02c623779f"

recipes-qt/qt5/qtconnectivity_git.bb +3 -1

index cca309b..35e54d3 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${BPN}.inc
 
-SRCREV = "2f2985b03f5202a9ab329f89de7317585af8c250"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 25 commits
+SRCREV = "9902dfdbc44934ce2e8072bc237ca8cdbfb3402b"

recipes-qt/qt5/qtdeclarative_git.bb +2 -1

index 1b9decd..e2d6ae5 100644
@@ -2,4 +2,5 @@ require qt5-git.inc
 require ${PN}.inc
 
 QT_MODULE_BRANCH = "release"
-SRCREV = "96e4f00db3bfd222146780251013501cfdd8baaa"
+# v5.2.1 + 81 commits
+SRCREV = "7ceefa60ab4f79d5f40e7051edf80c1a77ae7734"

recipes-qt/qt5/qtgraphicaleffects_git.bb +3 -1

index 2f964fe..b442069 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "740fbcf28012ade59087df945b4c6b8ae05b7a68"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 3 commits
+SRCREV = "1fbbe87e6d5dc84bff70bd90b71d07f9982a8bc3"

recipes-qt/qt5/qtimageformats_git.bb +3 -1

index 8a39e2d..e40bd3f 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "8548d1fe0985b3b680acef3135646aa4e876175c"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 1 commits
+SRCREV = "dde6daeccdf0a3f8d49fe1777b49046576b12218"

recipes-qt/qt5/qtlocation_git.bb +3 -1

index e1af5fb..e498515 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "a74b31c16b4baeeb8047e1958eb1b6787dc885e8"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 13 commits
+SRCREV = "2ba9fd5550eb7766c20b3a61679e88ec4a6c8a54"

recipes-qt/qt5/qtmultimedia_git.bb +3 -1

index 6e87fb3..e9fed1a 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "658ad524f8ba9cbcae797aefbdf498ef9d364067"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 17 commits
+SRCREV = "db7f7cc5654ddec60297259bc9f86f5f777749cd"

recipes-qt/qt5/qtquick1_git.bb +3 -1

index 636c4c9..d744aa8 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "3384daf6d1ab1fc15908866e2743f060a7461daa"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 2 commits
+SRCREV = "07d8ce32b1112dcb590c793ee51cb713e514011b"

recipes-qt/qt5/qtquickcontrols_git.bb +3 -1

index be0fbba..69c3353 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "c7540702126251ca5f7cc78e685b970d06e48ce8"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 15 commits
+SRCREV = "1c54d411ad6e98c3779a412750aec8b93d587872"

recipes-qt/qt5/qtscript_git.bb +3 -1

index dd9b3a8..2b86650 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "3aadb5c9894d5fe92923cc6c5dd2a71949a49927"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 1 commits
+SRCREV = "f89d64ca722acf4a1a38c5e136bb01eff2525978"

recipes-qt/qt5/qtsensors_git.bb +3 -1

index 767655f..aedcc40 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "832136829ece18885ef7ac35f4527d1d314aaea8"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 2 commits
+SRCREV = "9a8319a39a06d6cf3163978301d650b8f3558c62"

recipes-qt/qt5/qtserialport_git.bb +2 -1

index 028c77f..3418259 100644
@@ -2,4 +2,5 @@ require qt5-git.inc
 require ${PN}.inc
 
 QT_MODULE_BRANCH = "release"
-SRCREV = "29e526ad5c1e2fe0996ba0a776d83ec86f7197d7"
+# v5.2.1 + 28 commits
+SRCREV = "03546732fa696467d23b24224fad2822bc6a9043"

recipes-qt/qt5/qtsvg_git.bb +3 -1

index 986b0c1..b6032b7 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "ef1c298cc27e15dd6f6bba95b605471d95bead6b"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 1 commits
+SRCREV = "ae68091e0d6023410bc657cf54e7fa9b6c8bbcc2"

recipes-qt/qt5/qtsystems_git.bb +0 -2

index 7853355..c264ab0 100644
@@ -4,6 +4,4 @@ require ${PN}.inc
 # qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
 # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1
 
-QT_MODULE_BRANCH = "dev"
-
 SRCREV = "aa651c73bf7bc57c1b6b1bfcfa9afe901884a102"

recipes-qt/qt5/qttools-native_git.bb +3 -1

index 77c5a8d..200f427 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "70e06f2cdbcd16cbbae3f577701ff44bf5765cdb"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 13 commits
+SRCREV = "80c6a5ea7f827647cc58037e1d1cf4bbf30e1fb6"

recipes-qt/qt5/qttools_git.bb +3 -1

index 77c5a8d..200f427 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "70e06f2cdbcd16cbbae3f577701ff44bf5765cdb"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 13 commits
+SRCREV = "80c6a5ea7f827647cc58037e1d1cf4bbf30e1fb6"

recipes-qt/qt5/qtwebkit-examples_git.bb +3 -1

index 0cc5fbf..1f5df71 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "0d6e9989eb2a15d130b2a132ddc196835a33c9b6"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 1 commits
+SRCREV = "cb8ed9694b850a429a93490beaa6462d9f3b8ea6"

recipes-qt/qt5/qtwebkit_git.bb +3 -1

index 8ba7145..047b37f 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "3dd07419f3f627ffd0a9efc3f7253cef145f14e5"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 18 commits
+SRCREV = "a1b801fc98ccda988df41e08dc70fdbd50ecb513"

recipes-qt/qt5/qtx11extras_git.bb +3 -1

index d6f82c0..d0a2a8c 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "766eaface63b98a248d49d6b70f367e9eebb8f95"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 1 commits
+SRCREV = "dd7eec92e7a5f4383783cc161f638867572dc208"

recipes-qt/qt5/qtxmlpatterns_git.bb +3 -1

index a51e6c1..28e45a4 100644
@@ -1,4 +1,6 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "f73a75f92a2e6036bbc183d7f63bfd8f42e8abc6"
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 4 commits
+SRCREV = "eaf0a92dcb6fb12f3d65aa4fc806ccbfaa7f7db0"

Signature · 1 line

1.9.0

Martin Jansa

author

2014-03-12 11:48 UTC #3 lore raw

PATCH 3/4 qtdeclarative_git: drop 0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch

In reply to Martin Jansa

* drop 0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch because it's already applied in upstream commit:
commit d765ad8e3dabe44f276db9084b1d16164c4535e7
Author: Florian Hänel <[email protected]>
Date: Wed Jun 5 19:23:32 2013 +0200
Subject: Fix wrong calculation of viewPort for transitions

Signed-off-by Martin Jansa <[email protected]>

---
 recipes-qt/qt5/qtdeclarative.inc      | 1 -
 recipes-qt/qt5/qtdeclarative_5.2.1.bb | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

recipes-qt/qt5/qtdeclarative.inc +0 -1

index bd68955..4a186fd 100644
@@ -2,7 +2,6 @@ require qt5.inc
 
 SRC_URI += " \
     file://0001-qmltestexample-fix-link.patch \
-    file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
 "
 
 DEPENDS += "qtbase"

recipes-qt/qt5/qtdeclarative_5.2.1.bb +4 -0

index 8e435cf..eaa90ba 100644
@@ -1,5 +1,9 @@
 require qt5-${PV}.inc
 require ${PN}.inc
 
+SRC_URI += " \
+    file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
+"
+
 SRC_URI[md5sum] = "a23fba03a4b48f36fe8b51d326d08acc"
 SRC_URI[sha256sum] = "7e32b8d6e1d64ca4bdfa92d15f9b4217a1b24239ef40e8826eeccbe918866690"

Signature · 1 line

1.9.0

Martin Jansa

author

2014-03-12 11:48 UTC #4 lore raw

PATCH 4/4 qtbase: move 0015-Fix-linuxfb-argument-mmsize-parsing.patch to 5.2.1 recipe

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 recipes-qt/qt5/qtbase.inc      | 1 -
 recipes-qt/qt5/qtbase_5.2.1.bb | 2 ++
 recipes-qt/qt5/qtbase_git.bb   | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

recipes-qt/qt5/qtbase.inc +0 -1

index a6fb3b2..89736be 100644
@@ -18,7 +18,6 @@ SRC_URI += "\
     file://0011-Allow-building-a-separate-qmake-for-the-target.patch \
     file://0013-QOpenGLPaintDevice-sub-area-support.patch \
     file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
-    file://0015-Fix-linuxfb-argument-mmsize-parsing.patch \
     file://0016-eglfs-Fix-quad-coordinates.patch \
 "

recipes-qt/qt5/qtbase_5.2.1.bb +2 -0

index c106d22..4257367 100644
@@ -1,5 +1,7 @@
 require qt5-${PV}.inc
 require ${PN}.inc
 
+SRC_URI += "file://0015-Fix-linuxfb-argument-mmsize-parsing.patch"
+
 SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b"
 SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0"

recipes-qt/qt5/qtbase_git.bb +2 -2

index 1083983..07dd936 100644
@@ -2,5 +2,5 @@ require qt5-git.inc
 require ${PN}.inc
 
 QT_MODULE_BRANCH = "release"
-# v5.2.1 + 168 commits
-SRCREV = "08cbbde61778276ccdda73d89fd64d02c623779f"
+# v5.2.1 + 172 commits
+SRCREV = "bf0336a02502b3ed4d399c1cf5b4a56b1e858d42"

Signature · 1 line

1.9.0