[gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/

[Craig Andrews]

commit:     6005cea2e275a6fae4ae896aba9b12b11f9b8b0f
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 22 21:11:23 2018 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Aug 22 23:35:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6005cea2

media-tv/kodi: Latest git now requires GBM_RENDER_SYSTEM set

usex is simpler and shorter than if/else.

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-tv/kodi/kodi-9999.ebuild | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index a7b9f962f7d..1fe5998a2b0 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -31,7 +31,6 @@ SLOT="0"
 IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gbm gles lcms 
libressl libusb lirc mysql nfs +opengl pulseaudio samba systemd +system-ffmpeg 
test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
 REQUIRED_USE="
        ${PYTHON_REQUIRED_USE}
-       gbm? ( gles )
        || ( gles opengl )
        ^^ ( gbm wayland X )
        udev? ( !libusb )
@@ -266,16 +265,17 @@ src_configure() {
        fi
 
        if use gbm; then
-               mycmakeargs+=( -DCORE_PLATFORM_NAME="gbm" )
+               mycmakeargs+=(
+                       -DCORE_PLATFORM_NAME="gbm"
+                       -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
+               )
        fi
 
        if use wayland; then
-               mycmakeargs+=( -DCORE_PLATFORM_NAME="wayland" )
-               if use opengl; then
-                       mycmakeargs+=( -DWAYLAND_RENDER_SYSTEM="gl" )
-               else
-                       mycmakeargs+=( -DWAYLAND_RENDER_SYSTEM="gles" )
-               fi
+               mycmakeargs+=(
+                       -DCORE_PLATFORM_NAME="wayland"
+                       -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
+               )
        fi
 
        if use X; then