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

["David Seifert" <soap@gentoo.org>]

commit:     5242b2e3a5905d9b7f1e464759004917fbd4f7ba
Author:     Craig Andrews <candrews <AT> integralblue <DOT> com>
AuthorDate: Thu Aug 10 21:33:15 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 11:02:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5242b2e3

media-tv/kodi: 17.4_rc1 version bump, update -9999

Package-Manager: Portage-2.3.6, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5387

 media-tv/kodi/Manifest                             |  4 ++++
 .../{kodi-9999.ebuild => kodi-17.4_rc1.ebuild}     | 23 ++++++++++++++--------
 media-tv/kodi/kodi-9999.ebuild                     | 13 ++++++++----
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 922f625ad12..fe49b013d17 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,6 +1,10 @@
 DIST ffmpeg-kodi-3.1.6-Krypton.tar.gz 11170735 SHA256 01f914742f6af8afd1d2eb076425975e24c4eed75f5d57f1c816086dc4625192 SHA512 060d06946ee71106196587b36eccf7fb7d0710d6ee72dae2e08f23e5bf7e223a3bac77f1730121f494ecf5f860a40635978023317a06f27a3b28752fa537f1a1 WHIRLPOOL ae6f0b3b798e92cd72aed8eb3e6dc82708c86052590b30ae93e1b8275dca89c5a4470dbc8ff51bfefd72bd40036b7bd1b7695ee77e90bab35b5e80bcb8b79826
+DIST ffmpeg-kodi-3.1.9-Krypton-17.4.tar.gz 11186492 SHA256 ead247d5d804399951531ba904d1b59b60c9163e2d8fbab014cf495a40f91266 SHA512 4f399578f95d42357c73dc01fb5372042070ce11ff82e97695cc5a69574f35b9a860042ea0d43cfd562f03ac06fd888c074a838944c0c1aef7a692f89ea85dda WHIRLPOOL 24c3c926bb0f204a66d4e01c9d96e34ab22d20389f9274ead9ff01393c62a1502f8604f9096f36f1fafb5c0526d6ccb5062a8b90e34a9773f2cfa89f8f87d069
+DIST ffmpeg-kodi-3.3.2-Leia-Alpha-1.tar.gz 11863481 SHA256 9ae58ff87fae2d124daba396c9d19db6152c501df54b11ff63971693843b4a84 SHA512 356c71aeca9eda11fd0d76d447cb005e1ff7041017df9bae2570f7486c32bc9091c26d2e38896c41b26654b1cacbdf47c69368e69654a9f2223e08bdd9117dcb WHIRLPOOL aecdb9aa813277a30006434b81d0e907e797bfa87dc7bac0a5cbc3380bc44ded282c65adcebdb09f1cfc3e5c170ecc771004ba5a87734dcfa7dc002b369ea6e4
 DIST kodi-17.3-generated-addons.tar.xz 57548 SHA256 6175ac64dbcbe2c747cd77f876b8e2bb3e516daa4707d7ccf768d76a89b27bd1 SHA512 56d1912f5e24d3fcda3010783a5b32728ece9c81c718ac6f8db2cbbd096059fe97b8d1971b34bbde1216558a8e5db874f7b2179e1f18942774ae5486167bca9a WHIRLPOOL 1023c69687ac9958e72ab70c15a280800ea4866f8e0dc2740d9bfd50f75bef71c28f23f01a841f254022610e1388d14217ea384213161264dae721515c9dabe3
 DIST kodi-17.3.tar.gz 58466114 SHA256 1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1 SHA512 832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987 WHIRLPOOL 0ed5585f891459292a1cfd4451bee1f2b19af217e462b810468b00395ee024ba346300f84c67c6dc428d27abcaef4eec9dc7b844e66e2ab83543830a106a1634
+DIST kodi-17.4rc1-generated-addons.tar.xz 57560 SHA256 b8fc905c58a0fc97418938f0e93155eda91e7389de44b1b20d5245c4a4a92900 SHA512 00255d3764074a1709b6a8b6e75122e100ce9ae2e6fbf9cda8149a2b4bbd0e0f0391e9fef5ca888c028a7d290cd88ac1bf0fd17e04eda6b2882850a4e1a4abb4 WHIRLPOOL 8f1389f59d745568953dd4dbf41a13c5d9813142e4ee63edb94ea22157acd1b0aa47b677adb35e720ab1aa441bcfb8ed324c7343e05f9186ea6073497dca4ebd
+DIST kodi-17.4rc1.tar.gz 58473381 SHA256 dd0604419528e00e14669c5c2ae9285ea60a7588eebf203bd2f399f9b8033e8c SHA512 47b4347fd4cb1ac10e5a659a77134f217646d2c2c9af1204af4d4230534eee81392dae3d18517d5e5cb53898447d44c33da913a6f280708ff055f5b7a378c347 WHIRLPOOL 6a6075683ff9ee7297213a1be89c4d5b48762730b69c35a11bd4c2d3575bfdc34a3fc06b407c5c169755f628258d7cd20e07ad8ad5b5e7f56bf791635ed10186
 DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 SHA256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9 WHIRLPOOL 8570ad8d2b6e629cc1c7e544be2853cab3bb50fd73438cea47c7a0919b251cecf906f7446ef3714c54ee3e636278dc0dabab47f772440624ff49877068b7b50a
 DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 SHA256 8e3f0563e16df898fe115e1723e3f78dbc953f6e9cf4f04568add215371d9ed2 SHA512 901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e WHIRLPOOL 588d060f418f18ef193061ff88260ac7929647b2babde5b78ab73141ffc7f3782ce1254bfee1234ec0da8bb28bc16ede301b4ec1e2d3073b9c6d22cb526f06ca
 DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 SHA256 e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b SHA512 e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2 WHIRLPOOL b42130027d201e545fabc27677bd4238d04bcbc5a0e622ca6da396ac340ea94b5c60004557334464a31dac880603dab99e2f189e41d6cddbe9e32728c626085a

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-17.4_rc1.ebuild
similarity index 91%
copy from media-tv/kodi/kodi-9999.ebuild
copy to media-tv/kodi/kodi-17.4_rc1.ebuild
index 005f3891a97..7c03f9c20d2 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-17.4_rc1.ebuild
@@ -7,17 +7,18 @@ 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.1.6"
+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
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )"
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 
 DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
 HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
@@ -27,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 gles libressl libusb lirc mysql nfs +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles 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}
 	|| ( gles opengl )
@@ -56,9 +57,9 @@ 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
 	gles? ( media-libs/mesa[gles2] )
 	libusb? ( virtual/libusb:1 )
 	media-fonts/corefonts
@@ -116,7 +117,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
@@ -160,6 +160,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
@@ -193,7 +195,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
@@ -219,6 +221,7 @@ src_configure() {
 		-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
@@ -240,7 +243,11 @@ src_configure() {
 
 	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
 
-	use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" )
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
 
 	cmake-utils_src_configure
 }

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 005f3891a97..d6cdbd49752 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -12,12 +12,13 @@ inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1
 LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
 LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
 LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.6"
-CODENAME="Krypton"
+FFMPEG_VERSION="3.3.2"
+CODENAME="Leia"
+FFMPEG_KODI_VERSION="Alpha-1"
 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
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )"
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 
 DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
 HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
@@ -240,7 +241,11 @@ src_configure() {
 
 	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
 
-	use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" )
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
 
 	cmake-utils_src_configure
 }