multimedia/kodi: Update to 19.0b2

We usually try to avoid updating to beta releases but this time we were forced by the upcoming python2.7 removal and had to hurry up to get it into the tree before 31st. Bugs are expected and testing was limited. Kodi 19.0 will be the first release that supports python3 so we had no other choice. Sorry! The maintainer situation for kodi and kodi-devel really needs some improvement so I'm glad that yzrh did the heavy lifting and stepped up as the next kodi maintainer. Thanks a lot to him! PR: 249724 Submitted by: yzrh@tuta.io (per email)
svn path=/head/; revision=559651
2020-12-30 12:15:44 +00:00 · 2020-12-30 12:15:44 +00:00 · 4fc0f920e2 · 2021-03-31 03:12:20 +00:00
commit 4fc0f920e2
parent afeda79345
7 changed files with 607 additions and 260 deletions
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@ -1,22 +1,17 @@
 # $FreeBSD$

 PORTNAME=	kodi
-DISTVERSION=	18.7.1
-PORTREVISION=	3
+DISTVERSION=	19.0b2
 CATEGORIES=	multimedia java

-PATCH_SITES=	https://github.com/xbmc/xbmc/commit/
-PATCHFILES=	920cc74da069216d19f724ecf5246cf997861bc6.patch:-p1
-
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	yzrh@noema.org
 COMMENT=	Award winning media center application

 LICENSE=	GPLv2+

-ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386 powerpc64
+ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64

 BUILD_DEPENDS=	flatbuffers>0:devel/flatbuffers \
-		gperf>0:devel/gperf \
 		rapidjson>0:devel/rapidjson \
 		swig>0:devel/swig
 LIB_DEPENDS=	libass.so:multimedia/libass \
@ -27,6 +22,9 @@ LIB_DEPENDS=	libass.so:multimedia/libass \
 		libcdio.so:sysutils/libcdio \
 		libcrossguid.so:devel/libcrossguid \
 		libcurl.so:ftp/curl \
+		libdav1d.so:multimedia/dav1d \
+		libdvdnav.so:multimedia/libdvdnav \
+		libdvdread.so:multimedia/libdvdread \
 		libexpat.so:textproc/expat2 \
 		libfmt.so:devel/libfmt \
 		libfreetype.so:print/freetype2 \
@ -37,105 +35,105 @@ LIB_DEPENDS=	libass.so:multimedia/libass \
 		libpcre.so:devel/pcre \
 		libpng.so:graphics/png \
 		libpostproc.so:multimedia/ffmpeg \
+		libspdlog.so:devel/spdlog \
 		libswresample.so:multimedia/ffmpeg \
 		libswscale.so:multimedia/ffmpeg \
 		libtag.so:audio/taglib \
 		libtinyxml.so:textproc/tinyxml \
 		libuuid.so:misc/e2fsprogs-libuuid
-RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu

-USES=		autoreconf:build cmake:noninja compiler:c++14-lang gettext gl gmake \
-		gnome iconv jpeg libtool pkgconfig python:2.7 ssl sqlite xorg
+USES=		cmake compiler:c++14-lang gettext \
+		gnome iconv jpeg pkgconfig python:3.5+ sqlite ssl

-KODI_ARCH_amd64=x86_64
-KODI_ARCH_i386=	x86
-KODI_ARCH_armv7=armv7
-KODI_ARCH_armv6=armv6
-KODI_ARCH_powerpc64=powerpc64
+KODI_CODENAME=	Matrix

-NOPRECIOUSMAKEVARS=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	xbmc
+GH_PROJECT=	xbmc
+GH_TAGNAME=	${DISTVERSION}-${KODI_CODENAME}
+
+KODI_ARCH_aarch64=	aarch64
+KODI_ARCH_amd64=	x86_64
+KODI_ARCH_i386=		x86
+KODI_ARCH_armv7=	armv7
+KODI_ARCH_armv6=	armv6
+KODI_ARCH_powerpc64=	powerpc64
+
+PLIST_SUB=	ARCH=${KODI_ARCH_${ARCH}}

 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 USE_JAVA=	yes
 JAVA_BUILD=	jre
 USE_GNOME=	libxml2
-CMAKE_ARGS=	-Dlibdvdcss_URL="${DISTDIR}/xbmc-libdvdcss-1.4.2-Leia-Beta-5_GH0.tar.gz" \
-		-Dlibdvdnav_URL="${DISTDIR}/xbmc-libdvdnav-6.0.0-Leia-Alpha-3_GH0.tar.gz" \
-		-Dlibdvdread_URL="${DISTDIR}/xbmc-libdvdread-6.0.0-Leia-Alpha-3_GH0.tar.gz"
-CMAKE_OFF=	ENABLE_INTERNAL_CROSSGUID \
-		ENABLE_INTERNAL_FFMPEG
+CMAKE_ARGS=	-DGIT_VERSION="${GH_TAGNAME}" \
+		-DDVDNAV_LIBRARY="${LOCALBASE}/lib/libdvdnav.so" \
+		-DDVDREAD_LIBRARY="${LOCALBASE}/lib/libdvdread.so" \
+		-DLIBDVD_INCLUDE_DIRS="${LOCALBASE}/include"
+CMAKE_OFF=	ENABLE_INTERNAL_CROSSGUID
 CONFIGURE_ENV=	_CPU_FEATURE="${CPU_FEATURE}"

-KODI_CODENAME=		Leia
-LIBDVDCSS_VERSION=	1.4.2-${KODI_CODENAME}-Beta-5
-LIBDVDNAV_VERSION=	6.0.0-${KODI_CODENAME}-Alpha-3
-LIBDVDREAD_VERSION=	6.0.0-${KODI_CODENAME}-Alpha-3
-
-USE_GITHUB=	yes
-GH_TUPLE=	xbmc:xbmc:${PORTVERSION}-${KODI_CODENAME} \
-		xbmc:libdvdcss:${LIBDVDCSS_VERSION}:libdvdcss/tools/depends/target/libdvdcss/native \
-		xbmc:libdvdnav:${LIBDVDNAV_VERSION}:libdvdnav/tools/depends/target/libdvdnav/native \
-		xbmc:libdvdread:${LIBDVDREAD_VERSION}:libdvdread/tools/depends/target/libdvdread/native
-
-PLIST_SUB=	ARCH=${KODI_ARCH_${ARCH}}
-
 OPTIONS_SUB=		yes
-# Not implemented: BLUETOOTH CAP
-OPTIONS_DEFINE=		AIRPLAY AIRTUNES AVAHI CEC DBUS DOCS DVDCSS LCMS2 \
-			LIBBLURAY LIRC NFS OPTICAL SMB UDEV UPNP VAAPI VDPAU \
-			WEBSERVER XSLT
-OPTIONS_DEFAULT=	AIRPLAY AIRTUNES AVAHI CEC DVDCSS LIBBLURAY NFS OPTICAL SMB \
-			UDEV UPNP VAAPI VDPAU WEBSERVER X11 XSLT
+# Broken: BLUETOOTH
+OPTIONS_DEFINE=		AIRPLAY AVAHI LIBBLURAY CEC DBUS DVDCSS LCMS2 \
+			LIRC WEBSERVER NFS DVD SMB TEST UDEV UPNP \
+			VAAPI VDPAU XSLT DOCS
+OPTIONS_DEFAULT=	LIBBLURAY CEC DVDCSS LCMS2 WEBSERVER \
+			DVD UPNP VAAPI VDPAU XSLT X11 GL
 OPTIONS_DEFAULT_amd64=	SSE SSE2 SSE3
 OPTIONS_DEFAULT_i386=	SSE SSE2 SSE3
-OPTIONS_SINGLE=		PLATFORM
-OPTIONS_SINGLE_PLATFORM=GBM RPI WAYLAND X11
+OPTIONS_SINGLE=		RENDER
+OPTIONS_SINGLE_RENDER=	GL GLES
 OPTIONS_RADIO=		DATABASE
 OPTIONS_RADIO_DATABASE=	MARIADB MYSQL
-OPTIONS_GROUP=		SOUND FEATURE
+OPTIONS_GROUP=		SOUND FEATURE PLATFORM
 # Broken: ALSA
 OPTIONS_GROUP_SOUND=	PULSEAUDIO SNDIO
 OPTIONS_GROUP_FEATURE=	SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 AVX AVX2
-OPTIONS_EXCLUDE_amd64=	RPI
-OPTIONS_EXCLUDE_i386=	RPI
+OPTIONS_GROUP_PLATFORM=GBM WAYLAND X11
+OPTIONS_EXCLUDE_aarch64=FEATURE
 OPTIONS_EXCLUDE_armv7=	FEATURE
 OPTIONS_EXCLUDE_armv6=	FEATURE

-AIRPLAY_DESC=	AirPlay support via libplist
-AIRTUNES_DESC=	AirTunes support via libshairplay
-AVX_DESC=	Use AVX optimized routines
-AVX2_DESC=	Use AVX2 optimized routines
-BLUETOOTH_DESC=	Bluetooth support via bluez
-CAP_DESC=	Capability support via libcap
-CEC_DESC=	CEC adapter support
+PLATFORM_DESC=	Kodi platform
 DATABASE_DESC=	Database
 FEATURE_DESC=	X86 CPU feature
+
+AIRPLAY_DESC=	AirPlay support
+BLUETOOTH_DESC=	Bluetooth support
+CEC_DESC=	CEC adapter support
+DVD_DESC=	DVD support
+UDEV_DESC=	Use libudev-devd
+XSLT_DESC=	Use libxslt
+
+RENDER_DESC=	Render system
+GL_DESC=	OpenGL
+GLES_DESC=	OpenGL ES
+
 GBM_DESC=	GBM support
 MARIADB_DESC=	MariaDB database support
-OPTICAL_DESC=	Optical disc support
-PLATFORM_DESC=	Kodi platform
-RPI_DESC=	Raspberry Pi support
+
 SSE2_DESC=	Use SSE2 optimized routines
 SSE3_DESC=	Use SSE3 optimized routines
 SSSE3_DESC=	Use SSSE3 optimized routines
 SSE4_1_DESC=	Use SSE4.1 optimized routines
 SSE4_2_DESC=	Use SSE4.2 optimized routines
-UDEV_DESC=	Use libudev-devd
-XSLT_DESC=	Use libxslt
+AVX_DESC=	Use AVX optimized routines
+AVX2_DESC=	Use AVX2 optimized routines

-AIRPLAY_LIB_DEPENDS=	libplist.so:devel/libplist
-AIRPLAY_CMAKE_BOOL=	ENABLE_PLIST
-
-AIRTUNES_LIB_DEPENDS=	libshairplay.so:audio/shairplay
-AIRTUNES_CMAKE_BOOL=	ENABLE_AIRTUNES
+AIRPLAY_LIB_DEPENDS=	libplist.so:devel/libplist \
+			libshairplay.so:audio/shairplay
+AIRPLAY_CMAKE_BOOL=	ENABLE_PLIST \
+			ENABLE_AIRTUNES

 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CMAKE_BOOL=	ENABLE_AVAHI

 BLUETOOTH_CMAKE_BOOL=	ENABLE_BLUETOOTH
+BLUETOOTH_CMAKE_ON=	-DBLUETOOTH_INCLUDE_DIR="${LOCALBASE}/include"

-CAP_CMAKE_BOOL=		ENABLE_CAP
+LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
+LIBBLURAY_CMAKE_BOOL=	ENABLE_BLURAY

 CEC_LIB_DEPENDS=	libcec.so:multimedia/libcec
 CEC_CMAKE_BOOL=		ENABLE_CEC
@ -143,32 +141,30 @@ CEC_CMAKE_BOOL=		ENABLE_CEC
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CMAKE_BOOL=	ENABLE_DBUS

+DVDCSS_LIB_DEPENDS=	libdvdcss.so:multimedia/libdvdcss
 DVDCSS_CMAKE_BOOL=	ENABLE_DVDCSS
+DVDCSS_CMAKE_ON=	-DDVDCSS_LIBRARY="${LOCALBASE}/lib/libdvdcss.so"

 LCMS2_LIB_DEPENDS=	liblcms2.so.2:graphics/lcms2
 LCMS2_CMAKE_BOOL=	ENABLE_LCMS2

-LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
-LIBBLURAY_CMAKE_BOOL=	ENABLE_BLURAY
-
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CMAKE_BOOL=	ENABLE_LIRCCLIENT

-MARIADB_USES=		mysql:104m
-MARIADB_CMAKE_BOOL=	ENABLE_MARIADBCLIENT
-MARIADB_CMAKE_ON=	-DMARIADBCLIENT_INCLUDE_DIR="${LOCALBASE}/include"
-
-MYSQL_USES=		mysql
-MYSQL_CMAKE_BOOL=	ENABLE_MYSQLCLIENT
+WEBSERVER_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
+WEBSERVER_CMAKE_BOOL=	ENABLE_MICROHTTPD

 NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
 NFS_CMAKE_BOOL=		ENABLE_NFS

-OPTICAL_CMAKE_BOOL=	ENABLE_OPTICAL
+DVD_CMAKE_BOOL=		ENABLE_OPTICAL

 SMB_USES=		samba:lib
 SMB_CMAKE_BOOL=		ENABLE_SMBCLIENT

+TEST_LIB_DEPENDS=	libgtest.so:devel/googletest
+TEST_CMAKE_BOOL=	ENABLE_TESTING
+
 UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 UDEV_CMAKE_BOOL=	ENABLE_UDEV

@ -180,12 +176,20 @@ VAAPI_CMAKE_BOOL=	ENABLE_VAAPI
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CMAKE_BOOL=	ENABLE_VDPAU

-WEBSERVER_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
-WEBSERVER_CMAKE_BOOL=	ENABLE_MICROHTTPD
-
 XSLT_LIB_DEPENDS=	libxslt.so:textproc/libxslt
 XSLT_CMAKE_BOOL=	ENABLE_XSLT

+GL_CMAKE_ON=		-DAPP_RENDER_SYSTEM:STRING="gl"
+
+GLES_CMAKE_ON=		-DAPP_RENDER_SYSTEM:STRING="gles"
+
+MARIADB_USES=		mysql:105m
+MARIADB_CMAKE_BOOL=	ENABLE_MARIADBCLIENT
+MARIADB_CMAKE_ON=	-DMARIADBCLIENT_INCLUDE_DIR="${LOCALBASE}/include"
+
+MYSQL_USES=		mysql
+MYSQL_CMAKE_BOOL=	ENABLE_MYSQLCLIENT
+
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	ENABLE_ALSA

@ -204,6 +208,8 @@ SSE4_2_VARS=		CPU_FEATURE+=SSE4.2
 AVX_VARS=		CPU_FEATURE+=AVX
 AVX2_VARS=		CPU_FEATURE+=AVX2

+GBM_IMPLIES=		UDEV
+GBM_USES=		gl
 GBM_USE=		GL=egl,gbm,glu
 GBM_CFLAGS=		-I${LOCALBASE}/include/libepoll-shim
 GBM_LDFLAGS=		-L${LOCALBASE}/lib -lepoll-shim
@ -212,38 +218,75 @@ GBM_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 			libdrm.so:graphics/libdrm \
 			libxkbcommon.so:x11/libxkbcommon \
 			libinput.so:x11/libinput
-GBM_CMAKE_ON=		-DCORE_PLATFORM_NAME:STRING="gbm" \
-			-DGBM_RENDER_SYSTEM:STRING="gl"
-
-RPI_LIB_DEPENDS=	libbrcmGLESv2.so:misc/raspberrypi-userland \
-			libbrcmEGL.so:misc/raspberrypi-userland \
-			libxkbcommon.so:x11/libxkbcommon \
-			libinput.so:x11/libinput
-RPI_CMAKE_ON=		-DCORE_PLATFORM_NAME:STRING="rbpi"

+WAYLAND_USES=		gl
 WAYLAND_USE=		GL=egl,glu
 WAYLAND_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 			wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 			libxkbcommon.so:x11/libxkbcommon \
+			libinput.so:x11/libinput \
 			libwayland-client++.so:graphics/waylandpp
-WAYLAND_CMAKE_ON=	-DCORE_PLATFORM_NAME:STRING="wayland" \
-			-DWAYLAND_RENDER_SYSTEM:STRING="gl"

+X11_USES=		xorg gl
 X11_USE=		XORG=x11,xext,xrandr GL=egl,gl,glu
 X11_LIB_DEPENDS=	libdrm.so:graphics/libdrm
-X11_CMAKE_ON=		-DCORE_PLATFORM_NAME:STRING="x11"

 .include <bsd.port.options.mk>

+.if !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
+CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm wayland x11"
+.elif empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
+CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="wayland x11"
+.elif !empty(PORT_OPTIONS:MGBM) && empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
+CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm x11"
+.elif !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && empty(PORT_OPTIONS:MX11)
+CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm wayland"
+.elif empty(PORT_OPTIONS:MGBM) && empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
+CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="x11"
+.elif empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && empty(PORT_OPTIONS:MX11)
+CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="wayland"
+.elif !empty(PORT_OPTIONS:MGBM) && empty(PORT_OPTIONS:MWAYLAND) && empty(PORT_OPTIONS:MX11)
+CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm"
+.endif
+
+.if !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) || !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MX11) || !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
+PLIST_SUB+=	KODICOMBINED="" \
+		KODIGBM="@comment " \
+		KODIWAYLAND="@comment " \
+		KODIX11="@comment "
+.else
+PLIST_SUB+=	KODICOMBINED="@comment "
+
+.if !empty(PORT_OPTIONS:MGBM)
+PLIST_SUB+=	KODIGBM=""
+.else
+PLIST_SUB+=	KODIGBM="@comment "
+.endif
+
+.if !empty(PORT_OPTIONS:MWAYLAND)
+PLIST_SUB+=	KODIWAYLAND=""
+.else
+PLIST_SUB+=	KODIWAYLAND="@comment "
+.endif
+
+.if !empty(PORT_OPTIONS:MX11)
+PLIST_SUB+=	KODIX11=""
+.else
+PLIST_SUB+=	KODIX11="@comment "
+.endif
+.endif
+
 post-patch:
+	${REINPLACE_CMD} 's|KODI_DEPENDSBUILD|true|' \
+		${WRKSRC}/cmake/modules/FindLibDvd.cmake
 	${REINPLACE_CMD} 's|/usr/share|${LOCALBASE}/share|' \
 		${WRKSRC}/xbmc/platform/linux/input/LibInputSettings.cpp

 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/manpages/kodi.bin.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -s kodi.bin.1.gz kodi.1.gz
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/TexturePacker
+	cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} TexturePacker JsonSchemaBuilder
 	${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -type f -name '*.so' -print0 | ${XARGS} -0 ${STRIP_CMD}
 	${RM} -rf ${STAGEDIR}${PREFIX}/lib/firewalld

--- a/multimedia/kodi/distinfo
+++ b/multimedia/kodi/distinfo
@ -1,11 +1,3 @@
-TIMESTAMP = 1601840959
-SHA256 (xbmc-xbmc-18.7.1-18.7.1-Leia_GH0.tar.gz) = 5cfec391bcd168bbd4f9d38a6c8ec93e42e040cf82cf6ebf23db5e86753816fb
-SIZE (xbmc-xbmc-18.7.1-18.7.1-Leia_GH0.tar.gz) = 51052174
-SHA256 (xbmc-libdvdcss-1.4.2-Leia-Beta-5_GH0.tar.gz) = 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d
-SIZE (xbmc-libdvdcss-1.4.2-Leia-Beta-5_GH0.tar.gz) = 101068
-SHA256 (xbmc-libdvdnav-6.0.0-Leia-Alpha-3_GH0.tar.gz) = 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a
-SIZE (xbmc-libdvdnav-6.0.0-Leia-Alpha-3_GH0.tar.gz) = 137942
-SHA256 (xbmc-libdvdread-6.0.0-Leia-Alpha-3_GH0.tar.gz) = a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf
-SIZE (xbmc-libdvdread-6.0.0-Leia-Alpha-3_GH0.tar.gz) = 130649
-SHA256 (920cc74da069216d19f724ecf5246cf997861bc6.patch) = e4963bdeb1de7c147a364cd3ee2186fb1d0b2fc8f3ea7636054cf2adac040468
-SIZE (920cc74da069216d19f724ecf5246cf997861bc6.patch) = 25487
+TIMESTAMP = 1607468843
+SHA256 (xbmc-xbmc-19.0b2-19.0b2-Matrix_GH0.tar.gz) = 7744d0a4c592b7e90ba72a41b69a7e14fd6e418c5732fb6967e440dee9a96ecc
+SIZE (xbmc-xbmc-19.0b2-19.0b2-Matrix_GH0.tar.gz) = 52329859
--- a/multimedia/kodi/files/patch-xbmc_dbwrappers_mysqldataset.cpp
+++ b/multimedia/kodi/files/patch-xbmc_dbwrappers_mysqldataset.cpp
@ -1,4 +1,4 @@
--- xbmc/dbwrappers/mysqldataset.cpp.orig	2020-05-19 23:10:06 UTC
+--- xbmc/dbwrappers/mysqldataset.cpp.orig	2020-10-04 17:34:28 UTC
 +++ xbmc/dbwrappers/mysqldataset.cpp
@@ -17,10 +17,8 @@
 #include "utils/StringUtils.h"
@ -6,7 +6,7 @@
 #include "mysqldataset.h"
 -#ifdef HAS_MYSQL
 +#if defined(HAS_MYSQL) || defined(HAS_MARIADB)
- #include "mysql/errmsg.h"
+ #include <mysql/errmsg.h>
 -#elif defined(HAS_MARIADB)
 -#include <mariadb/errmsg.h>
 #endif
--- a/multimedia/kodi/files/patch-xbmc_dbwrappers_mysqldataset.h
+++ b/multimedia/kodi/files/patch-xbmc_dbwrappers_mysqldataset.h
@ -1,4 +1,4 @@
--- xbmc/dbwrappers/mysqldataset.h.orig	2020-05-19 23:04:15 UTC
+--- xbmc/dbwrappers/mysqldataset.h.orig	2020-10-04 17:37:02 UTC
 +++ xbmc/dbwrappers/mysqldataset.h
@@ -10,10 +10,8 @@
 
@ -6,7 +6,7 @@
 #include "dataset.h"
 -#ifdef HAS_MYSQL
 +#if defined(HAS_MYSQL) || defined(HAS_MARIADB)
- #include "mysql/mysql.h"
+ #include <mysql/mysql.h>
 -#elif defined(HAS_MARIADB)
 -#include <mariadb/mysql.h>
 #endif
--- a/multimedia/kodi/files/patch-xbmc_platform_linux_input_LibInputHandler.cpp
+++ b/multimedia/kodi/files/patch-xbmc_platform_linux_input_LibInputHandler.cpp
@ -1,11 +0,0 @@
--- xbmc/platform/linux/input/LibInputHandler.cpp.orig	2020-05-19 20:44:08 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));
--- a/multimedia/kodi/files/patch-xbmc_windowing_rpi_WinSystemRpi.cpp
+++ b/multimedia/kodi/files/patch-xbmc_windowing_rpi_WinSystemRpi.cpp
@ -1,26 +0,0 @@
--- xbmc/windowing/rpi/WinSystemRpi.cpp.orig	2020-05-19 20:47:38 UTC
-+++ xbmc/windowing/rpi/WinSystemRpi.cpp
-@@ -49,13 +49,21 @@ CWinSystemRpi::CWinSystemRpi() :
-   if (getenv("KODI_AE_SINK"))
-     envSink = getenv("KODI_AE_SINK");
- 
-  if (StringUtils::EqualsNoCase(envSink, "PULSE"))
-+  if (StringUtils::EqualsNoCase(envSink, "ALSA"))
-   {
-+    OPTIONALS::ALSARegister();
-+  }
-+  else if (StringUtils::EqualsNoCase(envSink, "PULSE"))
-+  {
-     OPTIONALS::PulseAudioRegister();
-   }
-+  else if (StringUtils::EqualsNoCase(envSink, "SNDIO"))
-+  {
-+    OPTIONALS::SndioRegister();
-+  }
-   else
-   {
-    OPTIONALS::ALSARegister();
-+    OPTIONALS::OSSRegister();
-   }
- 
-   CLinuxPowerSyscall::Register();
--- a/multimedia/kodi/pkg-plist
+++ b/multimedia/kodi/pkg-plist
@ -1,29 +1,97 @@
+bin/JsonSchemaBuilder
 bin/TexturePacker
 bin/kodi
 bin/kodi-standalone
-include/kodi/AEChannelData.h
-include/kodi/ActionIDs.h
 include/kodi/AddonBase.h
-include/kodi/DemuxCrypto.h
-include/kodi/DemuxPacket.h
+include/kodi/AudioEngine.h
 include/kodi/Filesystem.h
 include/kodi/General.h
-include/kodi/IFileTypes.h
 include/kodi/Network.h
-include/kodi/StreamCodec.h
-include/kodi/StreamCrypto.h
-include/kodi/TimingConstants.h
-include/kodi/XBMC_vkeys.h
 include/kodi/addon-instance/AudioDecoder.h
 include/kodi/addon-instance/AudioEncoder.h
+include/kodi/addon-instance/Game.h
 include/kodi/addon-instance/ImageDecoder.h
 include/kodi/addon-instance/Inputstream.h
+include/kodi/addon-instance/PVR.h
 include/kodi/addon-instance/Peripheral.h
-include/kodi/addon-instance/PeripheralUtils.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/inputstream/DemuxPacket.h
+include/kodi/addon-instance/inputstream/StreamCodec.h
+include/kodi/addon-instance/inputstream/StreamConstants.h
+include/kodi/addon-instance/inputstream/StreamCrypto.h
+include/kodi/addon-instance/inputstream/TimingConstants.h
+include/kodi/addon-instance/peripheral/PeripheralUtils.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/audio_decoder.h
+include/kodi/c-api/addon-instance/audio_encoder.h
+include/kodi/c-api/addon-instance/game.h
+include/kodi/c-api/addon-instance/image_decoder.h
+include/kodi/c-api/addon-instance/inputstream.h
+include/kodi/c-api/addon-instance/inputstream/demux_packet.h
+include/kodi/c-api/addon-instance/inputstream/stream_codec.h
+include/kodi/c-api/addon-instance/inputstream/stream_constants.h
+include/kodi/c-api/addon-instance/inputstream/stream_crypto.h
+include/kodi/c-api/addon-instance/inputstream/timing_constants.h
+include/kodi/c-api/addon-instance/peripheral.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-instance/screensaver.h
+include/kodi/c-api/addon-instance/vfs.h
+include/kodi/c-api/addon-instance/video_codec.h
+include/kodi/c-api/addon-instance/visualization.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/gui/controls/button.h
+include/kodi/c-api/gui/controls/edit.h
+include/kodi/c-api/gui/controls/fade_label.h
+include/kodi/c-api/gui/controls/image.h
+include/kodi/c-api/gui/controls/label.h
+include/kodi/c-api/gui/controls/progress.h
+include/kodi/c-api/gui/controls/radio_button.h
+include/kodi/c-api/gui/controls/rendering.h
+include/kodi/c-api/gui/controls/settings_slider.h
+include/kodi/c-api/gui/controls/slider.h
+include/kodi/c-api/gui/controls/spin.h
+include/kodi/c-api/gui/controls/text_box.h
+include/kodi/c-api/gui/definitions.h
+include/kodi/c-api/gui/dialogs/context_menu.h
+include/kodi/c-api/gui/dialogs/extended_progress.h
+include/kodi/c-api/gui/dialogs/filebrowser.h
+include/kodi/c-api/gui/dialogs/keyboard.h
+include/kodi/c-api/gui/dialogs/numeric.h
+include/kodi/c-api/gui/dialogs/ok.h
+include/kodi/c-api/gui/dialogs/progress.h
+include/kodi/c-api/gui/dialogs/select.h
+include/kodi/c-api/gui/dialogs/text_viewer.h
+include/kodi/c-api/gui/dialogs/yes_no.h
+include/kodi/c-api/gui/general.h
+include/kodi/c-api/gui/input/action_ids.h
+include/kodi/c-api/gui/list_item.h
+include/kodi/c-api/gui/window.h
+include/kodi/c-api/network.h
+include/kodi/c-api/platform/android/system.h
 include/kodi/gui/General.h
 include/kodi/gui/ListItem.h
 include/kodi/gui/Window.h
@ -39,7 +107,6 @@ include/kodi/gui/controls/SettingsSlider.h
 include/kodi/gui/controls/Slider.h
 include/kodi/gui/controls/Spin.h
 include/kodi/gui/controls/TextBox.h
-include/kodi/gui/definitions.h
 include/kodi/gui/dialogs/ContextMenu.h
 include/kodi/gui/dialogs/ExtendedProgress.h
 include/kodi/gui/dialogs/FileBrowser.h
@ -50,25 +117,22 @@ include/kodi/gui/dialogs/Progress.h
 include/kodi/gui/dialogs/Select.h
 include/kodi/gui/dialogs/TextViewer.h
 include/kodi/gui/dialogs/YesNo.h
-include/kodi/kodi_game_dll.h
-include/kodi/kodi_game_types.h
-include/kodi/kodi_vfs_types.h
-include/kodi/libKODI_game.h
-include/kodi/libKODI_guilib.h
-include/kodi/libXBMC_addon.h
-include/kodi/libXBMC_pvr.h
+include/kodi/gui/gl/GL.h
+include/kodi/gui/gl/GLonDX.h
+include/kodi/gui/gl/Shader.h
+include/kodi/gui/input/ActionIDs.h
+include/kodi/gui/renderHelper.h
 include/kodi/platform/android/System.h
 include/kodi/tools/DllHelper.h
+include/kodi/tools/EndTime.h
+include/kodi/tools/StringUtils.h
+include/kodi/tools/Thread.h
+include/kodi/tools/Timer.h
 include/kodi/versions.h
-include/kodi/xbmc_addon_dll.h
-include/kodi/xbmc_addon_types.h
-include/kodi/xbmc_epg_types.h
-include/kodi/xbmc_pvr_dll.h
-include/kodi/xbmc_pvr_types.h
-%%GBM%%lib/kodi/kodi-gbm
-%%RPI%%lib/kodi/kodi-rbpi
-%%WAYLAND%%lib/kodi/kodi-wayland
-%%X11%%lib/kodi/kodi-x11
+%%KODIGBM%%lib/kodi/kodi-gbm
+%%KODIWAYLAND%%lib/kodi/kodi-wayland
+%%KODIX11%%lib/kodi/kodi-x11
+%%KODICOMBINED%%lib/kodi/kodi.bin
 %%X11%%lib/kodi/kodi-xrandr
 %%SSE4_1%%lib/kodi/system/libsse4-%%ARCH%%-freebsd.so
 lib/kodi/system/players/VideoPlayer/libdvdnav-%%ARCH%%-freebsd.so
@ -88,11 +152,11 @@ share/icons/hicolor/48x48/apps/kodi.png
 share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/audioencoder.kodi.builtin.aac/addon.xml
 %%DATADIR%%/addons/audioencoder.kodi.builtin.aac/icon.png
-%%DATADIR%%/addons/audioencoder.kodi.builtin.aac/resources/language/English/strings.po
+%%DATADIR%%/addons/audioencoder.kodi.builtin.aac/resources/language/resource.language.en_gb/strings.po
 %%DATADIR%%/addons/audioencoder.kodi.builtin.aac/resources/settings.xml
 %%DATADIR%%/addons/audioencoder.kodi.builtin.wma/addon.xml
 %%DATADIR%%/addons/audioencoder.kodi.builtin.wma/icon.png
-%%DATADIR%%/addons/audioencoder.kodi.builtin.wma/resources/language/English/strings.po
+%%DATADIR%%/addons/audioencoder.kodi.builtin.wma/resources/language/resource.language.en_gb/strings.po
 %%DATADIR%%/addons/audioencoder.kodi.builtin.wma/resources/settings.xml
 %%DATADIR%%/addons/game.controller.default/addon.xml
 %%DATADIR%%/addons/game.controller.default/resources/icon.png
@ -111,6 +175,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/kodi.binary.global.gui/addon.xml
 %%DATADIR%%/addons/kodi.binary.global.main/addon.xml
 %%DATADIR%%/addons/kodi.binary.global.network/addon.xml
+%%DATADIR%%/addons/kodi.binary.global.tools/addon.xml
 %%DATADIR%%/addons/kodi.binary.instance.audiodecoder/addon.xml
 %%DATADIR%%/addons/kodi.binary.instance.audioencoder/addon.xml
 %%DATADIR%%/addons/kodi.binary.instance.game/addon.xml
@ -265,9 +330,262 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/metadata.common.themoviedb.org/addon.xml
 %%DATADIR%%/addons/metadata.common.themoviedb.org/icon.png
 %%DATADIR%%/addons/metadata.common.themoviedb.org/tmdb.xml
+%%DATADIR%%/addons/metadata.generic.albums/LICENSE.txt
+%%DATADIR%%/addons/metadata.generic.albums/addon.xml
+%%DATADIR%%/addons/metadata.generic.albums/changelog.txt
+%%DATADIR%%/addons/metadata.generic.albums/default.py
+%%DATADIR%%/addons/metadata.generic.albums/lib/allmusic.py
+%%DATADIR%%/addons/metadata.generic.albums/lib/discogs.py
+%%DATADIR%%/addons/metadata.generic.albums/lib/fanarttv.py
+%%DATADIR%%/addons/metadata.generic.albums/lib/musicbrainz.py
+%%DATADIR%%/addons/metadata.generic.albums/lib/nfo.py
+%%DATADIR%%/addons/metadata.generic.albums/lib/scraper.py
+%%DATADIR%%/addons/metadata.generic.albums/lib/theaudiodb.py
+%%DATADIR%%/addons/metadata.generic.albums/lib/utils.py
+%%DATADIR%%/addons/metadata.generic.albums/lib/wikipedia.py
+%%DATADIR%%/addons/metadata.generic.albums/resources/icon.png
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.af_za/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.am_et/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.ar_sa/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.ast_es/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.az_az/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.be_by/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.bg_bg/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.bs_ba/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.ca_es/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.cs_cz/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.cy_gb/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.da_dk/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.de_de/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.el_gr/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.en_au/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.en_gb/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.en_nz/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.en_us/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.eo/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.es_ar/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.es_es/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.es_mx/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.et_ee/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.eu_es/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.fa_af/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.fa_ir/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.fi_fi/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.fo_fo/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.fr_ca/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.fr_fr/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.gl_es/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.he_il/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.hi_in/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.hr_hr/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.hu_hu/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.hy_am/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.id_id/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.is_is/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.it_it/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.ja_jp/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.kn_in/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.ko_kr/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.lt_lt/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.lv_lv/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.mi/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.mk_mk/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.ml_in/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.mn_mn/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.ms_my/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.mt_mt/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.my_mm/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.nb_no/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.nl_nl/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.pl_pl/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.pt_br/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.pt_pt/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.ro_ro/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.ru_ru/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.si_lk/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.sk_sk/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.sl_si/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.sq_al/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.sr_rs/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.sr_rs@latin/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.sv_se/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.szl/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.ta_in/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.te_in/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.tg_tj/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.th_th/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.tr_tr/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.uk_ua/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.uz_uz/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.vi_vn/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.zh_cn/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/language/resource.language.zh_tw/strings.po
+%%DATADIR%%/addons/metadata.generic.albums/resources/settings.xml
+%%DATADIR%%/addons/metadata.generic.artists/LICENSE.txt
+%%DATADIR%%/addons/metadata.generic.artists/addon.xml
+%%DATADIR%%/addons/metadata.generic.artists/changelog.txt
+%%DATADIR%%/addons/metadata.generic.artists/default.py
+%%DATADIR%%/addons/metadata.generic.artists/lib/allmusic.py
+%%DATADIR%%/addons/metadata.generic.artists/lib/discogs.py
+%%DATADIR%%/addons/metadata.generic.artists/lib/fanarttv.py
+%%DATADIR%%/addons/metadata.generic.artists/lib/musicbrainz.py
+%%DATADIR%%/addons/metadata.generic.artists/lib/nfo.py
+%%DATADIR%%/addons/metadata.generic.artists/lib/scraper.py
+%%DATADIR%%/addons/metadata.generic.artists/lib/theaudiodb.py
+%%DATADIR%%/addons/metadata.generic.artists/lib/utils.py
+%%DATADIR%%/addons/metadata.generic.artists/lib/wikipedia.py
+%%DATADIR%%/addons/metadata.generic.artists/resources/icon.png
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.af_za/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.am_et/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.ar_sa/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.ast_es/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.az_az/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.be_by/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.bg_bg/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.bs_ba/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.ca_es/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.cs_cz/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.cy_gb/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.da_dk/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.de_de/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.el_gr/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.en_au/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.en_gb/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.en_nz/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.en_us/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.eo/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.es_ar/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.es_es/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.es_mx/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.et_ee/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.eu_es/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.fa_af/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.fa_ir/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.fi_fi/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.fo_fo/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.fr_ca/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.fr_fr/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.gl_es/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.he_il/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.hi_in/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.hr_hr/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.hu_hu/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.hy_am/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.id_id/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.is_is/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.it_it/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.ja_jp/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.kn_in/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.ko_kr/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.lt_lt/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.lv_lv/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.mi/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.mk_mk/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.ml_in/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.mn_mn/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.ms_my/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.mt_mt/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.my_mm/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.nb_no/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.nl_nl/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.pl_pl/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.pt_br/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.pt_pt/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.ro_ro/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.ru_ru/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.si_lk/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.sk_sk/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.sl_si/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.sq_al/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.sr_rs/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.sr_rs@latin/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.sv_se/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.szl/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.ta_in/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.te_in/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.tg_tj/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.th_th/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.tr_tr/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.uk_ua/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.uz_uz/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.vi_vn/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.zh_cn/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/language/resource.language.zh_tw/strings.po
+%%DATADIR%%/addons/metadata.generic.artists/resources/settings.xml
 %%DATADIR%%/addons/metadata.local/addon.xml
 %%DATADIR%%/addons/metadata.local/icon.png
 %%DATADIR%%/addons/metadata.local/local.xml
+%%DATADIR%%/addons/metadata.themoviedb.org.python/LICENSE.txt
+%%DATADIR%%/addons/metadata.themoviedb.org.python/README.md
+%%DATADIR%%/addons/metadata.themoviedb.org.python/addon.xml
+%%DATADIR%%/addons/metadata.themoviedb.org.python/python/lib/__init__.py
+%%DATADIR%%/addons/metadata.themoviedb.org.python/python/lib/tmdbscraper/__init__.py
+%%DATADIR%%/addons/metadata.themoviedb.org.python/python/lib/tmdbscraper/api_utils.py
+%%DATADIR%%/addons/metadata.themoviedb.org.python/python/lib/tmdbscraper/fanarttv.py
+%%DATADIR%%/addons/metadata.themoviedb.org.python/python/lib/tmdbscraper/imdbratings.py
+%%DATADIR%%/addons/metadata.themoviedb.org.python/python/lib/tmdbscraper/tmdb.py
+%%DATADIR%%/addons/metadata.themoviedb.org.python/python/lib/tmdbscraper/tmdbapi.py
+%%DATADIR%%/addons/metadata.themoviedb.org.python/python/lib/tmdbscraper/traktratings.py
+%%DATADIR%%/addons/metadata.themoviedb.org.python/python/scraper.py
+%%DATADIR%%/addons/metadata.themoviedb.org.python/python/scraper_config.py
+%%DATADIR%%/addons/metadata.themoviedb.org.python/python/scraper_datahelper.py
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/icon.png
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.af_za/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.am_et/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.be_by/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.bg_bg/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.ca_es/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.cs_cz/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.cy_gb/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.da_dk/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.de_de/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.el_gr/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.en_gb/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.en_nz/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.en_us/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.es_ar/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.es_es/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.es_mx/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.et_ee/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.eu_es/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.fi_fi/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.fr_ca/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.fr_fr/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.gl_es/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.he_il/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.hi_in/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.hr_hr/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.hu_hu/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.id_id/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.is_is/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.it_it/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.ja_jp/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.ko_kr/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.lt_lt/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.mk_mk/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.ml_in/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.ms_my/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.my_mm/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.nb_no/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.nl_nl/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.pl_pl/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.pt_br/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.pt_pt/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.ro_ro/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.ru_ru/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.sk_sk/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.sl_si/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.sq_al/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.sv_se/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.ta_in/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.th_th/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.tr_tr/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.uk_ua/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.uz_uz/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.vi_vn/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.zh_cn/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/language/resource.language.zh_tw/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org.python/resources/settings.xml
 %%DATADIR%%/addons/metadata.themoviedb.org/addon.xml
 %%DATADIR%%/addons/metadata.themoviedb.org/changelog.txt
 %%DATADIR%%/addons/metadata.themoviedb.org/icon.png
@ -328,6 +646,24 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/resource.language.zh_tw/strings.po
 %%DATADIR%%/addons/metadata.themoviedb.org/resources/settings.xml
 %%DATADIR%%/addons/metadata.themoviedb.org/tmdb.xml
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/LICENSE.txt
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/addon.xml
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/changelog.txt
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/libs/__init__.py
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/libs/actions.py
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/libs/api_utils.py
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/libs/cache.py
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/libs/data_utils.py
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/libs/debugger.py
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/libs/imdbratings.py
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/libs/settings.py
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/libs/tmdb.py
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/libs/traktratings.py
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/libs/utils.py
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/main.py
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/resources/icon.png
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/resources/language/resource.language.en_gb/strings.po
+%%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/resources/settings.xml
 %%DATADIR%%/addons/metadata.tvshows.themoviedb.org/LICENSE.TXT
 %%DATADIR%%/addons/metadata.tvshows.themoviedb.org/addon.xml
 %%DATADIR%%/addons/metadata.tvshows.themoviedb.org/changelog.txt
@ -526,94 +862,97 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/script.module.pil/icon.png
 %%DATADIR%%/addons/script.module.pycryptodome/addon.xml
 %%DATADIR%%/addons/script.module.pycryptodome/icon.png
-%%DATADIR%%/addons/service.xbmc.versioncheck/LICENSE.txt
-%%DATADIR%%/addons/service.xbmc.versioncheck/README.md
+%%DATADIR%%/addons/service.xbmc.versioncheck/LICENSES/Apache-2.0.txt
+%%DATADIR%%/addons/service.xbmc.versioncheck/LICENSES/GPL-2.0-or-later.txt
+%%DATADIR%%/addons/service.xbmc.versioncheck/LICENSES/GPL-3.0-or-later.txt
 %%DATADIR%%/addons/service.xbmc.versioncheck/addon.xml
-%%DATADIR%%/addons/service.xbmc.versioncheck/changelog.txt
 %%DATADIR%%/addons/service.xbmc.versioncheck/icon.png
-%%DATADIR%%/addons/service.xbmc.versioncheck/lib/__init__.py
-%%DATADIR%%/addons/service.xbmc.versioncheck/lib/aptdaemonhandler.py
-%%DATADIR%%/addons/service.xbmc.versioncheck/lib/common.py
-%%DATADIR%%/addons/service.xbmc.versioncheck/lib/jsoninterface.py
-%%DATADIR%%/addons/service.xbmc.versioncheck/lib/shellhandlerapt.py
-%%DATADIR%%/addons/service.xbmc.versioncheck/lib/versions.py
-%%DATADIR%%/addons/service.xbmc.versioncheck/lib/viewer.py
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/gotham-alpha_notice.txt
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Afrikaans/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Albanian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Amharic/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Arabic/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Armenian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Asturian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Basque/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Belarusian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Bosnian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Bulgarian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Burmese/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Catalan/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Chinese (Simple)/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Chinese (Traditional)/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Croatian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Czech/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Danish/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Dutch/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/English (Australia)/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/English (New Zealand)/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/English (US)/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/English/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Esperanto/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Estonian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Faroese/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Finnish/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/French (Canada)/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/French/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Galician/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Georgian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/German/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Greek/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Hebrew/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Hindi (Devanagiri)/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Hungarian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Icelandic/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Indonesian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Italian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Japanese/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Korean/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Latvian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Lithuanian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Macedonian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Malay/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Malayalam/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Maltese/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Mongolian (Mongolia)/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Norwegian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Persian (Iran)/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Persian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Polish/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Portuguese (Brazil)/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Portuguese/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Romanian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Russian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Serbian (Cyrillic)/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Serbian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Slovak/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Slovenian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Spanish (Argentina)/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Spanish (Mexico)/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Spanish/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Swedish/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Tamil (India)/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Thai/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Turkish/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Ukrainian/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Uzbek/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Vietnamese/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Welsh/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.af_za/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.am_et/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.ar_sa/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.be_by/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.bg_bg/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.bs_ba/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.ca_es/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.cs_cz/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.cy_gb/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.da_dk/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.de_de/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.el_gr/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.en_au/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.en_gb/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.en_nz/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.en_us/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.eo/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.es_ar/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.es_es/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.es_mx/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.et_ee/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.eu_es/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.fa_af/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.fa_ir/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.fi_fi/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.fo_fo/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.fr_ca/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.fr_fr/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.gl_es/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.he_il/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.hi_in/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.hr_hr/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.hu_hu/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.hy_am/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.id_id/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.is_is/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.it_it/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.ja_jp/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.ko_kr/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.lt_lt/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.lv_lv/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.mk_mk/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.ml_in/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.mn_mn/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.ms_my/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.mt_mt/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.my_mm/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.nb_no/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.nl_nl/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.pl_pl/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.pt_br/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.pt_pt/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.ro_ro/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.ru_ru/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.sk_sk/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.sl_si/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.sq_al/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.sr_rs/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.sr_rs@latin/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.sv_se/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.ta_in/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.th_th/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.tr_tr/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.uk_ua/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.uz_uz/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.vi_vn/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.zh_cn/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.zh_tw/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/lib/__init__.py
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/lib/runner.py
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/lib/version_check/__init__.py
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/lib/version_check/apt_daemon_handler.py
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/lib/version_check/common.py
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/lib/version_check/distro/__init__.py
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/lib/version_check/distro/distro.py
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/lib/version_check/handler.py
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/lib/version_check/json_interface.py
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/lib/version_check/service.py
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/lib/version_check/shell_handler_apt.py
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/lib/version_check/versions.py
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/lib/version_check/viewer.py
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/polkit/10-allow-update.pkla
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/polkit/README
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/settings.xml
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/versions.schema.txt
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/versions.txt
-%%DATADIR%%/addons/service.xbmc.versioncheck/service.py
 %%DATADIR%%/addons/skin.estouchy/LICENSE.txt
 %%DATADIR%%/addons/skin.estouchy/addon.xml
 %%DATADIR%%/addons/skin.estouchy/background/primary.jpg
@ -626,6 +965,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.estouchy/language/resource.language.af_za/strings.po
 %%DATADIR%%/addons/skin.estouchy/language/resource.language.am_et/strings.po
 %%DATADIR%%/addons/skin.estouchy/language/resource.language.ar_sa/strings.po
+%%DATADIR%%/addons/skin.estouchy/language/resource.language.ast_es/strings.po
 %%DATADIR%%/addons/skin.estouchy/language/resource.language.az_az/strings.po
 %%DATADIR%%/addons/skin.estouchy/language/resource.language.be_by/strings.po
 %%DATADIR%%/addons/skin.estouchy/language/resource.language.bg_bg/strings.po
@ -662,6 +1002,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.estouchy/language/resource.language.is_is/strings.po
 %%DATADIR%%/addons/skin.estouchy/language/resource.language.it_it/strings.po
 %%DATADIR%%/addons/skin.estouchy/language/resource.language.ja_jp/strings.po
+%%DATADIR%%/addons/skin.estouchy/language/resource.language.kn_in/strings.po
 %%DATADIR%%/addons/skin.estouchy/language/resource.language.ko_kr/strings.po
 %%DATADIR%%/addons/skin.estouchy/language/resource.language.lt_lt/strings.po
 %%DATADIR%%/addons/skin.estouchy/language/resource.language.lv_lv/strings.po
@ -822,7 +1163,6 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.estuary/extras/home-images/movie.jpg
 %%DATADIR%%/addons/skin.estuary/extras/home-images/music.jpg
 %%DATADIR%%/addons/skin.estuary/fonts/NotoMono-Regular.ttf
-%%DATADIR%%/addons/skin.estuary/fonts/NotoSans-Bold.ttf
 %%DATADIR%%/addons/skin.estuary/fonts/NotoSans-Regular.ttf
 %%DATADIR%%/addons/skin.estuary/fonts/Roboto-Thin.ttf
 %%DATADIR%%/addons/skin.estuary/fonts/heebo_licence.txt
@ -832,6 +1172,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.estuary/language/resource.language.af_za/strings.po
 %%DATADIR%%/addons/skin.estuary/language/resource.language.am_et/strings.po
 %%DATADIR%%/addons/skin.estuary/language/resource.language.ar_sa/strings.po
+%%DATADIR%%/addons/skin.estuary/language/resource.language.ast_es/strings.po
 %%DATADIR%%/addons/skin.estuary/language/resource.language.az_az/strings.po
 %%DATADIR%%/addons/skin.estuary/language/resource.language.be_by/strings.po
 %%DATADIR%%/addons/skin.estuary/language/resource.language.bg_bg/strings.po
@ -868,6 +1209,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.estuary/language/resource.language.is_is/strings.po
 %%DATADIR%%/addons/skin.estuary/language/resource.language.it_it/strings.po
 %%DATADIR%%/addons/skin.estuary/language/resource.language.ja_jp/strings.po
+%%DATADIR%%/addons/skin.estuary/language/resource.language.kn_in/strings.po
 %%DATADIR%%/addons/skin.estuary/language/resource.language.ko_kr/strings.po
 %%DATADIR%%/addons/skin.estuary/language/resource.language.lt_lt/strings.po
 %%DATADIR%%/addons/skin.estuary/language/resource.language.lv_lv/strings.po
@ -947,6 +1289,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml
 %%DATADIR%%/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml
 %%DATADIR%%/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml
+%%DATADIR%%/addons/skin.estuary/xml/Custom_1110_TempoControl.xml
 %%DATADIR%%/addons/skin.estuary/xml/Defaults.xml
 %%DATADIR%%/addons/skin.estuary/xml/DialogAddonInfo.xml
 %%DATADIR%%/addons/skin.estuary/xml/DialogAddonSettings.xml
@ -956,6 +1299,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.estuary/xml/DialogContextMenu.xml
 %%DATADIR%%/addons/skin.estuary/xml/DialogExtendedProgressBar.xml
 %%DATADIR%%/addons/skin.estuary/xml/DialogFavourites.xml
+%%DATADIR%%/addons/skin.estuary/xml/DialogFullScreenInfo.xml
 %%DATADIR%%/addons/skin.estuary/xml/DialogGameControllers.xml
 %%DATADIR%%/addons/skin.estuary/xml/DialogKeyboard.xml
 %%DATADIR%%/addons/skin.estuary/xml/DialogMediaSource.xml
@ -966,6 +1310,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.estuary/xml/DialogPVRChannelManager.xml
 %%DATADIR%%/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml
 %%DATADIR%%/addons/skin.estuary/xml/DialogPVRGroupManager.xml
+%%DATADIR%%/addons/skin.estuary/xml/DialogPVRGuideControls.xml
 %%DATADIR%%/addons/skin.estuary/xml/DialogPVRGuideSearch.xml
 %%DATADIR%%/addons/skin.estuary/xml/DialogPVRInfo.xml
 %%DATADIR%%/addons/skin.estuary/xml/DialogPVRRadioRDSInfo.xml
@ -991,6 +1336,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.estuary/xml/Includes_DialogSelect.xml
 %%DATADIR%%/addons/skin.estuary/xml/Includes_Home.xml
 %%DATADIR%%/addons/skin.estuary/xml/Includes_MediaMenu.xml
+%%DATADIR%%/addons/skin.estuary/xml/Includes_MusicInfo.xml
 %%DATADIR%%/addons/skin.estuary/xml/Includes_PVR.xml
 %%DATADIR%%/addons/skin.estuary/xml/LoginScreen.xml
 %%DATADIR%%/addons/skin.estuary/xml/MusicOSD.xml
@ -1027,6 +1373,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.estuary/xml/View_500_Wall.xml
 %%DATADIR%%/addons/skin.estuary/xml/View_501_Banner.xml
 %%DATADIR%%/addons/skin.estuary/xml/View_502_FanArt.xml
+%%DATADIR%%/addons/skin.estuary/xml/View_503_NowPlaying.xml
 %%DATADIR%%/addons/skin.estuary/xml/View_50_List.xml
 %%DATADIR%%/addons/skin.estuary/xml/View_51_Poster.xml
 %%DATADIR%%/addons/skin.estuary/xml/View_52_IconWall.xml
@ -1062,6 +1409,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/webinterface.default/lang/_strings/nl.json
 %%DATADIR%%/addons/webinterface.default/lang/_strings/pl.json
 %%DATADIR%%/addons/webinterface.default/lang/_strings/pt.json
+%%DATADIR%%/addons/webinterface.default/lang/_strings/sk.json
 %%DATADIR%%/addons/webinterface.default/lang/_strings/zh_hans.json
 %%DATADIR%%/addons/webinterface.default/lang/de/app-readme.html
 %%DATADIR%%/addons/webinterface.default/lang/de/keybind-readme.html
@ -1088,7 +1436,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/webinterface.default/lang/pl/license.html
 %%DATADIR%%/addons/webinterface.default/lib/icons/icomoon.json
 %%DATADIR%%/addons/webinterface.default/lib/icons/mdi.json
-%%DATADIR%%/addons/webinterface.default/lib/jquery/jquery-1.11.0.min.js
+%%DATADIR%%/addons/webinterface.default/lib/jquery/jquery-3.5.1.min.js
 %%DATADIR%%/addons/webinterface.default/lib/soundmanager/swf/soundmanager2.swf
 %%DATADIR%%/addons/webinterface.default/lib/soundmanager/swf/soundmanager2_debug.swf
 %%DATADIR%%/addons/webinterface.default/lib/soundmanager/swf/soundmanager2_flash9.swf
@ -1212,6 +1560,8 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/media/icon48x48.png
 %%DATADIR%%/media/icon80x80.png
 %%DATADIR%%/media/splash.jpg
+%%DATADIR%%/media/vendor_icon.png
+%%DATADIR%%/media/vendor_logo.png
 %%DATADIR%%/privacy-policy.txt
 %%DATADIR%%/system/addon-manifest.xml
 %%DATADIR%%/system/certs/cacert.pem
@ -1233,6 +1583,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/system/keyboardlayouts/korean.xml
 %%DATADIR%%/system/keyboardlayouts/lithuanian.xml
 %%DATADIR%%/system/keyboardlayouts/norwegian.xml
+%%DATADIR%%/system/keyboardlayouts/persian.xml
 %%DATADIR%%/system/keyboardlayouts/polish.xml
 %%DATADIR%%/system/keyboardlayouts/portuguese.xml
 %%DATADIR%%/system/keyboardlayouts/romanian.xml
@ -1248,17 +1599,20 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/system/keymaps/appcommand.xml
 %%DATADIR%%/system/keymaps/customcontroller.AppleRemote.xml
 %%DATADIR%%/system/keymaps/customcontroller.Harmony.xml
+%%DATADIR%%/system/keymaps/customcontroller.SiriRemote.xml
 %%DATADIR%%/system/keymaps/gamepad.xml
 %%DATADIR%%/system/keymaps/joystick.xml
 %%DATADIR%%/system/keymaps/keyboard.xml
 %%DATADIR%%/system/keymaps/mouse.xml
 %%DATADIR%%/system/keymaps/nyxboard/keyboard.xml
+%%DATADIR%%/system/keymaps/osmc/osmc_remote.xml
 %%DATADIR%%/system/keymaps/remote.xml
 %%DATADIR%%/system/keymaps/touchscreen.xml
 %%DATADIR%%/system/keymaps/wetek-play/keyboard.xml
 %%DATADIR%%/system/library/music/addons.xml
 %%DATADIR%%/system/library/music/albums.xml
 %%DATADIR%%/system/library/music/artists.xml
+%%DATADIR%%/system/library/music/boxsets.xml
 %%DATADIR%%/system/library/music/compilations.xml
 %%DATADIR%%/system/library/music/files.xml
 %%DATADIR%%/system/library/music/genres.xml
@ -1338,22 +1692,17 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/system/library/video_flat/tvshows.xml
 %%DATADIR%%/system/peripherals.xml
 %%DATADIR%%/system/playercorefactory.xml
-%%DATADIR%%/system/settings/aml-linux.xml
 %%DATADIR%%/system/settings/android.xml
 %%DATADIR%%/system/settings/darwin.xml
 %%DATADIR%%/system/settings/darwin_ios.xml
 %%DATADIR%%/system/settings/darwin_osx.xml
+%%DATADIR%%/system/settings/darwin_tvos.xml
 %%DATADIR%%/system/settings/freebsd.xml
-%%DATADIR%%/system/settings/gbm.xml
 %%DATADIR%%/system/settings/linux.xml
-%%DATADIR%%/system/settings/rbp.xml
-%%DATADIR%%/system/settings/rbp2.xml
 %%DATADIR%%/system/settings/settings.xml
-%%DATADIR%%/system/settings/wayland.xml
 %%DATADIR%%/system/settings/win10.xml
 %%DATADIR%%/system/settings/win32.xml
 %%DATADIR%%/system/settings/windows.xml
-%%DATADIR%%/system/settings/x11.xml
 %%DATADIR%%/system/shaders/GL/1.2/gl_convolution-4x4.glsl
 %%DATADIR%%/system/shaders/GL/1.2/gl_convolution-6x6.glsl
 %%DATADIR%%/system/shaders/GL/1.2/gl_output.glsl