Revision bump adds upstream patch to fix gles2 support, bug #551448. Thanks to Dennis Schridde <devurandom@gmx.net>.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 74 insertions, 17 deletions

diff --git a/kde-plasma/kwin/ChangeLog b/kde-plasma/kwin/ChangeLog
index a8dcd4b752bb..fab00b99441e 100644
--- a/kde-plasma/kwin/ChangeLog
+++ b/kde-plasma/kwin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-plasma/kwin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-plasma/kwin/ChangeLog,v 1.2 2015/06/11 16:10:34 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-plasma/kwin/ChangeLog,v 1.3 2015/06/11 20:55:29 johu Exp $
+
+*kwin-5.3.1-r1 (11 Jun 2015)
+
+  11 Jun 2015; Johannes Huber <johu@gentoo.org> +files/kwin-5.3.1-gles2.patch,
+  +kwin-5.3.1-r1.ebuild, -kwin-5.3.1.ebuild:
+  Revision bump adds upstream patch to fix gles2 support, bug #551448. Thanks to
+  Dennis Schridde <devurandom@gmx.net>.
 
   11 Jun 2015; Johannes Huber <johu@gentoo.org> kwin-5.3.1.ebuild:
   Adjust dev-qt/qtgui USE dependencies, bug #551772.
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index c6dfa87831d6..b191bfebd80a 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kwin-5.3.1-gles2.patch 2075 SHA256 dfa605310bdcc75457e685f77eccbd8937e7587875d78ad827b62359babd7c97 SHA512 090731178e00a36c27fbec5dafe097df44d2302b03c6fa5c320863f69aeb5315d7f994d8a9348cec7f33eb1b569c95014261fa41972ae5521bbc9ea063d42cdb WHIRLPOOL 43a4bff986c20837cba3e6dcabc3ae2a11ed8aa5ee22f1f4bf95e94aafd26205991594d1897515ef042758a4f4235d21254f55ff478fdfcb87aeef4dee6d667c
 DIST kwin-5.3.1.tar.xz 3817736 SHA256 665412fd2cdd8b1f69fcd957f8972afd4c0da29166063d1da2b62e460b717d11 SHA512 16668a89f36b21d12f0eb735601643b784d39b32442256e70b70461f4b8462aea67065f53d98dc3494de86141aa251c12cd92304903a363fa2a3d0e7b8481011 WHIRLPOOL ceca6d028e7a22308b521e07ff1695ad7d3fd6d320bb12ecdb618ebd43dcff61c13b740ee2a35714ffaddbd9f495f4cd20a2a72514d050d00baeffe9b250ab37
-EBUILD kwin-5.3.1.ebuild 2126 SHA256 fe664cdc8d508bf8e4959b7d59754def4d5e6f647ae48e16c9f550bc87fa5054 SHA512 a42c555596341420fe15ae9b4ee60fb86660112c3e3f4da0bf4943450adb6bfb2715990502dff5c322161d9f2617d72d8dd3f58822607c72e8067e6c343e976c WHIRLPOOL 56a6c47e5e2a4859bdc3006023dbbdf6d149c5a188e57ead75bf025eec3f0a98371539e3eb69c97e76c8698645fbc72564957a7a908a6b4781180b908c14db87
-MISC ChangeLog 580 SHA256 128161d7fb52aa5dd92b89be9b37d3a62516f6599a05fa453f5686f84a6eae90 SHA512 6acc6fb2ac7b1a2f960d1a99fb05a91d8bb36935ae8061d6ce248ebb7a04bacfdfb365fbec15e90466460db0fcefea6e8b422aac744cfcecad8aabed6a42bf13 WHIRLPOOL 1949be372a08f6c08200ad2200b9f10fd2325cf4caaf347aa17f19ada9d16b800c4e3d4f7f5b56cd3b5916af8ee341885e8e1d1fd766849253e7f098d891795e
+EBUILD kwin-5.3.1-r1.ebuild 2173 SHA256 0d2f4c1c69fe85f853ef82e14bd2f0a2703762a78900f6af227a2da14785cb83 SHA512 628be6008429806c7937888b9a9b8f105385663047eba278b31db047ad4c34ffc25777cc2794651fe4c8fa03b9e190f23a0819f27e56111da28de667aee847c1 WHIRLPOOL a4967cf24c078fce564bf8f5031b500a25a3454d6f058beeaf1b7cb851e04b28204d076612151b4e522c867f8417dbc9337884f884616b656d8ac57a518e2b16
+MISC ChangeLog 856 SHA256 97c9fdc41dc9c29530e66932c1735ea92579e8896e645f8809edb4c376075a51 SHA512 6c89c2810e0d48f3571ce43f37098d52fb9d3071cc5cb4cac67c24c2265ec0d3e0ba893cdfc0482c14a1185dd07f49eeb4cad7437aefdc318a79a8d8e9fe3305 WHIRLPOOL c57839e049e59460ec55c230ff1863d5ffeb24b353b7279321ab8d61a17bf978c82ca718bdf950d9125b13b274aab18db9191812f0c85fc23905d0addd0d7d74
 MISC metadata.xml 235 SHA256 9dbfcd763f979df53473aa04c0acdc73ed76ae0ea480e1b968085c6c8b9adc11 SHA512 eb67d2a0cac932f0376c56f472339d94e566c8252172c2bbd731711b641b555bdde254d98e09840209035173cc7956442722f4aedbc1d856b746ab79465ef2f0 WHIRLPOOL be3831bcb974f4ee4132686dbc46c43198fb2712efb8851292c85772cb5e06f5af993f705cbdd8365f028ebef8d7dff3d5b9306d0bf65f79b27b1b70c1cf35c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVebMVAAoJEGVpnaTzz9K9k3AP/iytANWvyCzkNWsBuy4A/G3T
-Oam98DzcCxo4C+L9L9zGJlCwsI3nWPumfrHowdjGg4sBrPwt5H3mWqMNnOObM/qN
-pO6n8GQXDhrSMQ/2mSPU4jIdcKfKVVFQJKPZGBI+1/Ltb4WQcrb3/qekFW8iOvoE
-sKec/zZlfERKqcsQOOqz49iiP3WijjX9HpttirIkPaTi+Cg0FU7anP2ZgGT2VmZ3
-V5kMfn6i1ntvGt34D2Xw3moOCQKWD6Ix3odmA6vtoujKW0E0AeAqUjZJ8B6CyE3Q
-MtmzTwyOZlTLaqm4HcdiHLeXcNNdniz/rPIUgVszpfNaN2+BNujUzUrmUbxl6DSg
-rirazIrE8R7SiJ82K19rR39OyUlBJT8BlxdY532VQUWGiMMmAr3dbUdwuRRfw7tR
-tIHf/NW5oTbohNo1yqlzajIQKpWbZ+OEcyISX5Nu4nnBdTsLUAqFHJVL61pBJOTe
-h7kLcJa505synEx2cE4bjL0cO9XNYo0FEH/2YPoRO5P6ot1NdRa5lsL3WnUdeIpI
-vPmdORlOmaCVuR5wRlURxxSb8T+sbezoOzpqxvUW4VCzUfCrb/jBOfwUiNSvNbVa
-TLvTT7z4LdaDTtHbQhqthvRjvjeub9ezMFMShV6af/xM7Qxk5KevUt+No3wq7mOk
-/anOUil1wh6HK/VqzEiQ
-=fYCr
+iQIcBAEBCAAGBQJVefXcAAoJEGVpnaTzz9K9QYIP/i3bSXPxDCZ+dQkFByatQ2lw
+NFRYLapnxp26My9/fTB3iL/axCWp4LCEhBPObwYmvBzZohCbNkmX7BXUP6ZgLeUa
+W0y6Aco8juMdA40xbIfyh+W1PIemhlNcYcKTW+UEH3PtMjaEHK6OriHWRKDMWrcF
+wnS8BpX01lPrEFxSdUhkAPwK1tx3A1j8AUMrFxyF3gP4+pVSqrufQL+w80Rmx0YC
+gZojsm4Ruq7PBdTx5ivPf9n4mYiRMmY44aTwVvxx1oJBrhVy6VL1L1BTSef29UFt
+gHOzDbQsOs/SDEz9botn7Mi0/QWt0EQZ0JpsPpwtFJYUi2xMDj9UzDrhbPD/SbjO
+giVLqBRjVQwhVuhoIA0JHNUMNNckkU4ewjlXo0jpyLtlKe9RykVHTxE2uhBOq/Wi
+ne4NiZo066y/XnS5ePz07L7c6EK51WYRhJMvg7pgAd6gbvNd/MGRzfZ8iSB8x12N
+NNIggJt+No7z4Qv6XrYH99nhUQ+7pQg7GhinVvQkwjkw5InNFj/+s/V/hqzqiaMB
+3N5wbMEMS0xc3VIUIMO266t8T0miAwj5d5rO9mT48CjrjcG2kqD+TCWPspYkYKPq
+gxkG9lDpg8WHnZvIjJ5Yti2NQMxTExQstcUJOAxz90ceoetGAaOjBqF/Ycb3kT1E
+29xypE6/Ia09+OpBRaFR
+=n4Pl
 -----END PGP SIGNATURE-----
diff --git a/kde-plasma/kwin/files/kwin-5.3.1-gles2.patch b/kde-plasma/kwin/files/kwin-5.3.1-gles2.patch
new file mode 100644
index 000000000000..cf4d859fe4ef
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.3.1-gles2.patch
@@ -0,0 +1,47 @@
+commit 713c6b25dce2fc60184ddc7b618b0b1195ab9870
+Author: Martin Gräßlin <mgraesslin@kde.org>
+Date:   Fri May 8 08:53:34 2015 +0200
+
+    [kwinglutils] Init glVersion on gles
+    
+    The glVersion was not set at all for gles causing any code doing a
+    hasGLVersion check to fail which means that the compositor doesn't
+    start at all, because it has a hasGLVersion(2, 0) check.
+    
+    The complete ifdef is no longer needed. The used additional glGetStringi
+    is also available in gles 3.0, thus epoxy can handle it quite well
+    without a need for ifdef.
+    
+    Unfortunately the version string can be "strange" on GLES. On desktop
+    it looks like: "3.0 some driver foo", on GLES it could also be:
+    "OpenGL ES 3.0 some driver bar". Thus to make the logic work we are
+    first removing any leading "OpenGL ES " and hope that then the version
+    is encoded just like on GL.
+
+diff --git a/libkwineffects/kwinglutils.cpp b/libkwineffects/kwinglutils.cpp
+index 8830c44..fd2e217 100644
+--- a/libkwineffects/kwinglutils.cpp
++++ b/libkwineffects/kwinglutils.cpp
+@@ -106,11 +106,12 @@ void initGL(OpenGLPlatformInterface platformInterface)
+ {
+     // Get OpenGL version
+     QString glversionstring = QString::fromUtf8((const char*)glGetString(GL_VERSION));
++    if (glversionstring.startsWith(QLatin1String("OpenGL ES "))) {
++        glversionstring = glversionstring.mid(10);
++    }
+     QStringList glversioninfo = glversionstring.left(glversionstring.indexOf(QStringLiteral(" "))).split(QStringLiteral("."));
+     while (glversioninfo.count() < 3)
+         glversioninfo << QStringLiteral("0");
+-
+-#ifndef KWIN_HAVE_OPENGLES
+     glVersion = MAKE_GL_VERSION(glversioninfo[0].toInt(), glversioninfo[1].toInt(), glversioninfo[2].toInt());
+ 
+     // Get list of supported OpenGL extensions
+@@ -123,7 +124,6 @@ void initGL(OpenGLPlatformInterface platformInterface)
+             glExtensions << name;
+         }
+     } else
+-#endif
+         glExtensions = QByteArray((const char*)glGetString(GL_EXTENSIONS)).split(' ');
+ 
+     // handle OpenGL extensions functions
diff --git a/kde-plasma/kwin/kwin-5.3.1.ebuild b/kde-plasma/kwin/kwin-5.3.1-r1.ebuild
index 59385ef50307..39bf6e9a80eb 100644
--- a/kde-plasma/kwin/kwin-5.3.1.ebuild
+++ b/kde-plasma/kwin/kwin-5.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-plasma/kwin/kwin-5.3.1.ebuild,v 1.2 2015/06/11 16:10:34 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-plasma/kwin/kwin-5.3.1-r1.ebuild,v 1.1 2015/06/11 20:55:29 johu Exp $
 
 EAPI=5
 
@@ -73,6 +73,8 @@ DEPEND="${COMMON_DEPEND}
 	test? (	x11-libs/xcb-util-wm )
 "
 
+PATCHES=( "${FILESDIR}/${P}-gles2.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package wayland)