sync with upstream

3 files changed, 38 insertions, 7 deletions

diff --git a/project/cmake/installdata/addon-bindings.txt b/project/cmake/installdata/addon-bindings.txt
index 61d2bc1..5655da5 100644
--- a/project/cmake/installdata/addon-bindings.txt
+++ b/project/cmake/installdata/addon-bindings.txt
@@ -13,10 +13,11 @@ xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_epg_types.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h
-xbmc/addons/kodi-addon-dev-kit/include/kodi_peripheral_callbacks.h
-xbmc/addons/kodi-addon-dev-kit/include/kodi_peripheral_dll.h
-xbmc/addons/kodi-addon-dev-kit/include/kodi_peripheral_types.h
-xbmc/addons/kodi-addon-dev-kit/include/kodi_peripheral_utils.hpp
+xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_utils.hpp
+xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_callbacks.h
+xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h
+xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h
+xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp
 xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_dll.h
@@ -28,6 +29,9 @@ xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h
-xbmc/addons/kodi-addon-dev-kit-include/kodi/libKODI_peripheral.h
+xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_peripheral.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_codec.h
+xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h
+xbmc/cores/AudioEngine/Utils/AEChannelData.h
+xbmc/filesystem/IFileTypes.h
diff --git a/project/cmake/installdata/cmake-files.txt b/project/cmake/installdata/cmake-files.txt
new file mode 100644
index 0000000..8dda8cd
--- /dev/null
+++ b/project/cmake/installdata/cmake-files.txt
@@ -0,0 +1,13 @@
+project/cmake/scripts/common/addon-helpers.cmake
+project/cmake/scripts/common/addoptions.cmake
+project/cmake/scripts/common/archsetup.cmake
+project/cmake/scripts/common/checkcommits.cmake
+project/cmake/scripts/common/check_target_platform.cmake
+project/cmake/scripts/common/generateversionedfiles.cmake
+project/cmake/scripts/common/generatorsetup.cmake
+project/cmake/scripts/common/handle-depends.cmake
+project/cmake/scripts/common/macros.cmake
+project/cmake/scripts/common/managestring.cmake
+project/cmake/scripts/common/pathsetup.cmake
+project/cmake/scripts/common/prepare-env.cmake
+project/cmake/scripts/common/projectmacros.cmake
diff --git a/project/cmake/installdata/common/addons.txt b/project/cmake/installdata/common/addons.txt
index 7d406ad..3f86c78 100644
--- a/project/cmake/installdata/common/addons.txt
+++ b/project/cmake/installdata/common/addons.txt
@@ -1,7 +1,14 @@
+addons/audioencoder.xbmc.builtin.aac/*
+addons/audioencoder.xbmc.builtin.wma/*
+addons/game.controller.default/*
 addons/kodi.adsp/*
 addons/kodi.audiodecoder/*
+addons/kodi.game/*
+addons/kodi.inputstream/*
+addons/kodi.peripheral/*
 addons/kodi.resource/*
-addons/kodi.vfs/*
+addons/xbmc.addon/metadata.xsd
+addons/xbmc.addon/repository.xsd
 addons/xbmc.audioencoder/*
 addons/xbmc.codec/*
 addons/xbmc.core/*
@@ -10,9 +17,13 @@ addons/xbmc.metadata/*
 addons/xbmc.pvr/*
 addons/xbmc.python/*
 addons/xbmc.webinterface/*
+addons/library.kodi.adsp/*
+addons/library.kodi.audioengine/*
+addons/library.kodi.guilib/*
+addons/library.kodi.inputstream/*
+addons/library.kodi.peripheral/*
 addons/library.xbmc.addon/*
 addons/library.xbmc.codec/*
-addons/library.xbmc.gui/*
 addons/library.xbmc.pvr/*
 addons/repository.xbmc.org/*
 addons/webinterface.default/*
@@ -26,6 +37,9 @@ addons/audioencoder.xbmc.builtin.wma/*
 addons/resource.language.en_gb/*
 addons/resource.uisounds.confluence/*
 addons/resource.images.weathericons.default/*
+addons/service.xbmc.versioncheck/*
+addons/skin.estuary/*
+addons/skin.estouchy/*
 addons/metadata.local/*
 addons/metadata.album.universal/*
 addons/metadata.artists.universal/*