From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.windriver.com ([147.11.1.11]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Qvojx-0007pi-JX for openembedded-core@lists.openembedded.org; Tue, 23 Aug 2011 13:01:55 +0200 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca [147.11.189.40]) by mail.windriver.com (8.14.3/8.14.3) with ESMTP id p7NAv7Bl007876 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Tue, 23 Aug 2011 03:57:07 -0700 (PDT) Received: from localhost (128.224.162.28) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.1.255.0; Tue, 23 Aug 2011 03:57:06 -0700 Message-ID: <2a8e8dd160c4dba319dbbd7864d33cecd681b08c.1314096402.git.xiaofeng.yan@windriver.com> In-Reply-To: References: Old-Date: Tue, 23 Aug 2011 18:32:42 +0800 Date: Tue, 23 Aug 2011 18:57:35 +0800 To: From: Xiaofeng Yan MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by mail.windriver.com id p7NAv7Bl007876 Subject: [PATCH 1/1] qt4e-demo-image: Fix bug 999 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Aug 2011 11:01:55 -0000 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable From: Xiaofeng Yan [YOCTO #999] Copy metadata of qt4e-demo-image from OE for easy testing qt4embeded on e= mbedded platform. This image was tested on qemuarm and can run program "qtdemoE". Signed-off-by: Xiaofeng Yan --- meta/recipes-qt/images/qt4e-base-image.bb | 19 + meta/recipes-qt/images/qt4e-demo-image.bb | 11 + meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init | 55 +++ meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb | 19 + meta/recipes-qt/qwt/files/qt2-fix.patch | 408 ++++++++++++++++= ++++++ meta/recipes-qt/qwt/qwt-e_5.2.1.bb | 11 + meta/recipes-qt/qwt/qwt.inc | 36 ++ meta/recipes-qt/qwt/qwt_5.2.1.bb | 10 + meta/recipes-qt/tasks/task-qt4e.bb | 54 +++ 9 files changed, 623 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-qt/images/qt4e-base-image.bb create mode 100644 meta/recipes-qt/images/qt4e-demo-image.bb create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb create mode 100644 meta/recipes-qt/qwt/files/qt2-fix.patch create mode 100644 meta/recipes-qt/qwt/qwt-e_5.2.1.bb create mode 100644 meta/recipes-qt/qwt/qwt.inc create mode 100644 meta/recipes-qt/qwt/qwt_5.2.1.bb create mode 100644 meta/recipes-qt/tasks/task-qt4e.bb diff --git a/meta/recipes-qt/images/qt4e-base-image.bb b/meta/recipes-qt/= images/qt4e-base-image.bb new file mode 100644 index 0000000..b8b7771 --- /dev/null +++ b/meta/recipes-qt/images/qt4e-base-image.bb @@ -0,0 +1,19 @@ +TOUCH =3D ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib t= slib-calibrate tslib-tests", "",d)}' + +DEPENDS +=3D "task-qt4e" + +RDEPENDS_${PN} +=3D " \ + task-qt4e-base \ + task-qt4e-qwt \ + " + +IMAGE_INSTALL +=3D "\ + initscripts \ + kernel-modules \ + gdbserver \ + strace \ + module-init-tools \ + task-qt4e-base \ + task-qt4e-qwt \ + ${TOUCH} \ +" diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/= images/qt4e-demo-image.bb new file mode 100644 index 0000000..23b365f --- /dev/null +++ b/meta/recipes-qt/images/qt4e-demo-image.bb @@ -0,0 +1,11 @@ +require qt4e-base-image.bb + +LIC_FILES_CHKSUM =3D "file://${COREBASE}/LICENSE;md5=3D3f40d799439710928= 5ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3D3da9cfbcb7= 88c80a0384361b4de20420" + + +IMAGE_INSTALL +=3D "\ + qt4-embedded-demos qt4-embedded-examples qt-demo-init \ + qt4-embedded-assistant \ + qwt-e-examples \ +" diff --git a/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init b/meta/reci= pes-qt/qt-demo/qt-demo-init/qtdemo-init new file mode 100644 index 0000000..affb958 --- /dev/null +++ b/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init @@ -0,0 +1,55 @@ +#!/bin/sh + +set -e + +if [ -f /usr/bin/qtdemo ]; then + QTDEMO=3D"qtdemo > /var/log/Xsession.log 2> &1" +else + QTDEMO=3D"qtdemoE -qws" +fi + +case "$1" in + start) + echo "Starting qtdemo" + if [ -f /etc/profile.d/tslib.sh ]; then + source /etc/profile.d/tslib.sh + fi + if [ -e $TSLIB_TSDEVICE ]; then + if [ ! -f /etc/pointercal ]; then + /usr/bin/ts_calibrate + fi + if [ $QTDEMO =3D=3D qtdemo ]; then + Xorg & + export DISPLAY=3D:0 + $QTDEMO & + else + QWS_MOUSE_PROTO=3Dtslib:$TSLIB_TSDEVICE $QTDEMO & + fi + else + if [ $QTDEMO =3D=3D qtdemo ]; then + Xorg & + export DISPLAY=3D:0 + fi + $QTDEMO & + fi + ;; + stop) + echo "Stopping qtdemo" + if [ $QTDEMO =3D=3D qtdemo ]; then + killall Xorg + killall qtdemo + else + killall qtdemoE + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 { start | stop | restart }" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb b/meta/recipes-q= t/qt-demo/qt-demo-init_0.1.bb new file mode 100644 index 0000000..3d7cdfc --- /dev/null +++ b/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION =3D "Init script for qtdemo" +LICENSE =3D "MIT" +SRC_URI =3D "file://qtdemo-init" +PR =3D "r2" +LIC_FILES_CHKSUM =3D "file://${COREBASE}/LICENSE;md5=3D3f40d799439710928= 5ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3D3da9cfbcb7= 88c80a0384361b4de20420" + + +PACKAGE_ARCH =3D "all" + +do_install() { + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/qtdemo-init ${D}${sysconfdir}/init.d/qtdemo +} + +inherit update-rc.d + +INITSCRIPT_NAME =3D "qtdemo" +INITSCRIPT_PARAMS =3D "start 99 5 2 . stop 19 0 1 6 ." diff --git a/meta/recipes-qt/qwt/files/qt2-fix.patch b/meta/recipes-qt/qw= t/files/qt2-fix.patch new file mode 100644 index 0000000..821846a --- /dev/null +++ b/meta/recipes-qt/qwt/files/qt2-fix.patch @@ -0,0 +1,408 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qwt-4.2.0rc1/include/qwt_global.h~qt2-fix ++++ qwt-4.2.0rc1/include/qwt_global.h +@@ -58,7 +58,7 @@ + #define QWT_EXPORT + #endif +=20 +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + // Use old QArray instead of QMemArray + #define QWT_NO_MEMARRAY=20 + #endif +@@ -68,7 +68,7 @@ + #undef QWT_NO_STL + // #define QWT_NO_STL // disable Standard Template Library based classe= s + #if defined(_MSC_VER) +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + // tmake does not produce the missing -GX flag for exception handling + #define QWT_NO_STL + #else +--- qwt-4.2.0rc1/include/qwt_picker.h~qt2-fix ++++ qwt-4.2.0rc1/include/qwt_picker.h +@@ -89,7 +89,7 @@ + Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMod= e) + Q_PROPERTY(bool isEnabled READ isEnabled WRITE setEnabled) +=20 +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + // Unfortunately moc is not aware of #ifdefs. To enable the QPen + // attributes as properties uncomment the following lines. +=20 +--- qwt-4.2.0rc1/src/qwt_text.cpp~qt2-fix ++++ qwt-4.2.0rc1/src/qwt_text.cpp +@@ -337,7 +337,7 @@ + //! Set the font + void QwtRichText::setFont(const QFont &font) + { +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + d_doc->setDefaultFont(font); + #endif + QwtText::setFont(font); +@@ -359,7 +359,7 @@ + */ + int QwtRichText::heightForWidth(int width) const + { +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + const QFont defaultFont =3D QFont::defaultFont(); + QFont::setDefaultFont(font()); + #endif +@@ -367,7 +367,7 @@ + const QwtLayoutMetrics metrics(QwtPainter::metricsMap()); + const int height =3D metrics.heightForWidth(*d_doc, width); +=20 +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + QFont::setDefaultFont(defaultFont); + #endif +=20 +@@ -390,7 +390,7 @@ + painter->save(); +=20 + painter->setPen(color()); +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + const QFont defaultFont =3D QFont::defaultFont(); + QFont::setDefaultFont(font()); + #else +@@ -399,7 +399,7 @@ +=20 + QwtPainter::drawSimpleRichText(painter, rect, alignment(), *d_doc); +=20 +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + QFont::setDefaultFont(defaultFont); + #endif + painter->restore(); +@@ -407,7 +407,7 @@ +=20 + QRect QwtRichText::boundingRect(QPainter *painter) const + { +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + const QFont defaultFont =3D QFont::defaultFont(); + QFont::setDefaultFont(font()); + #endif +@@ -415,7 +415,7 @@ + const QwtLayoutMetrics metrics(QwtPainter::metricsMap()); + const QRect rect =3D metrics.boundingRect(*d_doc, alignment(), pain= ter); +=20 +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + QFont::setDefaultFont(defaultFont); + #endif +=20 +@@ -428,7 +428,7 @@ + QString rich =3D text; +=20 + // By default QwtSimpleRichText is Qt::AlignLeft +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + if (align & Qt::AlignJustify)=20 + { + rich.prepend("
"); +--- qwt-4.2.0rc1/src/qwt_push_button.cpp~qt2-fix ++++ qwt-4.2.0rc1/src/qwt_push_button.cpp +@@ -88,7 +88,7 @@ + !(d_button->alignment() & Qt::AlignCenter)) + { + const QRect contentsRect =3D +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + d_button->style().subRect(=20 + QStyle::SR_PushButtonContents, d_button); + #else +@@ -103,7 +103,7 @@ + // Many styles move the label right/down + // when the button is down. +=20 +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + const QRect &r =3D *((QRect *)param[0].rect); + #else + const QRect r(*param[0].point, param[1].pixmap->size())= ; +@@ -133,7 +133,7 @@ + d_inFilter =3D TRUE; +=20 + d_button->style().drawItem(painter,=20 +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + pixRect, + #else + pixRect.x(), pixRect.y(),=20 +@@ -150,7 +150,7 @@ + // We save the position of the icon. We need it later + // to align the label pixmap. Hope that there are no st= yles + // that paint the pixmap before the icon. +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + d_iconRect =3D QRect(*param[0].point, param[1].pixmap->= size()); + #else + d_iconRect =3D *param[0].rect; +@@ -427,7 +427,7 @@ +=20 + QPainter picPainter(&paintFilter); +=20 +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + // When painting to QPicture the dotted line of the focus rect is + // set to solid. ( 06.08.2003 ) + // So we don=B4t set the Style_HasFocus flag and paint the focus re= ct +@@ -459,7 +459,7 @@ +=20 + paintFilter.play(painter);=20 +=20 +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + if (hasFocus()) + { + // Paint the focus rect on top of the button label. +--- qwt-4.2.0rc1/src/qwt_layout_metrics.cpp~qt2-fix ++++ qwt-4.2.0rc1/src/qwt_layout_metrics.cpp +@@ -212,7 +212,7 @@ + QRect QwtMetricsMap::translate( + const QWMatrix &m, const QRect &rect)=20 + { +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + return m.map(rect.normalize()); + #else + return m.mapRect(rect); +@@ -227,7 +227,7 @@ + QPointArray QwtMetricsMap::translate( + const QWMatrix &m, const QPointArray &pa)=20 + { +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + return m.map(pa); + #else + return m * pa; +--- qwt-4.2.0rc1/src/qwt_slider.cpp~qt2-fix ++++ qwt-4.2.0rc1/src/qwt_slider.cpp +@@ -353,7 +353,7 @@ + { + const QRect rect =3D d_sliderRect; +=20 +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + style().drawFocusRect(painter, rect, colorGroup()); + #else + style().drawPrimitive(QStyle::PE_FocusRect, painter, +--- qwt-4.2.0rc1/src/qwt_counter.cpp~qt2-fix ++++ qwt-4.2.0rc1/src/qwt_counter.cpp +@@ -330,7 +330,7 @@ + // QLineEdit::minimumSizeHint is for one char. Subtracting + // the size for the char we get all the margins, frames ... +=20 +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + w +=3D d_valueEdit->minimumSizeHint().width() - fm.maxWidth(); + #else + w +=3D 2 * d_valueEdit->frameWidth() +=20 +--- qwt-4.2.0rc1/src/qwt_paint ++++ /dev/null +--- qwt-4.2.0rc1/src/qwt_painter.cpp~qt2-fix ++++ qwt-4.2.0rc1/src/qwt_painter.cpp +@@ -201,7 +201,7 @@ + QColorGroup cg; + cg.setColor(QColorGroup::Text, painter->pen().color()); +=20 +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + const QFont defaultFont =3D QFont::defaultFont(); + QFont::setDefaultFont(painter->font()); + #endif +@@ -220,7 +220,7 @@ +=20 + text.draw(painter, scaledRect.x(), y, scaledRect, cg); +=20 +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + QFont::setDefaultFont(defaultFont); + #endif + } +--- qwt-4.2.0rc1/src/qwt_dial.cpp~qt2-fix ++++ qwt-4.2.0rc1/src/qwt_dial.cpp +@@ -491,7 +491,7 @@ + // because round objects doesn=B4t cover all pixels. +=20 + QRect br =3D boundingRect(); +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + #ifdef _WS_WIN32_ + // Qt-230-NC draws ellipses not as nicely as Qt-2.3.x on X Wind= ows + br.setTop(br.top()-1); +@@ -1044,7 +1044,7 @@ + { + if ( isReadOnly() ) + { +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + e->ignore(); + #endif + return; +@@ -1078,7 +1078,7 @@ + setValue(maxValue()); + break; + default:; +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + e->ignore(); + #endif + } +--- qwt-4.2.0rc1/src/qwt_knob.cpp~qt2-fix ++++ qwt-4.2.0rc1/src/qwt_knob.cpp +@@ -279,7 +279,7 @@ + { + QRect r =3D rect(); +=20 +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + style().drawFocusRect(painter, r, colorGroup()); + #else + style().drawPrimitive(QStyle::PE_FocusRect, painter, +--- qwt-4.2.0rc1/src/qwt_arrbtn.cpp~qt2-fix ++++ qwt-4.2.0rc1/src/qwt_arrbtn.cpp +@@ -58,7 +58,7 @@ + QRect QwtArrowButton::labelRect() const + { + QRect r =3D +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + style().buttonRect(rect().x(), rect().y(), + rect().width(), rect().height()); + #else +@@ -71,7 +71,7 @@ + if ( isDown() ) + { + int ph, pv; +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + style().getButtonShift(ph, pv); + #else + ph =3D style().pixelMetric( +@@ -135,7 +135,7 @@ + } + p->restore(); +=20 +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + if ( hasFocus() ) + { + const QRect focusRect =3D =20 +@@ -218,7 +218,7 @@ + if ( d_arrowType =3D=3D Qt::UpArrow || d_arrowType =3D=3D Qt::DownA= rrow ) + sz.transpose(); +=20 +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + int bm =3D style().buttonMargin() - 1; + sz +=3D QSize(2 * bm, 2 * bm); + #else +--- qwt-4.2.0rc1/src/qwt_wheel.cpp~qt2-fix ++++ qwt-4.2.0rc1/src/qwt_wheel.cpp +@@ -453,7 +453,7 @@ + { + QRect r =3D rect(); + =20 +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + style().drawFocusRect(painter, r, colorGroup()); + #else + style().drawPrimitive(QStyle::PE_FocusRect, painter, +--- qwt-4.2.0rc1/src/qwt_plot_canvas.cpp~qt2-fix ++++ qwt-4.2.0rc1/src/qwt_plot_canvas.cpp +@@ -195,7 +195,7 @@ +=20 + void QwtPlotCanvas::drawFocusIndicator(QPainter *painter, const QRect &= rect) + { +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + style().drawFocusRect(painter, rect, colorGroup()); + #else + style().drawPrimitive(QStyle::PE_FocusRect, painter, +--- qwt-4.2.0rc1/src/qwt_sldbase.cpp~qt2-fix ++++ qwt-4.2.0rc1/src/qwt_sldbase.cpp +@@ -115,7 +115,7 @@ + { + if ( isReadOnly() ) + { +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + e->ignore(); + #endif + return; +@@ -166,7 +166,7 @@ + { + if ( isReadOnly() ) + { +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + e->ignore(); + #endif + return; +@@ -274,7 +274,7 @@ + { + if ( isReadOnly() ) + { +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + e->ignore(); + #endif + return; +@@ -304,7 +304,7 @@ + { + if ( isReadOnly() ) + { +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + e->ignore(); + #endif + return; +@@ -341,7 +341,7 @@ + { + if ( isReadOnly() ) + { +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + e->ignore(); + #endif + return; +@@ -370,7 +370,7 @@ + increment =3D 1; + break; + default:; +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + e->ignore(); + #endif + } +--- qwt-4.2.0rc1/examples/realtime_plot/scrollbar.cpp~qt2-fix ++++ qwt-4.2.0rc1/examples/realtime_plot/scrollbar.cpp +@@ -154,7 +154,7 @@ + int ScrollBar::extent() const + { + int dim; +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + dim =3D style().pixelMetric(QStyle::PM_ScrollBarExtent, this); + #else + const QSize sz =3D style().scrollBarExtent(); +--- qwt-4.2.0rc1/examples/event_filter/colorbar.cpp~qt2-fix ++++ qwt-4.2.0rc1/examples/event_filter/colorbar.cpp +@@ -48,7 +48,7 @@ + const QRgb rgb =3D pm.convertToImage().pixel(e->x(), e->y()); + =20 + emit selected(QColor(rgb)); +-#if QT_VERSION >=3D 300 ++#if QT_VERSION >=3D 0x030000 + e->accept(); + #endif + } diff --git a/meta/recipes-qt/qwt/qwt-e_5.2.1.bb b/meta/recipes-qt/qwt/qwt= -e_5.2.1.bb new file mode 100644 index 0000000..81e2ab8 --- /dev/null +++ b/meta/recipes-qt/qwt/qwt-e_5.2.1.bb @@ -0,0 +1,11 @@ +inherit qt4e + +require qwt.inc +LIC_FILES_CHKSUM =3D "file://${COREBASE}/LICENSE;md5=3D3f40d799439710928= 5ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3D3da9cfbcb7= 88c80a0384361b4de20420" + + +SRC_URI[qwt.md5sum] =3D "4a595b8db0ec3856b117836c1d60cb27" +SRC_URI[qwt.sha256sum] =3D "e2b8bb755404cb3dc99e61f3e2d7262152193488f5fb= e88524eb698e11ac569f" + +RPROVIDES_${PN}-dev =3D "libqwt-dev" diff --git a/meta/recipes-qt/qwt/qwt.inc b/meta/recipes-qt/qwt/qwt.inc new file mode 100644 index 0000000..87ee926 --- /dev/null +++ b/meta/recipes-qt/qwt/qwt.inc @@ -0,0 +1,36 @@ +DESCRIPTION =3D "Qt Widget Extension for Technical Applications" +SECTION =3D "libs" +PRIORITY =3D "optional" + +# LGPLv2.1 + some exceptions +LICENSE =3D "QWTv1.0" + +SRC_URI =3D "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=3Dqwt" + +S =3D "${WORKDIR}/qwt-${PV}" +#OE_CFLAGS +=3D "-lX11" +CFLAGS +=3D "-lx11 -lX11" + +CXXFLAGS +=3D "-lX11 -lx11" +do_configure_prepend() { + sed -i -e 's:RELEASE_SUFFIX =3D :RELEASE_SUFFIX =3D ${QT_LIBI= NFIX} :' *.pri + sed -i -e s:lqwt:lqwt${QT_LIBINFIX}:g -e s:/usr/local/qwt-$\${QwtVersio= n}:${prefix}:g *.prf + sed -e 's/#CONFIG +=3D QwtExamples/CONFIG +=3D QwtExamples/g' -= i qwtconfig.pri + sed -i -e s:/usr/local/qwt-${PV}:${D}${prefix}:g ${S}/*.pri +} + +do_install() { + oe_runmake -e install + install -d ${D}${datadir}/doc/${PN} + mv ${D}${prefix}/doc/* ${D}${datadir}/doc/${PN}/ + cd ${S}/examples + install -d ${D}/${bindir} + cd ${S}/examples/bin${QT_LIBINFIX}/ + for i in * ; do + cp -pPR ${i} ${D}/${bindir}/${i}${QT_LIBINFIX} + done +} + +PACKAGES_prepend =3D "${PN}-examples " +FILES_${PN}-examples =3D "${bindir}/*" + diff --git a/meta/recipes-qt/qwt/qwt_5.2.1.bb b/meta/recipes-qt/qwt/qwt_5= .2.1.bb new file mode 100644 index 0000000..ed04fe4 --- /dev/null +++ b/meta/recipes-qt/qwt/qwt_5.2.1.bb @@ -0,0 +1,10 @@ +inherit qt4x11 + +require qwt.inc +LIC_FILES_CHKSUM =3D "file://${COREBASE}/LICENSE;md5=3D3f40d799439710928= 5ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3D3da9cfbcb7= 88c80a0384361b4de20420" + +SRC_URI[qwt.md5sum] =3D "4a595b8db0ec3856b117836c1d60cb27" +SRC_URI[qwt.sha256sum] =3D "e2b8bb755404cb3dc99e61f3e2d7262152193488f5fb= e88524eb698e11ac569f" + +RPROVIDES_${PN}-dev =3D "libqwt-dev" diff --git a/meta/recipes-qt/tasks/task-qt4e.bb b/meta/recipes-qt/tasks/t= ask-qt4e.bb new file mode 100644 index 0000000..52f9419 --- /dev/null +++ b/meta/recipes-qt/tasks/task-qt4e.bb @@ -0,0 +1,54 @@ +DESCRIPTION =3D "QT4 Embedded base Image Feed" +PR =3D "r0" +LICENSE =3D "MIT" + +LIC_FILES_CHKSUM =3D "file://${COREBASE}/LICENSE;md5=3D3f40d799439710928= 5ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3D3da9cfbcb7= 88c80a0384361b4de20420" + +inherit task + +PACKAGES +=3D " \ + ${PN}-base \ + ${PN}-qwt \ +" + +RDEPENDS_${PN}-base =3D " \ + busybox \ + qt4-embedded \ + libqt-embedded3support4 \ + libqt-embeddedclucene4 \ + libqt-embeddedcore4 \ + libqt-embeddeddbus4 \ + libqt-embeddedgui4 \ + libqt-embeddedhelp4 \ + libqt-embeddedmultimedia4 \ + libqt-embeddednetwork4 \ + libqt-embeddedscript4 \ + libqt-embeddedscripttools4 \ + libqt-embeddedsql4 \ + libqt-embeddedsvg4 \ + libqt-embeddedtest4 \ + libqt-embeddedwebkit4 \ + libqt-embeddedxml4 \ + qt4-embedded-fonts-ttf-dejavu \ + qt4-embedded-fonts-ttf-vera \ + qt4-embedded-plugin-iconengine-svgicon \ + qt4-embedded-plugin-imageformat-gif \ + qt4-embedded-plugin-imageformat-ico \ + qt4-embedded-plugin-imageformat-jpeg \ + qt4-embedded-plugin-imageformat-mng \ + qt4-embedded-plugin-imageformat-svg \ + qt4-embedded-plugin-imageformat-tiff \ + qt4-embedded-plugin-mousedriver-tslib \ + qt4-embedded-plugin-phonon-backend-gstreamer \ + qt4-embedded-plugin-script-dbus \ + qt4-embedded-plugin-sqldriver-sqlite \ +" + +RRECOMMENDS_${PN}-base =3D " \ + libqt-embeddedxmlpatterns4 \ +" + +RDEPENDS_${PN}-qwt =3D "\ + qwt-e \ +" --=20 1.7.0.4