Gentoo Archives: gentoo-commits

From: Craig Andrews <candrews@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/
Date: Wed, 22 Aug 2018 23:35:37
Message-Id: 1534980925.6005cea2e275a6fae4ae896aba9b12b11f9b8b0f.candrews@gentoo
1 commit: 6005cea2e275a6fae4ae896aba9b12b11f9b8b0f
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 22 21:11:23 2018 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 22 23:35:25 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6005cea2
7
8 media-tv/kodi: Latest git now requires GBM_RENDER_SYSTEM set
9
10 usex is simpler and shorter than if/else.
11
12 Package-Manager: Portage-2.3.48, Repoman-2.3.10
13
14 media-tv/kodi/kodi-9999.ebuild | 16 ++++++++--------
15 1 file changed, 8 insertions(+), 8 deletions(-)
16
17 diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
18 index a7b9f962f7d..1fe5998a2b0 100644
19 --- a/media-tv/kodi/kodi-9999.ebuild
20 +++ b/media-tv/kodi/kodi-9999.ebuild
21 @@ -31,7 +31,6 @@ SLOT="0"
22 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"
23 REQUIRED_USE="
24 ${PYTHON_REQUIRED_USE}
25 - gbm? ( gles )
26 || ( gles opengl )
27 ^^ ( gbm wayland X )
28 udev? ( !libusb )
29 @@ -266,16 +265,17 @@ src_configure() {
30 fi
31
32 if use gbm; then
33 - mycmakeargs+=( -DCORE_PLATFORM_NAME="gbm" )
34 + mycmakeargs+=(
35 + -DCORE_PLATFORM_NAME="gbm"
36 + -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
37 + )
38 fi
39
40 if use wayland; then
41 - mycmakeargs+=( -DCORE_PLATFORM_NAME="wayland" )
42 - if use opengl; then
43 - mycmakeargs+=( -DWAYLAND_RENDER_SYSTEM="gl" )
44 - else
45 - mycmakeargs+=( -DWAYLAND_RENDER_SYSTEM="gles" )
46 - fi
47 + mycmakeargs+=(
48 + -DCORE_PLATFORM_NAME="wayland"
49 + -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
50 + )
51 fi
52
53 if use X; then