commit: 15c417c8f8765fd1802f425d07253e597132e9b1
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 09:59:47 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 10:00:11 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=15c417c8
kde-frameworks/plasma: replace opengl USE flag with gles2
This mirrors how Qt packages handled, reducing conflicts when switching on/off.
Package-Manager: portage-2.2.20.1
kde-frameworks/plasma/metadata.xml | 1 +
kde-frameworks/plasma/plasma-9999.ebuild | 11 ++++-------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/kde-frameworks/plasma/metadata.xml
b/kde-frameworks/plasma/metadata.xml
index 0515e23..4c736d5 100644
--- a/kde-frameworks/plasma/metadata.xml
+++ b/kde-frameworks/plasma/metadata.xml
@@ -4,5 +4,6 @@
<herd>kde</herd>
<use>
<flag name="egl">Enable EGL support</flag>
+ <flag name="gles2">Use GLES 2.0 or later instead of full
OpenGL</flag>
</use>
</pkgmetadata>
diff --git a/kde-frameworks/plasma/plasma-9999.ebuild
b/kde-frameworks/plasma/plasma-9999.ebuild
index b59950a..0718f6b 100644
--- a/kde-frameworks/plasma/plasma-9999.ebuild
+++ b/kde-frameworks/plasma/plasma-9999.ebuild
@@ -11,7 +11,7 @@ inherit kde5
DESCRIPTION="Plasma framework"
LICENSE="LGPL-2+"
KEYWORDS=""
-IUSE="egl opengl X"
+IUSE="egl gles2 X"
RDEPEND="
$(add_frameworks_dep kactivities)
@@ -33,7 +33,7 @@ RDEPEND="
$(add_frameworks_dep kxmlgui)
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
+ dev-qt/qtgui:5[gles2=]
dev-qt/qtquickcontrols:5
dev-qt/qtscript:5
dev-qt/qtsql:5
@@ -41,10 +41,7 @@ RDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
egl? ( media-libs/mesa[egl] )
- opengl? (
- dev-qt/qtgui:5[opengl(+),-gles2]
- virtual/opengl
- )
+ !gles2? ( virtual/opengl )
X? (
dev-qt/qtx11extras:5
x11-libs/libX11
@@ -62,7 +59,7 @@ RESTRICT="test"
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package egl EGL)
- $(cmake-utils_use_find_package opengl OpenGL)
+ $(cmake-utils_use_find_package !gles2 OpenGL)
$(cmake-utils_use_find_package X X11)
$(cmake-utils_use_find_package X XCB)
)
