[gentoo-commits] repo/gentoo:master commit in: dev-libs/efl/

[Joonas Niilola]

commit:     cd97b7bdf959f23b2985e4e2febb848d4ce7291f
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  7 06:36:16 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan  7 07:36:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd97b7bd

dev-libs/efl: rework opengl-gles2 logic

 - 'opengl' is barely supported by upstream, and es-egl will provide
    similar experience. Even if they're compiled in, hwaccel can be
    disabled from the settings.

Closes: https://bugs.gentoo.org/757339
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-libs/efl/{efl-1.26.1.ebuild => efl-1.26.1-r1.ebuild} | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev-libs/efl/efl-1.26.1.ebuild b/dev-libs/efl/efl-1.26.1-r1.ebuild
similarity index 98%
rename from dev-libs/efl/efl-1.26.1.ebuild
rename to dev-libs/efl/efl-1.26.1-r1.ebuild
index 2ffe8a53d6e6..8528716bda38 100644
--- a/dev-libs/efl/efl-1.26.1.ebuild
+++ b/dev-libs/efl/efl-1.26.1-r1.ebuild
@@ -33,6 +33,7 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
        drm? ( wayland )
        examples? ( eet svg )
        ibus? ( glib )
+       opengl? ( X )
        pulseaudio? ( sound )
        xim? ( X )
        xpresent? ( X )"
@@ -50,6 +51,7 @@ RDEPEND="${LUA_DEPS}
        sys-libs/zlib
        virtual/jpeg
        X? (
+               !opengl? ( media-libs/mesa[egl(+),gles2] )
                media-libs/freetype
                x11-libs/libX11
                x11-libs/libXScrnSaver
@@ -221,6 +223,8 @@ src_configure() {
                emesonargs+=( -D opengl=es-egl )
        elif ! use wayland && use opengl; then
                emesonargs+=( -D opengl=full )
+       elif ! use wayland && use X && ! use opengl; then
+               emesonargs+=( -D opengl=es-egl )
        else
                emesonargs+=( -D opengl=none )
        fi