From patchwork Wed Feb 4 19:56:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Johan Derycke X-Patchwork-Id: 436473 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 0A6D8140218 for ; Thu, 5 Feb 2015 06:56:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 59455A14D8; Wed, 4 Feb 2015 19:56:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cXFldzzOqfHr; Wed, 4 Feb 2015 19:56:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 91952A1525; Wed, 4 Feb 2015 19:56:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 4B08A1C07F7 for ; Wed, 4 Feb 2015 19:56:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 44CB3A1529 for ; Wed, 4 Feb 2015 19:56:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yXpF_MKOC-Ao for ; Wed, 4 Feb 2015 19:56:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B7794A150A for ; Wed, 4 Feb 2015 19:56:08 +0000 (UTC) Received: by mail-wg0-f41.google.com with SMTP id a1so3820426wgh.0 for ; Wed, 04 Feb 2015 11:56:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=ANGU2MdjozxhE3e1SYi9oUZt/gmNHhWaxwoNbSRp/80=; b=WbDTBtWjdrAbcP9VLuOqE3dW0jmQJvUc0RPTV2viVX2NwYVg7aixG6Wx6E7NyxMGuR khWa7DspOWfCel9k1/Pt6rSgGYQzeJRgfnSqNsRQJARxGQUZuXFgbmxXKmqaKSUvDlkH MF8WWJyADFXH13M1IIPRvsLVhoaKkjFhijk/KPjkNtRi4uMBkX0F2vKb3lSMAg49fb8c IM7RFijKUzC6Io+B08QhMA2Dl/K2jeo51NzzkpM85C5nP69yG4F+A2XLVLl/EwiWdZrA 0YXD4nLcSpEXRvzmF4q2XEmI8NiDqrCLYKo8q5HeV3eV6Z7uEWUVXy4IUm1oab5WYCSt GtYA== X-Received: by 10.194.63.206 with SMTP id i14mr70228368wjs.107.1423079767350; Wed, 04 Feb 2015 11:56:07 -0800 (PST) Received: from localhost.localdomain (206.66-243-81.adsl-dyn.isp.belgacom.be. [81.243.66.206]) by mx.google.com with ESMTPSA id dz10sm4625452wib.17.2015.02.04.11.56.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Feb 2015 11:56:06 -0800 (PST) From: johanderycke@gmail.com To: buildroot@buildroot.org Date: Wed, 4 Feb 2015 20:56:02 +0100 Message-Id: <1423079762-1517-1-git-send-email-johanderycke@gmail.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Cc: Johan Derycke Subject: [Buildroot] [PATCH v1 1/1] qt5webkit: Fix build without OpenGl X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Johan Derycke Signed-off-by: Johan Derycke --- .../qt5webkit/0003-Fix-build-without-OpenGL.patch | 291 +++++++++++++++++++++ 1 file changed, 291 insertions(+) create mode 100644 package/qt5/qt5webkit/0003-Fix-build-without-OpenGL.patch diff --git a/package/qt5/qt5webkit/0003-Fix-build-without-OpenGL.patch b/package/qt5/qt5webkit/0003-Fix-build-without-OpenGL.patch new file mode 100644 index 0000000..cf6aeee --- /dev/null +++ b/package/qt5/qt5webkit/0003-Fix-build-without-OpenGL.patch @@ -0,0 +1,291 @@ +From 4ecb913768ff0806c6efdff4567ef5907f597e4a Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Tue, 6 Jan 2015 16:31:27 +0100 +Subject: [PATCH] Fix build without OpenGL +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The accelerated 2D canvas feature broke building without OpenGL due to +missing feature checks. + +Task-number: QTBUG-43549 +Change-Id: I7e62751d5237e1c600bc784539c70db50bccfa22 +Reviewed-by: Ashish Kulkarni +Reviewed-by: Michael Brüning +--- + Source/WebCore/Target.pri | 4 ++-- + Source/WebCore/html/HTMLCanvasElement.cpp | 2 +- + Source/WebCore/platform/graphics/ImageBuffer.h | 4 ++-- + .../platform/graphics/qt/ImageBufferDataQt.cpp | 11 +++++------ + .../platform/graphics/qt/ImageBufferDataQt.h | 7 ++++++- + .../WebCore/platform/graphics/qt/ImageBufferQt.cpp | 4 ++++ + Tools/QtTestBrowser/launcherwindow.cpp | 8 ++++---- + Tools/QtTestBrowser/launcherwindow.h | 2 +- + 8 files changed, 25 insertions(+), 17 deletions(-) + +diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri +index b9167d1..d1aad9f 100644 +--- a/Source/WebCore/Target.pri ++++ b/Source/WebCore/Target.pri +@@ -2232,7 +2232,6 @@ HEADERS += \ + platform/graphics/RoundedRect.h \ + platform/graphics/qt/FontCustomPlatformData.h \ + platform/graphics/qt/NativeImageQt.h \ +- platform/graphics/qt/QFramebufferPaintDevice.h \ + platform/graphics/qt/StillImageQt.h \ + platform/graphics/qt/TransparencyLayer.h \ + platform/graphics/SegmentedFontData.h \ +@@ -2886,7 +2885,6 @@ SOURCES += \ + platform/graphics/qt/IntPointQt.cpp \ + platform/graphics/qt/IntRectQt.cpp \ + platform/graphics/qt/IntSizeQt.cpp \ +- platform/graphics/qt/QFramebufferPaintDevice.cpp \ + platform/graphics/qt/PathQt.cpp \ + platform/graphics/qt/PatternQt.cpp \ + platform/graphics/qt/StillImageQt.cpp \ +@@ -4146,6 +4144,7 @@ use?(3D_GRAPHICS) { + platform/graphics/gpu/Texture.h \ + platform/graphics/gpu/TilingData.h \ + platform/graphics/opengl/Extensions3DOpenGL.h \ ++ platform/graphics/qt/QFramebufferPaintDevice.h \ + platform/graphics/texmap/TextureMapperGL.h \ + platform/graphics/texmap/TextureMapperShaderProgram.h \ + platform/graphics/texmap/coordinated/AreaAllocator.h \ +@@ -4182,6 +4181,7 @@ use?(3D_GRAPHICS) { + platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp \ + platform/graphics/opengl/Extensions3DOpenGLCommon.cpp \ + platform/graphics/qt/GraphicsContext3DQt.cpp \ ++ platform/graphics/qt/QFramebufferPaintDevice.cpp \ + platform/graphics/texmap/TextureMapperGL.cpp \ + platform/graphics/texmap/TextureMapperShaderProgram.cpp \ + platform/graphics/texmap/coordinated/AreaAllocator.cpp \ +diff --git a/Source/WebCore/html/HTMLCanvasElement.cpp b/Source/WebCore/html/HTMLCanvasElement.cpp +index b856234..ae39959 100644 +--- a/Source/WebCore/html/HTMLCanvasElement.cpp ++++ b/Source/WebCore/html/HTMLCanvasElement.cpp +@@ -586,7 +586,7 @@ void HTMLCanvasElement::createImageBuffer() const + return; + + RenderingMode renderingMode = shouldAccelerate(bufferSize) ? Accelerated : Unaccelerated; +-#if PLATFORM(QT) ++#if PLATFORM(QT) && ENABLE(ACCELERATED_2D_CANVAS) + if (renderingMode == Accelerated) { + QWebPageClient* client = document()->page()->chrome().platformPageClient(); + // The WebKit2 Chrome does not have a pageclient. +diff --git a/Source/WebCore/platform/graphics/ImageBuffer.h b/Source/WebCore/platform/graphics/ImageBuffer.h +index 7addde9..a30d052 100644 +--- a/Source/WebCore/platform/graphics/ImageBuffer.h ++++ b/Source/WebCore/platform/graphics/ImageBuffer.h +@@ -95,7 +95,7 @@ namespace WebCore { + } + + static PassOwnPtr createCompatibleBuffer(const IntSize&, float resolutionScale, ColorSpace, const GraphicsContext*, bool hasAlpha); +-#if PLATFORM(QT) ++#if PLATFORM(QT) && ENABLE(ACCELERATED_2D_CANVAS) + static PassOwnPtr createCompatibleBuffer(const IntSize&, float resolutionScale, ColorSpace, QOpenGLContext*); + #endif + +@@ -165,7 +165,7 @@ namespace WebCore { + // This constructor will place its success into the given out-variable + // so that create() knows when it should return failure. + ImageBuffer(const IntSize&, float resolutionScale, ColorSpace, RenderingMode, bool& success); +-#if PLATFORM(QT) ++#if PLATFORM(QT) && ENABLE(ACCELERATED_2D_CANVAS) + ImageBuffer(const IntSize&, float resolutionScale, ColorSpace, QOpenGLContext*, bool& success); + #endif + }; +diff --git a/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.cpp b/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.cpp +index 4a16515..1235ce6 100644 +--- a/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.cpp ++++ b/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.cpp +@@ -34,7 +34,6 @@ + #include "GraphicsSurface.h" + #include "ImageData.h" + #include "StillImageQt.h" +-#include "QFramebufferPaintDevice.h" + + #include + #include +@@ -42,6 +41,7 @@ + #include + + #if ENABLE(ACCELERATED_2D_CANVAS) ++#include "QFramebufferPaintDevice.h" + #include "TextureMapper.h" + #include "TextureMapperPlatformLayer.h" + #include "TextureMapperGL.h" +@@ -483,16 +483,12 @@ ImageBufferData::ImageBufferData(const IntSize& size) + initPainter(); + } + ++#if ENABLE(ACCELERATED_2D_CANVAS) + ImageBufferData::ImageBufferData(const IntSize& size, QOpenGLContext* compatibleContext) + { + m_painter = new QPainter; + +-#if ENABLE(ACCELERATED_2D_CANVAS) + m_impl = new ImageBufferDataPrivateAccelerated(size, compatibleContext); +-#else +- Q_UNUSED(compatibleContext); +- m_impl = new ImageBufferDataPrivateUnaccelerated(size); +-#endif + + if (!m_impl->paintDevice()) + return; +@@ -501,11 +497,14 @@ ImageBufferData::ImageBufferData(const IntSize& size, QOpenGLContext* compatible + + initPainter(); + } ++#endif + + ImageBufferData::~ImageBufferData() + { ++#if ENABLE(ACCELERATED_2D_CANVAS) + if (m_impl->isAccelerated()) + static_cast(m_impl->paintDevice())->ensureActiveTarget(); ++#endif + m_painter->end(); + delete m_painter; + delete m_impl; +diff --git a/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.h b/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.h +index 486b0d5..fcad887 100644 +--- a/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.h ++++ b/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.h +@@ -29,10 +29,13 @@ + #include "Image.h" + + #include +-#include + #include + #include + ++#if ENABLE(ACCELERATED_2D_CANVAS) ++#include ++#endif ++ + #include + + namespace WebCore { +@@ -61,7 +64,9 @@ class ImageBufferData + { + public: + ImageBufferData(const IntSize&); ++#if ENABLE(ACCELERATED_2D_CANVAS) + ImageBufferData(const IntSize&, QOpenGLContext*); ++#endif + ~ImageBufferData(); + QPainter* m_painter; + ImageBufferDataPrivate* m_impl; +diff --git a/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp +index 400743d..09c90a6 100644 +--- a/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp ++++ b/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp +@@ -47,6 +47,7 @@ + + namespace WebCore { + ++#if ENABLE(ACCELERATED_2D_CANVAS) + ImageBuffer::ImageBuffer(const IntSize& size, float /* resolutionScale */, ColorSpace, QOpenGLContext* compatibleContext, bool& success) + : m_data(size, compatibleContext) + , m_size(size) +@@ -58,6 +59,7 @@ ImageBuffer::ImageBuffer(const IntSize& size, float /* resolutionScale */, Color + + m_context = adoptPtr(new GraphicsContext(m_data.m_painter)); + } ++#endif + + ImageBuffer::ImageBuffer(const IntSize& size, float /* resolutionScale */, ColorSpace, RenderingMode /*renderingMode*/, bool& success) + : m_data(size) +@@ -75,6 +77,7 @@ ImageBuffer::~ImageBuffer() + { + } + ++#if ENABLE(ACCELERATED_2D_CANVAS) + PassOwnPtr ImageBuffer::createCompatibleBuffer(const IntSize& size, float resolutionScale, ColorSpace colorSpace, QOpenGLContext* context) + { + bool success = false; +@@ -83,6 +86,7 @@ PassOwnPtr ImageBuffer::createCompatibleBuffer(const IntSize& size, + return nullptr; + return buf.release(); + } ++#endif + + GraphicsContext* ImageBuffer::context() const + { +diff --git a/Tools/QtTestBrowser/launcherwindow.cpp b/Tools/QtTestBrowser/launcherwindow.cpp +index e2dcef3..d293397 100644 +--- a/Tools/QtTestBrowser/launcherwindow.cpp ++++ b/Tools/QtTestBrowser/launcherwindow.cpp +@@ -177,9 +177,9 @@ void LauncherWindow::initializeView() + #ifndef QT_NO_OPENGL + if (!m_windowOptions.useQOpenGLWidgetViewport) + toggleQGLWidgetViewport(m_windowOptions.useQGLWidgetViewport); +-#endif + if (!m_windowOptions.useQGLWidgetViewport) + toggleQOpenGLWidgetViewport(m_windowOptions.useQOpenGLWidgetViewport); ++#endif + view->setPage(page()); + + connect(view, SIGNAL(currentFPSUpdated(int)), this, SLOT(updateFPS(int))); +@@ -407,7 +407,6 @@ void LauncherWindow::createChrome() + toggleQGLWidgetViewport->setChecked(m_windowOptions.useQGLWidgetViewport); + toggleQGLWidgetViewport->setEnabled(isGraphicsBased()); + toggleQGLWidgetViewport->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool))); +-#endif + #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) + QAction* toggleQOpenGLWidgetViewport = graphicsViewMenu->addAction("Toggle use of QOpenGLWidget Viewport", this, SLOT(toggleQOpenGLWidgetViewport(bool))); + toggleQOpenGLWidgetViewport->setCheckable(true); +@@ -415,6 +414,7 @@ void LauncherWindow::createChrome() + toggleQOpenGLWidgetViewport->setEnabled(isGraphicsBased()); + toggleQOpenGLWidgetViewport->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool))); + #endif ++#endif + + QMenu* viewportUpdateMenu = graphicsViewMenu->addMenu("Change Viewport Update Mode"); + viewportUpdateMenu->setEnabled(isGraphicsBased()); +@@ -802,9 +802,9 @@ void LauncherWindow::screenshot() + #ifndef QT_NO_OPENGL + if (!m_windowOptions.useQOpenGLWidgetViewport) + toggleQGLWidgetViewport(m_windowOptions.useQGLWidgetViewport); +-#endif + if (!m_windowOptions.useQGLWidgetViewport) + toggleQOpenGLWidgetViewport(m_windowOptions.useQOpenGLWidgetViewport); ++#endif + } + + void LauncherWindow::setEditable(bool on) +@@ -997,7 +997,6 @@ void LauncherWindow::toggleQGLWidgetViewport(bool enable) + WebViewGraphicsBased* view = static_cast(m_view); + view->setViewport(enable ? new QGLWidget() : 0); + } +-#endif + + void LauncherWindow::toggleQOpenGLWidgetViewport(bool enable) + { +@@ -1013,6 +1012,7 @@ void LauncherWindow::toggleQOpenGLWidgetViewport(bool enable) + view->setViewport(enable ? new QOpenGLWidget() : 0); + #endif + } ++#endif + + void LauncherWindow::changeViewportUpdateMode(int mode) + { +diff --git a/Tools/QtTestBrowser/launcherwindow.h b/Tools/QtTestBrowser/launcherwindow.h +index c470a5a..5cee7e5 100644 +--- a/Tools/QtTestBrowser/launcherwindow.h ++++ b/Tools/QtTestBrowser/launcherwindow.h +@@ -180,8 +180,8 @@ protected Q_SLOTS: + #endif + #ifndef QT_NO_OPENGL + void toggleQGLWidgetViewport(bool enable); +-#endif + void toggleQOpenGLWidgetViewport(bool enable); ++#endif + + void changeViewportUpdateMode(int mode); + void animatedFlip(); +-- +1.7.1 + +