[SCM] qtbase packaging branch, kubuntu_vivid_mobile, updated. debian/5.5.1+dfsg-2-5-gd54f09c

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_mobile branch:
commit d54f09c2424b17970373d7ac0a6ef1280656317f
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Nov 24 11:33:07 2015 +0000

    add kubuntu-mobile_qopenglvertexarrayobject.diff from Martin Graesslin <mgraesslin at kde.org>
---
 .../kubuntu-mobile_qopenglvertexarrayobject.diff   | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/kubuntu-mobile_qopenglvertexarrayobject.diff b/debian/patches/kubuntu-mobile_qopenglvertexarrayobject.diff
new file mode 100644
index 0000000..cc82337
--- /dev/null
+++ b/debian/patches/kubuntu-mobile_qopenglvertexarrayobject.diff
@@ -0,0 +1,31 @@
+diff --git a/src/gui/opengl/qopenglvertexarrayobject.cpp b/src/gui/opengl/qopenglvertexarrayobject.cpp
+index 2a1b7f4..b0605dc 100644
+--- a/src/gui/opengl/qopenglvertexarrayobject.cpp
++++ b/src/gui/opengl/qopenglvertexarrayobject.cpp
+@@ -56,19 +56,19 @@ void qtInitializeVertexArrayObjectHelper(QOpenGLVertexArrayObjectHelper *helper,
+     bool tryARB = true;
+ 
+     if (context->isOpenGLES()) {
+-        if (context->format().majorVersion() >= 3) {
++        if (context->hasExtension(QByteArrayLiteral("GL_OES_vertex_array_object"))) {
++            helper->GenVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_GenVertexArrays_t>(context->getProcAddress(QByteArrayLiteral("glGenVertexArraysOES")));
++            helper->DeleteVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_DeleteVertexArrays_t>(context->getProcAddress(QByteArrayLiteral("glDeleteVertexArraysOES")));
++            helper->BindVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_BindVertexArray_t>(context->getProcAddress(QByteArrayLiteral("glBindVertexArrayOES")));
++            helper->IsVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_IsVertexArray_t>(context->getProcAddress(QByteArrayLiteral("glIsVertexArrayOES")));
++            tryARB = false;
++        } else if (context->format().majorVersion() >= 3) {
+             QOpenGLES3Helper *es3 = static_cast<QOpenGLExtensions *>(context->functions())->gles3Helper();
+             helper->GenVertexArrays = es3->GenVertexArrays;
+             helper->DeleteVertexArrays = es3->DeleteVertexArrays;
+             helper->BindVertexArray = es3->BindVertexArray;
+             helper->IsVertexArray = es3->IsVertexArray;
+             tryARB = false;
+-        } else if (context->hasExtension(QByteArrayLiteral("GL_OES_vertex_array_object"))) {
+-            helper->GenVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_GenVertexArrays_t>(context->getProcAddress(QByteArrayLiteral("glGenVertexArraysOES")));
+-            helper->DeleteVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_DeleteVertexArrays_t>(context->getProcAddress(QByteArrayLiteral("glDeleteVertexArraysOES")));
+-            helper->BindVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_BindVertexArray_t>(context->getProcAddress(QByteArrayLiteral("glBindVertexArrayOES")));
+-            helper->IsVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_IsVertexArray_t>(context->getProcAddress(QByteArrayLiteral("glIsVertexArrayOES")));
+-            tryARB = false;
+         }
+     } else if (context->hasExtension(QByteArrayLiteral("GL_APPLE_vertex_array_object")) &&
+                !context->hasExtension(QByteArrayLiteral("GL_ARB_vertex_array_object"))) {
diff --git a/debian/patches/series b/debian/patches/series
index aa5f22c..d594e4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ no_htmlinfo_example.diff
 remove_privacy_breachs.diff
 hurd-forkfd.diff
 link_fbclient.diff
+kubuntu-mobile_qopenglvertexarrayobject.diff

-- 
qtbase packaging