From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 33A89138CDB for ; Thu, 11 Jun 2015 20:55:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE0BFE08A5; Thu, 11 Jun 2015 20:55:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 628B1E08A5 for ; Thu, 11 Jun 2015 20:55:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D7BC340C1B for ; Thu, 11 Jun 2015 20:55:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 116519A2 for ; Thu, 11 Jun 2015 20:55:46 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1434055852.fe13fd14d67a9ff1046b8ee8ecf065836b20300a.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kwin/files/kwin-5.3.1-gles2.patch kde-plasma/kwin/kwin-5.3.49.9999.ebuild X-VCS-Directories: kde-plasma/kwin/ kde-plasma/kwin/files/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: fe13fd14d67a9ff1046b8ee8ecf065836b20300a X-VCS-Branch: master Date: Thu, 11 Jun 2015 20:55:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0aacdbb1-11b4-4079-a03d-cd8db3342a87 X-Archives-Hash: 15de8070743acb1a34cced1cbf3571a1 commit: fe13fd14d67a9ff1046b8ee8ecf065836b20300a Author: Johannes Huber gentoo org> AuthorDate: Thu Jun 11 20:50:52 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Thu Jun 11 20:50:52 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fe13fd14 [kde-plasma/kwin] Upstream patch to fix gles2 support, bug #551448 Thanks to Dennis Schridde gmx.net>. Package-Manager: portage-2.2.20 kde-plasma/kwin/files/kwin-5.3.1-gles2.patch | 47 ++++++++++++++++++++++++++++ kde-plasma/kwin/kwin-5.3.49.9999.ebuild | 2 ++ 2 files changed, 49 insertions(+) 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 0000000..cf4d859 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.3.1-gles2.patch @@ -0,0 +1,47 @@ +commit 713c6b25dce2fc60184ddc7b618b0b1195ab9870 +Author: Martin Gräßlin +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.49.9999.ebuild b/kde-plasma/kwin/kwin-5.3.49.9999.ebuild index 524e9ac..ca541e2 100644 --- a/kde-plasma/kwin/kwin-5.3.49.9999.ebuild +++ b/kde-plasma/kwin/kwin-5.3.49.9999.ebuild @@ -73,6 +73,8 @@ DEPEND="${COMMON_DEPEND} test? ( x11-libs/xcb-util-wm ) " +PATCHES=( "${FILESDIR}/${PN}-5.3.1-gles2.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package wayland)