d.hpp")
++      if(EXISTS "${_crossguid_include_dir}/guid.hpp")
+         list(APPEND ${${CMAKE_FIND_PACKAGE_NAME}_MODULE}_COMPILE_DEFINITIONS HAVE_NEW_CROSSGUID)
+       endif()
+     elseif(TARGET crossguid AND NOT TARGET ${${${CMAKE_FIND_PACKAGE_NAME}_MODULE}_BUILD_NAME})
+@@ -67,7 +67,7 @@ if(NOT TARGET ${APP_NAME_LC}::${CMAKE_FIND_PACKAGE_NAM
+       get_target_property(_crossguid_include_dir crossguid INTERFACE_INCLUDE_DIRECTORIES)
+ 
+       # NEW_CROSSGUID >= 0.2.0 release
+-      if(EXISTS "${_crossguid_include_dir}/crossguid/guid.hpp")
++      if(EXISTS "${_crossguid_include_dir}/guid.hpp")
          list(APPEND ${${CMAKE_FIND_PACKAGE_NAME}_MODULE}_COMPILE_DEFINITIONS HAVE_NEW_CROSSGUID)
        endif()
      else()
diff --git a/multimedia/kodi/pkg-plist b/multimedia/kodi/pkg-plist
index 4c59089c73ce..c5cffebb8d7e 100644
--- a/multimedia/kodi/pkg-plist
+++ b/multimedia/kodi/pkg-plist
@@ -652,6 +652,7 @@ share/icons/hicolor/scalable/apps/kodi.svg
 %%DATADIR%%/addons/kodi.resource/icon.png
 %%DATADIR%%/addons/kodi.resource/images.xsd
 %%DATADIR%%/addons/kodi.resource/language.xsd
+%%DATADIR%%/addons/kodi.resource/skin.xsd
 %%DATADIR%%/addons/kodi.resource/uisounds.xsd
 %%DATADIR%%/addons/metadata.album.universal/addon.xml
 %%DATADIR%%/addons/metadata.album.universal/albumuniversal.xml
@@ -684,7 +685,6 @@ share/icons/hicolor/scalable/apps/kodi.svg
 %%DATADIR%%/addons/metadata.album.universal/resources/language/resource.language.fa_af/strings.po
 %%DATADIR%%/addons/metadata.album.universal/resources/language/resource.language.fa_ir/strings.po
 %%DATADIR%%/addons/metadata.album.universal/resources/language/resource.language.fi_fi/strings.po
-%%DATADIR%%/addons/metadata.album.universal/resources/language/resource.language.fil/strings.po
 %%DATADIR%%/addons/metadata.album.universal/resources/language/resource.language.fo_fo/strings.po
 %%DATADIR%%/addons/metadata.album.universal/resources/language/resource.language.fr_ca/strings.po
 %%DATADIR%%/addons/metadata.album.universal/resources/language/resource.language.fr_fr/strings.po
@@ -698,7 +698,6 @@ share/icons/hicolor/scalable/apps/kodi.svg
 %%DATADIR%%/addons/metadata.album.universal/resources/language/resource.language.is_is/strings.po
 %%DATADIR%%/addons/metadata.album.universal/resources/language/resource.language.it_it/strings.po
 %%DATADIR%%/addons/metadata.album.universal/resources/language/resource.language.ja_jp/strings.po
-%%DATADIR%%/addons/metadata.album.universal/resources/language/resource.language.kn_in/strings.po
 %%DATADIR%%/addons/metadata.album.universal/resources/language/resource.language.ko_kr/strings.po
 %%DATADIR%%/addons/metadata.album.universal/resources/language/resource.language.lt_lt/strings.po
 %%DATADIR%%/addons/metadata.album.universal/resources/language/resource.language.lv_lv/strings.po
@@ -767,7 +766,6 @@ share/icons/hicolor/scalable/apps/kodi.svg
 %%DATADIR%%/addons/metadata.artists.universal/resources/language/resource.language.fa_af/strings.po
 %%DATADIR%%/addons/metadata.artists.universal/resources/language/resource.language.fa_ir/strings.po
 %%DATADIR%%/addons/metadata.artists.universal/resources/language/resource.language.fi_fi/strings.po
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/resource.language.fil/strings.po
 %%DATADIR%%/addons/metadata.artists.universal/resources/language/resource.language.fo_fo/strings.po
 %%DATADIR%%/addons/metadata.artists.universal/resources/language/resource.language.fr_ca/strings.po
 %%DATADIR%%/addons/metadata.artists.universal/resources/language/resource.language.fr_fr/strings.po
@@ -781,7 +779,6 @@ share/icons/hicolor/scalable/apps/kodi.svg
 %%DATADIR%%/addons/metadata.artists.universal/resources/language/resource.language.is_is/strings.po
 %%DATADIR%%/addons/metadata.artists.universal/resources/language/resource.language.it_it/strings.po
 %%DATADIR%%/addons/metadata.artists.universal/resources/language/resource.language.ja_jp/strings.po
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/resource.language.kn_in/strings.po
 %%DATADIR%%/addons/metadata.artists.universal/resources/language/resource.language.ko_kr/strings.po
 %%DATADIR%%/addons/metadata.artists.universal/resources/language/resource.language.lt_lt/strings.po
 %%DATADIR%%/addons/metadata.artists.universal/resources/language/resource.language.lv_lv/strings.po
@@ -2061,7 +2058,6 @@ share/icons/hicolor/scalable/apps/kodi.svg
 %%DATADIR%%/system/keyboardlayouts/turkish.xml
 %%DATADIR%%/system/keyboardlayouts/ukrainian.xml
 %%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
@@ -2074,6 +2070,7 @@ share/icons/hicolor/scalable/apps/kodi.svg
 %%DATADIR%%/system/keymaps/remote.xml
 %%DATADIR%%/system/keymaps/touchscreen.xml
 %%DATADIR%%/system/keymaps/wetek-play/keyboard.xml
+%%DATADIR%%/system/language-subtag-registry.txt
 %%DATADIR%%/system/library/music/addons.xml
 %%DATADIR%%/system/library/music/albums.xml
 %%DATADIR%%/system/library/music/artists.xml
@@ -2161,7 +2158,6 @@ share/icons/hicolor/scalable/apps/kodi.svg
 %%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/linux.xml