commit: 8dedec51d388b1abd8925b0720b32a1795569530
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 4 18:08:04 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Apr 4 18:08:04 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8dedec51
[kde-base/kwin] Rework opengl/gles support.
Package-Manager: portage-2.2.8-r1
---
kde-base/kwin/kwin-9999.ebuild | 15 ++++++---------
kde-base/kwin/metadata.xml | 9 +++++----
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild
index e91ce36..a1d4073 100644
--- a/kde-base/kwin/kwin-9999.ebuild
+++ b/kde-base/kwin/kwin-9999.ebuild
@@ -12,7 +12,9 @@ inherit kde5
DESCRIPTION="KDE window manager"
LICENSE="GPL-2+"
KEYWORDS=""
-IUSE="wayland"
+IUSE="gles2 +opengl wayland"
+
+REQUIRED_USE="^^ ( gles2 opengl )"
COMMON_DEPEND="
$(add_frameworks_dep kactivities)
@@ -38,10 +40,7 @@ COMMON_DEPEND="
$(add_frameworks_dep plasma)
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
- || (
- dev-qt/qtgui:5[opengl]
- dev-qt/qtgui:5[gles2]
- )
+ dev-qt/qtgui:5[gles2=,opengl=]
dev-qt/qtmultimedia:5
dev-qt/qtscript:5
dev-qt/qtwidgets:5
@@ -65,12 +64,10 @@ RDEPEND="${COMMON_DEPEND}
"
DEPEND="${COMMON_DEPEND}
dev-qt/designer:5
- || (
- ( dev-qt/qtgui:5[opengl] media-libs/mesa[egl] )
- ( dev-qt/qtgui:5[gles2] media-libs/mesa[egl,gles2] )
- )
dev-qt/qtconcurrent:5
x11-proto/xproto
+ gles2? ( media-libs/mesa[egl,gles2] )
+ opengl? ( media-libs/mesa[egl] )
"
src_configure() {
diff --git a/kde-base/kwin/metadata.xml b/kde-base/kwin/metadata.xml
index 8b8d86d..b7977769 100644
--- a/kde-base/kwin/metadata.xml
+++ b/kde-base/kwin/metadata.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <herd>kde</herd>
- <use>
- <flag name="gles">Enable support for GLES.</flag>
- </use>
+ <herd>kde</herd>
+ <use>
+ <flag name="gles">Enable support for GLES.</flag>
+ <flag name="gles2">Enable support for GLES2.</flag>
+ </use>
</pkgmetadata>
