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: Tue, 22 Aug 2017 20:15:14
Message-Id: 1503432114.a57427d460ea9ff05037f0784755be1fa8752452.candrews@gentoo
1 commit: a57427d460ea9ff05037f0784755be1fa8752452
2 Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 22 19:11:40 2017 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 22 20:01:54 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a57427d4
7
8 media-tv/kodi: add wayland and gbm/kms support to -9999
9
10 Gentoo-bug: 620428
11 Package-Manager: Portage-2.3.8, Repoman-2.3.3
12
13 media-tv/kodi/kodi-9999.ebuild | 43 ++++++++++++++++++++++++++++++++++++------
14 media-tv/kodi/metadata.xml | 1 +
15 2 files changed, 38 insertions(+), 6 deletions(-)
16
17 diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
18 index 257054417a0..296f702257b 100644
19 --- a/media-tv/kodi/kodi-9999.ebuild
20 +++ b/media-tv/kodi/kodi-9999.ebuild
21 @@ -28,12 +28,12 @@ SLOT="0"
22 # use flag is called libusb so that it doesn't fool people in thinking that
23 # it is _required_ for USB support. Otherwise they'll disable udev and
24 # that's going to be worse.
25 -IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
26 +IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gbm gles libressl libusb lirc mysql nfs +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
27 REQUIRED_USE="
28 ${PYTHON_REQUIRED_USE}
29 + gbm? ( gles )
30 || ( gles opengl )
31 - gles? ( X )
32 - opengl? ( X )
33 + ^^ ( gbm wayland X )
34 udev? ( !libusb )
35 udisks? ( dbus )
36 upower? ( dbus )
37 @@ -60,6 +60,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
38 dev-python/pillow[${PYTHON_USEDEP}]
39 dev-libs/libcdio
40 dev-libs/libfmt
41 + gbm? ( media-libs/mesa[gbm] )
42 gles? ( media-libs/mesa[gles2] )
43 libusb? ( virtual/libusb:1 )
44 media-fonts/corefonts
45 @@ -82,18 +83,32 @@ COMMON_DEPEND="${PYTHON_DEPS}
46 sftp? ( net-libs/libssh[sftp] )
47 sys-libs/zlib
48 udev? ( virtual/udev )
49 - vaapi? ( x11-libs/libva[opengl] )
50 + vaapi? (
51 + x11-libs/libva[egl]
52 + opengl? ( x11-libs/libva[opengl] )
53 + system-ffmpeg? ( media-video/ffmpeg[vaapi] )
54 + vdpau? ( x11-libs/libva[vdpau] )
55 + wayland? ( x11-libs/libva[wayland] )
56 + X? ( x11-libs/libva[X] )
57 + )
58 vdpau? (
59 || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
60 system-ffmpeg? ( media-video/ffmpeg[vdpau] )
61 )
62 + wayland? (
63 + dev-cpp/waylandpp
64 + media-libs/mesa[wayland]
65 + >=dev-libs/wayland-protocols-1.7
66 + x11-libs/libxkbcommon
67 + )
68 webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
69 X? (
70 - x11-libs/libdrm
71 x11-libs/libX11
72 x11-libs/libXrandr
73 x11-libs/libXrender
74 + system-ffmpeg? ( media-video/ffmpeg[X] )
75 )
76 + x11-libs/libdrm
77 xslt? ( dev-libs/libxslt )
78 zeroconf? ( net-dns/avahi[dbus] )
79 "
80 @@ -232,7 +247,6 @@ src_configure() {
81 -DENABLE_UPNP=$(usex upnp)
82 -DENABLE_VAAPI=$(usex vaapi)
83 -DENABLE_VDPAU=$(usex vdpau)
84 - -DENABLE_X11=$(usex X)
85 -DENABLE_XSLT=$(usex xslt)
86 -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
87 -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
88 @@ -247,6 +261,23 @@ src_configure() {
89 mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
90 fi
91
92 + if use gbm; then
93 + mycmakeargs+=( -DCORE_PLATFORM_NAME="gbm" )
94 + fi
95 +
96 + if use wayland; then
97 + mycmakeargs+=( -DCORE_PLATFORM_NAME="wayland" )
98 + if use opengl; then
99 + mycmakeargs+=( -DWAYLAND_RENDER_SYSTEM="gl" )
100 + else
101 + mycmakeargs+=( -DWAYLAND_RENDER_SYSTEM="gles" )
102 + fi
103 + fi
104 +
105 + if use X; then
106 + mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
107 + fi
108 +
109 cmake-utils_src_configure
110 }
111
112
113 diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml
114 index e969bd60277..919f9f79dc4 100644
115 --- a/media-tv/kodi/metadata.xml
116 +++ b/media-tv/kodi/metadata.xml
117 @@ -9,6 +9,7 @@
118 <flag name="airplay">enable AirPlay support</flag>
119 <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
120 <flag name="cec">Enable support for HDMI-CEC devices via libcec</flag>
121 + <flag name="gbm">Use the Graphics Buffer Manager for EGL on KMS.</flag>
122 <flag name="gles">Enable support for GLES</flag>
123 <flag name="lirc">Enable support for controlling Totem with a remote control using <pkg>app-misc/lirc</pkg></flag>
124 <flag name="nfs">Enable NFS client support</flag>