commit:     c7d06fd8eee37017eba3a09438632b923f751485
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 13:53:21 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 22:27:21 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c7d06fd8

kde-frameworks/plasma: Drop USE=egl and tie it together w/ USE=wayland

In short: X11 default is GLX with no UI handle to change it, on Wayland
EGL is required. It is then much simpler to drop USE=egl and enable
EGL support together with the wayland USE flag.

See also:
https://blog.martin-graesslin.com/blog/2016/08/opengl-changes-in-kwin-compositing/

Reported-by:  Martijn Schmidt <martijn.schmidt <AT> gmail.com>
Gentoo-bug: 610892

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-frameworks/plasma/metadata.xml       |  1 -
 kde-frameworks/plasma/plasma-9999.ebuild | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/kde-frameworks/plasma/metadata.xml 
b/kde-frameworks/plasma/metadata.xml
index 03d701808d..6b9e870031 100644
--- a/kde-frameworks/plasma/metadata.xml
+++ b/kde-frameworks/plasma/metadata.xml
@@ -6,7 +6,6 @@
                <name>Gentoo KDE Project</name>
        </maintainer>
        <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 cc13c6d726..157a89ba61 100644
--- a/kde-frameworks/plasma/plasma-9999.ebuild
+++ b/kde-frameworks/plasma/plasma-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Plasma framework"
 LICENSE="LGPL-2+"
 KEYWORDS=""
-IUSE="egl gles2 wayland X"
+IUSE="gles2 wayland X"
 
 COMMON_DEPEND="
        $(add_frameworks_dep kactivities)
@@ -36,9 +36,11 @@ COMMON_DEPEND="
        $(add_qt_dep qtsql)
        $(add_qt_dep qtsvg)
        $(add_qt_dep qtwidgets)
-       egl? ( media-libs/mesa[egl] )
        !gles2? ( virtual/opengl )
-       wayland? ( $(add_frameworks_dep kwayland) )
+       wayland? (
+               $(add_frameworks_dep kwayland)
+               media-libs/mesa[egl]
+       )
        X? (
                $(add_qt_dep qtx11extras)
                x11-libs/libX11
@@ -57,8 +59,8 @@ RESTRICT+=" test"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package egl EGL)
                $(cmake-utils_use_find_package !gles2 OpenGL)
+               $(cmake-utils_use_find_package wayland EGL)
                $(cmake-utils_use_find_package wayland KF5Wayland)
                $(cmake-utils_use_find_package X X11)
                $(cmake-utils_use_find_package X XCB)

Reply via email to