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

[Craig Andrews]

commit:     7aa5de27bdaf2e4140ee9f9b489d54758c2d9d9f
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 02:26:40 2017 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 02:31:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aa5de27

media-tv/kodi: optional dependency on media-libs/lcms

Gentoo-bug: 629086
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../kodi/{kodi-9999.ebuild => kodi-17.4-r1.ebuild} | 61 ++++++----------------
 media-tv/kodi/kodi-9999.ebuild                     |  4 +-
 2 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-17.4-r1.ebuild
similarity index 87%
copy from media-tv/kodi/kodi-9999.ebuild
copy to media-tv/kodi/kodi-17.4-r1.ebuild
index 296f702257b..e4099e51e0e 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-17.4-r1.ebuild
@@ -7,14 +7,14 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1
+inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
 
 LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
 LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
 LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.3.2"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="Alpha-1"
+FFMPEG_VERSION="3.1.9"
+FFMPEG_KODI_VERSION="$(get_version_component_range 1-2)"
+CODENAME="Krypton"
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
@@ -28,12 +28,12 @@ SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-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"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	gbm? ( gles )
 	|| ( gles opengl )
-	^^ ( gbm wayland X )
+	gles? ( X )
+	opengl? ( X )
 	udev? ( !libusb )
 	udisks? ( dbus )
 	upower? ( dbus )
@@ -57,11 +57,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/libxml2
 	>=dev-libs/lzo-2.04
 	dev-libs/tinyxml[stl]
+	>=dev-libs/yajl-2
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-libs/libcdio
-	dev-libs/libfmt
-	gbm? (	media-libs/mesa[gbm] )
 	gles? ( media-libs/mesa[gles2] )
+	lcms? ( media-libs/lcms:2 )
 	libusb? ( virtual/libusb:1 )
 	media-fonts/corefonts
 	>=media-fonts/noto-20160531
@@ -83,32 +83,18 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	sftp? ( net-libs/libssh[sftp] )
 	sys-libs/zlib
 	udev? ( virtual/udev )
-	vaapi? (
-		x11-libs/libva[egl]
-		opengl? ( x11-libs/libva[opengl] )
-		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
-		vdpau? ( x11-libs/libva[vdpau] )
-		wayland? ( x11-libs/libva[wayland] )
-		X? ( x11-libs/libva[X] )
-	)
+	vaapi? ( x11-libs/libva[opengl] )
 	vdpau? (
 		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
 		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
 	)
-	wayland? (
-		dev-cpp/waylandpp
-		media-libs/mesa[wayland]
-		>=dev-libs/wayland-protocols-1.7
-		x11-libs/libxkbcommon
-	)
 	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
 	X? (
+		x11-libs/libdrm
 		x11-libs/libX11
 		x11-libs/libXrandr
 		x11-libs/libXrender
-		system-ffmpeg? ( media-video/ffmpeg[X] )
 	)
-	x11-libs/libdrm
 	xslt? ( dev-libs/libxslt )
 	zeroconf? ( net-dns/avahi[dbus] )
 "
@@ -132,7 +118,6 @@ DEPEND="${COMMON_DEPEND}
 	app-arch/zip
 	dev-lang/swig
 	dev-libs/crossguid
-	dev-libs/rapidjson
 	dev-util/cmake
 	dev-util/gperf
 	media-libs/giflib
@@ -176,6 +161,8 @@ In some cases Kodi needs to access multicast addresses.
 Please consider enabling IP_MULTICAST under Networking options.
 "
 
+CMAKE_USE_DIR=${S}/project/cmake/
+
 pkg_setup() {
 	check_extra_config
 	python-single-r1_pkg_setup
@@ -209,7 +196,7 @@ src_prepare() {
 
 	# Prevent autoreconf rerun
 	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-		"${S}"/cmake/modules/FindCpluff.cmake \
+		"${S}"/project/cmake/modules/FindCpluff.cmake \
 		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
 		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
 		|| die
@@ -231,10 +218,12 @@ src_configure() {
 		-DENABLE_INTERNAL_CROSSGUID=OFF
 		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
 		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
 		-DENABLE_LIRC=$(usex lirc)
 		-DENABLE_MICROHTTPD=$(usex webserver)
 		-DENABLE_MYSQLCLIENT=$(usex mysql)
 		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_NONFREE=$(usex nonfree)
 		-DENABLE_OPENGLES=$(usex gles)
 		-DENABLE_OPENGL=$(usex opengl)
 		-DENABLE_OPENSSL=ON
@@ -247,6 +236,7 @@ src_configure() {
 		-DENABLE_UPNP=$(usex upnp)
 		-DENABLE_VAAPI=$(usex vaapi)
 		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_X11=$(usex X)
 		-DENABLE_XSLT=$(usex xslt)
 		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
 		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
@@ -261,23 +251,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" )
-	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
-	fi
-
-	if use X; then
-		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
-	fi
-
 	cmake-utils_src_configure
 }
 

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 296f702257b..0d9cdf8f62e 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -28,7 +28,7 @@ SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-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"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gbm gles lcms libressl libusb lirc mysql nfs +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	gbm? ( gles )
@@ -62,6 +62,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/libfmt
 	gbm? (	media-libs/mesa[gbm] )
 	gles? ( media-libs/mesa[gles2] )
+	lcms? ( media-libs/lcms:2 )
 	libusb? ( virtual/libusb:1 )
 	media-fonts/corefonts
 	>=media-fonts/noto-20160531
@@ -231,6 +232,7 @@ src_configure() {
 		-DENABLE_INTERNAL_CROSSGUID=OFF
 		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
 		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
 		-DENABLE_LIRC=$(usex lirc)
 		-DENABLE_MICROHTTPD=$(usex webserver)
 		-DENABLE_MYSQLCLIENT=$(usex mysql)