sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

qt3d, qtjsondb: bump SRCREV and set MODULE_VERSION 

* drop INC_PR/PR where possible

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2013-07-20 14:42:03 +02:00
parent 5eb22ffbfa
commit 3da4d425d0
8 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-qt/qt5/qt3d.inc
View File

@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
"
INC_PR = "r1"
FILES_${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/*/*/*.bez \
${OE_QMAKE_PATH_QML}/*/*/*.obj \

11
recipes-qt/qt5/qt3d_git.bb
View File

@ -4,8 +4,13 @@ require ${PN}.inc
# last tag before this SRCREV is 5.0.0-beta1
PV = "4.999+5.0.0-beta1+git${SRCPV}"
PR = "${INC_PR}.0"
QT_MODULE_BRANCH = "master"
SRCREV = "0158ce783a61bac3e4f4ff619b0601daf9174ce6"
SRCREV = "d517d39d5491bc95b1dddc3ff5cb880bd3bd0058"
do_configure_prepend() {
# Temporary hack to get qt3d build for Qt 5.1.0
if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then
echo "MODULE_VERSION = 5.1.0" >> ${S}/.qmake.conf
fi
}

2
recipes-qt/qt5/qtjsondb.inc
View File

@ -8,5 +8,3 @@ LIC_FILES_CHKSUM = "file://${S}/doc/src/qtjsondb.qdoc;endline=26;md5=757f4eda130
file://${S}/examples/jsondb-client/example.qml;endline=39;md5=5213e8171c07d54db7107f29ac2f7b5e \
file://${S}/src/client/qjsondbglobal.h;endline=40;md5=34f5660524f0d70941d0416511ef49a0 \
"
INC_PR = "r0"

17
recipes-qt/qt5/qtjsondb_git.bb
View File

@ -4,8 +4,19 @@ require ${PN}.inc
# qtjsondb wasn't released yet, last tag before this SRCREV isn't even 5.0.0-beta1, but lets use it for now
PV = "4.999+5.0.0-beta1+git${SRCPV}"
PR = "${INC_PR}.0"
QT_MODULE_BRANCH = "master"
SRCREV = "c7c1e61bb5beddc3f4502548fd9ee498f1534e67"
SRCREV = "27a2b5d9a0f081f71c26a1716721411606f8dedf"
do_configure_prepend() {
# Temporary hack to get qtjsondb build for Qt 5.1.0
if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then
echo "MODULE_VERSION = 5.1.0" >> ${S}/.qmake.conf
fi
}
do_configure_append() {
# work around for this issue:
# http://www.mail-archive.com/ci-reports@qt-project.org/msg09692.html
sed -i '/^INCPATH/s#-I\.$#-I. -I../../include/QtJsonDbPartition#g' ${B}/src/client/Makefile
}

2
recipes-qt/qt5/qtlocation.inc
View File

@ -2,5 +2,3 @@ require qt5.inc
DEPENDS += "qtbase qt3d qtjsondb"
# qtsystems qtmultimedia
INC_PR = "r0"

3
recipes-qt/qt5/qtlocation_git.bb
View File

@ -4,7 +4,8 @@ require ${PN}.inc
# qtlocation wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
PV = "4.999+5.0.0-beta1+git${SRCPV}"
PR = "${INC_PR}.0"
# drop when bumping SRCREV
PR = "r1"
QT_MODULE_BRANCH = "master"

2
recipes-qt/qt5/qtsystems.inc
View File

@ -8,5 +8,3 @@ LIC_FILES_CHKSUM = "file://${S}/src/imports/systeminfo/qsysteminfo.cpp;endline=4
file://${S}/examples/systeminfo/qml-storageinfo/content/ProgressBar.qml;endline=39;md5=5213e8171c07d54db7107f29ac2f7b5e \
file://${S}/doc/src/systeminfo/systeminfo.qdoc;endline=26;md5=757f4eda130ceff3ca0985dde715af07 \
"
INC_PR = "r0"

3
recipes-qt/qt5/qtsystems_git.bb
View File

@ -4,7 +4,8 @@ require ${PN}.inc
# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
PV = "4.999+5.0.0-beta1+git${SRCPV}"
PR = "${INC_PR}.0"
# drop when bumping SRCREV
PR = "r1"
QT_MODULE_BRANCH = "master"