commit: 3168191358f85e35ae5bb01a7f192419a0875f4f Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Tue Oct 27 21:58:35 2020 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Tue Oct 27 21:59:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31681913
media-tv/kodi: Allow multiple windowing systems See: https://github.com/xbmc/xbmc/pull/18534 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> media-tv/kodi/kodi-9999.ebuild | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index 00063a3470d..ad742a28610 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -43,7 +43,7 @@ IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libress REQUIRED_USE=" ${PYTHON_REQUIRED_USE} || ( gles opengl ) - ^^ ( gbm raspberry-pi wayland X ) + || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) @@ -216,6 +216,10 @@ src_prepare() { } src_configure() { + local platform=() + use gbm && platform+=( gbm ) + use wayland && platform+=( wayland ) + use X && platform+=( x11 ) local mycmakeargs=( -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 @@ -258,6 +262,8 @@ src_configure() { -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" -DPYTHON_LIBRARY="$(python_get_library_path)" + -DAPP_RENDER_SYSTEM="$(usex opengl gl gles)" + -DCORE_PLATFORM_NAME="${platform[@]}" ) use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) @@ -268,31 +274,6 @@ src_configure() { mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" ) fi - if use gbm; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="gbm" - -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - - if use wayland; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="wayland" - -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - - if use raspberry-pi; then - mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" ) - fi - - if use X; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="x11" - -DX11_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - cmake_src_configure }
