[oe-commits] org.oe.dev merge of '1d191d57e609530bf7d6ccd6705f7e63b0c24231'
florian commit
openembedded-commits at lists.openembedded.org
Mon Oct 29 16:16:05 UTC 2007
merge of '1d191d57e609530bf7d6ccd6705f7e63b0c24231'
and '47227a7d14aad3fad97ac42c0f58256e043f95b7'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 8e80fd41102eb8162f6703d73bfcc676629551d5
ViewMTN: http://monotone.openembedded.org/revision/info/8e80fd41102eb8162f6703d73bfcc676629551d5
Files:
1
packages/gpephone/libabenabler_1.0.bb
packages/gpephone/libiac_1.0.bb
packages/gpephone/librecord_1.0.bb
packages/libtiff/tiff_3.7.2.bb
packages/uicmoc/uicmoc4-native.inc
packages/webkit/files/qtwebkit-use-image-decoders.patch
conf/distro/include/sane-srcrevs.inc
packages/openmoko2/openmoko-mediaplayer2_svn.bb
packages/uicmoc/uicmoc4-native_4.3.1.bb
packages/uicmoc/uicmoc4-native_4.3.2.bb
packages/webkit/webkit-qt.inc
packages/webkit/webkit-qt_svn.bb
packages/webkit/webkit-qtopia_svn.bb
packages/webkit/webkit.inc
Diffs:
#
# mt diff -r1d191d57e609530bf7d6ccd6705f7e63b0c24231 -r8e80fd41102eb8162f6703d73bfcc676629551d5
#
#
#
# add_file "packages/gpephone/libabenabler_1.0.bb"
# content [1a145e7906115c71b82cc805d95d733ca2b2d861]
#
# add_file "packages/gpephone/libiac_1.0.bb"
# content [7351c3868b4a5dd238b349704be0657dc806f68b]
#
# add_file "packages/gpephone/librecord_1.0.bb"
# content [162390f9d51c36e0a4493660fc49b3b4fd40ffe6]
#
# patch "packages/libtiff/tiff_3.7.2.bb"
# from [11812494c5ede2018d6bf81e95c44cde62630994]
# to [dcf63f64a0fd80e6c8938c56074be4ceff0756d5]
#
============================================================
--- packages/gpephone/libabenabler_1.0.bb 1a145e7906115c71b82cc805d95d733ca2b2d861
+++ packages/gpephone/libabenabler_1.0.bb 1a145e7906115c71b82cc805d95d733ca2b2d861
@@ -0,0 +1,16 @@
+LICENSE = "LGPL"
+DESCRIPTION = "LiPS address book library."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "glib-2.0 librecord liblipsevent libim sqlite3"
+PR = "r1"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpephone pkgconfig autotools
+
+LDFLAGS += " -L${STAGING_LIBDIR}"
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/gpephone/libiac_1.0.bb 7351c3868b4a5dd238b349704be0657dc806f68b
+++ packages/gpephone/libiac_1.0.bb 7351c3868b4a5dd238b349704be0657dc806f68b
@@ -0,0 +1,13 @@
+LICENSE = "LiPS"
+DESCRIPTION = "LiPS IPC library."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "gtk+ gtk-doc"
+PR = "r1"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpephone pkgconfig autotools
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/gpephone/librecord_1.0.bb 162390f9d51c36e0a4493660fc49b3b4fd40ffe6
+++ packages/gpephone/librecord_1.0.bb 162390f9d51c36e0a4493660fc49b3b4fd40ffe6
@@ -0,0 +1,15 @@
+LICENSE = "LiPS"
+DESCRIPTION = "LiPS database API."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "glib-2.0 e2fsprogs-libs sqlite3"
+PR = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpephone pkgconfig autotools
+
+LDFLAGS += " -L${STAGING_LIBDIR}"
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/libtiff/tiff_3.7.2.bb 11812494c5ede2018d6bf81e95c44cde62630994
+++ packages/libtiff/tiff_3.7.2.bb dcf63f64a0fd80e6c8938c56074be4ceff0756d5
@@ -1,8 +1,8 @@ HOMEPAGE = "http://www.remotesensing.org
DESCRIPTION = "This software provides support for the Tag Image File Format (TIFF)"
LICENSE = ""
HOMEPAGE = "http://www.remotesensing.org/libtiff/"
-DEPENDS = "zlib jpeg"
-PR = "r3"
+DEPENDS = "zlib jpeg lzo"
+PR = "r4"
SRC_URI = "http://dl.maptools.org/dl/libtiff/old/tiff-${PV}.tar.gz \
file://configure.patch;patch=1"
#
# mt diff -r47227a7d14aad3fad97ac42c0f58256e043f95b7 -r8e80fd41102eb8162f6703d73bfcc676629551d5
#
#
#
# add_file "packages/uicmoc/uicmoc4-native.inc"
# content [e89d594107d11cad2c66dd25e8bd9673cb40f450]
#
# add_file "packages/webkit/files/qtwebkit-use-image-decoders.patch"
# content [5c7100d7b0b40430d195105c7a43d3c29824c001]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [acd372a44cfe8a4e1e3db38949e45f2a27f5a357]
# to [9edddc6c4d4e0c6193e853f84bd49a123cfbe02e]
#
# patch "packages/openmoko2/openmoko-mediaplayer2_svn.bb"
# from [d34ba67b0b3bd96a21bdcb63c52a50a81fd45e8d]
# to [62871a05b036315696652becdcb2d8b4d4642882]
#
# patch "packages/uicmoc/uicmoc4-native_4.3.1.bb"
# from [e89d594107d11cad2c66dd25e8bd9673cb40f450]
# to [7cc53a71e63f8787010e6481bcaf2f1d1958283a]
#
# patch "packages/uicmoc/uicmoc4-native_4.3.2.bb"
# from [e89d594107d11cad2c66dd25e8bd9673cb40f450]
# to [7cc53a71e63f8787010e6481bcaf2f1d1958283a]
#
# patch "packages/webkit/webkit-qt.inc"
# from [cf87668b6c6100c92f3789cfdab99d05b6699d3d]
# to [11f8e3a520d20c819272c86da12f31ad12ab451a]
#
# patch "packages/webkit/webkit-qt_svn.bb"
# from [98285c7285a74018daa1107a3757b71a0a8767bd]
# to [8a7e0008b0321d228d80e15a433d3a8b60cd718c]
#
# patch "packages/webkit/webkit-qtopia_svn.bb"
# from [ccce4fbb6f4178fbe8f5c34728cd43ed24d10433]
# to [b5dc044dff172085223b8193424139312f8cf5e7]
#
# patch "packages/webkit/webkit.inc"
# from [7592351db1bfac2d0bb7c3317216d74aa14bbf0c]
# to [a9b135977d33b8fecb08b3e6b9ca8bae313ed7e2]
#
============================================================
--- packages/uicmoc/uicmoc4-native.inc e89d594107d11cad2c66dd25e8bd9673cb40f450
+++ packages/uicmoc/uicmoc4-native.inc e89d594107d11cad2c66dd25e8bd9673cb40f450
@@ -0,0 +1,61 @@
+DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "zlib-native"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz"
+S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
+
+inherit native
+
+EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \
+ -qt-libjpeg -qt-gif -system-zlib \
+ -no-nis -no-cups -no-exceptions \
+ -no-accessibility -no-libjpeg \
+ -no-nas-sound -no-sm \
+ -no-xshape -no-xinerama \
+ -no-xcursor -no-xrandr \
+ -no-xrender -no-fontconfig \
+ -no-tablet -no-xkb \
+ -no-libpng \
+ -verbose -release -fast -static \
+ -qt3support "
+# yank default -e
+EXTRA_OEMAKE = " "
+
+do_configure() {
+ sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
+ echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+ src/tools/moc \
+ src/corelib \
+ src/sql \
+ src/qt3support \
+ src/xml \
+ src/tools/uic \
+ src/tools/rcc \
+ src/network \
+ src/gui \
+ src/tools/uic3 \
+"
+
+do_compile() {
+ unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
+ for i in ${TOBUILD}; do
+ cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+ done
+}
+
+do_stage() {
+ install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
+ install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
+ install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
+ install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
+ install -d ${STAGING_DIR}/${BUILD_SYS}/qt4/
+ install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/
+}
============================================================
--- packages/webkit/files/qtwebkit-use-image-decoders.patch 5c7100d7b0b40430d195105c7a43d3c29824c001
+++ packages/webkit/files/qtwebkit-use-image-decoders.patch 5c7100d7b0b40430d195105c7a43d3c29824c001
@@ -0,0 +1,280 @@
+diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
+index bb34e44..23a1cd0 100644
+--- a/WebCore/WebCore.pro
++++ b/WebCore/WebCore.pro
+@@ -6,6 +6,7 @@ CONFIG += building-libs
+ CONFIG += no_batch
+ include($$PWD/../WebKit.pri)
+ gtk-port:LIBS -= -lWebKitGtk
++qt-port:LIBS += -lpng -ljpeg
+
+ TEMPLATE = lib
+ qt-port:TARGET = QtWebKit
+@@ -74,6 +75,12 @@ qt-port {
+ INCLUDEPATH += \
+ $$PWD/platform/qt \
+ $$PWD/platform/network/qt \
++ $$PWD/platform/image-decoders/bmp \
++ $$PWD/platform/image-decoders/gif \
++ $$PWD/platform/image-decoders/ico \
++ $$PWD/platform/image-decoders/jpeg \
++ $$PWD/platform/image-decoders/png \
++ $$PWD/platform/image-decoders/xbm \
+ $$PWD/platform/graphics/qt \
+ $$PWD/platform/graphics/svg/qt \
+ $$PWD/loader/qt \
+@@ -777,6 +784,13 @@ qt-port {
+ page/qt/EventHandlerQt.cpp \
+ page/qt/FrameQt.cpp \
+ loader/qt/DocumentLoaderQt.cpp \
++ platform/image-decoders/gif/GIFImageDecoder.cpp \
++ platform/image-decoders/gif/GIFImageReader.cpp \
++ platform/image-decoders/png/PNGImageDecoder.cpp \
++ platform/image-decoders/jpeg/JPEGImageDecoder.cpp \
++ platform/image-decoders/bmp/BMPImageDecoder.cpp \
++ platform/image-decoders/ico/ICOImageDecoder.cpp \
++ platform/image-decoders/xbm/XBMImageDecoder.cpp \
+ platform/graphics/qt/AffineTransformQt.cpp \
+ platform/graphics/qt/ColorQt.cpp \
+ platform/graphics/qt/FloatPointQt.cpp \
+diff --git a/WebCore/platform/graphics/ImageSource.h b/WebCore/platform/graphics/ImageSource.h
+index a75f1d6..2af8c1e 100644
+--- a/WebCore/platform/graphics/ImageSource.h
++++ b/WebCore/platform/graphics/ImageSource.h
+@@ -49,8 +49,8 @@ class SharedBuffer;
+ typedef CGImageSourceRef NativeImageSourcePtr;
+ typedef CGImageRef NativeImagePtr;
+ #elif PLATFORM(QT)
+-class ImageDecoderQt;
+-typedef ImageDecoderQt* NativeImageSourcePtr;
++class ImageDecoder;
++typedef ImageDecoder* NativeImageSourcePtr;
+ typedef QPixmap* NativeImagePtr;
+ #else
+ class ImageDecoder;
+diff --git a/WebCore/platform/graphics/qt/ImageSourceQt.cpp b/WebCore/platform/graphics/qt/ImageSourceQt.cpp
+index 264f90f..d1fd340 100644
+--- a/WebCore/platform/graphics/qt/ImageSourceQt.cpp
++++ b/WebCore/platform/graphics/qt/ImageSourceQt.cpp
+@@ -1,6 +1,7 @@
+ /*
+ * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2006 Trolltech ASA
++ * Copyright (C) 2007 Alp Toker <alp.toker at collabora.co.uk>
+ *
+ * All rights reserved.
+ *
+@@ -28,76 +29,78 @@
+
+ #include "config.h"
+ #include "ImageSource.h"
+-#include "ImageDecoderQt.h"
+ #include "SharedBuffer.h"
+
+-#include <QImage>
+-#include <qdebug.h>
++#include "GIFImageDecoder.h"
++#include "JPEGImageDecoder.h"
++#include "PNGImageDecoder.h"
++#include "BMPImageDecoder.h"
++#include "ICOImageDecoder.h"
++#include "XBMImageDecoder.h"
+
++#include <QImage>
++#include <QPixmap>
+
+ namespace WebCore {
+- enum ImageFormat { ImageFormat_None, ImageFormat_GIF, ImageFormat_PNG, ImageFormat_JPEG,
+- ImageFormat_BMP, ImageFormat_ICO, ImageFormat_XBM };
+
+-ImageFormat detectImageFormat(const SharedBuffer& data)
++ImageDecoder* createDecoder(const Vector<char>& data)
+ {
+ // We need at least 4 bytes to figure out what kind of image we're dealing with.
+ int length = data.size();
+ if (length < 4)
+- return ImageFormat_None;
++ return 0;
+
+- const unsigned char* uContents = (const unsigned char*) data.data();
++ const unsigned char* uContents = (const unsigned char*)data.data();
+ const char* contents = data.data();
+
+ // GIFs begin with GIF8(7 or 9).
+ if (strncmp(contents, "GIF8", 4) == 0)
+- return ImageFormat_GIF;
++ return new GIFImageDecoder();
+
+ // Test for PNG.
+- if (uContents[0] == 0x89 &&
+- uContents[1] == 0x50 &&
+- uContents[2] == 0x4E &&
+- uContents[3] == 0x47)
+- return ImageFormat_PNG;
++ if (uContents[0]==0x89 &&
++ uContents[1]==0x50 &&
++ uContents[2]==0x4E &&
++ uContents[3]==0x47)
++ return new PNGImageDecoder();
+
+ // JPEG
+- if (uContents[0] == 0xFF &&
+- uContents[1] == 0xD8 &&
+- uContents[2] == 0xFF)
+- return ImageFormat_JPEG;
++ if (uContents[0]==0xFF &&
++ uContents[1]==0xD8 &&
++ uContents[2]==0xFF)
++ return new JPEGImageDecoder();
+
+ // BMP
+ if (strncmp(contents, "BM", 2) == 0)
+- return ImageFormat_BMP;
++ return new BMPImageDecoder();
+
+ // ICOs always begin with a 2-byte 0 followed by a 2-byte 1.
+ // CURs begin with 2-byte 0 followed by 2-byte 2.
+ if (!memcmp(contents, "\000\000\001\000", 4) ||
+ !memcmp(contents, "\000\000\002\000", 4))
+- return ImageFormat_ICO;
+-
++ return new ICOImageDecoder();
++
+ // XBMs require 8 bytes of info.
+ if (length >= 8 && strncmp(contents, "#define ", 8) == 0)
+- return ImageFormat_XBM;
++ return new XBMImageDecoder();
+
+ // Give up. We don't know what the heck this is.
+- return ImageFormat_None;
+-}
+-
+-ImageDecoderQt* createDecoder(const SharedBuffer& data) {
+- if (detectImageFormat(data) != ImageFormat_None)
+- return new ImageDecoderQt();
+ return 0;
+ }
+
+ ImageSource::ImageSource()
+- : m_decoder(0)
++ : m_decoder(0)
++{}
++
++ImageSource::~ImageSource()
+ {
++ clear();
+ }
+
+-ImageSource::~ImageSource()
++void ImageSource::clear()
+ {
+ delete m_decoder;
++ m_decoder = 0;
+ }
+
+ bool ImageSource::initialized() const
+@@ -111,13 +114,11 @@ void ImageSource::setData(SharedBuffer* data, bool allDataReceived)
+ // This method will examine the data and instantiate an instance of the appropriate decoder plugin.
+ // If insufficient bytes are available to determine the image type, no decoder plugin will be
+ // made.
+- if (!m_decoder)
+- m_decoder = createDecoder(*data);
+-
++ delete m_decoder;
++ m_decoder = createDecoder(data->buffer());
+ if (!m_decoder)
+ return;
+-
+- m_decoder->setData(data->buffer(), allDataReceived);
++ m_decoder->setData(data, allDataReceived);
+ }
+
+ bool ImageSource::isSizeAvailable()
+@@ -146,10 +147,7 @@ int ImageSource::repetitionCount()
+
+ size_t ImageSource::frameCount() const
+ {
+- if (!m_decoder)
+- return 0;
+-
+- return m_decoder->frameCount();
++ return m_decoder ? m_decoder->frameCount() : 0;
+ }
+
+ NativeImagePtr ImageSource::createFrameAtIndex(size_t index)
+@@ -157,25 +155,38 @@ NativeImagePtr ImageSource::createFrameAtIndex(size_t index)
+ if (!m_decoder)
+ return 0;
+
+-
+- const QPixmap* source = m_decoder->imageAtIndex(index);
+- if (!source)
++ RGBA32Buffer* buffer = m_decoder->frameBufferAtIndex(index);
++ if (!buffer || buffer->status() == RGBA32Buffer::FrameEmpty)
+ return 0;
+
+- return new QPixmap(*source);
++ return new QPixmap(QPixmap::fromImage(QImage(reinterpret_cast<unsigned char*>(buffer->bytes().data()),
++ size().width(), size().height(), size().width()*4, QImage::Format_ARGB32)));
++}
++
++bool ImageSource::frameIsCompleteAtIndex(size_t index)
++{
++ if (!m_decoder)
++ return false;
++
++ RGBA32Buffer* buffer = m_decoder->frameBufferAtIndex(index);
++ return buffer && buffer->status() == RGBA32Buffer::FrameComplete;
+ }
+
+ float ImageSource::frameDurationAtIndex(size_t index)
+ {
+ if (!m_decoder)
+ return 0;
+-
++
++ RGBA32Buffer* buffer = m_decoder->frameBufferAtIndex(index);
++ if (!buffer || buffer->status() == RGBA32Buffer::FrameEmpty)
++ return 0;
++
+ // Many annoying ads specify a 0 duration to make an image flash as quickly
+ // as possible. We follow WinIE's behavior and use a duration of 100 ms
+ // for any frames that specify a duration of <= 50 ms. See
+ // <http://bugs.webkit.org/show_bug.cgi?id=14413> or Radar 4051389 for
+ // more.
+- const float duration = m_decoder->duration(index) / 1000.0f;
++ const float duration = buffer->duration() / 1000.0f;
+ return (duration < 0.051f) ? 0.100f : duration;
+ }
+
+@@ -183,26 +194,13 @@ bool ImageSource::frameHasAlphaAtIndex(size_t index)
+ {
+ if (!m_decoder || !m_decoder->supportsAlpha())
+ return false;
+-
+- const QPixmap* source = m_decoder->imageAtIndex( index);
+- if (!source)
+- return false;
+-
+- return source->hasAlphaChannel();
+-}
+
+-bool ImageSource::frameIsCompleteAtIndex(size_t index)
+-{
+- return (m_decoder && m_decoder->imageAtIndex(index) != 0);
+-}
++ RGBA32Buffer* buffer = m_decoder->frameBufferAtIndex(index);
++ if (!buffer || buffer->status() == RGBA32Buffer::FrameEmpty)
++ return false;
+
+-void ImageSource::clear()
+-{
+- delete m_decoder;
+- m_decoder = 0;
++ return buffer->hasAlpha();
+ }
+-
+-
+ }
+
+ // vim: ts=4 sw=4 et
============================================================
--- conf/distro/include/sane-srcrevs.inc acd372a44cfe8a4e1e3db38949e45f2a27f5a357
+++ conf/distro/include/sane-srcrevs.inc 9edddc6c4d4e0c6193e853f84bd49a123cfbe02e
@@ -109,9 +109,9 @@ SRCREV_pn-sphyrna ?= "45"
SRCREV_pn-settings-daemon ?= "1755"
SRCREV_pn-sjf2410-linux-native ?= "933"
SRCREV_pn-sphyrna ?= "45"
-SRCREV_pn-webkit-gtk ?= "26915"
-SRCREV_pn-webkit-qt ?= "26079"
-SRCREV_pn-webkit-qtopia ?= "26079"
+SRCREV_pn-webkit-gtk ?= "27222"
+SRCREV_pn-webkit-qt ?= "27222"
+SRCREV_pn-webkit-qtopia ?= "27222"
SRCREV_pn-xoo ?= "1623"
SRCREV_pn-mplayer ?= "24587"
SRCREV_pn-networkmanager ?= "2887"
============================================================
--- packages/openmoko2/openmoko-mediaplayer2_svn.bb d34ba67b0b3bd96a21bdcb63c52a50a81fd45e8d
+++ packages/openmoko2/openmoko-mediaplayer2_svn.bb 62871a05b036315696652becdcb2d8b4d4642882
@@ -1,7 +1,7 @@ DEPENDS = "libmokoui2 expat gstreamer li
DESCRIPTION = "A media player for OpenMoko"
SECTION = "openmoko/tools"
DEPENDS = "libmokoui2 expat gstreamer libspiff curl"
-RDEPENDS = "gst-meta-audio gconf"
+RDEPENDS = "gst-meta-audio gconf openmoko-sound-system2"
PV = "0.1.0+svnr${SRCREV}"
PR = "r4"
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.1.bb e89d594107d11cad2c66dd25e8bd9673cb40f450
+++ packages/uicmoc/uicmoc4-native_4.3.1.bb 7cc53a71e63f8787010e6481bcaf2f1d1958283a
@@ -1,61 +1 @@
-DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
-DEPENDS = "zlib-native"
-SECTION = "libs"
-HOMEPAGE = "http://www.trolltech.com"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz"
-S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
-
-inherit native
-
-EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \
- -qt-libjpeg -qt-gif -system-zlib \
- -no-nis -no-cups -no-exceptions \
- -no-accessibility -no-libjpeg \
- -no-nas-sound -no-sm \
- -no-xshape -no-xinerama \
- -no-xcursor -no-xrandr \
- -no-xrender -no-fontconfig \
- -no-tablet -no-xkb \
- -no-libpng \
- -verbose -release -fast -static \
- -qt3support "
-# yank default -e
-EXTRA_OEMAKE = " "
-
-do_configure() {
- sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
- echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
-}
-
-TOBUILD = "\
- src/tools/moc \
- src/corelib \
- src/sql \
- src/qt3support \
- src/xml \
- src/tools/uic \
- src/tools/rcc \
- src/network \
- src/gui \
- src/tools/uic3 \
-"
-
-do_compile() {
- unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
- for i in ${TOBUILD}; do
- cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
- done
-}
-
-do_stage() {
- install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
- install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
- install -m 0755 bin/uic3 ${STAGING_BINDI%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list