sync with upstream

107 files changed, 639 insertions, 820 deletions

diff --git a/cmake/README.md b/cmake/README.md
index c1b953f..8637da6 100644
--- a/cmake/README.md
+++ b/cmake/README.md
@@ -1,326 +1,85 @@
-# Kodi CMake based buildsystem
+![Kodi Logo](../docs/resources/banner_slim.png)
 
-This files describes Kodi's CMake based buildsystem. CMake is a cross-platform
-tool for generating makefiles as well as project files used by IDEs.
+# Kodi's CMake Based Build System
+Welcome to Kodi's CMake Based Build System. CMake is a cross-platform tool for generating makefiles as well as project files used by IDEs. The current version of the build system is capable of building and packaging Kodi for the following platforms:
 
-The current version of the buildsystem is capable of building and packaging
-Kodi for the following platforms:
+* Linux (several distros)
+* Windows
+* macOS and iOS
+* Android
+* FreeBSD
 
-- Linux (GNU Makefiles, Ninja)
-- Windows (NMake Makefiles, Visual Studio 14 (2015), Ninja)
-- macOS and iOS (GNU Makefiles, Xcode, Ninja)
-- Android (GNU Makefiles)
-- FreeBSD (GNU Makefiles)
+While the legacy build systems typically used in-source builds, it's recommended to use out-of-source builds with CMake. The necessary runtime dependencies such as dlls, skins and configuration files are copied over to the build directory automatically. Instructions are highly dependent on your operating system and target platform but we prepared a set of **[build guides](../docs/README.md)** for your convenience.
 
-Before building Kodi with CMake, please ensure that you have the platform
-specific dependencies installed.
-
-While the legacy build systems typically used in-source builds it's recommended
-to use out-of-source builds with CMake. The necessary runtime dependencies such
-as dlls, skins and configuration files are copied over to the build directory
-automatically.
-
-## Dependency installation
-
-### Linux
-
-The dependencies required to build on Linux can be found in
-[docs/README.xxx](https://github.com/xbmc/xbmc/tree/master/docs).
-
-### Raspberry Pi
-
-The cross compilation environment for the Raspberry Pi as well as the
-dependencies have to be installed as explained in
-[docs/README.raspberrypi](https://github.com/xbmc/xbmc/tree/master/docs/README.raspberrypi).
-
-### Windows
-
-For Windows the dependencies can be found in the
-[Wiki](https://kodi.wiki/view/HOW-TO:Compile_Kodi_for_Windows#Setting_up_the_build_Environment) (Step 1-4). If not already available on your pc, you should
-install the [Windows Software Development Kit (SDK)](https://dev.windows.com/en-us/downloads/sdk-archive) for your Windows version. This is required for HLSL shader offline compiling with the [Effect-Compiler Tool](https://msdn.microsoft.com/de-de/library/windows/desktop/bb232919(v=vs.85).aspx) (fxc.exe).
-
-On Windows, the CMake based buildsystem requires that the binary dependencies
-are downloaded using `download-dependencies.bat` and `download-msys2.bat`
-and that the mingw libs (ffmpeg, libdvd and others) are built using
-`make-mingwlibs.bat`.
-
-### macOS
-
-For macOS the required dependencies can be found in
-[docs/README.osx.md](https://github.com/xbmc/xbmc/tree/master/docs/README.osx.md).
-
-On macOS it is necessary to build the dependencies in `tools/depends` using
-`./bootstrap && ./configure --host=<PLATFORM> && make`. The other steps such
-as `make -C tools/depends/target/xbmc` and `make xcode_depends` are not needed
-as these steps are covered already by the CMake project.
-
-### Android
-
-The dependencies needed to compile for Android can be found in
-[docs/README.android](https://github.com/xbmc/xbmc/tree/master/docs/README.android)
-. All described steps have to be executed (except 5.2 which is replaced by the
-respective CMake command below).
-
-## Building Kodi
-
-This section lists the necessary commands for building Kodi with CMake.
-CMake supports different generators that can be classified into two categories:
-single- and multiconfiguration generators.
-
-A single configuration generator (GNU/NMake Makefiles) generates project files
-for a single build type (e.g. Debug, Release) specified at configure time.
-Multi configuration generators (Visual Studio, Xcode) allow to specify the
-build type at compile time.
-
-All examples below are for out-of-source builds with Kodi checked out to
-`<KODI_SRC>`:
-
-```
-mkdir kodi-build && cd kodi-build
-```
-
-### Linux with GNU Makefiles
-
-```
-cmake <KODI_SRC>
-cmake --build . -- VERBOSE=1 -j$(nproc)  # or: make VERBOSE=1 -j$(nproc)
-./kodi.bin
-```
-
-`CMAKE_BUILD_TYPE` defaults to `Release`.
-
-#### Debian package generation
-The buildsystem is capable of generating Debian packages using CPack. To generate them, `CPACK_GENERATOR` has to be set to *DEB*, i.e. executing CMake's configure step with `-DCPACK_GENERATOR=DEB`.
-You should use CMake/CPack 3.6.0 or higher. Lower versions can generate the packages but package names will be mangled.
-
-The following optional variables (which can be passed to buildsystem when executing cmake with the -D`<variable-name>=<value>` format) can be used to manipulate package type, name and version:
-
-- `DEBIAN_PACKAGE_TYPE` controls the name and version of generated packages. Accepted values are `stable`, `unstable` and `nightly` (default is `nightly`).
-- `DEBIAN_PACKAGE_EPOCH` controls package epoch (default is `2`)
-- `DEBIAN_PACKAGE_VERSION` controls package version (default is `0`)
-- `DEBIAN_PACKAGE_REVISION` controls package revision (no default is set)
-
-Packages metadata can be changed simply by editing files present in the `cpack/deb` folder
-A lot more variables are available (see cpack/CPackDebian.cmake file) but you shouldn't mess with them unless you know what you're doing.
-
-Generated packages can be found in <BUILD_DIR>/packages.
-
-### Raspberry Pi with GNU Makefiles
-
-```
-cmake -DCMAKE_TOOLCHAIN_FILE=<KODI_SRC>/tools/depends/target/Toolchain.cmake <KODI_SRC>
-cmake --build . -- VERBOSE=1 -j$(nproc)  # or: make VERBOSE=1 -j$(nproc)
-```
-
-### Windows with Visual Studio project files
-These instructions are for Visual Studio 2015. If you want to build for Visal Studio 2017, you need to target `Visual Studio 15` instead of `Visual Studio 14`.
-
-#### Build for win32
-```
-cmake -G "Visual Studio 14" <KODI_SRC>
-cmake --build . --config "Debug"  # or: Build solution with Visual Studio
-Debug\kodi.exe
-```
-
-Building on a x64 cpu can be improved, if you're on a cmake version > 3.8:
-```
-cmake -G "Visual Studio 14" -T host=x64 <KODI_SRC>
-cmake --build . --config "Debug"  # or: Build solution with Visual Studio
-Debug\kodi.exe
-```
-This will choose the x64 toolset, as windows uses the x32 toolset by default.
-
-#### Build for x64
-```
-cmake -G "Visual Studio 14 Win64" <KODI_SRC>
-cmake --build . --config "Debug"  # or: Build solution with Visual Studio
-Debug\kodi.exe
-```
-
-Building on a x64 cpu can be improved, if you're on a cmake version > 3.8:
-```
-cmake -G "Visual Studio 14 Win64" -T host=x64 <KODI_SRC>
-cmake --build . --config "Debug"  # or: Build solution with Visual Studio
-Debug\kodi.exe
-```
-This will choose the x64 toolset, as windows uses the x32 toolset by default.
-
-You can always check ``cmake --help` to see which generators are available and how to call those.
-
-#### Windows installer generation
-
-The script [project/Win32BuildSetup](https://github.com/xbmc/xbmc/blob/master/tools/buildsteps/windows/win32/BuildSetup.bat) or [project/Win64BuildSetup](https://github.com/xbmc/xbmc/blob/master/tools/buildsteps/windows/x64/BuildSetup.bat)
-builds an installable package for Windows. Choose either 32bit or 64bit, depending on what your trying to build.
-
-### Windows with NMake Makefiles
-
-```
-cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release <KODI_SRC>
-cmake --build .  # or: nmake
-kodi.exe
-```
-
-### macOS with GNU Makefiles
-
-```
-cmake -DCMAKE_TOOLCHAIN_FILE=<KODI_SRC>/tools/depends/target/Toolchain.cmake <KODI_SRC>
-cmake --build . -- VERBOSE=1 -j$(sysctl -n hw.ncpu)  # or: make VERBOSE=1 -j$(sysctl -n hw.ncpu)
-./kodi.bin
-```
-
-### macOS with Xcode project files
-
-```
-cmake -DCMAKE_TOOLCHAIN_FILE=<KODI_SRC>/tools/depends/target/Toolchain.cmake -G "Xcode" <KODI_SRC>
-cmake --build . --config "Release" -- -verbose -jobs $(sysctl -n hw.ncpu)  # or: Build solution with Xcode
-./Release/kodi.bin
-```
-
-#### macOS installer generation
-
-Afterwards an installable DMG for macOS can be built with the following command:
-
-```
-cmake --build . --config "Release" --target "dmg"  # or: make dmg
-```
-
-#### iOS package generation
-
-Consequently an installable DEB for iOS can be built with the following command:
-
-```
-make deb
-```
-
-### Android with GNU Makefiles
-
-```
-cmake -DCMAKE_TOOLCHAIN_FILE=<KODI_SRC>/tools/depends/target/Toolchain.cmake <KODI_SRC>
-cmake --build . -- VERBOSE=1 -j$(nproc)  # or: make VERBOSE=1 -j$(nproc)
-```
-
-#### Android package generation
-
-An installable APK for Android can be built with the following command:
-
-```
-make apk
-```
-
-## Options
-
-Kodi supports a number of build options that can enable or disable certain
-functionality.i These options must be set when running CMake with
-`-DENABLE_<OPTION>=<ON|OFF|AUTO`. The default is `AUTO` which enables
-the option if a certain dependency is found. For example CEC support is
-enabled if libCEC is available. `ON` forcefully enables the dependency
-and the CMake run will fail if the related dependency is not available.
-This is mostly useful for packagers. `OFF` will disable the feature.
+## Build options
+Kodi supports a number of build options that can enable or disable functionality. These options must be set when running CMake with `-DENABLE_<OPTION>=<ON|OFF|AUTO`. The default is `AUTO` which enables the option if a certain dependency is found. For example CEC support is enabled if `libCEC` is available. `ON` forcefully enables the dependency and the CMake run will **fail** if the related dependency is not available. `OFF` will disable the feature.
 
 Example for forcefully enabling VAAPI and disabling VDPAU:
-
 ```
 cmake ... -DENABLE_VAAPI=ON -DENABLE_VDPAU=OFF ...
 ```
 
-Example for building with external FFMPEG:
-
-```
-cmake ... -DFFMPEG_PATH=/opt/ffmpeg -DENABLE_INTERNAL_FFMPEG=OFF ...
-```
-
-For more information and an updated list of option, please check the
-main [CMakeLists.txt](https://github.com/xbmc/xbmc/tree/master/CMakeLists.txt).
+Unfortunately, Kodi's CMake gazillion options are not fully documented yet. For more information and an updated list of options, please check the main **[CMakeLists.txt](../CMakeLists.txt)**.
 
 ## Tests
+Kodi uses Google Test as its testing framework. Each test file is scanned for tests and these are added to CTest, which is the native test driver for CMake.
 
-Kodi uses Google Test as its testing framework. Each test file is scanned for tests and these
-are added to CTest, which is the native test driver for CMake.
-
-This scanning happens at configuration time. If tests depend on generated support files which
-should not be scanned, then those support files should be added to the SUPPORT_SOURCES
-variable as opposed to SOURCES before calling core_add_test. You might want to do this where
-the generated support files would not exist at configure time, or if they are so large that
-scanning them would take up an unreasonable amount of configure time.
+This scanning happens at configuration time. If tests depend on generated support files which should not be scanned, then those support files should be added to the `SUPPORT_SOURCES` variable as opposed to `SOURCES` before calling `core_add_test`. You might want to do this where the generated support files would not exist at configure time, or if they are so large that scanning them would take up an unreasonable amount of configure time.
 
 ## Extra targets
+When using makefile builds, a few extra targets are defined:
 
-When using the makefile builds a few extra targets are defined:
-
-- `make check` builds and executes the test suite.
-- `make check-valgrind` builds and executes the test suite with valgrind memcheck.
-- `make doc` builds the Doxygen documentation.
+* `make check` builds and executes the test suite.
+* `make check-valgrind` builds and executes the test suite with valgrind memcheck.
+* `make doc` builds the Doxygen documentation.
 
 Code coverage (with Gcov, LCOV and Gcovr) can be built on Linux:
 
-- CMake has to be executed with `-DCMAKE_BUILD_TYPE=Coverage`
-- `make coverage` generates an HTML code coverage report.
-- `make coverage_xml` generates an XML code coverage report.
+* CMake has to be executed with `-DCMAKE_BUILD_TYPE=Coverage`.
+* `make coverage` generates an HTML code coverage report.
+* `make coverage_xml` generates an XML code coverage report.
 
 ## Building binary addons
+Kodi's CMake build system integrates with the add-on build system if the GNU Makefile generator is used. This offers an easy way to build add-ons for packagers or Kodi developers who don't work on add-ons.
 
-The CMake build system integrates with the addon build system if the GNU
-Makefile generator is used. This offers an easy way to build addons for
-packagers or Kodi developers who don't work on addons.
-
+Build all add-ons:
 ```
 make binary-addons
 ```
 
-Specific addons can be built with:
-
+Build specific add-ons:
 ```
 make binary-addons ADDONS="visualization.spectrum pvr.demo"
 ```
 
-Addon developers can build single addons into the Kodi build directory
-so that the addon can be tested with self-compiled specific versions of Kodi.
-
+Add-on developers can build single add-ons into the Kodi build directory so that the add-on can be tested with self-compiled specific versions of Kodi.
 ```
-mkdir pvr.demo-build && cd pvr.demo-build
+mkdir pvr.demo-build
+cd pvr.demo-build
 cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=<KODI_BUILD_DIR>/build -DKODI_BUILD_DIR=<KODI_BUILD_DIR> <pvr.demo-SRC>
 make
 ```
 
-It is recommended to specify the directories as absolute paths. If relative
-paths are used, they are considered relative to the build directory in which
-`cmake` was executed (aka the current working working directory).
+It is recommended to specify the directories as absolute paths. If relative paths are used, they are considered relative to the build directory in which `cmake` was executed (the current working directory).
 
-Both methods work only for already existing addons. See this
-[forum thread](http://forum.kodi.tv/showthread.php?tid=219166&pid=1934922#pid1934922)
-and [addons/README.md](https://github.com/xbmc/xbmc/blob/master/cmake/addons/README.md)
-for addon development and detailed documentation about the addon build system.
+Both methods work only for already existing add-ons. See this **[forum thread](https://forum.kodi.tv/showthread.php?tid=219166&pid=1934922)** and add-ons **[README](cmake/addons/README.md)**
+for add-on development and detailed documentation about the add-on build system.
 
 ## Sanitizers
+Clang and GCC support different kinds of sanitizers. To enable a sanitizer, call CMake with the option `-DECM_ENABLE_SANITIZERS=’san1;san2;...'`. For more information about enabling the
+sanitizers, read the module **[documentation](modules/extra/ECMEnableSanitizers.cmake)**.
 
-Clang and GCC support different kinds of Sanitizers. To enable a Sanitizer call CMake with the
-option `-DECM_ENABLE_SANITIZERS=’san1;san2;...'`. For more information about enabling the
-Sanitizers read the documentation in 
-[modules/extra/ECMEnableSanitizers.cmake](https://github.com/xbmc/xbmc/tree/master/cmake/modules/extra/ECMEnableSanitizers.cmake).
-
-It is also recommended to read the sections about the Sanitizers in the [Clang 
-documentation](http://clang.llvm.org/docs/).
+It is also recommended to read the sections about sanitizers in the [Clang documentation](http://clang.llvm.org/docs/).
 
 ## Debugging the build
+In order to see the exact compiler commands `make` and `nmake` can be executed with a `VERBOSE=1` parameter.
 
-This section covers some tips that can be useful for debugging a CMake
-based build.
-
-### Verbosity (show compiler and linker parameters)
-
-In order to see the exact compiler commands `make` and `nmake` can be
-executed with a `VERBOSE=1` parameter.
-
-On Windows, this is unfortunately not enough because `nmake` uses
-temporary files to workaround `nmake`'s command string length limitations.
-In order to see verbose output the file
-[Modules/Platform/Windows.cmake](https://github.com/Kitware/CMake/blob/master/Modules/Platform/Windows.cmake#L40)
-in the local CMake installation has to be adapted by uncommenting these
-lines:
-
+On Windows, this is unfortunately not enough because `nmake` uses temporary files to workaround `nmake`'s command string length limitations.
+In order to see verbose output the file **[Modules/Platform/Windows.cmake](https://github.com/Kitware/CMake/blob/master/Modules/Platform/Windows.cmake#L40)** in the local CMake installation has to be adapted by uncommenting these lines:
 ```
 # uncomment these out to debug nmake and borland makefiles
 #set(CMAKE_START_TEMP_FILE "")
 #set(CMAKE_END_TEMP_FILE "")
 #set(CMAKE_VERBOSE_MAKEFILE 1)
 ```
+
diff --git a/cmake/addons/CMakeLists.txt b/cmake/addons/CMakeLists.txt
index 5db5dba..5fc798b 100644
--- a/cmake/addons/CMakeLists.txt
+++ b/cmake/addons/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.5)
 project(kodi-addons)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
diff --git a/cmake/addons/README.md b/cmake/addons/README.md
index 6470ee1..e04c834 100644
--- a/cmake/addons/README.md
+++ b/cmake/addons/README.md
@@ -5,7 +5,7 @@ This directory contains the cmake-based buildsystem for Kodi add-ons. It looks i
   - `<addon-id> <git-url> <git-revision>`
   - `<addon-id> <tarball-url>`
   - `<addon-id> <file://path>`
- 
+
 where
 - `<addon-id>` must be identical to the add-on's ID as defined in the add-on's addon.xml
 - `<git-url>` must be the URL of the git repository containing the add-on
diff --git a/cmake/addons/depends/common/tinyxml/tinyxml.sha256 b/cmake/addons/depends/common/tinyxml/tinyxml.sha256
new file mode 100644
index 0000000..78c07c8
--- /dev/null
+++ b/cmake/addons/depends/common/tinyxml/tinyxml.sha256
@@ -0,0 +1 @@
+8164c9ad48b9028667768a584d62f7760cfbfb90d0dd6214ad174403058da10c
diff --git a/cmake/cpack/deb/copyright b/cmake/cpack/deb/copyright
index ba82f18..3033afd 100644
--- a/cmake/cpack/deb/copyright
+++ b/cmake/cpack/deb/copyright
@@ -1920,14 +1920,6 @@ Crystal HD
     You should have received a copy of the GNU General Public License
     along with this driver.  If not, see <http://www.gnu.org/licenses/>.
 
-OpenSSH
-<http://www.openssh.org/>
-
-    Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-    All rights reserved.
-
-    See the section 'License: OpenSSH' for full license terms.
-
 Enca - Extremely Naive Charset Analyser
 <http://freshmeat.net/projects/enca/>
 
@@ -2916,211 +2908,3 @@ We are required to state that
     CompuServe Incorporated."
 
 -- End of IJG License --
-
-License: OpenSSH
-
-This file is part of the OpenSSH software.
-
-The licences which components of this software fall under are as
-follows.  First, we will summarize and say that all components
-are under a BSD licence, or a licence more free than that.
-
-OpenSSH contains no GPL code.
-
-1)
-     * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-     *                    All rights reserved
-     *
-     * As far as I am concerned, the code I have written for this software
-     * can be used freely for any purpose.  Any derived versions of this
-     * software must be clearly marked as such, and if the derived work is
-     * incompatible with the protocol description in the RFC file, it must be
-     * called by a name other than "ssh" or "Secure Shell".
-
-    [Tatu continues]
-     *  However, I am not implying to give any licenses to any patents or
-     * copyrights held by third parties, and the software includes parts that
-     * are not under my direct control.  As far as I know, all included
-     * source code is used in accordance with the relevant license agreements
-     * and can be used freely for any purpose (the GNU license being the most
-     * restrictive); see below for details.
-
-    [However, none of that term is relevant at this point in time.  All of
-    these restrictively licenced software components which he talks about
-    have been removed from OpenSSH, i.e.,
-
-     - RSA is no longer included, found in the OpenSSL library
-     - IDEA is no longer included, its use is deprecated
-     - DES is now external, in the OpenSSL library
-     - GMP is no longer used, and instead we call BN code from OpenSSL
-     - Zlib is now external, in a library
-     - The make-ssh-known-hosts script is no longer included
-     - TSS has been removed
-     - MD5 is now external, in the OpenSSL library
-     - RC4 support has been replaced with ARC4 support from OpenSSL
-     - Blowfish is now external, in the OpenSSL library
-
-    [The licence continues]
-
-    Note that any information and cryptographic algorithms used in this
-    software are publicly available on the Internet and at any major
-    bookstore, scientific library, and patent office worldwide.  More
-    information can be found e.g. at "http://www.cs.hut.fi/crypto".
-
-    The legal status of this program is some combination of all these
-    permissions and restrictions.  Use only at your own responsibility.
-    You will be responsible for any legal consequences yourself; I am not
-    making any claims whether possessing or using this is legal or not in
-    your country, and I am not taking any responsibility on your behalf.
-
-
-          NO WARRANTY
-
-    BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-    FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-    PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-    OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-    TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-    PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-    REPAIR OR CORRECTION.
-
-    IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-    WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-    INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-    OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-    TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-    YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-    PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-2)
-    The 32-bit CRC compensation attack detector in deattack.c was
-    contributed by CORE SDI S.A. under a BSD-style license.
-
-     * Cryptographic attack detector for ssh - source code
-     *
-     * Copyright (c) 1998 CORE SDI S.A., Buenos Aires, Argentina.
-     *
-     * All rights reserved. Redistribution and use in source and binary
-     * forms, with or without modification, are permitted provided that
-     * this copyright notice is retained.
-     *
-     * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-     * WARRANTIES ARE DISCLAIMED. IN NO EVENT SHALL CORE SDI S.A. BE
-     * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY OR
-     * CONSEQUENTIAL DAMAGES RESULTING FROM THE USE OR MISUSE OF THIS
-     * SOFTWARE.
-     *
-     * Ariel Futoransky <futo@core-sdi.com>
-     * <http://www.core-sdi.com>
-
-3)
-    ssh-keyscan was contributed by David Mazieres under a BSD-style
-    license.
-
-     * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
-     *
-     * Modification and redistribution in source and binary forms is
-     * permitted provided that due credit is given to the author and the
-     * OpenBSD project by leaving this copyright notice intact.
-
-4)
-    The Rijndael implementation by Vincent Rijmen, Antoon Bosselaers
-    and Paulo Barreto is in the public domain and distributed
-    with the following license:
-
-     * @version 3.0 (December 2000)
-     *
-     * Optimised ANSI C code for the Rijndael cipher (now AES)
-     *
-     * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
-     * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
-     * @author Paulo Barreto <paulo.barreto@terra.com.br>
-     *
-     * This code is hereby placed in the public domain.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
-     * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-     * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-     * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
-     * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-     * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-     * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-     * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-     * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-     * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-5)
-    One component of the ssh source code is under a 3-clause BSD license,
-    held by the University of California, since we pulled these parts from
-    original Berkeley code.
-
-     * Copyright (c) 1983, 1990, 1992, 1993, 1995
-     *      The Regents of the University of California.  All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without
-     * modification, are permitted provided that the following conditions
-     * are met:
-     * 1. Redistributions of source code must retain the above copyright
-     *    notice, this list of conditions and the following disclaimer.
-     * 2. Redistributions in binary form must reproduce the above copyright
-     *    notice, this list of conditions and the following disclaimer in the
-     *    documentation and/or other materials provided with the distribution.
-     * 3. Neither the name of the University nor the names of its contributors
-     *    may be used to endorse or promote products derived from this software
-     *    without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-     * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-     * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
-     * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-     * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-     * THE POSSIBILITY OF SUCH DAMAGE.
-
-6)
-    Remaining components of the software are provided under a standard
-    2-term BSD licence with the following names as copyright holders:
-
-  Markus Friedl
-  Theo de Raadt
-  Niels Provos
-  Dug Song
-  Aaron Campbell
-  Damien Miller
-  Kevin Steves
-  Daniel Kouril
-  Wesley Griffin
-  Per Allansson
-  Nils Nordman
-  Simon Wilkinson
-
-     * Redistribution and use in source and binary forms, with or without
-     * modification, are permitted provided that the following conditions
-     * are met:
-     * 1. Redistributions of source code must retain the above copyright
-     *    notice, this list of conditions and the following disclaimer.
-     * 2. Redistributions in binary form must reproduce the above copyright
-     *    notice, this list of conditions and the following disclaimer in the
-     *    documentation and/or other materials provided with the distribution.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-     * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-     * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-     * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-     * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-     * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-     * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-     * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-     * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-     * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--- End of OpenSSH License --
diff --git a/cmake/cpack/deb/packages/kodi-bin.txt.in b/cmake/cpack/deb/packages/kodi-bin.txt.in
index 2ece66f..0e31451 100644
--- a/cmake/cpack/deb/packages/kodi-bin.txt.in
+++ b/cmake/cpack/deb/packages/kodi-bin.txt.in
@@ -15,7 +15,7 @@ PACKAGE_ARCHITECTURE
 PACKAGE_SECTION video
 PACKAGE_PRIORITY optional
 PACKAGE_SHLIBDEPS ON
-PACKAGE_DEPENDS 
+PACKAGE_DEPENDS
 PACKAGE_RECOMMENDS
 PACKAGE_SUGGESTS
 PACKAGE_BREAKS xbmc-bin (<< 2:14.0~git20141019), xbmc-common
diff --git a/cmake/cpack/deb/packages/kodi-tools-texturepacker.txt.in b/cmake/cpack/deb/packages/kodi-tools-texturepacker.txt.in
index 36e8297..79c1f0f 100644
--- a/cmake/cpack/deb/packages/kodi-tools-texturepacker.txt.in
+++ b/cmake/cpack/deb/packages/kodi-tools-texturepacker.txt.in
@@ -15,7 +15,7 @@ PACKAGE_ARCHITECTURE
 PACKAGE_SECTION video
 PACKAGE_PRIORITY optional
 PACKAGE_SHLIBDEPS ON
-PACKAGE_DEPENDS 
+PACKAGE_DEPENDS
 PACKAGE_RECOMMENDS
 PACKAGE_SUGGESTS
 PACKAGE_BREAKS
diff --git a/cmake/cpack/deb/packages/kodi.txt.in b/cmake/cpack/deb/packages/kodi.txt.in
index 90ae9ea..5ab8905 100644
--- a/cmake/cpack/deb/packages/kodi.txt.in
+++ b/cmake/cpack/deb/packages/kodi.txt.in
@@ -15,7 +15,7 @@ PACKAGE_ARCHITECTURE all
 PACKAGE_SECTION video
 PACKAGE_PRIORITY optional
 PACKAGE_SHLIBDEPS
-PACKAGE_DEPENDS @APP_NAME_LC@-bin (>= @CPACK_DEBIAN_PACKAGE_VERSION@), @APP_NAME_LC@-bin (<< @CPACK_DEBIAN_PACKAGE_VERSION@.1~), curl, libcurl4 | libcurl3, mesa-utils, x11-utils, fonts-liberation | ttf-liberation, fonts-dejavu-core | ttf-dejavu-core, python-bluez | python-lightblue, python-imaging | python-pil, python-simplejson, libass9 | libass5 | libass4, libgif5 | libgif7, libssh-4 | libssh2-1, libnfs8 | libnfs4 | libnfs1, libbluray1 | libbluray2, libshairplay0, libvorbisfile3, libaacs0, libcec4, libgnutls30 | libgnutls-deb0-28 | libgnutls28 | libgnutls26, libxslt1.1, libyajl2
+PACKAGE_DEPENDS @APP_NAME_LC@-bin (>= @CPACK_DEBIAN_PACKAGE_VERSION@), @APP_NAME_LC@-bin (<< @CPACK_DEBIAN_PACKAGE_VERSION@.1~), curl, libcurl4 | libcurl3, mesa-utils, x11-utils, fonts-liberation | ttf-liberation, fonts-dejavu-core | ttf-dejavu-core, python-bluez | python-lightblue, python-imaging | python-pil, python-simplejson, libass9 | libass5 | libass4, libgif5 | libgif7, libnfs8 | libnfs4 | libnfs1, libbluray1 | libbluray2, libshairplay0, libvorbisfile3, libaacs0, libcec4, libgnutls30 | libgnutls-deb0-28 | libgnutls28 | libgnutls26, libxslt1.1, libyajl2
 PACKAGE_RECOMMENDS libvdpau1, libva-intel-vaapi-driver, libva1
 PACKAGE_SUGGESTS @APP_NAME_LC@-pvr-mythtv, @APP_NAME_LC@-pvr-vuplus, @APP_NAME_LC@-pvr-vdr-vnsi, @APP_NAME_LC@-pvr-njoy, @APP_NAME_LC@-pvr-nextpvr, @APP_NAME_LC@-pvr-mediaportal-tvserver, @APP_NAME_LC@-pvr-tvheadend-hts, @APP_NAME_LC@-pvr-dvbviewer, @APP_NAME_LC@-pvr-argustv, @APP_NAME_LC@-pvr-iptvsimple, @APP_NAME_LC@-audioencoder-vorbis, @APP_NAME_LC@-audioencoder-flac, @APP_NAME_LC@-audioencoder-lame
 PACKAGE_BREAKS xbmc (<< 2:14.0~git20141019), xbmc-data, xbmc-standalone
diff --git a/cmake/installdata/ios/certificates.txt b/cmake/installdata/common/certificates.txt
index 14e74a7..14e74a7 100644
--- a/cmake/installdata/ios/certificates.txt
+++ b/cmake/installdata/common/certificates.txt
diff --git a/cmake/installdata/ios/packaging.txt b/cmake/installdata/ios/packaging.txt
index ce990b5..3d5ae4a 100644
--- a/cmake/installdata/ios/packaging.txt
+++ b/cmake/installdata/ios/packaging.txt
@@ -1,3 +1,3 @@
-LICENSE.gpl
+LICENSE.md
 privacy-policy.txt
 xbmc/platform/darwin/Credits.html
diff --git a/cmake/installdata/osx/certificates.txt b/cmake/installdata/osx/certificates.txt
deleted file mode 100644
index 14e74a7..0000000
--- a/cmake/installdata/osx/certificates.txt
+++ /dev/null
@@ -1 +0,0 @@
-tools/depends/target/openssl/cacert.pem system/certs
\ No newline at end of file
diff --git a/cmake/installdata/osx/packaging.txt b/cmake/installdata/osx/packaging.txt
index f869e4c..f9ae368 100644
--- a/cmake/installdata/osx/packaging.txt
+++ b/cmake/installdata/osx/packaging.txt
@@ -1,4 +1,4 @@
-LICENSE.gpl
+LICENSE.md
 privacy-policy.txt
 xbmc/platform/darwin/Credits.html
 tools/darwin/packaging/media/osx/icon.iconset/*
diff --git a/cmake/installdata/windowsstore/certificates.txt b/cmake/installdata/windowsstore/certificates.txt
deleted file mode 100644
index 14e74a7..0000000
--- a/cmake/installdata/windowsstore/certificates.txt
+++ /dev/null
@@ -1 +0,0 @@
-tools/depends/target/openssl/cacert.pem system/certs
\ No newline at end of file
diff --git a/cmake/messages/flatbuffers/retroplayer.txt b/cmake/messages/flatbuffers/retroplayer.txt
new file mode 100644
index 0000000..3d42d5c
--- /dev/null
+++ b/cmake/messages/flatbuffers/retroplayer.txt
@@ -0,0 +1 @@
+xbmc/cores/RetroPlayer/messages                                 cores/RetroPlayer/messages
diff --git a/cmake/modules/FindAML.cmake b/cmake/modules/FindAML.cmake
index 602f5d9..89d1fd9 100644
--- a/cmake/modules/FindAML.cmake
+++ b/cmake/modules/FindAML.cmake
@@ -3,7 +3,7 @@
 # -------
 # Finds the AML codec
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # AML_FOUND - system has AML
 # AML_INCLUDE_DIRS - the AML include directory
diff --git a/cmake/modules/FindASS.cmake b/cmake/modules/FindASS.cmake
index 2d592fa..cb9d732 100644
--- a/cmake/modules/FindASS.cmake
+++ b/cmake/modules/FindASS.cmake
@@ -3,7 +3,7 @@
 # -------
 # Finds the ASS library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # ASS_FOUND - system has ASS
 # ASS_INCLUDE_DIRS - the ASS include directory
diff --git a/cmake/modules/FindAlsa.cmake b/cmake/modules/FindAlsa.cmake
index ae05817..fdc7db8 100644
--- a/cmake/modules/FindAlsa.cmake
+++ b/cmake/modules/FindAlsa.cmake
@@ -3,7 +3,7 @@
 # --------
 # Finds the Alsa library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # ALSA_FOUND - system has Alsa
 # ALSA_INCLUDE_DIRS - the Alsa include directory
diff --git a/cmake/modules/FindAvahi.cmake b/cmake/modules/FindAvahi.cmake
index 068b292..e0e6689 100644
--- a/cmake/modules/FindAvahi.cmake
+++ b/cmake/modules/FindAvahi.cmake
@@ -3,7 +3,7 @@
 # ---------
 # Finds the avahi library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # AVAHI_FOUND - system has avahi
 # AVAHI_INCLUDE_DIRS - the avahi include directory
diff --git a/cmake/modules/FindBluetooth.cmake b/cmake/modules/FindBluetooth.cmake
index a69980d..7ca99bb 100644
--- a/cmake/modules/FindBluetooth.cmake
+++ b/cmake/modules/FindBluetooth.cmake
@@ -3,7 +3,7 @@
 # ---------
 # Finds the Bluetooth library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # BLUETOOTH_FOUND - system has Bluetooth
 # BLUETOOTH_INCLUDE_DIRS - the Bluetooth include directory
diff --git a/cmake/modules/FindBluray.cmake b/cmake/modules/FindBluray.cmake
index 3c29f54..58a9a91 100644
--- a/cmake/modules/FindBluray.cmake
+++ b/cmake/modules/FindBluray.cmake
@@ -3,7 +3,7 @@
 # ----------
 # Finds the libbluray library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # BLURAY_FOUND - system has libbluray
 # BLURAY_INCLUDE_DIRS - the libbluray include directory
@@ -30,20 +30,13 @@ if(NOT BLURAY_VERSION AND EXISTS ${BLURAY_INCLUDE_DIR}/libbluray/bluray-version.
   unset(_bluray_version_str)
 endif()
 
-include(FindPackageHandleStandardArgs)
-if(NOT WIN32)
-  find_library(BLURAY_LIBRARY NAMES bluray
-                              PATHS ${PC_BLURAY_LIBDIR})
+find_library(BLURAY_LIBRARY NAMES bluray libbluray
+                            PATHS ${PC_BLURAY_LIBDIR})
 
-  find_package_handle_standard_args(Bluray
-                                    REQUIRED_VARS BLURAY_LIBRARY BLURAY_INCLUDE_DIR BLURAY_VERSION
-                                    VERSION_VAR BLURAY_VERSION)
-else()
-  # Dynamically loaded DLL
-  find_package_handle_standard_args(Bluray
-                                    REQUIRED_VARS BLURAY_INCLUDE_DIR
-                                    VERSION_VAR BLURAY_VERSION)
-endif()
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Bluray
+                                  REQUIRED_VARS BLURAY_LIBRARY BLURAY_INCLUDE_DIR BLURAY_VERSION
+                                  VERSION_VAR BLURAY_VERSION)
 
 if(BLURAY_FOUND)
   set(BLURAY_LIBRARIES ${BLURAY_LIBRARY})
diff --git a/cmake/modules/FindCEC.cmake b/cmake/modules/FindCEC.cmake
index bd6fd1d..00b2e12 100644
--- a/cmake/modules/FindCEC.cmake
+++ b/cmake/modules/FindCEC.cmake
@@ -3,7 +3,7 @@
 # -------
 # Finds the libCEC library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # CEC_FOUND - system has libCEC
 # CEC_INCLUDE_DIRS - the libCEC include directory
@@ -33,20 +33,13 @@ if(NOT CEC_FIND_VERSION)
   set(CEC_FIND_VERSION 4.0.0)
 endif()
 
-include(FindPackageHandleStandardArgs)
-if(NOT WIN32)
-  find_library(CEC_LIBRARY NAMES cec
-                           PATHS ${PC_CEC_LIBDIR})
+find_library(CEC_LIBRARY NAMES cec
+                         PATHS ${PC_CEC_LIBDIR})
 
-  find_package_handle_standard_args(CEC
-                                    REQUIRED_VARS CEC_LIBRARY CEC_INCLUDE_DIR
-                                    VERSION_VAR CEC_VERSION)
-else()
-  # Dynamically loaded DLL
-  find_package_handle_standard_args(CEC
-                                    REQUIRED_VARS CEC_INCLUDE_DIR
-                                    VERSION_VAR CEC_VERSION)
-endif()
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CEC
+                                  REQUIRED_VARS CEC_LIBRARY CEC_INCLUDE_DIR
+                                  VERSION_VAR CEC_VERSION)
 
 if(CEC_FOUND)
   set(CEC_LIBRARIES ${CEC_LIBRARY})
diff --git a/cmake/modules/FindCWiid.cmake b/cmake/modules/FindCWiid.cmake
index 88cfbef..af9e391 100644
--- a/cmake/modules/FindCWiid.cmake
+++ b/cmake/modules/FindCWiid.cmake
@@ -3,7 +3,7 @@
 # ---------
 # Finds the CWiid library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # CWIID_FOUND - system has CWiid
 # CWIID_INCLUDE_DIRS - the CWiid include directory
diff --git a/cmake/modules/FindCdio.cmake b/cmake/modules/FindCdio.cmake
index cce7f2a..91ba7bc 100644
--- a/cmake/modules/FindCdio.cmake
+++ b/cmake/modules/FindCdio.cmake
@@ -3,7 +3,7 @@
 # --------
 # Finds the cdio library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # CDIO_FOUND - system has cdio
 # CDIO_INCLUDE_DIRS - the cdio include directory
diff --git a/cmake/modules/FindCurl.cmake b/cmake/modules/FindCurl.cmake
index 17c1f01..6ccf44a 100644
--- a/cmake/modules/FindCurl.cmake
+++ b/cmake/modules/FindCurl.cmake
@@ -3,7 +3,7 @@
 # --------
 # Finds the Curl library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # CURL_FOUND - system has Curl
 # CURL_INCLUDE_DIRS - the Curl include directory
diff --git a/cmake/modules/FindDBus.cmake b/cmake/modules/FindDBus.cmake
index 9ea4f8f..df3edc5 100644
--- a/cmake/modules/FindDBus.cmake
+++ b/cmake/modules/FindDBus.cmake
@@ -3,7 +3,7 @@
 # -------
 # Finds the DBUS library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # DBUS_FOUND - system has DBUS
 # DBUS_INCLUDE_DIRS - the DBUS include directory
diff --git a/cmake/modules/FindEGL.cmake b/cmake/modules/FindEGL.cmake
index 331ac39..0b73eb8 100644
--- a/cmake/modules/FindEGL.cmake
+++ b/cmake/modules/FindEGL.cmake
@@ -3,7 +3,7 @@
 # -------
 # Finds the EGL library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # EGL_FOUND - system has EGL
 # EGL_INCLUDE_DIRS - the EGL include directory
diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake
index e2fbe8d..ef74671 100644
--- a/cmake/modules/FindFFMPEG.cmake
+++ b/cmake/modules/FindFFMPEG.cmake
@@ -18,7 +18,7 @@
 #               usage: -DWITH_FFMPEG=/path/to/ffmpeg_install_prefix
 #
 # --------
-# This module will will define the following variables:
+# This module will define the following variables:
 #
 # FFMPEG_FOUND - system has FFmpeg
 # FFMPEG_INCLUDE_DIRS - FFmpeg include directory
@@ -33,14 +33,14 @@
 #
 
 # required ffmpeg library versions
-set(REQUIRED_FFMPEG_VERSION 3.4)
-set(_avcodec_ver ">=57.107.100")
-set(_avfilter_ver ">=6.107.100")
-set(_avformat_ver ">=57.83.100")
-set(_avutil_ver ">=55.78.100")
-set(_swscale_ver ">=4.8.100")
-set(_swresample_ver ">=2.9.100")
-set(_postproc_ver ">=54.7.100")
+set(REQUIRED_FFMPEG_VERSION 4.0)
+set(_avcodec_ver ">=58.18.100")
+set(_avfilter_ver ">=7.16.100")
+set(_avformat_ver ">=58.12.100")
+set(_avutil_ver ">=56.14.100")
+set(_swscale_ver ">=5.1.100")
+set(_swresample_ver ">=3.1.100")
+set(_postproc_ver ">=55.1.100")
 
 
 # Allows building with external ffmpeg not found in system paths,
@@ -229,6 +229,11 @@ if(NOT FFMPEG_FOUND)
     message(STATUS "FFMPEG_URL: ${FFMPEG_URL}")
   endif()
 
+  set(FFMPEG_OPTIONS -DENABLE_CCACHE=${ENABLE_CCACHE}
+                     -DCCACHE_PROGRAM=${CCACHE_PROGRAM}
+                     -DENABLE_VAAPI=${ENABLE_VAAPI}
+                     -DENABLE_VDPAU=${ENABLE_VDPAU})
+
   if(KODI_DEPENDSBUILD)
     set(CROSS_ARGS -DDEPENDS_PATH=${DEPENDS_PATH}
                    -DPKG_CONFIG_EXECUTABLE=${PKG_CONFIG_EXECUTABLE}
@@ -237,6 +242,8 @@ if(NOT FFMPEG_FOUND)
                    -DOS=${OS}
                    -DCMAKE_AR=${CMAKE_AR})
   endif()
+  set(LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
+  list(APPEND LINKER_FLAGS ${SYSTEM_LDFLAGS})
 
   externalproject_add(ffmpeg
                       URL ${FFMPEG_URL}
@@ -255,8 +262,9 @@ if(NOT FFMPEG_FOUND)
                                  -DENABLE_CCACHE=${ENABLE_CCACHE}
                                  -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
                                  -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-                                 -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
+                                 -DCMAKE_EXE_LINKER_FLAGS=${LINKER_FLAGS}
                                  ${CROSS_ARGS}
+                                 ${FFMPEG_OPTIONS}
                       PATCH_COMMAND ${CMAKE_COMMAND} -E copy
                                     ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/CMakeLists.txt
                                     <SOURCE_DIR> &&
diff --git a/cmake/modules/FindFlatBuffers.cmake b/cmake/modules/FindFlatBuffers.cmake
new file mode 100644
index 0000000..6f7e6a2
--- /dev/null
+++ b/cmake/modules/FindFlatBuffers.cmake
@@ -0,0 +1,72 @@
+# FindFlatBuffers
+# --------
+# Find the FlatBuffers schema compiler and headers
+#
+# This will define the following variables:
+#
+# FLATBUFFERS_FOUND - system has FlatBuffers compiler and headers
+# FLATBUFFERS_FLATC_EXECUTABLE - the flatc compiler executable
+# FLATBUFFERS_INCLUDE_DIRS - the FlatFuffers include directory
+# FLATBUFFERS_MESSAGES_INCLUDE_DIR - the directory for generated headers
+
+if(ENABLE_INTERNAL_FLATBUFFERS)
+  include(ExternalProject)
+  file(STRINGS ${CMAKE_SOURCE_DIR}/tools/depends/native/flatbuffers-native/Makefile VER REGEX "^[ ]*VERSION[ ]*=.+$")
+  string(REGEX REPLACE "^[ ]*VERSION[ ]*=[ ]*" "" FLATBUFFERS_VER "${VER}")
+
+  # Allow user to override the download URL with a local tarball
+  # Needed for offline build envs
+  if(FLATBUFFERS_URL)
+    get_filename_component(FLATBUFFERS_URL "${FLATBUFFERS_URL}" ABSOLUTE)
+  else()
+    set(FLATBUFFERS_URL http://mirrors.kodi.tv/build-deps/sources/flatbuffers-${FLATBUFFERS_VER}.tar.gz)
+  endif()
+  if(VERBOSE)
+    message(STATUS "FLATBUFFERS_URL: ${FLATBUFFERS_URL}")
+  endif()
+
+  set(FLATBUFFERS_FLATC_EXECUTABLE ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/bin/flatc CACHE INTERNAL "FlatBuffer compiler")
+  set(FLATBUFFERS_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include CACHE INTERNAL "FlatBuffer include dir")
+
+  externalproject_add(flatbuffers
+                      URL ${FLATBUFFERS_URL}
+                      DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/download
+                      PREFIX ${CORE_BUILD_DIR}/flatbuffers
+                      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
+                                 -DCMAKE_BUILD_TYPE=Release
+                                 -DFLATBUFFERS_CODE_COVERAGE=OFF
+                                 -DFLATBUFFERS_BUILD_TESTS=OFF
+                                 -DFLATBUFFERS_INSTALL=ON
+                                 -DFLATBUFFERS_BUILD_FLATLIB=OFF
+                                 -DFLATBUFFERS_BUILD_FLATC=ON
+                                 -DFLATBUFFERS_BUILD_FLATHASH=OFF
+                                 -DFLATBUFFERS_BUILD_GRPCTEST=OFF
+                                 -DFLATBUFFERS_BUILD_SHAREDLIB=OFF
+                                 "${EXTRA_ARGS}"
+                      PATCH_COMMAND patch -p1 < ${CORE_SOURCE_DIR}/tools/depends/native/flatbuffers-native/0001-Fix-compiler-warning.patch
+                      BUILD_BYPRODUCTS ${FLATBUFFERS_FLATC_EXECUTABLE})
+  set_target_properties(flatbuffers PROPERTIES FOLDER "External Projects"
+                                    INTERFACE_INCLUDE_DIRECTORIES ${FLATBUFFERS_INCLUDE_DIR})
+else()
+  find_program(FLATBUFFERS_FLATC_EXECUTABLE NAMES flatc)
+  find_path(FLATBUFFERS_INCLUDE_DIR NAMES flatbuffers/flatbuffers.h)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(FlatBuffers
+                                  REQUIRED_VARS FLATBUFFERS_FLATC_EXECUTABLE FLATBUFFERS_INCLUDE_DIR
+                                  VERSION_VAR FLATBUFFERS_VER)
+
+if(FLATBUFFERS_FOUND)
+  set(FLATBUFFERS_MESSAGES_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cores/RetroPlayer/messages CACHE INTERNAL "Generated FlatBuffer headers")
+  set(FLATBUFFERS_INCLUDE_DIRS ${FLATBUFFERS_INCLUDE_DIR} ${FLATBUFFERS_MESSAGES_INCLUDE_DIR})
+
+  if(NOT TARGET flatbuffers)
+    add_library(flatbuffers UNKNOWN IMPORTED)
+    set_target_properties(flatbuffers PROPERTIES
+                               FOLDER "External Projects"
+                               INTERFACE_INCLUDE_DIRECTORIES ${FLATBUFFERS_INCLUDE_DIR})
+  endif()
+endif()
+
+mark_as_advanced(FLATBUFFERS_FLATC_EXECUTABLE FLATBUFFERS_INCLUDE_DIR)
diff --git a/cmake/modules/FindFmt.cmake b/cmake/modules/FindFmt.cmake
index 5e47509..df18d85 100644
--- a/cmake/modules/FindFmt.cmake
+++ b/cmake/modules/FindFmt.cmake
@@ -30,7 +30,7 @@ if(ENABLE_INTERNAL_FMT)
 
   if(APPLE)
     set(EXTRA_ARGS "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}")
-  endif()  
+  endif()
 
   set(FMT_LIBRARY ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/libfmt.a)
   set(FMT_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include)
@@ -90,14 +90,13 @@ if(FMT_FOUND)
   set(FMT_LIBRARIES ${FMT_LIBRARY})
   set(FMT_INCLUDE_DIRS ${FMT_INCLUDE_DIR})
 
-  if(NOT TARGET Fmt::Fmt)
-    add_library(Fmt::Fmt UNKNOWN IMPORTED)
-    set_target_properties(Fmt::Fmt PROPERTIES
-                                     IMPORTED_LOCATION "${FMT_LIBRARY}"
-                                     INTERFACE_INCLUDE_DIRECTORIES "${FMT_INCLUDE_DIR}")
+  if(NOT TARGET fmt)
+    add_library(fmt UNKNOWN IMPORTED)
+    set_target_properties(fmt PROPERTIES
+                               IMPORTED_LOCATION "${FMT_LIBRARY}"
+                               INTERFACE_INCLUDE_DIRECTORIES "${FMT_INCLUDE_DIR}")
   endif()
 endif()
 
-mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)
-
 endif()
+mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)
diff --git a/cmake/modules/FindFreeType.cmake b/cmake/modules/FindFreeType.cmake
index fb4c668..8a39555 100644
--- a/cmake/modules/FindFreeType.cmake
+++ b/cmake/modules/FindFreeType.cmake
@@ -3,7 +3,7 @@
 # ------------
 # Finds the FreeType library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # FREETYPE_FOUND - system has FreeType
 # FREETYPE_INCLUDE_DIRS - the FreeType include directory
diff --git a/cmake/modules/FindFriBidi.cmake b/cmake/modules/FindFriBidi.cmake
index dcaeb48..91f3994 100644
--- a/cmake/modules/FindFriBidi.cmake
+++ b/cmake/modules/FindFriBidi.cmake
@@ -3,7 +3,7 @@
 # -----------
 # Finds the GNU FriBidi library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # FRIBIDI_FOUND - system has FriBidi
 # FRIBIDI_INCLUDE_DIRS - the FriBidi include directory
diff --git a/cmake/modules/FindGBM.cmake b/cmake/modules/FindGBM.cmake
index ac95241..37a26a7 100644
--- a/cmake/modules/FindGBM.cmake
+++ b/cmake/modules/FindGBM.cmake
@@ -2,7 +2,7 @@
 # ----------
 # Finds the GBM library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # GBM_FOUND - system has GBM
 # GBM_INCLUDE_DIRS - the GBM include directory
@@ -29,11 +29,35 @@ find_package_handle_standard_args(GBM
                                   REQUIRED_VARS GBM_LIBRARY GBM_INCLUDE_DIR
                                   VERSION_VAR GBM_VERSION)
 
+include(CheckCSourceCompiles)
+set(CMAKE_REQUIRED_LIBRARIES ${GBM_LIBRARY})
+check_c_source_compiles("#include <gbm.h>
+
+                         int main()
+                         {
+                           gbm_bo_map(NULL, 0, 0, 0, 0, GBM_BO_TRANSFER_WRITE, NULL, NULL);
+                         }
+                         " GBM_HAS_BO_MAP)
+
+check_c_source_compiles("#include <gbm.h>
+
+                         int main()
+                         {
+                           gbm_surface_create_with_modifiers(NULL, 0, 0, 0, NULL, 0);
+                         }
+                         " GBM_HAS_MODIFIERS)
+
 if(GBM_FOUND)
   set(GBM_LIBRARIES ${GBM_LIBRARY})
   set(GBM_INCLUDE_DIRS ${GBM_INCLUDE_DIR})
   set(GBM_DEFINITIONS -DHAVE_GBM=1)
-    if(NOT TARGET GBM::GBM)
+  if(GBM_HAS_BO_MAP)
+    list(APPEND GBM_DEFINITIONS -DHAS_GBM_BO_MAP=1)
+  endif()
+  if(GBM_HAS_MODIFIERS)
+    list(APPEND GBM_DEFINITIONS -DHAS_GBM_MODIFIERS=1)
+  endif()
+  if(NOT TARGET GBM::GBM)
     add_library(GBM::GBM UNKNOWN IMPORTED)
     set_target_properties(GBM::GBM PROPERTIES
                                    IMPORTED_LOCATION "${GBM_LIBRARY}"
diff --git a/cmake/modules/FindGIF.cmake b/cmake/modules/FindGIF.cmake
index 8649bd4..1c616e0 100644
--- a/cmake/modules/FindGIF.cmake
+++ b/cmake/modules/FindGIF.cmake
@@ -3,7 +3,7 @@
 # -------
 # Finds the libgif library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # GIF_FOUND - system has libgif
 # GIF_INCLUDE_DIRS - the libgif include directory
diff --git a/cmake/modules/FindGLX.cmake b/cmake/modules/FindGLX.cmake
index 77c8fce..ab74dfd 100644
--- a/cmake/modules/FindGLX.cmake
+++ b/cmake/modules/FindGLX.cmake
@@ -3,7 +3,7 @@
 # -----
 # Finds the GLX library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # GLX_FOUND - system has GLX
 # GLX_INCLUDE_DIRS - the GLX include directory
diff --git a/cmake/modules/FindIconv.cmake b/cmake/modules/FindIconv.cmake
index 8ee01fb..ae7d8d7 100644
--- a/cmake/modules/FindIconv.cmake
+++ b/cmake/modules/FindIconv.cmake
@@ -3,7 +3,7 @@
 # --------
 # Finds the ICONV library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # ICONV_FOUND - system has ICONV
 # ICONV_INCLUDE_DIRS - the ICONV include directory
diff --git a/cmake/modules/FindLCMS2.cmake b/cmake/modules/FindLCMS2.cmake
index 5ec7a77..7cc1497 100644
--- a/cmake/modules/FindLCMS2.cmake
+++ b/cmake/modules/FindLCMS2.cmake
@@ -3,7 +3,7 @@
 # -----------
 # Finds the LCMS Color Management library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # LCMS2_FOUND - system has LCMS Color Management
 # LCMS2_INCLUDE_DIRS - the LCMS Color Management include directory
diff --git a/cmake/modules/FindLibDRM.cmake b/cmake/modules/FindLibDRM.cmake
index 35d632e..ec30920 100644
--- a/cmake/modules/FindLibDRM.cmake
+++ b/cmake/modules/FindLibDRM.cmake
@@ -3,7 +3,7 @@
 # ----------
 # Finds the LibDRM library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # LIBDRM_FOUND - system has LibDRM
 # LIBDRM_INCLUDE_DIRS - the LibDRM include directory
@@ -14,7 +14,7 @@
 #   LibDRM::LibDRM   - The LibDRM library
 
 if(PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_LIBDRM libdrm QUIET)
+  pkg_check_modules(PC_LIBDRM libdrm>=2.4.71 QUIET)
 endif()
 
 find_path(LIBDRM_INCLUDE_DIR NAMES drm.h
diff --git a/cmake/modules/FindLibDvd.cmake b/cmake/modules/FindLibDvd.cmake
index 5c72826..bd08b94 100644
--- a/cmake/modules/FindLibDvd.cmake
+++ b/cmake/modules/FindLibDvd.cmake
@@ -76,9 +76,6 @@ else()
   endforeach()
 
   set(DVDREAD_CFLAGS "${DVDREAD_CFLAGS} -I${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/libdvd/include")
-  if(CMAKE_CROSSCOMPILING)
-    set(EXTRA_FLAGS "CC=${CMAKE_C_COMPILER}")
-  endif()
 
   if(APPLE)
     set(CMAKE_LD_FLAGS "-framework IOKit -framework CoreFoundation")
@@ -113,7 +110,7 @@ else()
                                                     --with-pic
                                                     --prefix=<INSTALL_DIR>
                                                     --libdir=<INSTALL_DIR>/lib
-                                                    "${EXTRA_FLAGS}"
+                                                    "CC=${CMAKE_C_COMPILER}"
                                                     "CFLAGS=${CMAKE_C_FLAGS} ${DVDREAD_CFLAGS}"
                                                     "LDFLAGS=${CMAKE_LD_FLAGS}"
                                   BUILD_BYPRODUCTS ${DVDCSS_LIBRARY})
@@ -154,7 +151,7 @@ else()
                                                   --with-pic
                                                   --prefix=<INSTALL_DIR>
                                                   --libdir=<INSTALL_DIR>/lib
-                                                  "${EXTRA_FLAGS}"
+                                                  "CC=${CMAKE_C_COMPILER}"
                                                   "CFLAGS=${CMAKE_C_FLAGS} ${DVDREAD_CFLAGS}"
                                                   "LDFLAGS=${CMAKE_LD_FLAGS}"
                               BUILD_BYPRODUCTS ${DVDREAD_LIBRARY})
@@ -198,7 +195,7 @@ else()
                                                   --with-pic
                                                   --prefix=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/libdvd
                                                   --libdir=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/libdvd/lib
-                                                  "${EXTRA_FLAGS}"
+                                                  "CC=${CMAKE_C_COMPILER}"
                                                   "LDFLAGS=${CMAKE_LD_FLAGS} -L${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/libdvd/lib"
                                                   "CFLAGS=${CMAKE_C_FLAGS} ${DVDREAD_CFLAGS}"
                                                   "DVDREAD_CFLAGS=${DVDREAD_CFLAGS}"
@@ -245,4 +242,4 @@ else()
   endif()
   set(LIBDVD_LIBRARIES ${LIBDVD_LIBRARIES} CACHE STRING "libdvd libraries" FORCE)
   set(LIBDVD_FOUND 1 CACHE BOOL "libdvd found" FORCE)
-endif()
\ No newline at end of file
+endif()
diff --git a/cmake/modules/FindLibInput.cmake b/cmake/modules/FindLibInput.cmake
new file mode 100644
index 0000000..069df5f
--- /dev/null
+++ b/cmake/modules/FindLibInput.cmake
@@ -0,0 +1,36 @@
+#.rst:
+# FindLibinput
+# --------
+# Finds the libinput library
+#
+# This will define the following variables::
+#
+# LIBINPUT_FOUND - system has libinput
+# LIBINPUT_INCLUDE_DIRS - the libinput include directory
+# LIBINPUT_LIBRARIES - the libinput libraries
+# LIBINPUT_DEFINITIONS - the libinput compile definitions
+#
+
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_LIBINPUT libinput QUIET)
+endif()
+
+find_path(LIBINPUT_INCLUDE_DIR NAMES libinput.h
+                               PATHS ${PC_LIBINPUT_INCLUDEDIR})
+
+find_library(LIBINPUT_LIBRARY NAMES input
+                              PATHS ${PC_LIBINPUT_LIBDIR})
+
+set(LIBINPUT_VERSION ${PC_LIBINPUT_VERSION})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LibInput
+                                  REQUIRED_VARS LIBINPUT_LIBRARY LIBINPUT_INCLUDE_DIR
+                                  VERSION_VAR LIBINPUT_VERSION)
+
+if(LIBINPUT_FOUND)
+  set(LIBINPUT_INCLUDE_DIRS ${LIBINPUT_INCLUDE_DIR})
+  set(LIBINPUT_LIBRARIES ${LIBINPUT_LIBRARY})
+endif()
+
+mark_as_advanced(LIBINPUT_INCLUDE_DIR LIBINPUT_LIBRARY)
diff --git a/cmake/modules/FindLibUSB.cmake b/cmake/modules/FindLibUSB.cmake
index e976bf4..17cf6ec 100644
--- a/cmake/modules/FindLibUSB.cmake
+++ b/cmake/modules/FindLibUSB.cmake
@@ -3,7 +3,7 @@
 # ----------
 # Finds the USB library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # LIBUSB_FOUND - system has LibUSB
 # LIBUSB_INCLUDE_DIRS - the USB include directory
diff --git a/cmake/modules/FindLircClient.cmake b/cmake/modules/FindLircClient.cmake
index 528c38e..c469af5 100644
--- a/cmake/modules/FindLircClient.cmake
+++ b/cmake/modules/FindLircClient.cmake
@@ -2,7 +2,7 @@
 # -----------
 # Finds the liblirc_client library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 #  LIRCCLIENT_FOUND         - if false, do not try to link to lirc_client
 #  LIRCCLIENT_INCLUDE_DIRS  - where to find lirc/lirc_client.h
diff --git a/cmake/modules/FindLzo2.cmake b/cmake/modules/FindLzo2.cmake
index 4f7313f..5e3e686 100644
--- a/cmake/modules/FindLzo2.cmake
+++ b/cmake/modules/FindLzo2.cmake
@@ -3,7 +3,7 @@
 # --------
 # Finds the Lzo2 library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # LZO2_FOUND - system has Lzo2
 # LZO2_INCLUDE_DIRS - the Lzo2 include directory
diff --git a/cmake/modules/FindMDNS.cmake b/cmake/modules/FindMDNS.cmake
index 9294708..c2574c8 100644
--- a/cmake/modules/FindMDNS.cmake
+++ b/cmake/modules/FindMDNS.cmake
@@ -3,7 +3,7 @@
 # --------
 # Finds the mDNS library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # MDNS_FOUND - system has mDNS
 # MDNS_INCLUDE_DIRS - the mDNS include directory
diff --git a/cmake/modules/FindMariaDBClient.cmake b/cmake/modules/FindMariaDBClient.cmake
index 1e5e736..8a28670 100644
--- a/cmake/modules/FindMariaDBClient.cmake
+++ b/cmake/modules/FindMariaDBClient.cmake
@@ -3,7 +3,7 @@
 # ---------------
 # Finds the MariaDBClient library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # MARIADBCLIENT_FOUND - system has MariaDBClient
 # MARIADBCLIENT_INCLUDE_DIRS - the MariaDBClient include directory
diff --git a/cmake/modules/FindMicroHttpd.cmake b/cmake/modules/FindMicroHttpd.cmake
index d04878c..e6127f3 100644
--- a/cmake/modules/FindMicroHttpd.cmake
+++ b/cmake/modules/FindMicroHttpd.cmake
@@ -3,7 +3,7 @@
 # --------------
 # Finds the MicroHttpd library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # MICROHTTPD_FOUND - system has MicroHttpd
 # MICROHTTPD_INCLUDE_DIRS - the MicroHttpd include directory
diff --git a/cmake/modules/FindMir.cmake b/cmake/modules/FindMir.cmake
deleted file mode 100644
index e66ff02..0000000
--- a/cmake/modules/FindMir.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-# FindMir
-# -------
-# Finds the Mir library
-#
-# This will will define the following variables::
-#
-# MIR_FOUND        - the system has Mir
-# MIR_INCLUDE_DIRS - the Mir include directory
-# MIR_LIBRARIES    - the Mir libraries
-# MIR_DEFINITIONS  - the Mir definitions
-
-
-if(PKG_CONFIG_FOUND)
-  pkg_check_modules (PC_MIR mirclient>=0.26.2 QUIET)
-endif()
-
-find_path(MIR_INCLUDE_DIR NAMES mir_toolkit/mir_client_library.h
-                          PATHS ${PC_MIR_INCLUDE_DIRS})
-
-find_library(MIR_LIBRARY NAMES mirclient
-                         PATHS ${PC_MIR_LIBRARIES} ${PC_MIR_LIBRARY_DIRS})
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (Mir
-                                   REQUIRED_VARS MIR_LIBRARY MIR_INCLUDE_DIR)
-
-if (MIR_FOUND)
-  set(MIR_LIBRARIES ${MIR_LIBRARY})
-  set(MIR_INCLUDE_DIRS ${PC_MIR_INCLUDE_DIRS})
-  set(MIR_DEFINITIONS -DHAVE_MIR=1)
-endif()
-
-mark_as_advanced (MIR_LIBRARY MIR_INCLUDE_DIR)
diff --git a/cmake/modules/FindMySqlClient.cmake b/cmake/modules/FindMySqlClient.cmake
index 50db582..05d3f57 100644
--- a/cmake/modules/FindMySqlClient.cmake
+++ b/cmake/modules/FindMySqlClient.cmake
@@ -3,7 +3,7 @@
 # ---------------
 # Finds the MySqlClient library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # MYSQLCLIENT_FOUND - system has MySqlClient
 # MYSQLCLIENT_INCLUDE_DIRS - the MySqlClient include directory
diff --git a/cmake/modules/FindNFS.cmake b/cmake/modules/FindNFS.cmake
index b304bf3..36727c0 100644
--- a/cmake/modules/FindNFS.cmake
+++ b/cmake/modules/FindNFS.cmake
@@ -3,7 +3,7 @@
 # -------
 # Finds the libnfs library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # NFS_FOUND - system has libnfs
 # NFS_INCLUDE_DIRS - the libnfs include directory
diff --git a/cmake/modules/FindOpenGLES.cmake b/cmake/modules/FindOpenGLES.cmake
index fac21bc..0191d9e 100644
--- a/cmake/modules/FindOpenGLES.cmake
+++ b/cmake/modules/FindOpenGLES.cmake
@@ -3,7 +3,7 @@
 # ------------
 # Finds the OpenGLES2 library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # OPENGLES_FOUND - system has OpenGLES
 # OPENGLES_INCLUDE_DIRS - the OpenGLES include directory
diff --git a/cmake/modules/FindOpenGl.cmake b/cmake/modules/FindOpenGl.cmake
index af1c433..cb695a6 100644
--- a/cmake/modules/FindOpenGl.cmake
+++ b/cmake/modules/FindOpenGl.cmake
@@ -3,7 +3,7 @@
 # ----------
 # Finds the FindOpenGl library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # OPENGL_FOUND - system has OpenGl
 # OPENGL_INCLUDE_DIRS - the OpenGl include directory
diff --git a/cmake/modules/FindPCRE.cmake b/cmake/modules/FindPCRE.cmake
index 8babed3..d549d19 100644
--- a/cmake/modules/FindPCRE.cmake
+++ b/cmake/modules/FindPCRE.cmake
@@ -3,7 +3,7 @@
 # --------
 # Finds the PCRECPP library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # PCRE_FOUND - system has libpcrecpp
 # PCRE_INCLUDE_DIRS - the libpcrecpp include directory
diff --git a/cmake/modules/FindPlist.cmake b/cmake/modules/FindPlist.cmake
index 0664c10..cd143e9 100644
--- a/cmake/modules/FindPlist.cmake
+++ b/cmake/modules/FindPlist.cmake
@@ -3,7 +3,7 @@
 # ---------
 # Finds the Plist library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # PLIST_FOUND - system has Plist library
 # PLIST_INCLUDE_DIRS - the Plist library include directory
diff --git a/cmake/modules/FindSSE.cmake b/cmake/modules/FindSSE.cmake
index b860dca..08e3630 100644
--- a/cmake/modules/FindSSE.cmake
+++ b/cmake/modules/FindSSE.cmake
@@ -1,4 +1,4 @@
-# Check if SSE instructions are available on the machine where 
+# Check if SSE instructions are available on the machine where
 # the project is compiled.
 include(TestCXXAcceptsFlag)
 
@@ -74,7 +74,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
      string(REGEX REPLACE "^.*(AVX2).*$" "\\1" _SSE_THERE ${CPUINFO})
      string(COMPARE EQUAL "AVX2" "${_SSE_THERE}" _AVX2_TRUE)
      CHECK_CXX_ACCEPTS_FLAG("-mavx2" _AVX2_OK)
-   endif()  
+   endif()
 elseif(CMAKE_SYSTEM_NAME MATCHES "Android")
   if(CPU MATCHES "x86_64" OR CPU MATCHES "i.86")
     set(_SSE_TRUE TRUE)
diff --git a/cmake/modules/FindSSH.cmake b/cmake/modules/FindSSH.cmake
deleted file mode 100644
index bf3837e..0000000
--- a/cmake/modules/FindSSH.cmake
+++ /dev/null
@@ -1,47 +0,0 @@
-#.rst:
-# FindSSH
-# -------
-# Finds the SSH library
-#
-# This will will define the following variables::
-#
-# SSH_FOUND - system has SSH
-# SSH_INCLUDE_DIRS - the SSH include directory
-# SSH_LIBRARIES - the SSH libraries
-# SSH_DEFINITIONS - the SSH definitions
-#
-# and the following imported targets::
-#
-#   SSH::SSH   - The SSH library
-
-if(PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_SSH libssh>=0.6 QUIET)
-endif()
-
-find_path(SSH_INCLUDE_DIR NAMES libssh/libssh.h
-                          PATHS ${PC_SSH_INCLUDEDIR})
-find_library(SSH_LIBRARY NAMES ssh
-                         PATHS ${PC_SSH_LIBDIR})
-
-set(SSH_VERSION ${PC_SSH_VERSION})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SSH
-                                  REQUIRED_VARS SSH_LIBRARY SSH_INCLUDE_DIR
-                                  VERSION_VAR SSH_VERSION)
-
-if(SSH_FOUND)
-  set(SSH_LIBRARIES ${SSH_LIBRARY})
-  set(SSH_INCLUDE_DIRS ${SSH_INCLUDE_DIR})
-  set(SSH_DEFINITIONS -DHAS_FILESYSTEM_SFTP=1)
-
-  if(NOT TARGET SSH::SSH)
-    add_library(SSH::SSH UNKNOWN IMPORTED)
-    set_target_properties(SSH::SSH PROPERTIES
-                                   IMPORTED_LOCATION "${SSH_LIBRARY}"
-                                   INTERFACE_INCLUDE_DIRECTORIES "${SSH_INCLUDE_DIR}"
-                                   INTERFACE_COMPILE_DEFINITIONS HAS_FILESYSTEM_SFTP=1)
-  endif()
-endif()
-
-mark_as_advanced(SSH_INCLUDE_DIR SSH_LIBRARY)
diff --git a/cmake/modules/FindSWIG.cmake b/cmake/modules/FindSWIG.cmake
index 523b49b..f9b27c2 100644
--- a/cmake/modules/FindSWIG.cmake
+++ b/cmake/modules/FindSWIG.cmake
@@ -3,7 +3,7 @@
 # --------
 # Finds the SWIG executable
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # SWIG_FOUND - system has SWIG
 # SWIG_EXECUTABLE - the SWIG executable
diff --git a/cmake/modules/FindSdl.cmake b/cmake/modules/FindSdl.cmake
index 81c1793..60959cb 100644
--- a/cmake/modules/FindSdl.cmake
+++ b/cmake/modules/FindSdl.cmake
@@ -3,7 +3,7 @@
 # -------
 # Finds the SDL library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # SDL_FOUND - system has SDL
 # SDL_INCLUDE_DIRS - the SDL include directory
diff --git a/cmake/modules/FindShairplay.cmake b/cmake/modules/FindShairplay.cmake
index 699fb7a..bbb3372 100644
--- a/cmake/modules/FindShairplay.cmake
+++ b/cmake/modules/FindShairplay.cmake
@@ -3,7 +3,7 @@
 # -------------
 # Finds the Shairplay library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # SHAIRPLAY_FOUND - system has Shairplay
 # SHAIRPLAY_INCLUDE_DIRS - the Shairplay include directory
diff --git a/cmake/modules/FindSmbClient.cmake b/cmake/modules/FindSmbClient.cmake
index 9a8b197..70492ff 100644
--- a/cmake/modules/FindSmbClient.cmake
+++ b/cmake/modules/FindSmbClient.cmake
@@ -3,7 +3,7 @@
 # -------------
 # Finds the SMB Client library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # SMBCLIENT_FOUND - system has SmbClient
 # SMBCLIENT_INCLUDE_DIRS - the SmbClient include directory
diff --git a/cmake/modules/FindSndio.cmake b/cmake/modules/FindSndio.cmake
index 5f08acd..992c0b1 100644
--- a/cmake/modules/FindSndio.cmake
+++ b/cmake/modules/FindSndio.cmake
@@ -3,7 +3,7 @@
 # ---------
 # Finds the Sndio Library
 #
-# This will will define the following variables:
+# This will define the following variables:
 #
 # SNDIO_FOUND - system has sndio
 # SNDIO_INCLUDE_DIRS - sndio include directory
diff --git a/cmake/modules/FindSqlite3.cmake b/cmake/modules/FindSqlite3.cmake
index abde0cf..8fd9719 100644
--- a/cmake/modules/FindSqlite3.cmake
+++ b/cmake/modules/FindSqlite3.cmake
@@ -3,7 +3,7 @@
 # -----------
 # Finds the SQLite3 library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # SQLITE3_FOUND - system has SQLite3
 # SQLITE3_INCLUDE_DIRS - the SQLite3 include directory
diff --git a/cmake/modules/FindTagLib.cmake b/cmake/modules/FindTagLib.cmake
index 8c8c2f3..ac7b7ec 100644
--- a/cmake/modules/FindTagLib.cmake
+++ b/cmake/modules/FindTagLib.cmake
@@ -3,7 +3,7 @@
 # ----------
 # Finds the TagLib library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # TAGLIB_FOUND - system has TagLib
 # TAGLIB_INCLUDE_DIRS - the TagLib include directory
diff --git a/cmake/modules/FindTinyXML.cmake b/cmake/modules/FindTinyXML.cmake
index 1220a94..5e9539e 100644
--- a/cmake/modules/FindTinyXML.cmake
+++ b/cmake/modules/FindTinyXML.cmake
@@ -3,7 +3,7 @@
 # -----------
 # Finds the TinyXML library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # TINYXML_FOUND - system has TinyXML
 # TINYXML_INCLUDE_DIRS - the TinyXML include directory
diff --git a/cmake/modules/FindUDEV.cmake b/cmake/modules/FindUDEV.cmake
index 422c437..a884025 100644
--- a/cmake/modules/FindUDEV.cmake
+++ b/cmake/modules/FindUDEV.cmake
@@ -3,7 +3,7 @@
 # -------
 # Finds the UDEV library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # UDEV_FOUND - system has UDEV
 # UDEV_INCLUDE_DIRS - the UDEV include directory
diff --git a/cmake/modules/FindUUID.cmake b/cmake/modules/FindUUID.cmake
index 173fac2..0c2ff5a 100644
--- a/cmake/modules/FindUUID.cmake
+++ b/cmake/modules/FindUUID.cmake
@@ -3,7 +3,7 @@
 # --------
 # Finds the libuuid library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # UUID_FOUND - system has libuuid
 # UUID_INCLUDE_DIRS - the libuuid include directory
diff --git a/cmake/modules/FindVAAPI.cmake b/cmake/modules/FindVAAPI.cmake
index 157cec4..2111e4f 100644
--- a/cmake/modules/FindVAAPI.cmake
+++ b/cmake/modules/FindVAAPI.cmake
@@ -3,7 +3,7 @@
 # ---------
 # Finds the VAAPI library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # VAAPI_FOUND - system has VAAPI
 # VAAPI_INCLUDE_DIRS - the VAAPI include directory
diff --git a/cmake/modules/FindVDPAU.cmake b/cmake/modules/FindVDPAU.cmake
index b99e03f..b2c5482 100644
--- a/cmake/modules/FindVDPAU.cmake
+++ b/cmake/modules/FindVDPAU.cmake
@@ -3,7 +3,7 @@
 # ---------
 # Finds the VDPAU library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # VDPAU_FOUND - system has VDPAU
 # VDPAU_INCLUDE_DIRS - the VDPAU include directory
diff --git a/cmake/modules/FindWaylandProtocols.cmake b/cmake/modules/FindWaylandProtocols.cmake
index 0b96ff0..e74bb80 100644
--- a/cmake/modules/FindWaylandProtocols.cmake
+++ b/cmake/modules/FindWaylandProtocols.cmake
@@ -2,7 +2,7 @@
 # --------------------
 # Find wayland-protocols
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # WAYLAND_PROTOCOLS_DIR - directory containing the additional Wayland protocols
 #                         from the wayland-protocols package
diff --git a/cmake/modules/FindWaylandpp.cmake b/cmake/modules/FindWaylandpp.cmake
index 336e613..3cfc282 100644
--- a/cmake/modules/FindWaylandpp.cmake
+++ b/cmake/modules/FindWaylandpp.cmake
@@ -2,7 +2,7 @@
 # -------------
 # Finds the waylandpp library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # WAYLANDPP_FOUND        - the system has waylandpp
 # WAYLANDPP_INCLUDE_DIRS - the waylandpp include directory
@@ -10,15 +10,27 @@
 # WAYLANDPP_DEFINITIONS  - the waylandpp definitions
 # WAYLANDPP_SCANNER      - path to wayland-scanner++
 
-pkg_check_modules(WAYLANDPP wayland-client++ wayland-egl++ wayland-cursor++)
-pkg_check_modules(PC_WAYLANDPP_SCANNER wayland-scanner++)
-if(WAYLANDPP_FOUND)
+pkg_check_modules(PC_WAYLANDPP wayland-client++ wayland-egl++ wayland-cursor++ QUIET)
+pkg_check_modules(PC_WAYLANDPP_SCANNER wayland-scanner++ QUIET)
+if(PC_WAYLANDPP_FOUND)
   pkg_get_variable(PC_WAYLANDPP_PKGDATADIR wayland-client++ pkgdatadir)
 endif()
 if(PC_WAYLANDPP_SCANNER_FOUND)
   pkg_get_variable(PC_WAYLANDPP_SCANNER wayland-scanner++ wayland_scannerpp)
 endif()
 
+find_path(WAYLANDPP_INCLUDE_DIR wayland-client.hpp PATHS ${PC_WAYLANDPP_INCLUDEDIR})
+
+find_library(WAYLANDPP_CLIENT_LIBRARY NAMES wayland-client++
+                                      PATHS ${PC_WAYLANDPP_LIBRARY_DIRS})
+
+find_library(WAYLANDPP_CURSOR_LIBRARY NAMES wayland-cursor++
+                                      PATHS ${PC_WAYLANDPP_LIBRARY_DIRS})
+
+find_library(WAYLANDPP_EGL NAMES wayland-egl++
+                           PATHS ${PC_WAYLANDPP_LIBRARY_DIRS})
+
+
 # Promote to cache variables so all code can access it
 set(WAYLANDPP_PROTOCOLS_DIR "${PC_WAYLANDPP_PKGDATADIR}/protocols" CACHE INTERNAL "")
 
@@ -27,13 +39,23 @@ set(WAYLANDPP_PROTOCOLS_DIR "${PC_WAYLANDPP_PKGDATADIR}/protocols" CACHE INTERNA
 find_program(WAYLANDPP_SCANNER wayland-scanner++ PATHS ${PC_WAYLANDPP_SCANNER})
 
 include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (Waylandpp
-  REQUIRED_VARS
-    WAYLANDPP_FOUND
-    WAYLANDPP_SCANNER
-  VERSION_VAR
-    WAYLANDPP_wayland-client++_VERSION)
-
-set(WAYLANDPP_DEFINITIONS -DHAVE_WAYLAND=1)
-# Also pass on library directories
-set(WAYLANDPP_LIBRARIES ${WAYLANDPP_LDFLAGS})
+find_package_handle_standard_args(Waylandpp
+                                  REQUIRED_VARS WAYLANDPP_INCLUDE_DIR
+                                                WAYLANDPP_CLIENT_LIBRARY
+                                                WAYLANDPP_CURSOR_LIBRARY
+                                                WAYLANDPP_EGL
+                                                WAYLANDPP_SCANNER
+                                  VERSION_VAR WAYLANDPP_wayland-client++_VERSION)
+
+if(WAYLANDPP_FOUND)
+  set(WAYLANDPP_INCLUDE_DIRS ${WAYLANDPP_INCLUDE_DIR})
+  set(WAYLANDPP_LIBRARIES ${WAYLANDPP_CLIENT_LIBRARY}
+                          ${WAYLANDPP_CURSOR_LIBRARY}
+                          ${WAYLANDPP_EGL})
+  set(WAYLANDPP_DEFINITIONS -DHAVE_WAYLAND=1)
+endif()
+
+mark_as_advanced(WAYLANDPP_INCLUDE_DIR
+                 WAYLANDPP_CLIENT_LIBRARY
+                 WAYLANDPP_CURSOR_LIBRARY
+                 WAYLANDPP_EGL WAYLANDPP_SCANNER)
diff --git a/cmake/modules/FindX.cmake b/cmake/modules/FindX.cmake
index 19bb770..a52f86f 100644
--- a/cmake/modules/FindX.cmake
+++ b/cmake/modules/FindX.cmake
@@ -3,7 +3,7 @@
 # -----
 # Finds the X11 library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # X_FOUND - system has X11
 # X_INCLUDE_DIRS - the X11 include directory
diff --git a/cmake/modules/FindXRandR.cmake b/cmake/modules/FindXRandR.cmake
index 9feaedc..12f3478 100644
--- a/cmake/modules/FindXRandR.cmake
+++ b/cmake/modules/FindXRandR.cmake
@@ -3,7 +3,7 @@
 # ----------
 # Finds the XRandR library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # XRANDR_FOUND - system has XRANDR
 # XRANDR_INCLUDE_DIRS - the XRANDR include directory
diff --git a/cmake/modules/FindXSLT.cmake b/cmake/modules/FindXSLT.cmake
index f7fea9e..3637214 100644
--- a/cmake/modules/FindXSLT.cmake
+++ b/cmake/modules/FindXSLT.cmake
@@ -3,7 +3,7 @@
 # --------
 # Finds the XSLT library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # XSLT_FOUND - system has XSLT
 # XSLT_INCLUDE_DIRS - the XSLT include directory
diff --git a/cmake/modules/FindXkbcommon.cmake b/cmake/modules/FindXkbcommon.cmake
index 2a84fe5..40cbb31 100644
--- a/cmake/modules/FindXkbcommon.cmake
+++ b/cmake/modules/FindXkbcommon.cmake
@@ -2,20 +2,39 @@
 # -----------
 # Finds the libxkbcommon library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # XKBCOMMON_FOUND        - the system has libxkbcommon
 # XKBCOMMON_INCLUDE_DIRS - the libxkbcommon include directory
 # XKBCOMMON_LIBRARIES    - the libxkbcommon libraries
-# XKBCOMMON_DEFINITIONS  - the libxkbcommon definitions
 
-pkg_check_modules (XKBCOMMON xkbcommon)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_XKBCOMMON xkbcommon QUIET)
+endif()
 
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (Xkbcommon
-  REQUIRED_VARS
-  XKBCOMMON_FOUND)
 
-set(XKBCOMMON_DEFINITIONS -DHAVE_XKBCOMMON=1)
-set(XKBCOMMON_LIBRARIES ${XKBCOMMON_LDFLAGS})
-set(XKBCOMMON_INCLUDE_DIRS ${XKBCOMMON_INCLUDEDIR})
+find_path(XKBCOMMON_INCLUDE_DIR NAMES xkbcommon/xkbcommon.h
+                           PATHS ${PC_XKBCOMMON_INCLUDEDIR})
+find_library(XKBCOMMON_LIBRARY NAMES xkbcommon
+                          PATHS ${PC_XKBCOMMON_LIBDIR})
+
+set(XKBCOMMON_VERSION ${PC_XKBCOMMON_VERSION})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Xkbcommon
+                                  REQUIRED_VARS XKBCOMMON_LIBRARY XKBCOMMON_INCLUDE_DIR
+                                  VERSION_VAR XKBCOMMON_VERSION)
+
+if(XKBCOMMON_FOUND)
+  set(XKBCOMMON_INCLUDE_DIRS ${XKBCOMMON_INCLUDE_DIR})
+  set(XKBCOMMON_LIBRARIES ${XKBCOMMON_LIBRARY})
+
+  if(NOT TARGET XKBCOMMON::XKBCOMMON)
+    add_library(XKBCOMMON::XKBCOMMON UNKNOWN IMPORTED)
+    set_target_properties(XKBCOMMON::XKBCOMMON PROPERTIES
+                                     IMPORTED_LOCATION "${XKBCOMMON_LIBRARY}"
+                                     INTERFACE_INCLUDE_DIRECTORIES "${XKBCOMMON_INCLUDE_DIR}")
+  endif()
+endif()
+
+mark_as_advanced(XKBCOMMON_INCLUDE_DIR XKBCOMMON_LIBRARY)
diff --git a/cmake/modules/FindYajl.cmake b/cmake/modules/FindYajl.cmake
index c73a67b..d8793e6 100644
--- a/cmake/modules/FindYajl.cmake
+++ b/cmake/modules/FindYajl.cmake
@@ -3,7 +3,7 @@
 # --------
 # Finds the Yajl library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # YAJL_FOUND - system has Yajl
 # YAJL_INCLUDE_DIRS - Yajl include directory
diff --git a/cmake/modules/FindZip.cmake b/cmake/modules/FindZip.cmake
index ecac262..6ddf478 100644
--- a/cmake/modules/FindZip.cmake
+++ b/cmake/modules/FindZip.cmake
@@ -3,7 +3,7 @@
 # -----------
 # Finds the Zip library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # ZIP_FOUND - system has Zip
 # ZIP_INCLUDE_DIRS - the Zip include directory
diff --git a/cmake/modules/Findfstrcmp.cmake b/cmake/modules/Findfstrcmp.cmake
new file mode 100644
index 0000000..f0c15d3
--- /dev/null
+++ b/cmake/modules/Findfstrcmp.cmake
@@ -0,0 +1,80 @@
+#.rst:
+# Findfstrcmp
+# --------
+# Finds the fstrcmp library
+#
+# This will define the following variables::
+#
+# FSTRCMP_FOUND - system has libfstrcmp
+# FSTRCMP_INCLUDE_DIRS - the libfstrcmp include directory
+# FSTRCMP_LIBRARIES - the libfstrcmp libraries
+#
+
+if(ENABLE_INTERNAL_FSTRCMP)
+  include(ExternalProject)
+  file(STRINGS ${CMAKE_SOURCE_DIR}/tools/depends/target/libfstrcmp/Makefile VER)
+  string(REGEX MATCH "VERSION=[^ ]*" FSTRCMP_VER "${VER}")
+  list(GET FSTRCMP_VER 0 FSTRCMP_VER)
+  string(SUBSTRING "${FSTRCMP_VER}" 8 -1 FSTRCMP_VER)
+
+  # allow user to override the download URL with a local tarball
+  # needed for offline build envs
+  if(FSTRCMP_URL)
+    get_filename_component(FSTRCMP_URL "${FSTRCMP_URL}" ABSOLUTE)
+  else()
+    set(FSTRCMP_URL http://mirrors.kodi.tv/build-deps/sources/fstrcmp-${FSTRCMP_VER}.tar.gz)
+  endif()
+  if(VERBOSE)
+    message(STATUS "FSTRCMPURL: ${FSTRCMP_URL}")
+  endif()
+
+  set(FSTRCMP_LIBRARY ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/libfstrcmp.a)
+  set(FSTRCMP_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include)
+  externalproject_add(fstrcmp
+                      URL ${FSTRCMP_URL}
+                      DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/download
+                      PREFIX ${CORE_BUILD_DIR}/fstrcmp
+                      CONFIGURE_COMMAND autoreconf -vif && ./configure --prefix ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
+                      BUILD_BYPRODUCTS ${FSTRCMP_LIBRARY}
+                      BUILD_IN_SOURCE 1)
+  set_target_properties(fstrcmp PROPERTIES FOLDER "External Projects")
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(fstrcmp
+                                    REQUIRED_VARS FSTRCMP_LIBRARY FSTRCMP_INCLUDE_DIR
+                                    VERSION_VAR FSTRCMP_VER)
+
+  set(FSTRCMP_LIBRARIES -Wl,-Bstatic ${FSTRCMP_LIBRARY} -Wl,-Bdynamic)
+  set(FSTRCMP_INCLUDE_DIRS ${FSTRCMP_INCLUDE_DIR})
+else()
+  if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_FSTRCMP fstrcmp QUIET)
+  endif()
+
+  find_path(FSTRCMP_INCLUDE_DIR NAMES fstrcmp.h
+                                 PATHS ${PC_FSTRCMP_INCLUDEDIR})
+
+  find_library(FSTRCMP_LIBRARY NAMES fstrcmp
+                                PATHS ${PC_FSTRCMP_LIBDIR})
+
+  set(FSTRCMP_VERSION ${PC_FSTRCMP_VERSION})
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(fstrcmp
+                                    REQUIRED_VARS FSTRCMP_LIBRARY FSTRCMP_INCLUDE_DIR
+                                    VERSION_VAR FSTRCMP_VERSION)
+
+  if(FSTRCMP_FOUND)
+    set(FSTRCMP_INCLUDE_DIRS ${FSTRCMP_INCLUDE_DIR})
+    set(FSTRCMP_LIBRARIES ${FSTRCMP_LIBRARY})
+  endif()
+
+  if(NOT TARGET fstrcmp)
+    add_library(fstrcmp UNKNOWN IMPORTED)
+    set_target_properties(fstrcmp PROPERTIES
+                                  IMPORTED_LOCATION "${FSTRCMP_LIBRARY}"
+                                  INTERFACE_INCLUDE_DIRECTORIES "${FSTRCMP_INCLUDE_DIR}")
+  endif()
+endif()
+
+mark_as_advanced(FSTRCMP_INCLUDE_DIR FSTRCMP_LIBRARY)
diff --git a/cmake/platform/freebsd/gbm.cmake b/cmake/platform/freebsd/gbm.cmake
new file mode 100644
index 0000000..b273a06
--- /dev/null
+++ b/cmake/platform/freebsd/gbm.cmake
@@ -0,0 +1 @@
+include(cmake/platform/linux/gbm.cmake)
diff --git a/cmake/platform/freebsd/rbpi.cmake b/cmake/platform/freebsd/rbpi.cmake
new file mode 100644
index 0000000..f095693
--- /dev/null
+++ b/cmake/platform/freebsd/rbpi.cmake
@@ -0,0 +1 @@
+include(cmake/platform/linux/rbpi.cmake)
diff --git a/cmake/platform/linux/aml.cmake b/cmake/platform/linux/aml.cmake
index 82e242b..a151226 100644
--- a/cmake/platform/linux/aml.cmake
+++ b/cmake/platform/linux/aml.cmake
@@ -1,3 +1,3 @@
-set(PLATFORM_REQUIRED_DEPS OpenGLES AML EGL)
+set(PLATFORM_REQUIRED_DEPS OpenGLES AML EGL LibInput Xkbcommon)
 set(APP_RENDER_SYSTEM gles)
 list(APPEND PLATFORM_DEFINES -DMESA_EGL_NO_X11_HEADERS)
diff --git a/cmake/platform/linux/gbm.cmake b/cmake/platform/linux/gbm.cmake
index d8e73d0..e5b44ad 100644
--- a/cmake/platform/linux/gbm.cmake
+++ b/cmake/platform/linux/gbm.cmake
@@ -1,4 +1,17 @@
-set(PLATFORM_REQUIRED_DEPS OpenGLES EGL GBM LibDRM)
+set(PLATFORM_REQUIRED_DEPS EGL GBM LibDRM LibInput Xkbcommon)
 set(PLATFORM_OPTIONAL_DEPS VAAPI)
-set(APP_RENDER_SYSTEM gles)
-list(APPEND PLATFORM_DEFINES -DMESA_EGL_NO_X11_HEADERS -DPLATFORM_SETTINGS_FILE=gbm.xml)
+
+set(GBM_RENDER_SYSTEM "" CACHE STRING "Render system to use with GBM: \"gl\" or \"gles\"")
+
+if(GBM_RENDER_SYSTEM STREQUAL "gl")
+  list(APPEND PLATFORM_REQUIRED_DEPS OpenGl)
+  set(APP_RENDER_SYSTEM gl)
+elseif(GBM_RENDER_SYSTEM STREQUAL "gles")
+  list(APPEND PLATFORM_REQUIRED_DEPS OpenGLES)
+  set(APP_RENDER_SYSTEM gles)
+else()
+  message(SEND_ERROR "You need to decide whether you want to use GL- or GLES-based rendering in combination with the GBM windowing system. Please set GBM_RENDER_SYSTEM to either \"gl\" or \"gles\". For normal desktop systems, you will usually want to use \"gl\".")
+endif()
+
+# __GBM__ is needed by eglplatform.h in case it is included before gbm.h
+list(APPEND PLATFORM_DEFINES -DMESA_EGL_NO_X11_HEADERS -D__GBM__=1 -DPLATFORM_SETTINGS_FILE=gbm.xml)
diff --git a/cmake/platform/linux/mir.cmake b/cmake/platform/linux/mir.cmake
deleted file mode 100644
index 0e672a9..0000000
--- a/cmake/platform/linux/mir.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(PLATFORM_REQUIRED_DEPS OpenGl EGL Mir LibDRM)
-set(PLATFORM_OPTIONAL_DEPS VAAPI OpenGLES)
-set(APP_RENDER_SYSTEM gl)
diff --git a/cmake/platform/linux/rbpi.cmake b/cmake/platform/linux/rbpi.cmake
index fa9a1dc..3dde57d 100644
--- a/cmake/platform/linux/rbpi.cmake
+++ b/cmake/platform/linux/rbpi.cmake
@@ -1,3 +1,3 @@
-set(PLATFORM_REQUIRED_DEPS OpenGLES EGL MMAL)
+set(PLATFORM_REQUIRED_DEPS OpenGLES EGL MMAL LibInput Xkbcommon)
 set(APP_RENDER_SYSTEM gles)
 list(APPEND PLATFORM_DEFINES -D_ARMEL -DTARGET_RASPBERRY_PI)
diff --git a/cmake/platform/linux/wayland.cmake b/cmake/platform/linux/wayland.cmake
index f42dbf5..97cff67 100644
--- a/cmake/platform/linux/wayland.cmake
+++ b/cmake/platform/linux/wayland.cmake
@@ -15,5 +15,7 @@ endif()
 
 set(PLATFORM_GLOBAL_TARGET_DEPS generate-wayland-extra-protocols)
 set(WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+# WL_EGL_PLATFORM is needed by eglplatform.h in case it is included before wayland-egl.h
+list(APPEND PLATFORM_DEFINES -DWL_EGL_PLATFORM=1 -DPLATFORM_SETTINGS_FILE=wayland.xml)
 # for wayland-extra-protocols.hpp
 include_directories("${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}")
diff --git a/cmake/platform/linux/x11.cmake b/cmake/platform/linux/x11.cmake
index 09cebde..72d9640 100644
--- a/cmake/platform/linux/x11.cmake
+++ b/cmake/platform/linux/x11.cmake
@@ -1,3 +1,4 @@
 set(PLATFORM_REQUIRED_DEPS OpenGl EGL X XRandR LibDRM)
 set(PLATFORM_OPTIONAL_DEPS VAAPI VDPAU GLX)
 set(APP_RENDER_SYSTEM gl)
+list(APPEND PLATFORM_DEFINES -DPLATFORM_SETTINGS_FILE=x11.xml)
\ No newline at end of file
diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake
index cc53607..a0fa155 100644
--- a/cmake/scripts/android/Install.cmake
+++ b/cmake/scripts/android/Install.cmake
@@ -151,6 +151,8 @@ foreach(lib IN LISTS required_dyload dyload_optional ITEMS Shairplay)
     add_bundle_file(${DEPENDS_PATH}/lib/${lib_so} ${libdir} "")
   endif()
 endforeach()
+add_bundle_file(${ASS_LIBRARY} ${libdir} "")
+add_bundle_file(${BLURAY_LIBRARY} ${libdir} "")
 add_bundle_file(${SMBCLIENT_LIBRARY} ${libdir} "")
 
 # Main targets from Makefile.in
diff --git a/cmake/scripts/common/AddonHelpers.cmake b/cmake/scripts/common/AddonHelpers.cmake
index 5470940..4bb4c98 100644
--- a/cmake/scripts/common/AddonHelpers.cmake
+++ b/cmake/scripts/common/AddonHelpers.cmake
@@ -1,9 +1,9 @@
 # Workaround for the fact that cpack's filenames are not customizable.
 # Each add-on is added as a separate component to facilitate zip/tgz packaging.
-# The filenames are always of the form basename-component, which is 
+# The filenames are always of the form basename-component, which is
 # incompatible with the addonid-version scheme we want. This hack renames
 # the files from the file names generated by the 'package' target.
-# Sadly we cannot extend the 'package' target, as it is a builtin target, see 
+# Sadly we cannot extend the 'package' target, as it is a builtin target, see
 # http://public.kitware.com/Bug/view.php?id=8438
 # Thus, we have to add an 'addon-package' target.
 get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
@@ -32,7 +32,7 @@ macro (addon_version dir prefix)
     file(READ ${dir}/addon.xml ADDONXML)
   endif()
 
-  string(REGEX MATCH "<addon[^>]*version.?=.?.[0-9\\.]+" VERSION_STRING ${ADDONXML}) 
+  string(REGEX MATCH "<addon[^>]*version.?=.?.[0-9\\.]+" VERSION_STRING ${ADDONXML})
   string(REGEX REPLACE ".*version=.([0-9\\.]+).*" "\\1" ${prefix}_VERSION ${VERSION_STRING})
   message(STATUS ${prefix}_VERSION=${${prefix}_VERSION})
 endmacro()
@@ -62,7 +62,7 @@ macro (build_addon target prefix libs)
         # include path name already complete
         list(APPEND USED_SOURCES ${${prefix}_HEADERS})
       else()
-        # add the complete include path to begin 
+        # add the complete include path to begin
         foreach(hdr_file ${${prefix}_HEADERS})
           list(APPEND USED_SOURCES ${PROJECT_SOURCE_DIR}/${hdr_file})
         endforeach()
@@ -86,19 +86,19 @@ macro (build_addon target prefix libs)
       # include path name already complete
       list(APPEND USED_SOURCES ${${prefix}_SOURCES})
     else()
-      # add the complete include path to begin 
+      # add the complete include path to begin
       foreach(src_file ${${prefix}_SOURCES})
         list(APPEND USED_SOURCES ${PROJECT_SOURCE_DIR}/${src_file})
       endforeach()
     endif()
-    
+
     # Set defines used in addon.xml.in and read from versions.h to set add-on
     # version parts automatically
     file(STRINGS ${KODI_INCLUDE_DIR}/versions.h BIN_ADDON_PARTS)
     foreach(loop_var ${BIN_ADDON_PARTS})
       # Only pass strings with "#define ADDON_" from versions.h
       if(loop_var MATCHES "#define ADDON_")
-        string(REGEX REPLACE "\\\n" " " loop_var ${loop_var}) # remove header line breaks 
+        string(REGEX REPLACE "\\\n" " " loop_var ${loop_var}) # remove header line breaks
         string(REGEX REPLACE "#define " "" loop_var ${loop_var}) # remove the #define name from string
         string(REGEX MATCHALL "[//a-zA-Z0-9._-]+" loop_var "${loop_var}") # separate the define values to a list
 
@@ -157,7 +157,8 @@ macro (build_addon target prefix libs)
     target_link_libraries(${target} ${${libs}})
     set_target_properties(${target} PROPERTIES VERSION ${${prefix}_VERSION}
                                                SOVERSION ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}
-                                               PREFIX "")
+                                               PREFIX ""
+                                               POSITION_INDEPENDENT_CODE 1)
     if(OS STREQUAL "android")
       set_target_properties(${target} PROPERTIES PREFIX "lib")
     endif()
@@ -384,7 +385,7 @@ if(HAVE_LTO)
   if(USE_LTO)
     add_options(ALL_LANGUAGES ALL_BUILDS "-flto")
   endif()
-endif() 
+endif()
 
 # set this to try linking dependencies as static as possible
 if(ADDONS_PREFER_STATIC_LIBS)
diff --git a/cmake/scripts/common/ArchSetup.cmake b/cmake/scripts/common/ArchSetup.cmake
index c97929e..4704193 100644
--- a/cmake/scripts/common/ArchSetup.cmake
+++ b/cmake/scripts/common/ArchSetup.cmake
@@ -55,7 +55,7 @@ macro(check_builtin func var)
 endmacro()
 
 
-# -------- Main script --------- 
+# -------- Main script ---------
 message(STATUS "System type: ${CMAKE_SYSTEM_NAME}")
 
 if(WITH_CPU)
@@ -157,7 +157,8 @@ if(PLATFORM_DEFINES)
   add_options(ALL_LANGUAGES ALL_BUILDS ${PLATFORM_DEFINES})
 endif()
 
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  add_options (ALL_LANGUAGES DEBUG "-g" "-D_DEBUG" "-Wall")
+if(NOT MSVC)
+  add_options(ALL_LANGUAGES ALL_BUILDS "-Wall")
+  add_options(ALL_LANGUAGES DEBUG "-g" "-D_DEBUG")
 endif()
 
diff --git a/cmake/scripts/common/CheckTargetPlatform.cmake b/cmake/scripts/common/CheckTargetPlatform.cmake
index 82ee668..526e4bd 100644
--- a/cmake/scripts/common/CheckTargetPlatform.cmake
+++ b/cmake/scripts/common/CheckTargetPlatform.cmake
@@ -9,9 +9,9 @@ function(check_target_platform dir target_platform build)
   if(EXISTS ${dir} AND EXISTS ${dir}/platforms.txt)
     # get all the specified platforms
     file(STRINGS ${dir}/platforms.txt platforms)
-    
+
     list( LENGTH platforms listlen )
-    if(${listlen} EQUAL 1)    
+    if(${listlen} EQUAL 1)
         string(REPLACE " " ";" platforms ${platforms})
     endif()
 
diff --git a/cmake/scripts/common/HandleDepends.cmake b/cmake/scripts/common/HandleDepends.cmake
index fb110d6..47f7d9b 100644
--- a/cmake/scripts/common/HandleDepends.cmake
+++ b/cmake/scripts/common/HandleDepends.cmake
@@ -231,9 +231,23 @@ function(add_addon_depends addon searchpath)
                                     -DCMAKE_INCLUDE_PATH=${OUTPUT_DIR}/include)
             endif()
 
+            set(DOWNLOAD_DIR ${BUILD_DIR}/download)
+            if(EXISTS ${dir}/${id}.sha256)
+              file(STRINGS ${dir}/${id}.sha256 sha256sum)
+              list(GET sha256sum 0 sha256sum)
+              set(URL_HASH_COMMAND URL_HASH SHA256=${sha256sum})
+              if(TARBALL_DIR)
+                set(DOWNLOAD_DIR ${TARBALL_DIR})
+              endif()
+            else()
+              unset(URL_HASH_COMMAND)
+              message(AUTHOR_WARNING "${dir}/${id}.sha256 is missing")
+            endif()
+
             externalproject_add(${id}
                                 URL ${url}
-                                DOWNLOAD_DIR ${BUILD_DIR}/download
+                                "${URL_HASH_COMMAND}"
+                                DOWNLOAD_DIR ${DOWNLOAD_DIR}
                                 CONFIGURE_COMMAND ${CONFIGURE_COMMAND}
                                 "${EXTERNALPROJECT_SETUP}")
           endif()
diff --git a/cmake/scripts/common/Macros.cmake b/cmake/scripts/common/Macros.cmake
index c21069d..0d89dd3 100644
--- a/cmake/scripts/common/Macros.cmake
+++ b/cmake/scripts/common/Macros.cmake
@@ -468,7 +468,7 @@ function(core_optional_dyload_dep)
   foreach(depspec ${ARGN})
     set(_required False)
     split_dependency_specification(${depspec} dep version)
-    setup_enable_switch()    
+    setup_enable_switch()
     if(${enable_switch} STREQUAL AUTO)
       find_package_with_ver(${dep} ${version})
     elseif(${${enable_switch}})
@@ -662,7 +662,11 @@ function(core_find_git_rev stamp)
       string(REPLACE "\"" "" DATE ${DATE})
       string(REPLACE "-" "" DATE ${DATE})
     else()
-      string(TIMESTAMP DATE "%Y%m%d" UTC)
+      if(EXISTS ${CMAKE_SOURCE_DIR}/BUILDDATE)
+        file(STRINGS ${CMAKE_SOURCE_DIR}/BUILDDATE DATE LIMIT_INPUT 8)
+      else()
+        string(TIMESTAMP DATE "%Y%m%d" UTC)
+      endif()
       if(EXISTS ${CMAKE_SOURCE_DIR}/VERSION)
         file(STRINGS ${CMAKE_SOURCE_DIR}/VERSION HASH LIMIT_INPUT 16)
       else()
@@ -687,6 +691,7 @@ endfunction()
 #   APP_NAME_UC - uppercased app name
 #   APP_PACKAGE - Android full package name
 #   COMPANY_NAME - company name
+#   APP_WEBSITE - site url
 #   APP_VERSION_MAJOR - the app version major
 #   APP_VERSION_MINOR - the app version minor
 #   APP_VERSION_TAG - the app version tag
@@ -711,7 +716,7 @@ macro(core_find_versions)
   core_file_read_filtered(version_list ${CORE_SOURCE_DIR}/version.txt)
   core_file_read_filtered(json_version ${CORE_SOURCE_DIR}/xbmc/interfaces/json-rpc/schema/version.txt)
   string(REGEX REPLACE "([^ ;]*) ([^;]*)" "\\1;\\2" version_list "${version_list};${json_version}")
-  set(version_props 
+  set(version_props
     ADDON_API
     APP_NAME
     APP_PACKAGE
@@ -761,6 +766,9 @@ macro(core_find_versions)
   # unset variables not used anywhere else
   unset(version_list)
   unset(APP_APP_NAME)
+  unset(APP_COMPANY_NAME)
+  unset(APP_APP_PACKAGE)
+  unset(APP_JSONRPC_VERSION)
   unset(BIN_ADDON_PARTS)
 
   # bail if we can't parse version.txt
diff --git a/cmake/scripts/common/ProjectMacros.cmake b/cmake/scripts/common/ProjectMacros.cmake
index 641e047..fba5252 100644
--- a/cmake/scripts/common/ProjectMacros.cmake
+++ b/cmake/scripts/common/ProjectMacros.cmake
@@ -46,7 +46,7 @@ function(copy_skin_to_buildtree skin)
 endfunction()
 
 # Get GTest tests as CMake tests.
-# Copied from FindGTest.cmake 
+# Copied from FindGTest.cmake
 # Thanks to Daniel Blezek <blezek@gmail.com> for the GTEST_ADD_TESTS code
 function(GTEST_ADD_TESTS executable extra_args)
     if(NOT ARGN)
diff --git a/cmake/scripts/freebsd/ArchSetup.cmake b/cmake/scripts/freebsd/ArchSetup.cmake
index db11bf8..3d5599c 100644
--- a/cmake/scripts/freebsd/ArchSetup.cmake
+++ b/cmake/scripts/freebsd/ArchSetup.cmake
@@ -10,6 +10,15 @@ else()
     set(ARCH x86_64-freebsd)
   elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i.86")
     set(ARCH x86-freebsd)
+  elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv6)
+    set(ARCH armv6-freebsd)
+    set(NEON True)
+  elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7)
+    set(ARCH armv7-freebsd)
+    set(NEON True)
+  elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
+    set(ARCH aarch64-freebsd)
+    set(NEON True)
   else()
     message(WARNING "unknown CPU: ${CPU}")
   endif()
diff --git a/cmake/scripts/freebsd/ExtraTargets.cmake b/cmake/scripts/freebsd/ExtraTargets.cmake
index 66383ab..9d5d214 100644
--- a/cmake/scripts/freebsd/ExtraTargets.cmake
+++ b/cmake/scripts/freebsd/ExtraTargets.cmake
@@ -1,29 +1 @@
-# xrandr
-if(X_FOUND AND XRANDR_FOUND)
-  find_package(X QUIET)
-  find_package(XRandR QUIET)
-  add_executable(${APP_NAME_LC}-xrandr ${CMAKE_SOURCE_DIR}/xbmc-xrandr.c)
-  target_link_libraries(${APP_NAME_LC}-xrandr ${SYSTEM_LDFLAGS} ${X_LIBRARIES} m ${XRANDR_LIBRARIES})
-endif()
-
-# WiiRemote
-if(ENABLE_EVENTCLIENTS AND BLUETOOTH_FOUND)
-  find_package(CWiid QUIET)
-  if(CWIID_FOUND)
-    add_subdirectory(${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/WiiRemote build/WiiRemote)
-  endif()
-endif()
-
-if(CORE_PLATFORM_NAME_LC STREQUAL "wayland")
-  # This cannot go into wayland.cmake since it requires the Wayland dependencies
-  # to already be resolved
-  set(PROTOCOL_XMLS "${WAYLAND_PROTOCOLS_DIR}/unstable/xdg-shell/xdg-shell-unstable-v6.xml"
-                    "${WAYLAND_PROTOCOLS_DIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml")
-  add_custom_command(OUTPUT "${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}/wayland-extra-protocols.hpp" "${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}/wayland-extra-protocols.cpp"
-                     COMMAND "${WAYLANDPP_SCANNER}" ${PROTOCOL_XMLS} "${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}/wayland-extra-protocols.hpp" "${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}/wayland-extra-protocols.cpp"
-                     DEPENDS "${WAYLANDPP_SCANNER}" ${PROTOCOL_XMLS}
-                     COMMENT "Generating wayland-protocols C++ wrappers")
-
-  # Dummy target for dependencies
-  add_custom_target(generate-wayland-extra-protocols DEPENDS wayland-extra-protocols.hpp)
-endif()
+include(cmake/scripts/linux/ExtraTargets.cmake)
diff --git a/cmake/scripts/freebsd/Macros.cmake b/cmake/scripts/freebsd/Macros.cmake
index 2fdbb25..ef5aed3 120000..100644
--- a/cmake/scripts/freebsd/Macros.cmake
+++ b/cmake/scripts/freebsd/Macros.cmake
@@ -1 +1,95 @@
-../linux/Macros.cmake
\ No newline at end of file
+function(core_link_library lib wraplib)
+  set(export -Wl,--unresolved-symbols=ignore-all
+             `cat ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cores/dll-loader/exports/wrapper.def`
+             ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cores/dll-loader/exports/CMakeFiles/wrapper.dir/wrapper.c.o)
+  set(check_arg "")
+  if(TARGET ${lib})
+    set(target ${lib})
+    set(link_lib $<TARGET_FILE:${lib}>)
+    set(check_arg ${ARGV2})
+    set(data_arg  ${ARGV3})
+  else()
+    set(target ${ARGV2})
+    set(link_lib ${lib})
+    set(check_arg ${ARGV3})
+    set(data_arg ${ARGV4})
+  endif()
+
+  # wrapper has to be adapted in order to support coverage.
+  if(CMAKE_BUILD_TYPE STREQUAL Coverage)
+    set(export "")
+  endif()
+
+  if(check_arg STREQUAL export)
+    set(export ${export}
+        -Wl,--version-script=${ARGV3})
+  elseif(check_arg STREQUAL extras)
+    foreach(arg ${data_arg})
+      list(APPEND export ${arg})
+    endforeach()
+  elseif(check_arg STREQUAL archives)
+    set(extra_libs ${data_arg})
+  endif()
+
+  string(REGEX REPLACE "[ ]+" ";" _flags "${CMAKE_SHARED_LINKER_FLAGS}")
+  get_filename_component(dir ${wraplib} DIRECTORY)
+  add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${wraplib}-${ARCH}${CMAKE_SHARED_MODULE_SUFFIX}
+                     COMMAND ${CMAKE_COMMAND} -E make_directory ${dir}
+                     COMMAND ${CMAKE_C_COMPILER}
+                     ARGS    ${_flags} -Wl,--whole-archive
+                             "${link_lib}" ${extra_libs}
+                             -Wl,--no-whole-archive -lm
+                             -Wl,-soname,${wraplib}-${ARCH}${CMAKE_SHARED_MODULE_SUFFIX}
+                             -shared -o ${CMAKE_BINARY_DIR}/${wraplib}-${ARCH}${CMAKE_SHARED_MODULE_SUFFIX}
+                             ${export}
+                     DEPENDS ${target} wrapper.def wrapper)
+
+  get_filename_component(libname ${wraplib} NAME_WE)
+  add_custom_target(wrap_${libname} ALL DEPENDS ${CMAKE_BINARY_DIR}/${wraplib}-${ARCH}${CMAKE_SHARED_MODULE_SUFFIX})
+  set_target_properties(wrap_${libname} PROPERTIES FOLDER lib/wrapped)
+  add_dependencies(${APP_NAME_LC}-libraries wrap_${libname})
+
+  set(LIBRARY_FILES ${LIBRARY_FILES} ${CMAKE_BINARY_DIR}/${wraplib}-${ARCH}${CMAKE_SHARED_MODULE_SUFFIX} CACHE STRING "" FORCE)
+endfunction()
+
+function(find_soname lib)
+  cmake_parse_arguments(arg "REQUIRED" "" "" ${ARGN})
+
+  string(TOLOWER ${lib} liblow)
+  if(${lib}_LDFLAGS)
+    set(link_lib "${${lib}_LDFLAGS}")
+  else()
+    if(IS_ABSOLUTE "${${lib}_LIBRARIES}")
+      set(link_lib "${${lib}_LIBRARIES}")
+    else()
+      set(link_lib -l${${lib}_LIBRARIES})
+    endif()
+  endif()
+  execute_process(COMMAND ${CMAKE_C_COMPILER} -nostdlib -o /dev/null -Wl,-M ${link_lib}
+                  COMMAND grep LOAD.*${liblow}
+                  ERROR_QUIET
+                  OUTPUT_VARIABLE ${lib}_FILENAME)
+  string(REPLACE "LOAD " "" ${lib}_FILENAME "${${lib}_FILENAME}")
+  string(STRIP "${${lib}_FILENAME}" ${lib}_FILENAME)
+  if(NOT ${lib}_FILENAME)
+    execute_process(COMMAND ${CMAKE_C_COMPILER} -nostdlib -o /dev/null -Wl,-t ${link_lib}
+                    ERROR_QUIET
+                    OUTPUT_VARIABLE _TMP_FILENAME)
+    string(REGEX MATCH ".*lib${liblow}.so" ${lib}_FILENAME ${_TMP_FILENAME})
+  endif()
+  if(${lib}_FILENAME)
+    execute_process(COMMAND ${CMAKE_OBJDUMP} -p ${${lib}_FILENAME}
+                    COMMAND grep SONAME.*${liblow}
+                    ERROR_QUIET
+                    OUTPUT_VARIABLE ${lib}_SONAME)
+    string(REPLACE "SONAME " "" ${lib}_SONAME ${${lib}_SONAME})
+    string(STRIP ${${lib}_SONAME} ${lib}_SONAME)
+    if(VERBOSE)
+      message(STATUS "${lib} soname: ${${lib}_SONAME}")
+    endif()
+    set(${lib}_SONAME ${${lib}_SONAME} PARENT_SCOPE)
+  endif()
+  if(arg_REQUIRED AND NOT ${lib}_SONAME)
+    message(FATAL_ERROR "Could not find dynamically loadable library ${lib}")
+  endif()
+endfunction()
diff --git a/cmake/scripts/ios/Install.cmake b/cmake/scripts/ios/Install.cmake
index 587b24f..7b6c3de 100644
--- a/cmake/scripts/ios/Install.cmake
+++ b/cmake/scripts/ios/Install.cmake
@@ -66,7 +66,8 @@ add_custom_command(TARGET ${APP_NAME_LC} POST_BUILD
             "WRAPPER_EXTENSION=app"
             "SRCROOT=${CMAKE_BINARY_DIR}"
             ${CMAKE_SOURCE_DIR}/tools/darwin/Support/copyframeworks-ios.command
-    COMMAND "NATIVEPREFIX=${NATIVEPREFIX}"
+    COMMAND "XBMC_DEPENDS=${DEPENDS_PATH}"
+            "NATIVEPREFIX=${NATIVEPREFIX}"
             "PLATFORM_NAME=${PLATFORM}"
             "CODESIGNING_FOLDER_PATH=$<TARGET_FILE_DIR:${APP_NAME_LC}>"
             "BUILT_PRODUCTS_DIR=$<TARGET_FILE_DIR:${APP_NAME_LC}>/.."
diff --git a/cmake/scripts/linux/ArchSetup.cmake b/cmake/scripts/linux/ArchSetup.cmake
index fcee675..624edf6 100644
--- a/cmake/scripts/linux/ArchSetup.cmake
+++ b/cmake/scripts/linux/ArchSetup.cmake
@@ -108,10 +108,6 @@ if(CMAKE_BUILD_TYPE STREQUAL Coverage)
   set(COVERAGE_EXCLUDES */test/* lib/* */lib/*)
 endif()
 
-if(ENABLE_MIR)
-  set(ENABLE_VDPAU OFF CACHE BOOL "Disabling VDPAU since no Mir support" FORCE)
-endif()
-
 if(ENABLE_GBM)
   set(ENABLE_VDPAU OFF CACHE BOOL "Disabling VDPAU" FORCE)
 endif()
diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake
index d6767bf..d64b98a 100644
--- a/cmake/scripts/linux/Install.cmake
+++ b/cmake/scripts/linux/Install.cmake
@@ -127,11 +127,17 @@ install(FILES ${CMAKE_SOURCE_DIR}/tools/Linux/packaging/media/icon256x256.png
         DESTINATION ${datarootdir}/icons/hicolor/256x256/apps
         COMPONENT kodi)
 
+# Install firewalld service definitions
+install(FILES ${CMAKE_SOURCE_DIR}/tools/Linux/firewalld-services/kodi-eventserver.xml
+              ${CMAKE_SOURCE_DIR}/tools/Linux/firewalld-services/kodi-http.xml
+              ${CMAKE_SOURCE_DIR}/tools/Linux/firewalld-services/kodi-jsonrpc.xml
+        DESTINATION ${prefix}/lib/firewalld/services
+        COMPONENT kodi)
+
 # Install docs
-install(FILES ${CMAKE_SOURCE_DIR}/copying.txt
-              ${CMAKE_SOURCE_DIR}/LICENSE.GPL
+install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.md
               ${CMAKE_SOURCE_DIR}/version.txt
-              ${CMAKE_SOURCE_DIR}/docs/README.linux
+              ${CMAKE_SOURCE_DIR}/docs/README.Linux.md
         DESTINATION ${docdir}
         COMPONENT kodi)
 
@@ -197,7 +203,7 @@ if(ENABLE_EVENTCLIENTS)
   file(WRITE ${CMAKE_BINARY_DIR}/packages/deb/defs.py ICON_PATH="usr/share/pixmaps/${APP_NAME_LC}/")
   install(PROGRAMS ${CMAKE_BINARY_DIR}/packages/deb/defs.py
                    ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/__init__.py
-                   "${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py"
+                   ${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/PS3BDRemote/ps3_remote.py
                    ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/xbmcclient.py
                    ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/zeroconf.py
           DESTINATION ${PYTHON_LIB_PATH}/${APP_NAME_LC}
@@ -246,7 +252,7 @@ if(ENABLE_EVENTCLIENTS)
           COMPONENT kodi-eventclients-dev)
 
   # Install kodi-eventclients-ps3
-  install(PROGRAMS "${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py"
+  install(PROGRAMS ${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/PS3BDRemote/ps3_remote.py
           RENAME ${APP_NAME_LC}-ps3remote
           DESTINATION ${bindir}
           COMPONENT kodi-eventclients-ps3)
@@ -259,7 +265,7 @@ if(ENABLE_EVENTCLIENTS)
   endif()
 
   # Install kodi-eventclients-xbmc-send
-  install(PROGRAMS "${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/Kodi Send/kodi-send.py"
+  install(PROGRAMS ${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/KodiSend/kodi-send.py
           RENAME ${APP_NAME_LC}-send
           DESTINATION ${bindir}
           COMPONENT kodi-eventclients-xbmc-send)
diff --git a/cmake/scripts/linux/Macros.cmake b/cmake/scripts/linux/Macros.cmake
index 9e8ebe6..37243a7 100644
--- a/cmake/scripts/linux/Macros.cmake
+++ b/cmake/scripts/linux/Macros.cmake
@@ -65,7 +65,7 @@ function(find_soname lib)
       set(link_lib -l${${lib}_LIBRARIES})
     endif()
   endif()
-  execute_process(COMMAND ${CMAKE_C_COMPILER} -nostdlib -o /dev/null -Wl,-M ${link_lib} 
+  execute_process(COMMAND ${CMAKE_C_COMPILER} -nostdlib -o /dev/null -Wl,-M ${link_lib}
                   COMMAND grep LOAD.*${liblow}
                   ERROR_QUIET
                   OUTPUT_VARIABLE ${lib}_FILENAME)
diff --git a/cmake/scripts/osx/ArchSetup.cmake b/cmake/scripts/osx/ArchSetup.cmake
index d0c5506..9ba0596 100644
--- a/cmake/scripts/osx/ArchSetup.cmake
+++ b/cmake/scripts/osx/ArchSetup.cmake
@@ -36,5 +36,5 @@ list(APPEND DEPLIBS "-framework DiskArbitration" "-framework IOKit"
                     "-framework CoreGraphics" "-framework CoreMedia"
                     "-framework VideoToolbox")
 
-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8)
+set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_LINK_OBJC_RUNTIME OFF)
diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake
index b3963a6..b94842f 100644
--- a/cmake/scripts/windows/ArchSetup.cmake
+++ b/cmake/scripts/windows/ArchSetup.cmake
@@ -87,9 +87,9 @@ foreach(_lib ${_nodefaultlibs_DEBUG})
 endforeach()
 
 # DELAYLOAD option
-set(_delayloadlibs zlib.dll libmysql.dll libxslt.dll dnssd.dll dwmapi.dll ssh.dll sqlite3.dll
-                   avcodec-57.dll avfilter-6.dll avformat-57.dll avutil-55.dll
-                   postproc-54.dll swresample-2.dll swscale-4.dll d3dcompiler_47.dll)
+set(_delayloadlibs zlib.dll libmysql.dll libxslt.dll dnssd.dll dwmapi.dll sqlite3.dll
+                   avcodec-58.dll avfilter-7.dll avformat-58.dll avutil-56.dll
+                   postproc-55.dll swresample-3.dll swscale-5.dll d3dcompiler_47.dll)
 foreach(_lib ${_delayloadlibs})
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:\"${_lib}\"")
 endforeach()
diff --git a/cmake/scripts/windowsstore/ArchSetup.cmake b/cmake/scripts/windowsstore/ArchSetup.cmake
index a663bb9..e3e46e7 100644
--- a/cmake/scripts/windowsstore/ArchSetup.cmake
+++ b/cmake/scripts/windowsstore/ArchSetup.cmake
@@ -1,5 +1,5 @@
 # Minimum SDK version we support
-set(VS_MINIMUM_SDK_VERSION 10.0.14393.0)
+set(VS_MINIMUM_SDK_VERSION 10.0.16299.0)
 
 if(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION VERSION_LESS VS_MINIMUM_SDK_VERSION)
   message(FATAL_ERROR "Detected Windows SDK version is ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}.\n"
@@ -25,7 +25,7 @@ elseif(_ARM_)
 else()
    message(FATAL_ERROR "Unsupported architecture")
 endif()
- 
+
 unset(_X86_)
 unset(_AMD64_)
 unset(_ARM_)
@@ -51,7 +51,7 @@ set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/win10-$
 # mingw libs
 list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${MINGW_LIBS_DIR})
 list(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin)
-# dependencies 
+# dependencies
 list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${DEPENDENCIES_DIR})
 # for python
 set(PYTHON_INCLUDE_DIR ${DEPENDENCIES_DIR}/include/python)
@@ -63,6 +63,7 @@ add_options(CXX ALL_BUILDS "/wd\"4996\"")
 add_options(CXX ALL_BUILDS "/wd\"4146\"")
 add_options(CXX ALL_BUILDS "/wd\"4251\"")
 add_options(CXX ALL_BUILDS "/wd\"4668\"")
+add_options(CXX ALL_BUILDS "/wd\"5033\"")
 set(ARCH_DEFINES -D_WINDOWS -DTARGET_WINDOWS -DTARGET_WINDOWS_STORE -DXBMC_EXPORT -DMS_UWP)
 if(NOT SDK_TARGET_ARCH STREQUAL arm)
   list(APPEND ARCH_DEFINES -D__SSE__ -D__SSE2__)
@@ -78,7 +79,7 @@ set(SYSTEM_DEFINES -DWIN32_LEAN_AND_MEAN -DNOMINMAX -DHAS_DX -D__STDC_CONSTANT_M
 list(APPEND SYSTEM_DEFINES -DHAS_WIN10_NETWORK)
 
 # The /MP option enables /FS by default.
-set(CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS} /ZW /EHsc /await")
+set(CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS} /EHsc /await /std:c++latest")
 # Google Test needs to use shared version of runtime libraries
 set(gtest_force_shared_crt ON CACHE STRING "" FORCE)
 
@@ -90,20 +91,10 @@ set(gtest_force_shared_crt ON CACHE STRING "" FORCE)
 link_directories(${MINGW_LIBS_DIR}/lib
                  ${DEPENDENCIES_DIR}/lib)
 
-list(APPEND DEPLIBS d3d11.lib WS2_32.lib dxguid.lib dloadhelper.lib)
-if(ARCH STREQUAL win32 OR ARCH STREQUAL x64)
-  list(APPEND DEPLIBS DInput8.lib DSound.lib winmm.lib Mpr.lib Iphlpapi.lib PowrProf.lib setupapi.lib dwmapi.lib)
-endif()
-# NODEFAULTLIB option
+list(APPEND DEPLIBS d3d11.lib WS2_32.lib dxguid.lib dloadhelper.lib WindowsApp.lib)
 
-set(_nodefaultlibs_RELEASE libcmt)
-set(_nodefaultlibs_DEBUG libcmt msvcrt)
-foreach(_lib ${_nodefaultlibs_RELEASE})
-  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:\"${_lib}\"")
-endforeach()
-foreach(_lib ${_nodefaultlibs_DEBUG})
-  set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:\"${_lib}\"")
-endforeach()
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /WINMD:NO")
+set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt /DEBUG:FASTLINK /OPT:NOREF /OPT:NOICF")
 
 # Make the Release version create a PDB
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
@@ -117,13 +108,6 @@ set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4264")
 
 if(CMAKE_GENERATOR MATCHES "Visual Studio")
   set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
-  # Generate a batch file that opens Visual Studio with the necessary env variables set.
-  file(WRITE ${CMAKE_BINARY_DIR}/kodi-sln.bat
-             "@echo off\n"
-             "set KODI_HOME=%~dp0\n"
-             "set PATH=%~dp0\\system\n"
-             "start %~dp0\\${PROJECT_NAME}.sln")
 endif()
 
 # -------- Build options ---------
diff --git a/cmake/scripts/windowsstore/Macros.cmake b/cmake/scripts/windowsstore/Macros.cmake
index 7240138..de89c62 100644
--- a/cmake/scripts/windowsstore/Macros.cmake
+++ b/cmake/scripts/windowsstore/Macros.cmake
@@ -70,11 +70,11 @@ macro(winstore_set_assets target)
   set_property(SOURCE ${ASSET_FILES} PROPERTY VS_DEPLOYMENT_CONTENT 1)
   set_property(SOURCE ${ASSET_FILES} PROPERTY VS_DEPLOYMENT_LOCATION "media")
   source_group("media" FILES ${ASSET_FILES})
-  set(RESOURCES ${RESOURCES} ${ASSET_FILES} 
+  set(RESOURCES ${RESOURCES} ${ASSET_FILES}
                             "${CMAKE_SOURCE_DIR}/tools/windows/packaging/uwp/kodi_temp_key.pfx")
-  set(LICENSE_FILES 
-    ${CMAKE_SOURCE_DIR}/LICENSE.GPL
-    ${CMAKE_SOURCE_DIR}/copying.txt
+
+  set(LICENSE_FILES
+    ${CMAKE_SOURCE_DIR}/LICENSE.md
     ${CMAKE_SOURCE_DIR}/privacy-policy.txt)
   if(EXISTS "${CMAKE_SOURCE_DIR}/known_issues.txt")
     list(APPEND LICENSE_FILES ${CMAKE_SOURCE_DIR}/known_issues.txt)
@@ -108,7 +108,7 @@ macro(add_deployment_content_group path link match exclude)
     "      <Link>${_link}%(RecursiveDir)%(FileName)%(Extension)</Link>\n"
     "      <DeploymentContent>true</DeploymentContent>\n"
     "    </EmbedResources>\n")
-endmacro() 
+endmacro()
 
 macro(winstore_append_props target)
   # exclude debug dlls from packaging
@@ -126,7 +126,7 @@ macro(winstore_append_props target)
     "    </None>\n"
     "  </ItemGroup>\n")
   endforeach(_dll DEBUG_DLLS)
-  
+
   add_deployment_content_group($(BuildRootPath)/dlls "" *.dll "${DEBUG_DLLS_EXCLUDE}")
   add_deployment_content_group($(BuildRootPath)/system system **/* "$(BuildRootPath)/**/shaders/**")
   add_deployment_content_group($(BuildRootPath)/system/shaders system/shaders **/*.fx "")
@@ -179,4 +179,4 @@ macro(winstore_add_target_properties target)
   winstore_set_assets(${target})
   winstore_generate_manifest(${target})
   winstore_append_props(${target})
-endmacro()
\ No newline at end of file
+endmacro()
diff --git a/cmake/treedata/android/subdirs.txt b/cmake/treedata/android/subdirs.txt
index 7f7fef5..036fd24 100644
--- a/cmake/treedata/android/subdirs.txt
+++ b/cmake/treedata/android/subdirs.txt
@@ -6,10 +6,10 @@ xbmc/platform/posix                     platform/posix
 xbmc/platform/posix/filesystem          platform/posix/filesystem
 xbmc/platform/posix/utils               platform/posix/utils
 xbmc/platform/linux                     platform/linux
-xbmc/platform/linux/network             platform/linux/network
 xbmc/platform/linux/peripherals         platform/linux/peripherals
 xbmc/platform/android/activity          platform/android/activity
 xbmc/platform/android/bionic_supplement platform/android/bionicsupplement
+xbmc/platform/android/drm               platform/android/drm
 xbmc/platform/android/filesystem        platform/android/filesystem
 xbmc/platform/android/network           platform/android/network
 xbmc/platform/android/peripherals       platform/android/peripherals
diff --git a/cmake/treedata/common/drm.txt b/cmake/treedata/common/drm.txt
new file mode 100644
index 0000000..fbcc906
--- /dev/null
+++ b/cmake/treedata/common/drm.txt
@@ -0,0 +1 @@
+xbmc/drm drm
diff --git a/cmake/treedata/common/games.txt b/cmake/treedata/common/games.txt
index 7b63f6a..7ae2d35 100644
--- a/cmake/treedata/common/games.txt
+++ b/cmake/treedata/common/games.txt
@@ -1,8 +1,7 @@
 xbmc/games                         games
 xbmc/games/addons                  games/addons
 xbmc/games/addons/input            games/addons/input
-xbmc/games/addons/playback         games/addons/playback
-xbmc/games/addons/savestates       games/addons/savestates
+xbmc/games/addons/streams          games/addons/streams
 xbmc/games/controllers             games/controllers
 xbmc/games/controllers/dialogs     games/controllers/dialogs
 xbmc/games/controllers/guicontrols games/controllers/guicontrols
diff --git a/cmake/treedata/common/retroplayer.txt b/cmake/treedata/common/retroplayer.txt
index 0239801..cf9c9c5 100644
--- a/cmake/treedata/common/retroplayer.txt
+++ b/cmake/treedata/common/retroplayer.txt
@@ -1,8 +1,15 @@
 xbmc/cores/RetroPlayer                                          cores/RetroPlayer
+xbmc/cores/RetroPlayer/audio                                    cores/RetroPlayer/audio
+xbmc/cores/RetroPlayer/buffers                                  cores/RetroPlayer/buffers
+xbmc/cores/RetroPlayer/buffers/video                            cores/RetroPlayer/buffers/video
 xbmc/cores/RetroPlayer/guibridge                                cores/RetroPlayer/guibridge
 xbmc/cores/RetroPlayer/guicontrols                              cores/RetroPlayer/guicontrols
 xbmc/cores/RetroPlayer/guiwindows                               cores/RetroPlayer/guiwindows
+xbmc/cores/RetroPlayer/playback                                 cores/RetroPlayer/playback
 xbmc/cores/RetroPlayer/process                                  cores/RetroPlayer/process
 xbmc/cores/RetroPlayer/rendering                                cores/RetroPlayer/rendering
 xbmc/cores/RetroPlayer/rendering/VideoRenderers                 cores/RetroPlayer/rendering/VideoRenderers
 xbmc/cores/RetroPlayer/rendering/VideoShaders                   cores/RetroPlayer/rendering/VideoShaders
+xbmc/cores/RetroPlayer/savestates                               cores/RetroPlayer/savestates
+xbmc/cores/RetroPlayer/streams                                  cores/RetroPlayer/streams
+xbmc/cores/RetroPlayer/streams/memory                           cores/RetroPlayer/streams/memory
diff --git a/cmake/treedata/freebsd/subdirs.txt b/cmake/treedata/freebsd/subdirs.txt
index fe0725c..e4edf23 100644
--- a/cmake/treedata/freebsd/subdirs.txt
+++ b/cmake/treedata/freebsd/subdirs.txt
@@ -1,6 +1,7 @@
 xbmc/platform/posix                 platform/posix
 xbmc/platform/posix/filesystem      platform/posix/filesystem
 xbmc/platform/posix/utils           platform/posix/utils
+xbmc/platform/freebsd               platform/freebsd
 xbmc/platform/linux                 platform/linux
 xbmc/platform/linux/input           platform/linux/input
 xbmc/platform/linux/network         platform/linux/network
@@ -9,3 +10,6 @@ xbmc/platform/linux/powermanagement platform/linux/powermanagement
 xbmc/platform/linux/storage         platform/linux/storage
 xbmc/input/touch                    input/touch
 xbmc/input/touch/generic            input/touch/generic
+xbmc/cores/RetroPlayer/process/rbpi cores/RetroPlayer/process/rbpi
+xbmc/cores/VideoPlayer/Process/rbpi cores/VideoPlayer/Process/rbpi
+xbmc/windowing/linux                windowing/linux
diff --git a/cmake/treedata/optional/common/mir.txt b/cmake/treedata/optional/common/mir.txt
deleted file mode 100644
index d681e8b..0000000
--- a/cmake/treedata/optional/common/mir.txt
+++ /dev/null
@@ -1 +0,0 @@
-xbmc/windowing/mir windowing/mir # MIR