[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.5.1+dfsg-16ubuntu6-9-g06611f3

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=06611f3

The following commit has been merged in the ubuntu branch:
commit 06611f3dd7d066044ca8e85b2777f135d9b89f5f
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Apr 15 07:30:35 2016 +0000

    debian/patches/Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch
    
    * debian/patches/Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch
      - Backport from upstream 5.6 (LP: #1557915) (LP: #1559906)
---
 debian/changelog                                   |  3 +-
 ...-Mali-T760-Mali-T720-from-supporting-BGRA.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bbe0bc1..9fe6347 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qtbase-opensource-src (5.5.1+dfsg-16ubuntu8) UNRELEASED; urgency=medium
 
-  * 
+  * debian/patches/Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch
+    - Backport from upstream 5.6 (LP: #1557915) (LP: #1559906)
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 15 Apr 2016 06:52:29 +0000
 
diff --git a/debian/patches/Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch b/debian/patches/Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch
new file mode 100644
index 0000000..9767f82
--- /dev/null
+++ b/debian/patches/Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch
@@ -0,0 +1,41 @@
+From 87715cc4917e0edcc1090658ea09be508f47f3b7 Mon Sep 17 00:00:00 2001
+From: Timo Jyrinki <timo.jyrinki at canonical.com>
+Date: Wed, 23 Mar 2016 09:41:50 +0000
+Subject: [PATCH] Blacklist Mali-T760/Mali-T720 from supporting BGRA.
+
+Extend the blacklist with Mali-T760 and Mali-T720 as found on Meizu
+Pro 5 and Bq Aquaris M10 Ubuntu Editions. Reading from FBO like
+taking screenshots does not produce correct result otherwise.
+
+Initially reported at: https://launchpad.net/bugs/1557915 and
+https://launchpad.net/bugs/1559906
+
+Change-Id: Ic875bd083277bf933863a3a50f8e874dd6e04365
+Reviewed-by: Laszlo Agocs <laszlo.agocs at theqtcompany.com>
+---
+ src/gui/opengl/qopenglframebufferobject.cpp | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp
+index 5184283..0e1074f 100644
+--- a/src/gui/opengl/qopenglframebufferobject.cpp
++++ b/src/gui/opengl/qopenglframebufferobject.cpp
+@@ -1281,9 +1281,13 @@ static inline QImage qt_gl_read_framebuffer_rgba8(const QSize &size, bool includ
+     const char *renderer = reinterpret_cast<const char *>(funcs->glGetString(GL_RENDERER));
+     const char *ver = reinterpret_cast<const char *>(funcs->glGetString(GL_VERSION));
+ 
+-    // Blacklist PowerVR Rogue G6200 as it has problems with its BGRA support.
++    // Blacklist GPU chipsets that have problems with their BGRA support.
+     const bool blackListed = (qstrcmp(renderer, "PowerVR Rogue G6200") == 0
+-                             && ::strstr(ver, "1.3") != 0);
++                             && ::strstr(ver, "1.3") != 0) ||
++                             (qstrcmp(renderer, "Mali-T760") == 0
++                             && ::strstr(ver, "3.1") != 0) ||
++                             (qstrcmp(renderer, "Mali-T720") == 0
++                             && ::strstr(ver, "3.1") != 0);
+ 
+     const bool supports_bgra = has_bgra_ext && !blackListed;
+ 
+-- 
+2.7.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 17eeaa8..8540156 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,6 +31,7 @@ dbusmenu_fixes.diff
 dbustray_fixes.diff
 qdoc-Wrap-QML-read-only-and-default-qualifiers-in-br.patch
 detect-indicator-application.diff
+Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch
 
 # Debian specific.
 gnukfreebsd.diff

-- 
qtbase packaging