multimedia/kodi-devel: Update to newer snapshot

- Switch to upstreamed patches
- Add patches for improved CPUInfo support [1]

[1] https://github.com/xbmc/xbmc/pull/16779

Submitted by:	rozhuk.im@gmail.com [1]

10 files changed, 32 insertions, 82 deletions

diff --git a/multimedia/kodi-addon-inputstream.adaptive-devel/Makefile b/multimedia/kodi-addon-inputstream.adaptive-devel/Makefile
index 64e0172edfa6..e3df89d4bffc 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.5.3
 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.a20191112:multimedia/kodi-devel
+BUILD_DEPENDS=	kodi-devel>=19.0.a20191216:multimedia/kodi-devel
 LIB_DEPENDS=	libexpat.so:textproc/expat2
-RUN_DEPENDS=	kodi-devel>=19.0.a20191112:multimedia/kodi-devel
+RUN_DEPENDS=	kodi-devel>=19.0.a20191216:multimedia/kodi-devel
 
 USES=		cmake
 USE_GITHUB=	yes
diff --git a/multimedia/kodi-addon-peripheral.joystick-devel/Makefile b/multimedia/kodi-addon-peripheral.joystick-devel/Makefile
index 2de9d4dfc328..932d8b4a1b4a 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.4.8
 DISTVERSIONSUFFIX=	-Leia
+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.a20191112:multimedia/kodi-devel
+		kodi-devel>=19.0.a20191216:multimedia/kodi-devel
 LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml \
 		libudev.so:devel/libudev-devd
-RUN_DEPENDS=	kodi-devel>=19.0.a20191112:multimedia/kodi-devel
+RUN_DEPENDS=	kodi-devel>=19.0.a20191216:multimedia/kodi-devel
 
 USES=		cmake localbase
 USE_GITHUB=	yes
diff --git a/multimedia/kodi-addon-vfs.libarchive-devel/Makefile b/multimedia/kodi-addon-vfs.libarchive-devel/Makefile
index ba35e64b5007..49af4ab5e06a 100644
--- a/multimedia/kodi-addon-vfs.libarchive-devel/Makefile
+++ b/multimedia/kodi-addon-vfs.libarchive-devel/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	vfs.libarchive
 DISTVERSION=	1.0.5
 DISTVERSIONSUFFIX=	-Leia
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	kodi-addon-
 PKGNAMESUFFIX=	-devel
@@ -13,10 +13,10 @@ COMMENT=	VFS addon for Kodi to access archives directly
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	kodi-devel>=19.0.a20191112:multimedia/kodi-devel
+BUILD_DEPENDS=	kodi-devel>=19.0.a20191216:multimedia/kodi-devel
 LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
 		liblzo2.so:archivers/lzo2
-RUN_DEPENDS=	kodi-devel>=19.0.a20191112:multimedia/kodi-devel
+RUN_DEPENDS=	kodi-devel>=19.0.a20191216:multimedia/kodi-devel
 
 USES=		cmake libarchive ssl
 USE_GITHUB=	yes
diff --git a/multimedia/kodi-devel/Makefile b/multimedia/kodi-devel/Makefile
index f1e4fb4e5cc0..226f6f9f56da 100644
--- a/multimedia/kodi-devel/Makefile
+++ b/multimedia/kodi-devel/Makefile
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
 PORTNAME=	kodi
-DISTVERSION=	19.0.a20191112
-PORTREVISION=	5
+DISTVERSION=	19.0.a20191216
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-devel
 
 PATCH_SITES=	https://github.com/xbmc/xbmc/commit/
-PATCHFILES=	d2922c8e4bb6fcaf5a2b3041da9b6303dd1225d4.patch:-p1 \
-		3bbb9f22e4c1a2a37b7d8e73b55361ca0a660a59.patch:-p1
+PATCHFILES=	6a3cbd22fbf72d592cc1a8ccb58782f494ada826.patch:-p1 \
+		91afd99709d8fb6a496f7dc451bae5bba75fa717.patch:-p1 \
+		ae804ecd9a9e9281b28918d0d21033ea1f285b81.patch:-p1
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Award winning media center application
@@ -61,7 +61,7 @@ USES=		autoreconf:build cmake:noninja compiler:c++11-lang gettext gl \
 USE_GITHUB=	yes
 GH_ACCOUNT=	xbmc
 GH_PROJECT=	xbmc
-GH_TAGNAME=	f6311e3c5559ced201fb8ff91846fe4b9b668a9a
+GH_TAGNAME=	c35b70cc2c5618f114ebea905aaacfe96eb15951
 USE_GL=		egl gl glu
 USE_GNOME=	libxml2 libxslt
 USE_JAVA=	yes
@@ -184,10 +184,14 @@ post-patch:
 # (see CMAKE_ARGS).
 	@${REINPLACE_CMD} 's@KODI_DEPENDSBUILD@true@' \
 		${WRKSRC}/cmake/modules/FindLibDvd.cmake
-# Make sure freebsd.xml is in sync with linux.xml since the
-# upstream devs do not sync them
-	@${CP} ${WRKSRC}/system/settings/linux.xml \
-		${WRKSRC}/system/settings/freebsd.xml
+# Abort build if freebsd.xml and linux.xml differ again.  The
+# upstream devs forget to sync them.  When that happens it might
+# be time to file a PR again.
+	@cd ${WRKSRC}/system/settings && \
+		if ! /usr/bin/cmp -s freebsd.xml linux.xml; then \
+			${ECHO_MSG} "=> freebsd.xml out of sync with linux.xml again"; \
+			${FALSE}; \
+		fi
 # Make sure Kodi can find keyboard layouts from xkeyboard-config
 	@${REINPLACE_CMD} 's,/usr/share/X11/xkb/rules/,${LOCALBASE}/share/X11/xkb/rules/,g' \
 		${WRKSRC}/xbmc/platform/linux/input/LibInputSettings.cpp
diff --git a/multimedia/kodi-devel/distinfo b/multimedia/kodi-devel/distinfo
index 72e41458ff0e..e43d9b8062f0 100644
--- a/multimedia/kodi-devel/distinfo
+++ b/multimedia/kodi-devel/distinfo
@@ -1,7 +1,9 @@
-TIMESTAMP = 1575674484
-SHA256 (xbmc-xbmc-19.0.a20191112-f6311e3c5559ced201fb8ff91846fe4b9b668a9a_GH0.tar.gz) = 74c80deeb040ba009f6b27e41ef95ae5cf37ff23c2b7c1390cfd9a1eb5c27864
-SIZE (xbmc-xbmc-19.0.a20191112-f6311e3c5559ced201fb8ff91846fe4b9b668a9a_GH0.tar.gz) = 78500747
-SHA256 (d2922c8e4bb6fcaf5a2b3041da9b6303dd1225d4.patch) = 1a16f26a5168579e4532c036f609bd15a4de57780af5369c598b34f5dacc414b
-SIZE (d2922c8e4bb6fcaf5a2b3041da9b6303dd1225d4.patch) = 1678
-SHA256 (3bbb9f22e4c1a2a37b7d8e73b55361ca0a660a59.patch) = adfae7aa272c7759bf3bcf2b9a07dbeacaf4c9af88cf3c881379f5f456e07d95
-SIZE (3bbb9f22e4c1a2a37b7d8e73b55361ca0a660a59.patch) = 7367
+TIMESTAMP = 1576509765
+SHA256 (xbmc-xbmc-19.0.a20191216-c35b70cc2c5618f114ebea905aaacfe96eb15951_GH0.tar.gz) = f58d01f123f9d11e406f2e5c666a2eb4a79f9354a3aafc9bef81ad8ddf01f28f
+SIZE (xbmc-xbmc-19.0.a20191216-c35b70cc2c5618f114ebea905aaacfe96eb15951_GH0.tar.gz) = 50045433
+SHA256 (6a3cbd22fbf72d592cc1a8ccb58782f494ada826.patch) = 6c908d10e9140e44430b6b22102d5abe059ca604ea42670c9b0d7a40017315aa
+SIZE (6a3cbd22fbf72d592cc1a8ccb58782f494ada826.patch) = 6345
+SHA256 (91afd99709d8fb6a496f7dc451bae5bba75fa717.patch) = 76222da0e5fdf5f1853b212eb897370ed2526e2b336352ab6c1ef797b3cf0ff4
+SIZE (91afd99709d8fb6a496f7dc451bae5bba75fa717.patch) = 1958
+SHA256 (ae804ecd9a9e9281b28918d0d21033ea1f285b81.patch) = f4a3db6005be2396efc697b60eb406b8aa79df8e44cd18ec62204f1b14269980
+SIZE (ae804ecd9a9e9281b28918d0d21033ea1f285b81.patch) = 1017
diff --git a/multimedia/kodi-devel/files/patch-cmake_modules_FindEpollShim.cmake b/multimedia/kodi-devel/files/patch-cmake_modules_FindEpollShim.cmake
deleted file mode 100644
index 2d1503c4c36f..000000000000
--- a/multimedia/kodi-devel/files/patch-cmake_modules_FindEpollShim.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
---- cmake/modules/FindEpollShim.cmake.orig	2019-05-18 04:05:16 UTC
-+++ cmake/modules/FindEpollShim.cmake
-@@ -0,0 +1,27 @@
-+# FindEpollShim
-+# -------------
-+# Finds the epoll-shim library
-+#
-+# This will define the following variables::
-+#
-+# EPOLLSHIM_FOUND       - the system has epoll-shim
-+# EPOLLSHIM_INCLUDE_DIR - the epoll-shim include directory
-+# EPOLLSHIM_LIBRARY     - the epoll-shim library
-+
-+if(PKG_CONFIG_FOUND)
-+  pkg_check_modules(PC_EPOLLSHIM epoll-shim QUIET)
-+endif()
-+
-+find_path(EPOLLSHIM_INCLUDE_DIR NAMES sys/epoll.h PATHS ${PC_EPOLLSHIM_INCLUDE_DIRS})
-+find_library(EPOLLSHIM_LIBRARY NAMES epoll-shim PATHS ${PC_EPOLLSHIM_LIBDIR})
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(EpollShim
-+                                  REQUIRED_VARS EPOLLSHIM_LIBRARY EPOLLSHIM_INCLUDE_DIR)
-+
-+if(EPOLLSHIM_FOUND)
-+  set(EPOLLSHIM_INCLUDE_DIRS ${EPOLLSHIM_INCLUDE_DIR})
-+  set(EPOLLSHIM_LIBRARIES ${EPOLLSHIM_LIBRARY})
-+endif()
-+
-+mark_as_advanced(EPOLLSHIM_INCLUDE_DIR EPOLLSHIM_LIBRARY)
diff --git a/multimedia/kodi-devel/files/patch-cmake_platform_freebsd_gbm.cmake b/multimedia/kodi-devel/files/patch-cmake_platform_freebsd_gbm.cmake
deleted file mode 100644
index f3587416d303..000000000000
--- a/multimedia/kodi-devel/files/patch-cmake_platform_freebsd_gbm.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
---- cmake/platform/freebsd/gbm.cmake.orig	2019-05-08 08:47:45 UTC
-+++ cmake/platform/freebsd/gbm.cmake
-@@ -1 +1,2 @@
- include(cmake/platform/linux/gbm.cmake)
-+list(APPEND PLATFORM_REQUIRED_DEPS EpollShim)
diff --git a/multimedia/kodi-devel/files/patch-xbmc_addons_kodi-addon-dev-kit_include_kodi_AddonBase.h b/multimedia/kodi-devel/files/patch-xbmc_addons_kodi-addon-dev-kit_include_kodi_AddonBase.h
deleted file mode 100644
index 2416aedd3124..000000000000
--- a/multimedia/kodi-devel/files/patch-xbmc_addons_kodi-addon-dev-kit_include_kodi_AddonBase.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h.orig	2019-05-21 06:04:06 UTC
-+++ xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h
-@@ -11,6 +11,7 @@
- #include <stdarg.h>     /* va_list, va_start, va_arg, va_end */
- #include <cstdlib>
- #include <cstring>
-+#include <ctime>
- #include <memory>
- #include <stdexcept>
- #include <string>
diff --git a/multimedia/kodi-devel/files/patch-xbmc_platform_linux_input_LibInputHandler.cpp b/multimedia/kodi-devel/files/patch-xbmc_platform_linux_input_LibInputHandler.cpp
deleted file mode 100644
index 35dc81ffcd5b..000000000000
--- a/multimedia/kodi-devel/files/patch-xbmc_platform_linux_input_LibInputHandler.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-epoll_create1() from libepoll-shim always fails with 0 and only
-supports EPOLL_CLOEXEC, so let's use that...
-
---- xbmc/platform/linux/input/LibInputHandler.cpp.orig	2019-01-17 23:22:57 UTC
-+++ xbmc/platform/linux/input/LibInputHandler.cpp
-@@ -115,7 +115,7 @@ void CLibInputHandler::Start()
- 
- void CLibInputHandler::Process()
- {
--  int epollFd = epoll_create1(0);
-+  int epollFd = epoll_create1(EPOLL_CLOEXEC);
-   if (epollFd < 0)
-   {
-     CLog::Log(LOGERROR, "CLibInputHandler::%s - failed to create epoll file descriptor: %s", __FUNCTION__, strerror(-errno));
diff --git a/multimedia/kodi-devel/pkg-plist b/multimedia/kodi-devel/pkg-plist
index f134ddec63d3..674606ae649c 100644
--- a/multimedia/kodi-devel/pkg-plist
+++ b/multimedia/kodi-devel/pkg-plist
@@ -10,6 +10,7 @@ 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
 include/kodi/StreamCrypto.h