multimedia/kodi-devel: Update to latest commit

6 files changed, 42 insertions, 25 deletions

diff --git a/multimedia/kodi-addon-inputstream.adaptive-devel/Makefile b/multimedia/kodi-addon-inputstream.adaptive-devel/Makefile
index bc30ac7fba74..7da512b22f93 100644
--- a/multimedia/kodi-addon-inputstream.adaptive-devel/Makefile
+++ b/multimedia/kodi-addon-inputstream.adaptive-devel/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	inputstream.adaptive
 DISTVERSION=	2.6.0
 DISTVERSIONSUFFIX=	-Matrix
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	kodi-addon-
 PKGNAMESUFFIX=	-devel
@@ -13,9 +14,9 @@ COMMENT=	Adaptive stream support for Kodi
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.GPL
 
-BUILD_DEPENDS=	kodi-devel>=19.0.a20200530:multimedia/kodi-devel
+BUILD_DEPENDS=	kodi-devel>=19.0.a20200630:multimedia/kodi-devel
 LIB_DEPENDS=	libexpat.so:textproc/expat2
-RUN_DEPENDS=	kodi-devel>=19.0.a20200530:multimedia/kodi-devel
+RUN_DEPENDS=	kodi-devel>=19.0.a20200630:multimedia/kodi-devel
 
 USES=		cmake compiler:c++14-lang
 USE_GITHUB=	yes
diff --git a/multimedia/kodi-addon-peripheral.joystick-devel/Makefile b/multimedia/kodi-addon-peripheral.joystick-devel/Makefile
index adb9c941cbb9..4c25d0941efe 100644
--- a/multimedia/kodi-addon-peripheral.joystick-devel/Makefile
+++ b/multimedia/kodi-addon-peripheral.joystick-devel/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	peripheral.joystick
 PORTVERSION=	1.6.0
 DISTVERSIONSUFFIX=	-Matrix
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	kodi-addon-
 PKGNAMESUFFIX=	-devel
@@ -14,10 +15,10 @@ COMMENT=	Joystick support for Kodi
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/joystick.h:devel/evdev-proto \
-		kodi-devel>=19.0.a20200530:multimedia/kodi-devel
+		kodi-devel>=19.0.a20200630:multimedia/kodi-devel
 LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml \
 		libudev.so:devel/libudev-devd
-RUN_DEPENDS=	kodi-devel>=19.0.a20200530:multimedia/kodi-devel
+RUN_DEPENDS=	kodi-devel>=19.0.a20200630:multimedia/kodi-devel
 
 USES=		cmake compiler:c++14-lang localbase
 USE_GITHUB=	yes
diff --git a/multimedia/kodi-addon-vfs.libarchive-devel/Makefile b/multimedia/kodi-addon-vfs.libarchive-devel/Makefile
index 816230a7d3c4..b73f9617f637 100644
--- a/multimedia/kodi-addon-vfs.libarchive-devel/Makefile
+++ b/multimedia/kodi-addon-vfs.libarchive-devel/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	vfs.libarchive
 DISTVERSION=	1.3.0
 DISTVERSIONSUFFIX=	-Matrix
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	kodi-addon-
 PKGNAMESUFFIX=	-devel
@@ -12,10 +13,10 @@ COMMENT=	VFS addon for Kodi to access archives directly
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	kodi-devel>=19.0.a20200530:multimedia/kodi-devel
+BUILD_DEPENDS=	kodi-devel>=19.0.a20200630:multimedia/kodi-devel
 LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
 		liblzo2.so:archivers/lzo2
-RUN_DEPENDS=	kodi-devel>=19.0.a20200530:multimedia/kodi-devel
+RUN_DEPENDS=	kodi-devel>=19.0.a20200630:multimedia/kodi-devel
 
 USES=		cmake compiler:c++14-lang libarchive ssl
 USE_GITHUB=	yes
diff --git a/multimedia/kodi-devel/Makefile b/multimedia/kodi-devel/Makefile
index 526aca441473..d820638139cc 100644
--- a/multimedia/kodi-devel/Makefile
+++ b/multimedia/kodi-devel/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kodi
-DISTVERSION=	19.0.a20200530
+DISTVERSION=	19.0.a20200630
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-devel
 
@@ -49,24 +49,22 @@ LIB_DEPENDS=	libass.so:multimedia/libass \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
-# Building libcpluff.a requires autoreconf and gmake.  Using ninja
-# leads to dependency problems where libcpluff.a is not yet finished
-# building when it's required.
-USES=		autoreconf:build cmake:noninja compiler:c++14-lang gettext gl \
-		gmake gnome iconv:wchar_t jpeg libtool pkgconfig python:3.5+ \
-		sqlite ssl
+USES=		cmake compiler:c++14-lang gettext gl gnome iconv:wchar_t jpeg \
+		libtool pkgconfig python:3.5+ sqlite ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	xbmc
 GH_PROJECT=	xbmc
-GH_TAGNAME=	3b954873c3ce93c3ceb176b06388ba9ba4f2d296
+GH_TAGNAME=	ac2a9f0d5e54aa02c2b3683aa8b1664e5cc0661f
 USE_GL=		egl gl glu
 USE_GNOME=	libxml2 libxslt
 USE_JAVA=	yes
 JAVA_BUILD=	yes
 USE_LDCONFIG=	yes
 
-CMAKE_ARGS=	-DDVDNAV_LIBRARY="${LOCALBASE}/lib/libdvdnav.so" \
+CMAKE_ARGS=	-DAPP_BUILD_DATE="${DISTVERSION:E:S/^a//}" \
+		-DDVDNAV_LIBRARY="${LOCALBASE}/lib/libdvdnav.so" \
 		-DDVDREAD_LIBRARY="${LOCALBASE}/lib/libdvdread.so" \
+		-DGIT_VERSION="${GH_TAGNAME:C/^(.{12}).*/\1/}" \
 		-DLIBDVD_INCLUDE_DIRS="${LOCALBASE}/include"
 CMAKE_OFF=	ENABLE_ALSA ENABLE_DVDCSS ENABLE_INTERNAL_CROSSGUID \
 		ENABLE_INTERNAL_FFMPEG ENABLE_TESTING
diff --git a/multimedia/kodi-devel/distinfo b/multimedia/kodi-devel/distinfo
index 1039eee07ccf..f806a5313851 100644
--- a/multimedia/kodi-devel/distinfo
+++ b/multimedia/kodi-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1590800927
-SHA256 (xbmc-xbmc-19.0.a20200530-3b954873c3ce93c3ceb176b06388ba9ba4f2d296_GH0.tar.gz) = a714978b294afaaea5e7c6d3e32fef47fa17a7c179cede61cb43b2bb50817174
-SIZE (xbmc-xbmc-19.0.a20200530-3b954873c3ce93c3ceb176b06388ba9ba4f2d296_GH0.tar.gz) = 50146606
+TIMESTAMP = 1593487612
+SHA256 (xbmc-xbmc-19.0.a20200630-ac2a9f0d5e54aa02c2b3683aa8b1664e5cc0661f_GH0.tar.gz) = b3586461048e6354207468073f20e15cc36f82aa796b274d9d727ce5aea5d2e8
+SIZE (xbmc-xbmc-19.0.a20200630-ac2a9f0d5e54aa02c2b3683aa8b1664e5cc0661f_GH0.tar.gz) = 50181580
diff --git a/multimedia/kodi-devel/pkg-plist b/multimedia/kodi-devel/pkg-plist
index 2af01a78a663..6cc23d7135df 100644
--- a/multimedia/kodi-devel/pkg-plist
+++ b/multimedia/kodi-devel/pkg-plist
@@ -1,3 +1,4 @@
+bin/JsonSchemaBuilder
 bin/TexturePacker
 bin/kodi
 bin/kodi-standalone
@@ -9,7 +10,6 @@ include/kodi/DemuxCrypto.h
 include/kodi/DemuxPacket.h
 include/kodi/Filesystem.h
 include/kodi/General.h
-include/kodi/IFileTypes.h
 include/kodi/InputStreamConstants.h
 include/kodi/Network.h
 include/kodi/StreamCodec.h
@@ -23,14 +23,36 @@ include/kodi/addon-instance/ImageDecoder.h
 include/kodi/addon-instance/Inputstream.h
 include/kodi/addon-instance/Peripheral.h
 include/kodi/addon-instance/PeripheralUtils.h
+include/kodi/addon-instance/PVR.h
 include/kodi/addon-instance/Screensaver.h
 include/kodi/addon-instance/VFS.h
 include/kodi/addon-instance/VideoCodec.h
 include/kodi/addon-instance/Visualization.h
+include/kodi/addon-instance/pvr/ChannelGroups.h
+include/kodi/addon-instance/pvr/Channels.h
+include/kodi/addon-instance/pvr/EDL.h
+include/kodi/addon-instance/pvr/EPG.h
+include/kodi/addon-instance/pvr/General.h
+include/kodi/addon-instance/pvr/MenuHook.h
+include/kodi/addon-instance/pvr/Recordings.h
+include/kodi/addon-instance/pvr/Stream.h
+include/kodi/addon-instance/pvr/Timers.h
 include/kodi/c-api/addon-instance/image_decoder.h
+include/kodi/c-api/addon-instance/pvr.h
+include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h
+include/kodi/c-api/addon-instance/pvr/pvr_channels.h
+include/kodi/c-api/addon-instance/pvr/pvr_defines.h
+include/kodi/c-api/addon-instance/pvr/pvr_edl.h
+include/kodi/c-api/addon-instance/pvr/pvr_epg.h
+include/kodi/c-api/addon-instance/pvr/pvr_general.h
+include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h
+include/kodi/c-api/addon-instance/pvr/pvr_recordings.h
+include/kodi/c-api/addon-instance/pvr/pvr_stream.h
+include/kodi/c-api/addon-instance/pvr/pvr_timers.h
 include/kodi/c-api/addon_base.h
 include/kodi/c-api/audio_engine.h
 include/kodi/c-api/filesystem.h
+include/kodi/c-api/general.h
 include/kodi/c-api/network.h
 include/kodi/gui/General.h
 include/kodi/gui/ListItem.h
@@ -62,15 +84,9 @@ include/kodi/gui/gl/GL.h
 include/kodi/gui/gl/GLonDX.h
 include/kodi/gui/gl/Shader.h
 include/kodi/gui/renderHelper.h
-include/kodi/libKODI_guilib.h
-include/kodi/libXBMC_addon.h
-include/kodi/libXBMC_pvr.h
 include/kodi/platform/android/System.h
 include/kodi/tools/DllHelper.h
 include/kodi/versions.h
-include/kodi/xbmc_addon_dll.h
-include/kodi/xbmc_pvr_dll.h
-include/kodi/xbmc_pvr_types.h
 %%GBM%%lib/kodi/kodi-gbm
 %%WAYLAND%%lib/kodi/kodi-wayland
 %%X11%%lib/kodi/kodi-x11