multimedia/kodi: Update to 21.0

PR: 278334
2025-06-02 19:36:28 -04:00 · 2024-05-25 21:24:48 +02:00 · 2024-05-25 21:24:48 +02:00 · edac4920e0
commit edac4920e0
parent d37e8622e9
10 changed files with 156 additions and 2454 deletions
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@ -1,6 +1,11 @@
 PORTNAME=	kodi
-DISTVERSION=	20.5
+DISTVERSION=	21.0
 CATEGORIES=	multimedia java
+MASTER_SITES=	http://mirrors.kodi.tv/build-deps/sources/
+DISTFILES=	apache-groovy-binary-${GROOVY_VERSION}.zip \
+		commons-lang3-${COMMONS_LANG_VERSION}-bin.tar.gz \
+		commons-text-${COMMONS_TEXT_VERSION}-bin.tar.gz
+DIST_SUBDIR=	${PORTNAME}
 # do not forget to fix devel/kodi-platform when updating kodi

 MAINTAINER=	yzrh@noema.org
@ -38,6 +43,8 @@ LIB_DEPENDS=	libass.so:multimedia/libass \
 		libswscale.so:multimedia/ffmpeg \
 		libtag.so:audio/taglib \
 		libtinyxml.so:textproc/tinyxml \
+		libtinyxml2.so:textproc/tinyxml2 \
+		libudfread.so:multimedia/libudfread \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}

@ -45,10 +52,13 @@ USES=		autoreconf:build cmake:noninja compiler:c++17-lang cpe \
 		desktop-file-utils gettext gmake gnome iconv jpeg libtool \
 		pkgconfig python sqlite ssl

-KODI_CODENAME=		Nexus
+KODI_CODENAME=		Omega
 LIBDVDCSS_VERSION=	1.4.3-Next-Nexus-Alpha2-2
 LIBDVDNAV_VERSION=	6.1.1-Next-Nexus-Alpha2-2
 LIBDVDREAD_VERSION=	6.1.3-Next-Nexus-Alpha2-2
+GROOVY_VERSION=		4.0.16
+COMMONS_LANG_VERSION=	3.14.0
+COMMONS_TEXT_VERSION=	1.11.0

 USE_GITHUB=	yes
 GH_TUPLE=	xbmc:xbmc:${DISTVERSION}-${KODI_CODENAME} \
@ -71,20 +81,24 @@ USE_JAVA=	yes
 JAVA_BUILD=	jre
 USE_GNOME=	libxml2
 CMAKE_ARGS=	-DGIT_VERSION="${DISTVERSION}-${KODI_CODENAME}" \
-		-DLIBDVDCSS_URL="${DISTDIR}/xbmc-libdvdcss-${LIBDVDCSS_VERSION}_GH0.tar.gz" \
-		-DLIBDVDNAV_URL="${DISTDIR}/xbmc-libdvdnav-${LIBDVDNAV_VERSION}_GH0.tar.gz" \
-		-DLIBDVDREAD_URL="${DISTDIR}/xbmc-libdvdread-${LIBDVDREAD_VERSION}_GH0.tar.gz" \
-		-DCROSSGUID_INCLUDE_DIR="${LOCALBASE}/include"
-CMAKE_OFF=	ENABLE_INTERNAL_CROSSGUID ENABLE_INTERNAL_RapidJSON
+		-DLIBDVDCSS_URL="${DISTDIR}/${PORTNAME}/xbmc-libdvdcss-${LIBDVDCSS_VERSION}_GH0.tar.gz" \
+		-DLIBDVDNAV_URL="${DISTDIR}/${PORTNAME}/xbmc-libdvdnav-${LIBDVDNAV_VERSION}_GH0.tar.gz" \
+		-DLIBDVDREAD_URL="${DISTDIR}/${PORTNAME}/xbmc-libdvdread-${LIBDVDREAD_VERSION}_GH0.tar.gz" \
+		-Dgroovy_SOURCE_DIR="${WRKSRC}/tools/depends/share/groovy" \
+		-Dapache-commons-lang_SOURCE_DIR="${WRKSRC}/tools/depends/share/java/lang" \
+		-Dapache-commons-text_SOURCE_DIR="${WRKSRC}/tools/depends/share/java/text" \
+		-DCROSSGUID_INCLUDE_DIR="${LOCALBASE}/include" \
+		-DCORE_PLATFORM_NAME:STRING="${KODI_PLATFORM}" \
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+CMAKE_OFF=	ENABLE_INTERNAL_CROSSGUID
 CONFIGURE_ENV=	_CPU_FEATURE="${CPU_FEATURE}"

 OPTIONS_SUB=		yes
-# Broken: BLUETOOTH
 OPTIONS_DEFINE=		AIRPLAY AVAHI LIBBLURAY CEC DAV1D DBUS \
 			DVDCSS LCMS2 LIRC WEBSERVER MYSQL NFS DVD SMB TEST \
 			UDEV UPNP VAAPI VDPAU XSLT DOCS
 OPTIONS_DEFAULT=	LIBBLURAY CEC LCMS2 WEBSERVER DAV1D \
-			DVD UPNP VAAPI VDPAU XSLT WAYLAND X11 GL
+			DVD UPNP VAAPI VDPAU XSLT GBM WAYLAND X11 GL
 OPTIONS_DEFAULT_amd64=	SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2
 OPTIONS_DEFAULT_i386=	SSE SSE2 SSE3
 OPTIONS_SINGLE=		RENDER
@ -103,7 +117,6 @@ PLATFORM_DESC=	Kodi platform
 FEATURE_DESC=	X86 CPU feature

 AIRPLAY_DESC=	AirPlay support
-BLUETOOTH_DESC=	Bluetooth support
 CEC_DESC=	CEC adapter support
 DAV1D_DESC=	Use dav1d as AV1 decoder
 DVD_DESC=	DVD support
@ -132,9 +145,6 @@ AIRPLAY_CMAKE_BOOL=	ENABLE_PLIST \
 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"
-
 LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CMAKE_BOOL=	ENABLE_BLURAY

@ -177,6 +187,7 @@ UPNP_CMAKE_BOOL=	ENABLE_UPNP
 VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CMAKE_BOOL=	ENABLE_VAAPI

+VDPAU_IMPLIES=		X11 GL
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CMAKE_BOOL=	ENABLE_VDPAU

@ -216,17 +227,18 @@ AVX_VARS=		CPU_FEATURE+=AVX
 AVX2_VARS=		CPU_FEATURE+=AVX2

 GBM_IMPLIES=		UDEV
+GBM_VARS=		KODI_PLATFORM+=gbm
 GBM_USES=		gl
 GBM_USE=		GL=egl,gbm,glu
-GBM_CFLAGS=		-I${LOCALBASE}/include/libepoll-shim
-GBM_LDFLAGS=		-L${LOCALBASE}/lib -lepoll-shim
 GBM_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 GBM_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 			libdrm.so:graphics/libdrm \
 			libxkbcommon.so:x11/libxkbcommon \
-			libinput.so:x11/libinput
+			libinput.so:x11/libinput \
+			libdisplay-info.so:sysutils/libdisplay-info
 GBM_RUN_DEPENDS=	mesa-dri>0:graphics/mesa-dri

+WAYLAND_VARS=		KODI_PLATFORM+=wayland
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_USES=		gl
 WAYLAND_USE=		GL=egl,glu
@ -237,6 +249,7 @@ WAYLAND_LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 			libinput.so:x11/libinput \
 			libwayland-client++.so:graphics/waylandpp

+X11_VARS=		KODI_PLATFORM+=x11
 X11_USES=		xorg gl
 X11_USE=		XORG=x11,xext,xrandr GL=egl,gbm,glu
 X11_LIB_DEPENDS=	libdrm.so:graphics/libdrm
@ -247,22 +260,6 @@ X11_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 BROKEN=	option GLES does not build with multiple PLATFORM
 .endif

-.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 " \
@ -290,6 +287,14 @@ PLIST_SUB+=	KODIX11="@comment "
 .endif
 .endif

+post-extract:
+	@${MKDIR} ${WRKSRC}/tools/depends/share
+	@${MV} ${WRKDIR}/groovy-${GROOVY_VERSION} ${WRKSRC}/tools/depends/share/groovy
+
+	@${MKDIR} ${WRKSRC}/tools/depends/share/java
+	@${MV} ${WRKDIR}/commons-lang3-${COMMONS_LANG_VERSION} ${WRKSRC}/tools/depends/share/java/lang
+	@${MV} ${WRKDIR}/commons-text-${COMMONS_TEXT_VERSION} ${WRKSRC}/tools/depends/share/java/text
+
 post-patch:
 	${REINPLACE_CMD} 's|/usr/share|${LOCALBASE}/share|' \
 		${WRKSRC}/xbmc/platform/linux/input/LibInputSettings.cpp
@ -297,7 +302,7 @@ post-patch:
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/manpages/kodi.bin.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	cd ${STAGEDIR}${PREFIX}/share/man/man1 && ${LN} -s kodi.bin.1.gz kodi.1.gz
-	cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} JsonSchemaBuilder kodi-TexturePacker
+	cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} kodi-TexturePacker TexturePacker
 	${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -type f -name '*.so' -print0 | ${XARGS} -0 ${STRIP_CMD}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/firewalld

--- a/multimedia/kodi/distinfo
+++ b/multimedia/kodi/distinfo
@ -1,9 +1,15 @@
-TIMESTAMP = 1709571779
-SHA256 (xbmc-xbmc-20.5-20.5-Nexus_GH0.tar.gz) = 9bf3257ebf251d20f276b7f90681985a270779150af2fb395d4b593c04002deb
-SIZE (xbmc-xbmc-20.5-20.5-Nexus_GH0.tar.gz) = 54568445
-SHA256 (xbmc-libdvdcss-1.4.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
-SIZE (xbmc-libdvdcss-1.4.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = 102124
-SHA256 (xbmc-libdvdnav-6.1.1-Next-Nexus-Alpha2-2_GH0.tar.gz) = 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc
-SIZE (xbmc-libdvdnav-6.1.1-Next-Nexus-Alpha2-2_GH0.tar.gz) = 128547
-SHA256 (xbmc-libdvdread-6.1.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
-SIZE (xbmc-libdvdread-6.1.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = 110513
+TIMESTAMP = 1712510398
+SHA256 (kodi/apache-groovy-binary-4.0.16.zip) = b8c3bec88a3f5a62235d9429a97e371032bf7216f3e28724823a9169dd10befc
+SIZE (kodi/apache-groovy-binary-4.0.16.zip) = 29793704
+SHA256 (kodi/commons-lang3-3.14.0-bin.tar.gz) = 317c3e3fcd5fcca3781a7996ff1e0c50c13244ee961e94e5f6f6d84b84733b16
+SIZE (kodi/commons-lang3-3.14.0-bin.tar.gz) = 9442785
+SHA256 (kodi/commons-text-1.11.0-bin.tar.gz) = 4169cb90571fb28fad4c5eea7c1c994c18f1995452f73e8ea7a86087c0e3822e
+SIZE (kodi/commons-text-1.11.0-bin.tar.gz) = 3018564
+SHA256 (kodi/xbmc-xbmc-21.0-21.0-Omega_GH0.tar.gz) = 7f54c1fd8456ac46221fbc85e447362bdc209163c6cb19fca98d106560071b7c
+SIZE (kodi/xbmc-xbmc-21.0-21.0-Omega_GH0.tar.gz) = 40987733
+SHA256 (kodi/xbmc-libdvdcss-1.4.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
+SIZE (kodi/xbmc-libdvdcss-1.4.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = 102124
+SHA256 (kodi/xbmc-libdvdnav-6.1.1-Next-Nexus-Alpha2-2_GH0.tar.gz) = 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc
+SIZE (kodi/xbmc-libdvdnav-6.1.1-Next-Nexus-Alpha2-2_GH0.tar.gz) = 128547
+SHA256 (kodi/xbmc-libdvdread-6.1.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
+SIZE (kodi/xbmc-libdvdread-6.1.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = 110513
--- a/multimedia/kodi/files/patch-cmake_modules_FindCrossGUID.cmake
+++ b/multimedia/kodi/files/patch-cmake_modules_FindCrossGUID.cmake
@ -1,29 +1,20 @@
--- cmake/modules/FindCrossGUID.cmake.orig	2022-07-08 10:04:52 UTC
+--- cmake/modules/FindCrossGUID.cmake.orig	2024-03-04 21:39:38 UTC
 +++ cmake/modules/FindCrossGUID.cmake
-@@ -45,7 +45,7 @@ else()
-   endif()
+@@ -45,7 +45,7 @@ if(NOT TARGET CrossGUID::CrossGUID)
+       set(CROSSGUID_VERSION ${PC_CROSSGUID_VERSION})
+     endif()
 
-   if(CROSSGUID_FOUND)
 -    find_path(CROSSGUID_INCLUDE_DIR NAMES crossguid/guid.hpp guid.h
 +    find_path(CROSSGUID_INCLUDE_DIR NAMES guid.hpp guid.h
-     PATHS ${PC_CROSSGUID_INCLUDEDIR})
+                                     HINTS ${DEPENDS_PATH}/include ${PC_CROSSGUID_INCLUDEDIR}
+                                     ${${CORE_PLATFORM_LC}_SEARCH_CONFIG}
+                                     NO_CACHE)
+@@ -59,7 +59,7 @@ if(NOT TARGET CrossGUID::CrossGUID)
+                                          NO_CACHE)
 
-     find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid
-@@ -53,7 +53,7 @@ else()
-     find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd crossguid-dgb
-           PATHS ${PC_CROSSGUID_LIBDIR})
-   else()
-    find_path(CROSSGUID_INCLUDE_DIR NAMES crossguid/guid.hpp guid.h)
-+    find_path(CROSSGUID_INCLUDE_DIR NAMES guid.hpp guid.h)
-     find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
-     find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
+     # NEW_CROSSGUID >= 0.2.0 release
+-    if(EXISTS "${CROSSGUID_INCLUDE_DIR}/crossguid/guid.hpp")
+    if(EXISTS "${CROSSGUID_INCLUDE_DIR}/guid.hpp")
+       list(APPEND _crossguid_definitions HAVE_NEW_CROSSGUID)
+     endif()
   endif()
-@@ -73,7 +73,7 @@ if(CROSSGUID_FOUND)
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- 
-   # NEW_CROSSGUID >= 0.2.0 release
-  if(EXISTS "${CROSSGUID_INCLUDE_DIR}/crossguid/guid.hpp")
-+  if(EXISTS "${CROSSGUID_INCLUDE_DIR}/guid.hpp")
-     list(APPEND CROSSGUID_DEFINITIONS -DHAVE_NEW_CROSSGUID)
-   endif()
- 
--- a/multimedia/kodi/files/patch-cmake_modules_FindLibDvdCSS.cmake
+++ b/multimedia/kodi/files/patch-cmake_modules_FindLibDvdCSS.cmake
@ -1,11 +0,0 @@
--- cmake/modules/FindLibDvdCSS.cmake.orig	2022-08-18 23:36:30 UTC
-+++ cmake/modules/FindLibDvdCSS.cmake
-@@ -63,7 +63,7 @@ if(ENABLE_DVDCSS)
-                    ${LIBDVD_ADDITIONAL_ARGS})
-   else()
-     find_program(AUTORECONF autoreconf REQUIRED)
-    find_program(MAKE_EXECUTABLE make REQUIRED)
-+    find_program(MAKE_EXECUTABLE gmake REQUIRED)
- 
-     set(CONFIGURE_COMMAND ${AUTORECONF} -vif
-                   COMMAND ac_cv_path_GIT= ./configure
--- a/multimedia/kodi/files/patch-cmake_modules_FindLibDvdNav.cmake
+++ b/multimedia/kodi/files/patch-cmake_modules_FindLibDvdNav.cmake
@ -1,11 +0,0 @@
--- cmake/modules/FindLibDvdNav.cmake.orig	2022-08-18 23:36:26 UTC
-+++ cmake/modules/FindLibDvdNav.cmake
-@@ -76,7 +76,7 @@ if(NOT TARGET LibDvdNav::LibDvdNav)
-     string(APPEND LIBDVDNAV_CFLAGS " -I$<TARGET_PROPERTY:LibDvdRead::LibDvdRead,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:LibDvdRead::LibDvdRead,INTERFACE_COMPILE_DEFINITIONS>")
- 
-     find_program(AUTORECONF autoreconf REQUIRED)
-    find_program(MAKE_EXECUTABLE make REQUIRED)
-+    find_program(MAKE_EXECUTABLE gmake REQUIRED)
- 
-     set(CONFIGURE_COMMAND ${AUTORECONF} -vif
-                   COMMAND ac_cv_path_GIT= ./configure
--- a/multimedia/kodi/files/patch-cmake_modules_FindLibDvdRead.cmake
+++ b/multimedia/kodi/files/patch-cmake_modules_FindLibDvdRead.cmake
@ -1,11 +0,0 @@
--- cmake/modules/FindLibDvdRead.cmake.orig	2022-08-18 23:36:34 UTC
-+++ cmake/modules/FindLibDvdRead.cmake
-@@ -81,7 +81,7 @@ if(NOT TARGET LibDvdRead::LibDvdRead)
-     endif()
- 
-     find_program(AUTORECONF autoreconf REQUIRED)
-    find_program(MAKE_EXECUTABLE make REQUIRED)
-+    find_program(MAKE_EXECUTABLE gmake REQUIRED)
- 
-     set(CONFIGURE_COMMAND ${AUTORECONF} -vif
-                   COMMAND ac_cv_path_GIT= ./configure
--- a/multimedia/kodi/files/patch-ffmpeg6-support
+++ b/multimedia/kodi/files/patch-ffmpeg6-support
--- a/multimedia/kodi/files/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA.cpp
+++ b/multimedia/kodi/files/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA.cpp
@ -1,6 +1,6 @@
--- xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp.orig	2022-05-22 10:57:33 UTC
+--- xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp.orig	2024-03-04 21:50:54 UTC
 +++ xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
-@@ -949,13 +949,6 @@ void CAESinkALSA::HandleError(const char* name, int er
+@@ -957,13 +957,6 @@ void CAESinkALSA::HandleError(const char* name, int er
   {
     case -EPIPE:
       CLog::Log(LOGERROR, "CAESinkALSA::HandleError({}) - underrun", name);
--- a/multimedia/kodi/files/patch-xbmc_cores_AudioEngine_Utils_AEELDParser.cpp
+++ b/multimedia/kodi/files/patch-xbmc_cores_AudioEngine_Utils_AEELDParser.cpp
@ -1,11 +0,0 @@
--- xbmc/cores/AudioEngine/Utils/AEELDParser.cpp.orig	2022-05-22 11:38:07 UTC
-+++ xbmc/cores/AudioEngine/Utils/AEELDParser.cpp
-@@ -72,7 +72,7 @@ typedef struct
- #define CEA_861_FORMAT_WMAPRO    14
- #define CEA_861_FORMAT_RESERVED2 15
- 
-#define rtrim(s) s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end())
-+#define rtrim(s) s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char c) { return !std::isspace(c); }).base(), s.end())
- 
- void CAEELDParser::Parse(const uint8_t *data, size_t length, CAEDeviceInfo& info)
- {
--- a/multimedia/kodi/pkg-plist
+++ b/multimedia/kodi/pkg-plist
@ -1,4 +1,4 @@
-bin/JsonSchemaBuilder
+bin/TexturePacker
 bin/kodi
 bin/kodi-TexturePacker
 bin/kodi-standalone
@ -151,6 +151,7 @@ share/icons/hicolor/256x256/apps/kodi.png
 share/icons/hicolor/32x32/apps/kodi.png
 share/icons/hicolor/48x48/apps/kodi.png
 share/icons/hicolor/64x64/apps/kodi.png
+share/icons/hicolor/scalable/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/resource.language.af_za/strings.po
@ -930,6 +931,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%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.fil/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
@ -1073,6 +1075,83 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/metadata.tvshows.themoviedb.org.python/resources/settings.xml
 %%DATADIR%%/addons/repository.xbmc.org/addon.xml
 %%DATADIR%%/addons/repository.xbmc.org/icon.png
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.af_za/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.am_et/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.ar_sa/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.ast_es/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.az_az/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.be_by/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.bg_bg/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.bs_ba/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.ca_es/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.cs_cz/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.cy_gb/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.da_dk/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.de_de/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.el_gr/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.en_au/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.en_gb/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.en_nz/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.en_us/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.eo/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.es_ar/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.es_es/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.es_mx/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.et_ee/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.eu_es/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.fa_af/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.fa_ir/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.fi_fi/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.fo_fo/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.fr_ca/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.fr_fr/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.gl_es/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.he_il/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.hi_in/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.hr_hr/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.hu_hu/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.hy_am/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.id_id/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.is_is/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.it_it/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.ja_jp/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.kn_in/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.ko_kr/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.lt_lt/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.lv_lv/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.mi/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.mk_mk/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.ml_in/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.mn_mn/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.ms_my/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.mt_mt/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.my_mm/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.nb_no/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.nl_nl/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.os_os/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.pl_pl/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.pt_br/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.pt_pt/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.ro_ro/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.ru_ru/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.si_lk/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.sk_sk/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.sl_si/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.sq_al/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.sr_rs/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.sr_rs@latin/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.sv_se/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.szl/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.ta_in/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.te_in/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.tg_tj/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.th_th/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.tr_tr/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.uk_ua/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.uz_uz/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.vi_vn/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.zh_cn/strings.po
+%%DATADIR%%/addons/repository.xbmc.org/resources/language/resource.language.zh_tw/strings.po
 %%DATADIR%%/addons/resource.images.weathericons.default/License.txt
 %%DATADIR%%/addons/resource.images.weathericons.default/addon.xml
 %%DATADIR%%/addons/resource.images.weathericons.default/icon.png
@ -1212,11 +1291,11 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%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/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.ar_ye/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.ast_es/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.az_az/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.be_by/strings.po
@ -1241,6 +1320,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%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.fil/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
@ -1272,10 +1352,8 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%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_md/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.scn/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/resource.language.si_lk/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
@ -1312,188 +1390,6 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%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/skin.estouchy/LICENSE.txt
-%%DATADIR%%/addons/skin.estouchy/addon.xml
-%%DATADIR%%/addons/skin.estouchy/background/primary.jpg
-%%DATADIR%%/addons/skin.estouchy/background/secondary1.png
-%%DATADIR%%/addons/skin.estouchy/background/tv.jpg
-%%DATADIR%%/addons/skin.estouchy/changelog.txt
-%%DATADIR%%/addons/skin.estouchy/colors/defaults.xml
-%%DATADIR%%/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-%%DATADIR%%/addons/skin.estouchy/fonts/noto_license.txt
-%%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
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.bs_ba/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.ca_es/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.cs_cz/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.cy_gb/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.da_dk/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.de_de/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.el_gr/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.en_au/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.en_gb/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.en_nz/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.en_us/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.eo/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.es_ar/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.es_es/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.es_mx/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.et_ee/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.eu_es/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.fa_af/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.fa_ir/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.fi_fi/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.fil/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.fo_fo/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.fr_ca/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.fr_fr/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.gl_es/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.he_il/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.hi_in/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.hr_hr/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.hu_hu/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.hy_am/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.id_id/strings.po
-%%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
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.mi/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.mk_mk/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.ml_in/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.mn_mn/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.ms_my/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.mt_mt/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.my_mm/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.nb_no/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.nl_nl/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.pl_pl/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.pt_br/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.pt_pt/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.ro_ro/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.ru_ru/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.si_lk/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.sk_sk/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.sl_si/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.sq_al/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.sr_rs/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.sr_rs@latin/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.sv_se/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.szl/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.ta_in/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.te_in/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.tg_tj/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.th_th/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.tr_tr/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.uk_ua/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.uz_uz/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.vi_vn/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.zh_cn/strings.po
-%%DATADIR%%/addons/skin.estouchy/language/resource.language.zh_tw/strings.po
-%%DATADIR%%/addons/skin.estouchy/media/Textures.xbt
-%%DATADIR%%/addons/skin.estouchy/resources/fanart.jpg
-%%DATADIR%%/addons/skin.estouchy/resources/icon.png
-%%DATADIR%%/addons/skin.estouchy/resources/screenshot-01.jpg
-%%DATADIR%%/addons/skin.estouchy/resources/screenshot-02.jpg
-%%DATADIR%%/addons/skin.estouchy/resources/screenshot-03.jpg
-%%DATADIR%%/addons/skin.estouchy/resources/screenshot-04.jpg
-%%DATADIR%%/addons/skin.estouchy/resources/screenshot-05.jpg
-%%DATADIR%%/addons/skin.estouchy/resources/screenshot-06.jpg
-%%DATADIR%%/addons/skin.estouchy/resources/screenshot-07.jpg
-%%DATADIR%%/addons/skin.estouchy/resources/screenshot-08.jpg
-%%DATADIR%%/addons/skin.estouchy/resources/screenshot-09.jpg
-%%DATADIR%%/addons/skin.estouchy/resources/screenshot-10.jpg
-%%DATADIR%%/addons/skin.estouchy/resources/screenshot-11.jpg
-%%DATADIR%%/addons/skin.estouchy/resources/screenshot-12.jpg
-%%DATADIR%%/addons/skin.estouchy/xml/AddonBrowser.xml
-%%DATADIR%%/addons/skin.estouchy/xml/CustomFirstRun.xml
-%%DATADIR%%/addons/skin.estouchy/xml/CustomVolume.xml
-%%DATADIR%%/addons/skin.estouchy/xml/Defaults.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogAddonInfo.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogAddonSettings.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogBusy.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogButtonMenu.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogColorPicker.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogConfirm.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogContextMenu.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogExtendedProgressBar.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogFavourites.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogGameControllers.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogKeyboard.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogMediaSource.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogMusicInfo.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogNotification.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogNumeric.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogPVRChannelGuide.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogPVRChannelManager.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogPVRChannelsOSD.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogPVRGroupManager.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogPVRGuideSearch.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogPVRInfo.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogPVRRadioRDSInfo.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogPictureInfo.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogPlayerProcessInfo.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogSeekBar.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogSelect.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogSettings.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogSlider.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogSubtitles.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogTextViewer.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogVideoInfo.xml
-%%DATADIR%%/addons/skin.estouchy/xml/DialogVolumeBar.xml
-%%DATADIR%%/addons/skin.estouchy/xml/EventLog.xml
-%%DATADIR%%/addons/skin.estouchy/xml/FileBrowser.xml
-%%DATADIR%%/addons/skin.estouchy/xml/FileManager.xml
-%%DATADIR%%/addons/skin.estouchy/xml/Font.xml
-%%DATADIR%%/addons/skin.estouchy/xml/GameOSD.xml
-%%DATADIR%%/addons/skin.estouchy/xml/Home.xml
-%%DATADIR%%/addons/skin.estouchy/xml/Includes.xml
-%%DATADIR%%/addons/skin.estouchy/xml/IncludesCodecFlagging.xml
-%%DATADIR%%/addons/skin.estouchy/xml/IncludesHomeRecentlyAdded.xml
-%%DATADIR%%/addons/skin.estouchy/xml/IncludesPlayerControls.xml
-%%DATADIR%%/addons/skin.estouchy/xml/LoginScreen.xml
-%%DATADIR%%/addons/skin.estouchy/xml/MusicOSD.xml
-%%DATADIR%%/addons/skin.estouchy/xml/MusicVisualisation.xml
-%%DATADIR%%/addons/skin.estouchy/xml/MyGames.xml
-%%DATADIR%%/addons/skin.estouchy/xml/MyMusicNav.xml
-%%DATADIR%%/addons/skin.estouchy/xml/MyMusicPlaylistEditor.xml
-%%DATADIR%%/addons/skin.estouchy/xml/MyPVRChannels.xml
-%%DATADIR%%/addons/skin.estouchy/xml/MyPVRGuide.xml
-%%DATADIR%%/addons/skin.estouchy/xml/MyPVRRecordings.xml
-%%DATADIR%%/addons/skin.estouchy/xml/MyPVRSearch.xml
-%%DATADIR%%/addons/skin.estouchy/xml/MyPVRTimers.xml
-%%DATADIR%%/addons/skin.estouchy/xml/MyPics.xml
-%%DATADIR%%/addons/skin.estouchy/xml/MyPlaylist.xml
-%%DATADIR%%/addons/skin.estouchy/xml/MyPrograms.xml
-%%DATADIR%%/addons/skin.estouchy/xml/MyVideoNav.xml
-%%DATADIR%%/addons/skin.estouchy/xml/MyWeather.xml
-%%DATADIR%%/addons/skin.estouchy/xml/PlayerControls.xml
-%%DATADIR%%/addons/skin.estouchy/xml/Pointer.xml
-%%DATADIR%%/addons/skin.estouchy/xml/Settings.xml
-%%DATADIR%%/addons/skin.estouchy/xml/SettingsCategory.xml
-%%DATADIR%%/addons/skin.estouchy/xml/SettingsProfile.xml
-%%DATADIR%%/addons/skin.estouchy/xml/SettingsScreenCalibration.xml
-%%DATADIR%%/addons/skin.estouchy/xml/SettingsSystemInfo.xml
-%%DATADIR%%/addons/skin.estouchy/xml/SkinSettings.xml
-%%DATADIR%%/addons/skin.estouchy/xml/SlideShow.xml
-%%DATADIR%%/addons/skin.estouchy/xml/SmartPlaylistEditor.xml
-%%DATADIR%%/addons/skin.estouchy/xml/SmartPlaylistRule.xml
-%%DATADIR%%/addons/skin.estouchy/xml/Startup.xml
-%%DATADIR%%/addons/skin.estouchy/xml/VideoFullScreen.xml
-%%DATADIR%%/addons/skin.estouchy/xml/VideoOSD.xml
-%%DATADIR%%/addons/skin.estouchy/xml/VideoOSDBookmarks.xml
-%%DATADIR%%/addons/skin.estouchy/xml/ViewsList.xml
-%%DATADIR%%/addons/skin.estouchy/xml/ViewsPVR.xml
-%%DATADIR%%/addons/skin.estouchy/xml/ViewsThumbnail.xml
-%%DATADIR%%/addons/skin.estouchy/xml/ViewsWide.xml
 %%DATADIR%%/addons/skin.estuary/LICENSE.txt
 %%DATADIR%%/addons/skin.estuary/addon.xml
 %%DATADIR%%/addons/skin.estuary/changelog.txt
@ -1661,7 +1557,6 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.estuary/xml/DialogConfirm.xml
 %%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
@ -1686,6 +1581,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.estuary/xml/DialogSubtitles.xml
 %%DATADIR%%/addons/skin.estuary/xml/DialogTextViewer.xml
 %%DATADIR%%/addons/skin.estuary/xml/DialogVideoInfo.xml
+%%DATADIR%%/addons/skin.estuary/xml/DialogVideoManager.xml
 %%DATADIR%%/addons/skin.estuary/xml/DialogVolumeBar.xml
 %%DATADIR%%/addons/skin.estuary/xml/EventLog.xml
 %%DATADIR%%/addons/skin.estuary/xml/FileBrowser.xml
@ -1909,7 +1805,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/cmake/ArchSetup.cmake
 %%DATADIR%%/cmake/CheckCommits.cmake
 %%DATADIR%%/cmake/CheckTargetPlatform.cmake
-%%DATADIR%%/cmake/GenerateVersionedFiles.cmake
+%%DATADIR%%/cmake/GenerateCompileInfo.cmake
 %%DATADIR%%/cmake/GeneratorSetup.cmake
 %%DATADIR%%/cmake/HandleDepends.cmake
 %%DATADIR%%/cmake/Macros.cmake
@ -1918,6 +1814,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/cmake/ProjectMacros.cmake
 %%DATADIR%%/media/Fonts/arial.ttf
 %%DATADIR%%/media/Fonts/teletext.ttf
+%%DATADIR%%/media/applaunch_screen.png
 %%DATADIR%%/media/banner.png
 %%DATADIR%%/media/icon120x120.png
 %%DATADIR%%/media/icon16x16.png
@ -2027,6 +1924,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/system/library/video/movies/studios.xml
 %%DATADIR%%/system/library/video/movies/tags.xml
 %%DATADIR%%/system/library/video/movies/titles.xml
+%%DATADIR%%/system/library/video/movies/versions.xml
 %%DATADIR%%/system/library/video/movies/years.xml
 %%DATADIR%%/system/library/video/musicvideos/albums.xml
 %%DATADIR%%/system/library/video/musicvideos/artists.xml
@ -2152,4 +2050,5 @@ share/icons/hicolor/64x64/apps/kodi.png
 share/man/man1/kodi.1.gz
 share/man/man1/kodi.bin.1.gz
 share/metainfo/org.xbmc.kodi.metainfo.xml
+share/wayland-sessions/kodi-gbm.desktop
 share/xsessions/kodi.desktop