[SCM] qtbase packaging branch, experimental, updated. debian/5.6.0-rc+dfsg-1-10-g4fcdc4f

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 4fcdc4fea45d8d523e33ba6b485b0f7da871c9db
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Mar 16 12:32:53 2016 -0300

    Force software rendering if the user does not has at least OpenGL 2 support.
---
 debian/90qt5-opengl              | 21 +++++++++++++++++++++
 debian/changelog                 |  3 +++
 debian/libqt5gui5.install-common |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/90qt5-opengl b/debian/90qt5-opengl
new file mode 100644
index 0000000..a59afd8
--- /dev/null
+++ b/debian/90qt5-opengl
@@ -0,0 +1,21 @@
+# -*- sh -*-
+# Xsession.d script to set the QT_XCB_FORCE_SOFTWARE_OPENGL env variable when
+# the user does not has at least OpenGL 2 support.
+#
+# This file is sourced by Xsession(5), not executed.
+
+if [ "$(which glxinfo)" = "" ] ; then
+  echo "glxinfo not found"
+  echo "On Debian (based) systems, install the mesa-utils package"
+  #echo "On RedHat (based) systems, install the glx-utils package"
+  exit 1
+fi
+OPENGL_VERSION=`LANG=C glxinfo | grep '^OpenGL version string: ' | head -n 1 | sed -e 's/^OpenGL version string: \([0-9]\).*$/
/g'`
+if [ -n "$OPENGL_VERSION" ] && [ "$OPENGL_VERSION" -lt 2 ]; then
+  QT_XCB_FORCE_SOFTWARE_OPENGL=1
+  export QT_XCB_FORCE_SOFTWARE_OPENGL
+elif [ -n "$OPENGL_VERSION" ] ; then
+  echo "OpenGL version: $OPENGL_VERSION"
+else
+  echo "OpenGL version not found"
+fi
diff --git a/debian/changelog b/debian/changelog
index 6120533..d01397b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qtbase-opensource-src (5.6.0+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
     - Update debian/watch to point at official releases again.
   * Update symbols files with buidds' logs.
+  * Install the 90qt5-opengl script into Xsession.d in order to force
+    software rendering in case the user does not has at least OpenGL 2
+    support (Closes: #811195).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 16 Mar 2016 09:40:51 -0300
 
diff --git a/debian/libqt5gui5.install-common b/debian/libqt5gui5.install-common
index a14eb13..3c8b88e 100644
--- a/debian/libqt5gui5.install-common
+++ b/debian/libqt5gui5.install-common
@@ -1,3 +1,4 @@
+debian/90qt5-opengl /etc/X11/Xsession.d/
 usr/lib/*/libQt5Gui.so.*
 usr/lib/*/libQt5XcbQpa.so.*
 usr/lib/*/qt5/plugins/generic/libqtuiotouchplugin.so

-- 
qtbase packaging