diff -Nru kodi-18.0+git20180703.0201-a44e6e2/BUILDDATE kodi-18.0+git20180704.0202-f0dda3a/BUILDDATE
--- kodi-18.0+git20180703.0201-a44e6e2/BUILDDATE	2018-07-03 00:01:53.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/BUILDDATE	2018-07-04 00:02:18.000000000 +0000
@@ -1 +1 @@
-20180703
+20180704
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/cmake/installdata/ios/packaging.txt kodi-18.0+git20180704.0202-f0dda3a/cmake/installdata/ios/packaging.txt
--- kodi-18.0+git20180703.0201-a44e6e2/cmake/installdata/ios/packaging.txt	2018-05-01 00:00:10.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/cmake/installdata/ios/packaging.txt	2018-07-04 00:01:49.000000000 +0000
@@ -1,3 +1,3 @@
-LICENSE.gpl
+LICENSE.md
 privacy-policy.txt
 xbmc/platform/darwin/Credits.html
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/cmake/installdata/osx/packaging.txt kodi-18.0+git20180704.0202-f0dda3a/cmake/installdata/osx/packaging.txt
--- kodi-18.0+git20180703.0201-a44e6e2/cmake/installdata/osx/packaging.txt	2018-05-01 00:00:10.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/cmake/installdata/osx/packaging.txt	2018-07-04 00:01:49.000000000 +0000
@@ -1,4 +1,4 @@
-LICENSE.gpl
+LICENSE.md
 privacy-policy.txt
 xbmc/platform/darwin/Credits.html
 tools/darwin/packaging/media/osx/icon.iconset/*
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/cmake/README.md kodi-18.0+git20180704.0202-f0dda3a/cmake/README.md
--- kodi-18.0+git20180703.0201-a44e6e2/cmake/README.md	2018-06-21 18:59:46.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/cmake/README.md	2018-07-04 00:01:49.000000000 +0000
@@ -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).
-
-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.
+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).
 
-## Sanitizers
+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.
 
-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).
+## 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)**.
 
-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 -Nru kodi-18.0+git20180703.0201-a44e6e2/cmake/scripts/freebsd/Install.cmake kodi-18.0+git20180704.0202-f0dda3a/cmake/scripts/freebsd/Install.cmake
--- kodi-18.0+git20180703.0201-a44e6e2/cmake/scripts/freebsd/Install.cmake	2018-06-21 18:59:46.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/cmake/scripts/freebsd/Install.cmake	2018-07-04 00:01:49.000000000 +0000
@@ -136,9 +136,9 @@
 
 # Install docs
 install(FILES ${CMAKE_SOURCE_DIR}/copying.txt
-              ${CMAKE_SOURCE_DIR}/LICENSE.GPL
+              ${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)
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/cmake/scripts/linux/Install.cmake kodi-18.0+git20180704.0202-f0dda3a/cmake/scripts/linux/Install.cmake
--- kodi-18.0+git20180703.0201-a44e6e2/cmake/scripts/linux/Install.cmake	2018-06-21 18:59:46.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/cmake/scripts/linux/Install.cmake	2018-07-04 00:01:49.000000000 +0000
@@ -136,9 +136,9 @@
 
 # Install docs
 install(FILES ${CMAKE_SOURCE_DIR}/copying.txt
-              ${CMAKE_SOURCE_DIR}/LICENSE.GPL
+              ${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)
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/cmake/scripts/windowsstore/Macros.cmake kodi-18.0+git20180704.0202-f0dda3a/cmake/scripts/windowsstore/Macros.cmake
--- kodi-18.0+git20180703.0201-a44e6e2/cmake/scripts/windowsstore/Macros.cmake	2018-06-21 18:59:46.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/cmake/scripts/windowsstore/Macros.cmake	2018-07-04 00:01:49.000000000 +0000
@@ -72,8 +72,9 @@
   source_group("media" FILES ${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}/LICENSE.md
     ${CMAKE_SOURCE_DIR}/copying.txt
     ${CMAKE_SOURCE_DIR}/privacy-policy.txt)
   if(EXISTS "${CMAKE_SOURCE_DIR}/known_issues.txt")
@@ -179,4 +180,4 @@
   winstore_set_assets(${target})
   winstore_generate_manifest(${target})
   winstore_append_props(${target})
-endmacro()
\ No newline at end of file
+endmacro()
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/CONTRIBUTING.md kodi-18.0+git20180704.0202-f0dda3a/CONTRIBUTING.md
--- kodi-18.0+git20180703.0201-a44e6e2/CONTRIBUTING.md	2015-06-14 19:32:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/CONTRIBUTING.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-### Introduction
-
-**Kodi** uses Github for development only, i.e. for *pull requests* and the review of such code.  
-**Do not open** an issue on Github for your questions or bug reports.  
-**Do not comment** on a *pull request* unless you are involved in the testing of such or have something meaningful to contribute.  
-Not familiar with git? Start by looking at Github's [collaborating pages](https://help.github.com/categories/collaborating/).
-
-#### Questions about Kodi?
-
-To get your questions answered, please ask in the [Kodi community forum's](http://forum.kodi.tv/) or on **IRC:** [#kodi](http://webchat.freenode.net?nick=kodi-contrib&channels=%23kodi&prompt=1&uio=OT10cnVlde) on freenode.net
-
-#### Issue or bug reports and discussions
-
-Issue or bug reports are created and reviewed at [Kodi's bug tracker](http://trac.kodi.tv) using the Kodi forum's *username* and *password*.
-
-If you can, we encourage you to investigate the issue yourself and create a [pull request](https://help.github.com/articles/creating-a-pull-request/) for us to review.
-
-For bug reports and related discussions, feature requests and all other support, please go to [Kodi community forum's](http://forum.kodi.tv/).
-
-#### Pull Requests
-
-Before [creating a pull request](https://help.github.com/articles/creating-a-pull-request/), please read our general code guidelines that can be found at:
-
-- [Code guidelines](http://kodi.wiki/view/Official:Code_guidelines_and_formatting_conventions)
-- [Submitting a patch](http://kodi.wiki/view/HOW-TO_submit_a_patch)
-- [Kodi development](http://kodi.wiki/view/Development)
-
-###### General guidelines for creating pull requests:
-- **Create topic branches**. Don't ask us to pull from your master branch. 
-- **One pull request per feature**. If you want to do more than one thing, send multiple *pull requests*. 
-- **Send coherent history**. Make sure each individual commit in your *pull
-  request* is meaningful.  
-  If you had to make multiple intermediate commits while developing, please squash them before sending them to us.  
-  In the end before merging you may be asked to squash your commit even some more.
-
-###### Please follow these guidelines; it's the best way to get your work included in the project!
-
-- [Click here](https://github.com/xbmc/xbmc/fork/) to **fork Kodi** project,
-   and [configure the remote](https://help.github.com/articles/configuring-a-remote-for-a-fork/):
-
-   ```bash
-   # Clone your fork of kodi's repo into the current directory in terminal
-   git clone git@github.com:<your github username>/xbmc.git kodi
-   # Navigate to the newly cloned directory
-   cd kodi
-   # Assign the original repo to a remote called "upstream"
-   git remote add upstream https://github.com/xbmc/xbmc.git
-   ```
-
-- If you cloned a while ago, get the latest changes from upstream:
-
-   ```bash
-   # Fetch upstream changes
-   git fetch upstream
-   # Make sure you are on your 'master' branch
-   git checkout master
-   # Merge upstream changes
-   git merge upstream/master
-   ```
-
-- Create a new topic branch to contain your feature, change, or fix:
-
-   ```bash
-   git checkout -b <topic-branch-name>
-   ```
-
-- Commit your changes in logical chunks, or your *pull request* is unlikely to be merged into the main project.  
-   Use git's [interactive rebase](https://help.github.com/articles/interactive-rebase)
-   feature to tidy up your commits before making them public.
-
-- Push your topic branch up to your fork:
-
-   ```bash
-   git push origin <topic-branch-name>
-   ```
-
--  Open a [pull request](https://help.github.com/articles/using-pull-requests) with a 
-   clear title and description.
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/debian/changelog kodi-18.0+git20180704.0202-f0dda3a/debian/changelog
--- kodi-18.0+git20180703.0201-a44e6e2/debian/changelog	2018-07-03 00:02:43.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/debian/changelog	2018-07-04 00:02:47.000000000 +0000
@@ -1,4 +1,182 @@
-kodi (2:18.0+git20180703.0201-a44e6e2-0bionic) bionic; urgency=high
+kodi (2:18.0+git20180704.0202-f0dda3a-0bionic) bionic; urgency=high
+
+  [h.udo]
+   * [docs/GIT-FU] New guide
+
+  [h.udo]
+   * [cmake/README] Clean up
+
+  [h.udo]
+   * [docs/doxygen/CODE_GUIDELINES] Sync with markdown code guidelines
+
+  [h.udo]
+   * [docs/doxygen/README.md] Update content to markdown
+
+  [h.udo]
+   * [docs/CONTRIBUTING.md] Update content
+
+  [h.udo]
+   * [tools/depends/README] Update content to markdown
+
+  [h.udo]
+   * [docs/README.Windows] New guide
+
+  [h.udo]
+   * [docs/README.Ubuntu] Update content to markdown
+
+  [h.udo]
+   * [docs/README.RaspberryPi] Update content to markdown
+
+  [h.udo]
+   * [docs/README.openSUSE] Update content to markdown
+
+  [h.udo]
+   * [docs/README.macOS] Update content to markdown
+
+  [h.udo]
+   * [docs/README.Linux] Update content to markdown
+
+  [h.udo]
+   * [docs/README.iOS] Update content to markdown
+
+  [h.udo]
+   * [docs/README.FreeBSD] Update content to markdown
+
+  [h.udo]
+   * [docs/README.Fedora] Update content to markdown
+
+  [h.udo]
+   * [docs/README.Android] Update content to markdown
+
+  [h.udo]
+   * [docs/README] Create index of building docs and resources
+
+  [h.udo]
+   * [PULL_REQUEST_TEMPLATE] Small update
+
+  [Garrett Brown]
+   * [docs/HOWTO] Kill a global
+
+  [Garrett Brown]
+   * [docs/HOWTO] Clean up logic
+
+  [h.udo]
+   * [docs/CODE_GUIDELINES] Add markdown code guidelines
+
+  [h.udo]
+   * [README] Kodi's codebase new face
+
+  [h.udo]
+   * [LICENSE] Update content to markdown
+
+  [h.udo]
+   * [files] Delete obsolete README.pvr
+
+  [h.udo]
+   * [files] Delete obsolete README.armel
+
+  [h.udo]
+   * [files] Add docs/resources folder with needed images
+
+  [h.udo]
+   * [files] Rename to markdown format
+
+  [Rechi]
+   * [modernize][windows] use default member initializers
+
+  [Rechi]
+   * [modernize][windowing] use default member initializers
+
+  [Rechi]
+   * [modernize][weather] use default member initializers
+
+  [Rechi]
+   * [modernize][view] use default member initializers
+
+  [Rechi]
+   * [modernize][video] use default member initializers
+
+  [Rechi]
+   * [modernize][utils] use default member initializers
+
+  [Rechi]
+   * [modernize][threads] use default member initializers
+
+  [Rechi]
+   * [modernize][storage] use default member initializers
+
+  [Rechi]
+   * [modernize][settings] use default member initializers
+
+  [Rechi]
+   * [modernize][rendering] use default member initializers
+
+  [Rechi]
+   * [modernize][pvr] use default member initializers
+
+  [Rechi]
+   * [modernize][profiles] use default member initializers
+
+  [Rechi]
+   * [modernize][platform] use default member initializers
+
+  [Rechi]
+   * [modernize][pictures] use default member initializers
+
+  [Rechi]
+   * [modernize][peripherals] use default member initializers
+
+  [Rechi]
+   * [modernize][network] use default member initializers
+
+  [Rechi]
+   * [modernize][music] use default member initializers
+
+  [Rechi]
+   * [modernize][interfaces] use default member initializers
+
+  [Rechi]
+   * [modernize][input] use default member initializers
+
+  [Rechi]
+   * [modernize][guilib] use default member initializers
+
+  [Rechi]
+   * [modernize][games] use default member initializers
+
+  [Rechi]
+   * [modernize][filesystem] use default member initializers
+
+  [Rechi]
+   * [modernize][dialogs] use default member initializers
+
+  [Rechi]
+   * [modernize][dbwrappers] use default member initializers
+
+  [Rechi]
+   * [modernize][VideoPlayer] use default member initializers
+
+  [Rechi]
+   * [modernize][AudioEngine] use default member initializers
+
+  [Rechi]
+   * [modernize][commons] use default member initializers
+
+  [Rechi]
+   * [modernize][cdrip] use default member initializers
+
+  [Rechi]
+   * [modernize][addons] use default member initializers
+
+  [Rechi]
+   * [modernize][xbmc] use default member initializers
+
+  [ace20022]
+   * [gui][pvr][fix] Prevent the modification of the provider list while using its iterator.
+
+  [peak3d]
+   * reusepython off by default
+
 
   [peak3d]
    * Fix segfault on shutdown caused by busy python addons
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/debian/changelog.tmp kodi-18.0+git20180704.0202-f0dda3a/debian/changelog.tmp
--- kodi-18.0+git20180703.0201-a44e6e2/debian/changelog.tmp	2018-07-03 00:02:43.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/debian/changelog.tmp	2018-07-04 00:02:46.000000000 +0000
@@ -1,4 +1,182 @@
-kodi (2:18.0+git20180703.0201-a44e6e2-0dist) dist; urgency=high
+kodi (2:18.0+git20180704.0202-f0dda3a-0dist) dist; urgency=high
+
+  [h.udo]
+   * [docs/GIT-FU] New guide
+
+  [h.udo]
+   * [cmake/README] Clean up
+
+  [h.udo]
+   * [docs/doxygen/CODE_GUIDELINES] Sync with markdown code guidelines
+
+  [h.udo]
+   * [docs/doxygen/README.md] Update content to markdown
+
+  [h.udo]
+   * [docs/CONTRIBUTING.md] Update content
+
+  [h.udo]
+   * [tools/depends/README] Update content to markdown
+
+  [h.udo]
+   * [docs/README.Windows] New guide
+
+  [h.udo]
+   * [docs/README.Ubuntu] Update content to markdown
+
+  [h.udo]
+   * [docs/README.RaspberryPi] Update content to markdown
+
+  [h.udo]
+   * [docs/README.openSUSE] Update content to markdown
+
+  [h.udo]
+   * [docs/README.macOS] Update content to markdown
+
+  [h.udo]
+   * [docs/README.Linux] Update content to markdown
+
+  [h.udo]
+   * [docs/README.iOS] Update content to markdown
+
+  [h.udo]
+   * [docs/README.FreeBSD] Update content to markdown
+
+  [h.udo]
+   * [docs/README.Fedora] Update content to markdown
+
+  [h.udo]
+   * [docs/README.Android] Update content to markdown
+
+  [h.udo]
+   * [docs/README] Create index of building docs and resources
+
+  [h.udo]
+   * [PULL_REQUEST_TEMPLATE] Small update
+
+  [Garrett Brown]
+   * [docs/HOWTO] Kill a global
+
+  [Garrett Brown]
+   * [docs/HOWTO] Clean up logic
+
+  [h.udo]
+   * [docs/CODE_GUIDELINES] Add markdown code guidelines
+
+  [h.udo]
+   * [README] Kodi's codebase new face
+
+  [h.udo]
+   * [LICENSE] Update content to markdown
+
+  [h.udo]
+   * [files] Delete obsolete README.pvr
+
+  [h.udo]
+   * [files] Delete obsolete README.armel
+
+  [h.udo]
+   * [files] Add docs/resources folder with needed images
+
+  [h.udo]
+   * [files] Rename to markdown format
+
+  [Rechi]
+   * [modernize][windows] use default member initializers
+
+  [Rechi]
+   * [modernize][windowing] use default member initializers
+
+  [Rechi]
+   * [modernize][weather] use default member initializers
+
+  [Rechi]
+   * [modernize][view] use default member initializers
+
+  [Rechi]
+   * [modernize][video] use default member initializers
+
+  [Rechi]
+   * [modernize][utils] use default member initializers
+
+  [Rechi]
+   * [modernize][threads] use default member initializers
+
+  [Rechi]
+   * [modernize][storage] use default member initializers
+
+  [Rechi]
+   * [modernize][settings] use default member initializers
+
+  [Rechi]
+   * [modernize][rendering] use default member initializers
+
+  [Rechi]
+   * [modernize][pvr] use default member initializers
+
+  [Rechi]
+   * [modernize][profiles] use default member initializers
+
+  [Rechi]
+   * [modernize][platform] use default member initializers
+
+  [Rechi]
+   * [modernize][pictures] use default member initializers
+
+  [Rechi]
+   * [modernize][peripherals] use default member initializers
+
+  [Rechi]
+   * [modernize][network] use default member initializers
+
+  [Rechi]
+   * [modernize][music] use default member initializers
+
+  [Rechi]
+   * [modernize][interfaces] use default member initializers
+
+  [Rechi]
+   * [modernize][input] use default member initializers
+
+  [Rechi]
+   * [modernize][guilib] use default member initializers
+
+  [Rechi]
+   * [modernize][games] use default member initializers
+
+  [Rechi]
+   * [modernize][filesystem] use default member initializers
+
+  [Rechi]
+   * [modernize][dialogs] use default member initializers
+
+  [Rechi]
+   * [modernize][dbwrappers] use default member initializers
+
+  [Rechi]
+   * [modernize][VideoPlayer] use default member initializers
+
+  [Rechi]
+   * [modernize][AudioEngine] use default member initializers
+
+  [Rechi]
+   * [modernize][commons] use default member initializers
+
+  [Rechi]
+   * [modernize][cdrip] use default member initializers
+
+  [Rechi]
+   * [modernize][addons] use default member initializers
+
+  [Rechi]
+   * [modernize][xbmc] use default member initializers
+
+  [ace20022]
+   * [gui][pvr][fix] Prevent the modification of the provider list while using its iterator.
+
+  [peak3d]
+   * reusepython off by default
+
 
   [peak3d]
    * Fix segfault on shutdown caused by busy python addons
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/debian/changelog.tmp.old kodi-18.0+git20180704.0202-f0dda3a/debian/changelog.tmp.old
--- kodi-18.0+git20180703.0201-a44e6e2/debian/changelog.tmp.old	2018-07-03 00:01:53.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/debian/changelog.tmp.old	2018-07-04 00:02:18.000000000 +0000
@@ -1,5 +1,12 @@
 kodi (2:18.0+git20171029.0201-910143c-0dist) dist; urgency=high
 
+  [peak3d]
+   * Fix segfault on shutdown caused by busy python addons
+
+  [Garrett Brown]
+   * RetroPlayer: Fix segfault on subsequent game error
+
+
   [Attila Jakosa]
    * [lang][skin.estuary] updated language files from Transifex
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/CODE_GUIDELINES.md kodi-18.0+git20180704.0202-f0dda3a/docs/CODE_GUIDELINES.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/CODE_GUIDELINES.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/CODE_GUIDELINES.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,348 @@
+![Kodi Logo](resources/banner_slim.png)
+
+# Code Guidelines
+
+## Table of Contents
+1. **[Motivation](#1-motivation)**
+2. **[Document Conventions](#2-document-conventions)**
+3. **[Indentation](#3-indentation)**
+4. **[Statements](#4-statements)**
+5. **[Namespaces](#5-namespaces)**
+6. **[Headers](#6-headers)**
+7. **[Braces](#7-braces)**
+8. **[Whitespace](#8-whitespace)**
+9. **[Vertical Alignment](#9-vertical-alignment)**
+10. **[Controls Statements](#10-controls-statements)**  
+  10.1. **[if else](#101-if-else)**  
+  10.2. **[switch case](#102-switch-case)**
+11. **[Naming](#11-naming)**  
+  11.1. **[Namespaces](#111-namespaces)**  
+  11.2. **[Constants](#112-constants)**  
+  11.3. **[Enums](#113-enums)**  
+  11.4. **[Interfaces](#114-interfaces)**  
+  11.5. **[Classes](#115-classes)**  
+  11.6. **[Methods](#116-methods)**  
+  11.7. **[Variables](#117-variables)**
+12. **[Conventions](#12-conventions)**  
+  12.1. **[Casts](#121-casts)**  
+  12.2. **[NULL vs nullptr](#122-null-vs-nullptr)**  
+  12.3. **[auto](#123-auto)**  
+  12.4. **[for loops](#124-for-loops)**
+
+## 1. Motivation
+When working in a large group, the two most important values are readability and maintainability. We code for other people, not computers. To accomplish these goals, we have created a unified set of code conventions.
+
+Conventions can be bent or broken in the interest of making code more readable and maintainable. However, if you submit a patch that contains excessive style conflicts, you may be asked to improve your code before your pull request is reviewed.
+
+## 2. Document Conventions
+Several different strategies are used to draw your attention to certain pieces of information. In order of how critical the information is, these items are marked as a note, tip, or warning. For example: 
+ 
+**NOTE:** Linux is user friendly... It's just very particular about who its friends are.  
+**TIP:** Algorithm is what developers call code they do not want to explain.  
+**WARNING:** Developers don't change light bulbs. It's a hardware problem.
+
+**[back to top](#table-of-contents)**
+
+## 3. Indentation
+Use spaces as tab policy with an indentation size of 2.
+
+**[back to top](#table-of-contents)**
+
+## 4. Statements
+No multiple statements on a single line.
+```cpp
+std::vector<std::string> test; test.push_back("foobar");
+```
+Always use a new line for a new statement.
+```cpp
+std::vector<std::string> test;
+test.push_back("foobar");
+```
+It is much easier to debug if one can pinpoint a precise line number.
+
+**[back to top](#table-of-contents)**
+
+## 5. Namespaces
+Indentation is not required to simplify nested namespaces and wrapping *.cpp* files in a namespace.
+```cpp
+namespace KODI
+{
+namespace UTILS
+{
+class ILogger
+{
+  void Log(...) = 0;
+}
+}
+}
+```
+
+**[back to top](#table-of-contents)**
+
+## 6. Headers
+Included header files have to be sorted alphabetically to prevent duplicates and allow better overview, with an empty line clearly separating sections.
+
+Header order has to be:
+* Own header file
+* Other Kodi includes
+* C and C++ system files
+* Other libraries' header files
+
+```cpp
+#include "PVRManager.h"
+
+#include "addons/AddonInstaller.h"
+#include "dialogs/GUIDialogExtendedProgressBar.h"
+#include "messaging/helpers/DialogHelper.h"
+#include "messaging/ApplicationMessenger.h"
+#include "messaging/ThreadMessage.h"
+#include "music/tags/MusicInfoTag.h"
+#include "music/MusicDatabase.h"
+#include "network/Network.h"
+#include "pvr/addons/PVRClients.h"
+#include "pvr/channels/PVRChannel.h"
+#include "settings/Settings.h"
+#include "threads/SingleLock.h"
+#include "utils/JobManager.h"
+#include "utils/log.h"
+#include "utils/Variant.h"
+#include "video/VideoDatabase.h"
+#include "Application.h"
+#include "ServiceBroker.h"
+
+#include <cassert>
+#include <utility>
+
+#include <libavutil/pixfmt.h>
+```
+
+Place directories before files. If the headers aren't sorted, either do your best to match the existing order, or precede your commit with an alphabetization commit.
+
+If possible, avoid including headers in another header. Instead, you can forward-declare the class and use a `std::unique_ptr`:
+
+```cpp
+class CFileItem;
+
+class Example
+{
+  ...
+  std::unique_ptr<CFileItem> m_fileItem;
+}
+```
+
+**[back to top](#table-of-contents)**
+
+## 7. Braces
+Braces have to go to a new line.
+```cpp
+if (int i = 0; i < t; i++)
+{
+  [...]
+}
+else
+{
+  [...]
+}
+class Dummy()
+{
+  [...]
+}
+```
+
+**[back to top](#table-of-contents)**
+
+## 8. Whitespace
+Conventional operators have to be surrounded by a whitespace.
+```cpp
+a = (b + c) * d;
+```
+Reserved words have to be separated from opening parentheses by a whitespace.
+```cpp
+while (true)
+for (int i = 0; i < x; ++i)
+```
+Commas have to be followed by a whitespace.
+```cpp
+void Dummy::Method(int a, int b, int c);
+int d, e;
+```
+Semicolons have to be followed by a newline.
+```cpp
+for (int i = 0; i < x; ++i)
+  doSomething(e);
+  doSomething(f);
+```
+
+**[back to top](#table-of-contents)**
+
+## 9. Vertical Alignment
+Do not use whitespaces to align value names together. This causes problems on code review if one needs to realign all values to their new position.
+
+Wrong:
+```cpp
+int                  value1             = 0;
+int                  value2             = 0;
+[...]
+CExampleClass       *exampleClass       = nullptr;
+CBiggerExampleClass *biggerExampleClass = nullptr;
+[...]
+exampleClass       = new CExampleClass      (value1, value2);
+biggerExampleClass = new CBiggerExampleClass(value1, value2);
+[...]
+exampleClass      ->InitExample();
+biggerExampleClass->InitExample();
+```
+
+Right:
+```cpp
+int value1 = 0;
+int value2 = 0;
+CExampleClass *exampleClass = nullptr;
+CBiggerExampleClass *biggerExampleClass = nullptr;
+exampleClass = new CExampleClass(value1, value2);
+biggerExampleClass = new CBiggerExampleClass(value1, value2);
+exampleClass->InitExample();
+biggerExampleClass->InitExample();
+```
+
+**[back to top](#table-of-contents)**
+
+## 10. Controls Statements
+Insert a new line before every:
+* else in an if statement
+* catch in a try statement
+* while in a do statement
+
+### 10.1. if else
+Put `then`, `return` or `throw` statements on a new line. Keep `else if` statements on one line.
+```cpp
+if (true)
+  return;
+if (true)
+{
+  [...]
+} 
+else if (false)
+{
+  return;
+} 
+else
+  return;
+```
+
+### 10.2. switch case
+```cpp
+switch (cmd)
+{
+  case x:
+  {
+    doSomething();
+    break;
+  }
+  case x:
+  case z:
+    return true;
+  default:
+    doSomething();
+}
+```
+
+**[back to top](#table-of-contents)**
+
+## 11. Naming
+### 11.1. Namespaces
+Namespaces have to be in uppercase.
+```cpp
+namespace KODI
+{
+  [...]
+}
+```
+
+### 11.2. Constants
+Use uppercase with underscore spacing where necessary.
+```cpp
+const int MY_CONSTANT = 1;
+```
+
+### 11.3. Enums
+Use CamelCase for the enum name and uppercase for the values.
+```cpp
+enum Dummy
+{
+  VALUE_X,
+  VALUE_Y
+};
+```
+
+### 11.4. Interfaces
+Use CamelCase for interface names and they have to be prefixed with an uppercase I. Filename has to match the interface name without the prefixed I, e.g. ILogger.h
+```cpp
+class ILogger
+{
+  void Log(...) = 0;
+}
+```
+
+### 11.5. Classes
+Use CamelCase for class names and they have to be prefixed with an uppercase C. Filename has to match the class name without the prefixed C, e.g. Logger.cpp
+```cpp
+class CLogger : public ILogger
+{
+  void Log(...)
+}
+```
+
+### 11.6. Methods
+Use CamelCase for method names and first letter has to be uppercase, even if the methods are private or protected.
+```cpp
+void MyDummyClass::DoSomething();
+```
+
+### 11.7. Variables
+Use CamelCase for variables. Type prefixing is discouraged.
+
+#### Global Variables
+Prefix global variables with *g_*
+```cpp
+int g_globalVariableA;
+```
+**WARNING:** Avoid globals use. It increases the chances of submitted code to be rejected.
+
+#### Member Variables
+Prefix member variables with *m_*
+```cpp
+int m_variableA;
+```
+
+**[back to top](#table-of-contents)**
+
+## 12. Conventions
+### 12.1. Casts
+New code has to use C++ style casts and not older C style casts. When modifying existing code the developer can choose to update it to C++ style casts or leave as is. Remember that whenever a `dynamic_cast` is used on a pointer object the result can be a `nullptr` and needs to be checked accordingly.
+
+### 12.2. NULL vs nullptr
+Prefer the use of `nullptr` instead of `NULL`. `nullptr` is a typesafe version and as such can't be implicitly converted to `int` or anything else.
+
+### 12.3. auto
+
+Feel free to use `auto` wherever it improves readability. Good places are iterators or when dealing with containers.
+```cpp
+std::map<std::string, std::vector<int>>::iterator i = var.begin();
+```
+vs
+```cpp
+auto i = var.being();
+```
+### 12.4. for loops
+Use range-based for loops wherever it makes sense. If iterators are used see above about using `auto`.
+```cpp
+for (const auto& : var)
+{
+  [...]
+}
+```
+Remove `const` if the value has to be modified.
+
+**[back to top](#table-of-contents)**
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/CONTRIBUTING.md kodi-18.0+git20180704.0202-f0dda3a/docs/CONTRIBUTING.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/CONTRIBUTING.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/CONTRIBUTING.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,33 @@
+![Kodi Logo](resources/banner_slim.png)
+
+# Contributing to Kodi Home Theater
+Looking to **contribute code** to Kodi Home Theater? Great! You landed on the right place and we appreciate you for taking the time. Can't code for your life? No shame in that. There's a lot more to the Kodi project than just code. Check out **[other ways](../README.md#how-to-contribute)** to contribute.
+
+First, a few words of caution: Kodi's huge codebase spans over 15 years of development, hundreds of volunteer developers from all walks of life and countless, sleepless hours. Please remember that somewhere in between your first *WTH?* and before you start ranting or splitting hairs.
+
+Also, always keep in mind that for many of us English is not our native language. What might come across as discourteous is probably an unintended side effect of the language barrier. Usage of emoticons is highly encouraged. They are great to convey, er, emotions and state of mind.
+
+## Getting Started
+Before you start coding we advise you to build Kodi's master branch. This will save you and us precious time by making sure a proper build environment is set up and all dependencies are met. For your convenience, **[build guides](README.md)** are available for most common platforms. A **[git guide](GIT-FU.md)** is also available, streamlined to Kodi's development workflow. Unless you're a *git ninja*, please read it carefully.  
+If you are a *git ninja*, we feel happy and sad for you at the same time. Your soul might be lost to the dark side already but worry not, we have cookies!
+
+## Pull request guidelines
+* **Create topic branches**. Never ever open a pull request from your master branch. **Ever!**
+* **Code against master branch**. Unless release specific, all Kodi development occurs in the `master` branch. If it needs backporting it can be done after it hits master.
+* **One topic branch per change**. Found something that needs fixing but is unrelated to the current work? Create a new topic branch and open another *pull request*.
+* **Use a coherent commit history**. Make sure each individual commit in your *pull request* is meaningful and organized in logical chunks. Tidy up and squash commits before submitting.
+* **Be descriptive, but concise**. The *pull request* and commits should have a useful title and follow the `[component(s)] Short description...` format. No, `[README.md] Update` is **not** descriptive enough. The *pull request* description should only contain information relevant to the change.
+* **Be patient, be kind, rewind**. We're all volunteers with busy lives but usually very responsive in cataloging *pull requests* and pinging the relevant maintainer(s). Sometimes though, things go unnoticed for longer than usual. Probably due to beer deprivation... or lack thereof. Feel free to nudge us if we forget.
+
+## Coding guidelines
+* **Follow our [code guidelines](CODE_GUIDELINES.md)**. New code should follow those guidelines even if existing code doesn't. If you're up to it, improve existing code and submit it in separate commits.
+* **Document the code**. You know you're brilliant, but maybe you'd like to understand what you did a year from now. Or, code God forbid, help others... Nope, `// Magic. Do not touch!` does not count as documentation.
+* **Separate code from cosmetics**. Code and cosmetic changes should be in separate commits. It's already hard to review code without added noise. Of course, deleting a **few** trailing spaces does not warrant a separate commit. Use your judgement.
+* **Test your changes**. Kodi's **[continuous integration system](http://jenkins.kodi.tv/)** builds every PR automatically. Nonetheless, you're expected to test the code on your development platform.
+
+## Updating your PR
+Making a *pull request* adhere to the standards above can be difficult. If the maintainers notice anything that they'd like changed, they'll ask you to edit your *pull request* before it gets merged. **There's no need to open a new *pull request*, just edit the existing one**. If you're not sure how to do that, our **[git guide](GIT-FU.md)** provides a step by step guide. If you're still not sure, ask us for guidance. We're all fairly proficient with *git* and happy to be of assistance.
+
+<a href="https://github.com/xbmc/xbmc"><img src="https://forthebadge.com/images/badges/made-with-c-plus-plus.svg" height="25"></a>
+<a href="https://github.com/xbmc/xbmc"><img src="https://forthebadge.com/images/badges/contains-technical-debt.svg" height="25"></a>
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/doxygen/CODING_GUIDELINES.dox kodi-18.0+git20180704.0202-f0dda3a/docs/doxygen/CODING_GUIDELINES.dox
--- kodi-18.0+git20180703.0201-a44e6e2/docs/doxygen/CODING_GUIDELINES.dox	2018-06-21 18:59:46.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/doxygen/CODING_GUIDELINES.dox	2018-07-04 00:01:49.000000000 +0000
@@ -59,10 +59,10 @@
 
 \subsection code_guidelines_1_3 Headers
 
-Included header files should be sorted alphabetically to prevent duplicates and
+Included header files have to be sorted alphabetically to prevent duplicates and
 allow better overview, with an empty line clearly separating sections.
 
-Header order should be:
+Header order has to be:
 
 - Own header file
 - Other Kodi includes
@@ -100,7 +100,7 @@
 Place directories before files. If the headers aren't sorted, either do your best
 to match the existing order, or precede your commit with an alphabetization commit.
 
-If possible, you should avoid including headers in another header. Instead, you can
+If possible, avoid including headers in another header. Instead, you can
 forward-declare the class and use a `std::unique_ptr`:
 
 ~~~~~~~~~~~~~
@@ -116,7 +116,7 @@
 ================================================================================
 \section code_guidelines_2 Braces
 
-Braces should go to newline and your code should look like the following example:
+Braces have to go to a new line.
 
 ~~~~~~~~~~~~~
 if (int i = 0; i < t; i++)
@@ -137,41 +137,41 @@
 ================================================================================
 \section code_guidelines_3 Whitespaces
 
-Conventional operators should be surrounded by a whitespace.
+Conventional operators have to be surrounded by a whitespace.
 
 ~~~~~~~~~~~~~
 a = (b + c) * d;
 ~~~~~~~~~~~~~
 
-Reserved words should be separated from opening parentheses by a whitespace.
+Reserved words have to be separated from opening parentheses by a whitespace.
 
 ~~~~~~~~~~~~~
 while (true)
 for (int i = 0; i < x; ++i)
 ~~~~~~~~~~~~~
 
-Commas should be followed by a whitespace.
+Commas have to be followed by a whitespace.
 
 ~~~~~~~~~~~~~
 void Dummy::Method(int a, int b, int c);
 int d, e;
 ~~~~~~~~~~~~~
 
-Semicolons should be followed by a whitespace if there is more than one
-expression per line.
+Semicolons have to be followed by a newline.
 
 ~~~~~~~~~~~~~
 for (int i = 0; i < x; ++i)
-doSomething(e); doSomething(f); // this is probably bad style anyway
+doSomething(e);
+doSomething(f);
 ~~~~~~~~~~~~~
 
 --------------------------------------------------------------------------------
 \subsection code_guidelines_3_1 No vertical alignment
 
-Do not use whitespaces to align value names together, this becomes problematic
-on updates to see the change, if the whitespace need to change on all.
+Do not use whitespaces to align value names together. This causes problems
+on code review if one needs to realign all values to their new position.
 
-This should be not used:
+Wrong:
 ~~~~~~~~~~~~~
 ...
 
@@ -189,7 +189,7 @@
 ...
 ~~~~~~~~~~~~~
 
-Use it as:
+Right:
 ~~~~~~~~~~~~~
 ...
 
@@ -262,7 +262,7 @@
 \section code_guidelines_5 Naming
 \subsection code_guidelines_5_1 Namespaces
 
-Namespaces should be in uppercase letters
+Namespaces have to be in uppercase.
 
 ~~~~~~~~~~~~~
 namespace KODI
@@ -273,7 +273,7 @@
 
 \subsection code_guidelines_5_2 Constants
 
-Use upper case with underscore spacing where necessary.
+Use uppercase with underscore spacing where necessary.
 
 ~~~~~~~~~~~~~
 const int MY_CONSTANT = 1;
@@ -282,7 +282,7 @@
 --------------------------------------------------------------------------------
 \subsection code_guidelines_5_3 Enums
 
-Use CamelCase for the enum name and upper case for the values.
+Use CamelCase for the enum name and uppercase for the values.
 
 ~~~~~~~~~~~~~
 enum Dummy
@@ -295,8 +295,8 @@
 --------------------------------------------------------------------------------
 \subsection code_guidelines_5_4 Interfaces
 
-We use CamelCase for interface names and they should be prefixed with an
-uppercase I. Filename should match the interface name, e.g. `ILogger.h`
+Use CamelCase for interface names and they have to be prefixed with an
+uppercase I. Filename has to match the interface name, e.g. `ILogger.h`
 
 ~~~~~~~~~~~~~
 class ILogger
@@ -308,8 +308,8 @@
 --------------------------------------------------------------------------------
 \subsection code_guidelines_5_5 Classes
 
-We use CamelCase for class names and they should be prefixed with an uppercase C.
-Filename should match the class name without the prefixed C, e.g. `Logger.cpp`
+We use CamelCase for class names and they have to be prefixed with an uppercase C.
+Filenamehas match the class name without the prefixed C, e.g. `Logger.cpp`
 
 ~~~~~~~~~~~~~
 class CLogger : public ILogger
@@ -321,7 +321,7 @@
 --------------------------------------------------------------------------------
 \subsection code_guidelines_5_6 Methods
 
-We use CamelCase for method names and first letter should always be upper case.
+Use CamelCase for method names and first letter shas to be uppercase.
 Even if the methods are private or protected.
 
 ~~~~~~~~~~~~~
@@ -356,7 +356,7 @@
 --------------------------------------------------------------------------------
 \subsection code_guidelines_6_1 Casts
 
-New code should use C++ style casts and not older C style casts. When modifying
+New code has to use C++ style casts and not older C style casts. When modifying
 existing code the developer can choose to update it to C++ style casts or leave
 as is. Remember that whenever a dynamic_cast is used the result can be a nullptr
 and needs to be checked accordingly.
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/doxygen/README.md kodi-18.0+git20180704.0202-f0dda3a/docs/doxygen/README.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/doxygen/README.md	2018-06-21 18:59:46.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/doxygen/README.md	2018-07-04 00:01:49.000000000 +0000
@@ -1,5 +1,5 @@
-To generate doxygen documentation,
+![Kodi Logo](../resources/banner_slim.png)
 
-run doxygen on the "Doxyfile.doxy" configuration file in this directory. It will generate HTML documentation
-in the ../docs folder (under "html")
+# Kodi's Doxygen Documentation
+To generate Kodi's doxygen documentation, run `doxygen Doxyfile.doxy` in this directory. Generated documentation will be located a directory level up (docs) inside `html`.
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/GIT-FU.md kodi-18.0+git20180704.0202-f0dda3a/docs/GIT-FU.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/GIT-FU.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/GIT-FU.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,445 @@
+
+![Kodi Logo](resources/banner_slim.png)
+
+# Kodi's git-fu reference
+This guide is intended as a **simple, non-exhaustive, git reference source**. It will help you get acquainted with command-line `git`, even if you never imagined yourself touching the dreaded beast with a 3m pole (that's 10 feet for those across the pound).
+
+It is streamlined to Kodi's **[fork and pull](https://help.github.com/articles/about-collaborative-development-models/)** development workflow: create feature branch, write awesome code, open a pull request, get it reviewed by Kodi team members, merge pull request. Loop!
+
+## Table of Contents
+1. **[Introduction](#1-introduction)**
+2. **[Document conventions](#2-document-conventions)**
+3. **[Prerequisites](#3-prerequisites)**
+4. **[Clone Kodi's repo into your machine](#4-clone-kodis-repo-into-your-machine)**
+5. **[Working with branches](#5-working-with-branches)**  
+  5.1. **[Create feature branch](#51-create-feature-branch)**  
+  5.2. **[Push feature branch to origin](#52-push-feature-branch-to-origin)**  
+  5.3. **[List branches](#53-list-branches)**  
+  5.4. **[Switch between branches](#54-switch-between-branches)**  
+  5.5. **[Backup branch](#55-backup-branch)**  
+  5.6. **[Check branch status](#56-check-branch-status)**  
+  5.7. **[Delete branch](#57-delete-branch)**  
+  5.8. **[Rebase branch](#58-rebase-branch)**
+6. **[Syncing branches](#6-syncing-branches)**  
+  6.1. **[Fetch master branch from upstream and sync local master branch with it](#61-fetch-master-branch-from-upstream-and-sync-local-master-branch-with-it)**  
+  6.2. **[Fetch feature branch from origin and sync local feature branch with it](#62-fetch-feature-branch-from-origin-and-sync-local-feature-branch-with-it)**  
+  6.3. **[Push local feature branch to origin and sync remote feature branch with it](#63-push-local-feature-branch-to-origin-and-sync-remote-feature-branch-with-it)**
+7. **[Working with commits](#7-working-with-commits)**  
+  7.1. **[Create commit](#71-create-commit)**  
+  7.2. **[Amend last commit](#72-amend-last-commit)**  
+  7.3. **[Rename last commit](#73-rename-last-commit)**  
+  7.4. **[Delete last commit](#74-delete-last-commit)**  
+  7.5. **[Fix commit](#75-fix-commit)**  
+  7.6. **[List commits](#76-list-commits)**  
+  7.7. **[Cherry-pick commits](#77-cherry-pick-commits)**
+8. **[Examples with nice screenies](#8-examples-with-nice-screenies)**  
+  8.1. **[Rebase branch](#81-rebase-branch)**  
+  8.2. **[Fix commits](#82-fix-commits)**
+9. **[Going pro](#9-going-pro)**  
+  9.1. **[Fetch an upstream pull request](#91-fetch-an-upstream-pull-request)**  
+  9.2. **[Fetch a pull request someone submitted to your repository](#92-fetch-a-pull-request-someone-submitted-to-your-repository)**  
+  9.3. **[Fetch a pull request or commit and apply them to another branch](#93-fetch-a-pull-request-or-commit-and-apply-them-to-another-branch)**
+10. **[Other resources](#10-other-resources)**  
+  10.1. **[Using git alias](#101-using-git-alias)**
+
+## 1. Introduction
+**[git](https://en.wikipedia.org/wiki/Git)** is a distributed version control system, originally written by a brilliant, self-described **[bastard](https://lkml.org/lkml/2000/9/6/65)**. It is not the most easy version control system (VCS for short) to work with but it is very intuitive **once** you understand some concepts. Some of the most important ones are outlined below.
+
+* **repository**: a place where files and their versioned history live. Also known as **repo**.
+* **upstream**: Kodi's **[main repository](https://github.com/xbmc/xbmc)**. It's where everything you code will end up after review and a pull request (PR for short) is merged.
+* **master**: the repository's main branch. It is where all the code integration happens.
+* **remote**: the remote location of a repository, usually on some central server. Both Kodi's **main repository** and your **personal repository** are remotes.
+* **origin**: your **personal repository**. Everything you code will end up in your personal repository after you `push`. You're master and commander.
+* **fork**: create an exact copy of a remote repository, at that point in time, in your personal GitHub account.
+* **clone**: grab an exact copy of a remote repository, usually from your personal repository, and place it on your local machine.
+* **branch**: a magical place where what you code doesn't interfere with anything else. Think of it as an house compartment. You cook in the kitchen, sleep in the bedroom, have fun with friends while watching football in the living room, etc. Unlike house compartments, they are free and you can have as many as you like.
+* **commit**: chunk of code you committed to. You think it's the best code you've ever written, decided to hang on to it and maybe rule the world one day.
+* **pull request**: a request for someone to review your code and include it in Kodi's main repository.
+* **fetch**: grab code from an outside source, usually from the main repository.
+* **push**: send code to a remote repository, usually to your personal repository.
+* **merge**: merge a feature branch with another branch, usually master branch.
+
+## 2. Document conventions
+This guide assumes you are using `terminal`, also known as `console`, `command-line` or simply `cli`. Commands need to be run at the terminal, one at a time and in the provided order.
+
+This is a comment that provides context:
+```
+this is a command       // this is an inline comment
+this is another command // you should not copy them
+and yet another one     // to the terminal
+```
+
+**Example:** Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+Commands that contain strings enclosed in angle brackets denote something you need to change to suit your needs.
+```
+git clone -b <branch-name> https://github.com/xbmc/xbmc kodi
+```
+
+**Example:** Clone Kodi's current Krypton branch:
+```
+git clone -b Krypton https://github.com/xbmc/xbmc kodi
+```
+
+Several different strategies are used to draw your attention to certain pieces of information. In order of how critical the information is, these items are marked as a note, tip, or warning. For example:
+ 
+**NOTE:** Linux is user friendly... It's just very particular about who its friends are. 
+**TIP:** Algorithm is what developers call code they do not want to explain. 
+**WARNING:** Developers don't change light bulbs. It's a hardware problem.
+
+**[back to top](#table-of-contents)** | **[back to section top](#2-document-conventions)**
+
+## 3. Prerequisites
+This guide assumes you have a **[GitHub account](https://github.com/join)** and that you already **[forked Kodi's repository](https://github.com/xbmc/xbmc/fork/)** into it.
+
+It also assumes `git` is installed and an SSH key is **[properly configured](https://help.github.com/articles/connecting-to-github-with-ssh/)**. How to install `git` can be found on our specific OS/distribution **[build guides](README.md)**.
+
+Configure `git` globally so it knows who you are:
+```
+git config --global user.email "<your-email>"
+git config --global user.name "<your-username>"
+```
+
+If you're a Windows user you also need:
+```
+git config --global core.autocrlf true
+```
+
+**[back to top](#table-of-contents)**
+
+## 4. Clone Kodi's repo into your machine
+Your forked Kodi's repository will hold everything you do when developing. For safety, you should push every branch and commit you make during development to your remote repository (your GitHub's Kodi fork). You should also be careful not to push sensitive data, credentials, etc. Once online, always online.
+
+Clone your personal repository into your machine:
+```
+cd $HOME                                                 // change to your `home` directory
+git clone git@github.com:<github-username>/xbmc.git kodi // clone your fork of Kodi's repo
+cd kodi                                                  // change to the newly cloned repo directory
+git remote add upstream https://github.com/xbmc/xbmc.git // assign Kodi's main repo to a remote
+```
+
+**TIP:** Windows users should use `cd %userprofile%` instead.
+
+From this point forward, every command shown assumes you're inside `$HOME/kodi` or `%userprofile%\kodi` if you're a Windows user. To get there, issue:
+```
+cd $HOME/kodi // or cd %userprofile%\kodi
+```
+
+**[back to top](#table-of-contents)**
+
+## 5. Working with branches
+Never ever work on master branch. **Ever!** It will get you and probably us into unnecessary trouble. Always create a feature branch.
+
+### 5.1. Create feature branch
+```
+git checkout master              // make sure you're on master branch
+git checkout -b <feature-branch> // create feature branch
+```
+
+### 5.2. Push feature branch to origin
+Pushing for the first time:
+```
+git push --set-upstream origin <feature-branch>
+```
+
+Subsequent pushes:
+```
+git push origin
+```
+
+Force pushing:
+```
+git push -f origin
+```
+
+### 5.3. List branches
+List local branches:
+```
+git branch
+```
+
+List local and remote branches:
+```
+git branch -a
+```
+
+### 5.4. Switch between branches
+```
+git checkout <feature-branch> // switch to feature branch
+git checkout master           // switch back to master branch
+```
+
+### 5.5. Backup branch
+```
+git checkout <feature-branch>           // switch to feature branch (the branch you want to backup)
+git checkout -b <feature-branch>-backup // create a new branch based on feature branch
+git checkout <feature-branch>           // switch back to feature branch
+```
+
+### 5.6. Check branch status
+Show you the branch name, status in relation to remote origin branch, unstaged changes, etc.:
+```
+git status
+```
+
+### 5.7. Delete branch
+Delete local branch:
+```
+git checkout master             // make sure you're not on feature branch to delete
+git branch -D <feature-branch>  // delete feature branch
+```
+
+Delete remote branch:
+```
+git push origin -d <feature-branch>
+```
+
+**WARNING:** Be careful deleting branches. Make sure you don't need them anymore.
+
+### 5.8. Rebase branch
+```
+git checkout <feature-branch>  // switch to feature branch in need of rebasing
+git fetch upstream             // fetch upstream changes
+git rebase upstream/master     // rebase feature branch on top of upstream master branch
+git push -f origin             // force push updated feature branch to your personal remote repo
+```
+
+**NOTE**: If you have a **pull request** open from that feature branch, this will also update it.
+
+**[back to top](#table-of-contents)** | **[back to section top](#5-working-with-branches)**
+
+## 6. Syncing branches
+Keeping branches up-to-date is an excellent base for successful, stress-free coding. You should always start coding a new feature on top of the latest master branch. If you work on more than one machine, this also ensures your feature branch is always up-to-date with the latest changes.
+
+### 6.1. Fetch master branch from upstream and sync local master branch with it
+If you cloned a while ago, you probably want to sync your local master branch with upstream's master branch. This is specially useful to ensure that your new feature branch is based on the latest code version:
+```
+git checkout master       // switch to master branch
+git fetch upstream        // fetch upstream changes
+git merge upstream/master // merge upstream changes
+git push origin           // push updated master branch to your personal remote repo (optional)
+```
+
+### 6.2. Fetch feature branch from origin and sync local feature branch with it
+```
+git checkout <feature-branch>            // switch to feature branch
+git fetch origin                         // fetch origin changes
+git reset --hard origin/<feature-branch> // reset feature branch
+```
+
+### 6.3. Push local feature branch to origin and sync remote feature branch with it
+```
+git checkout <feature-branch> // switch to feature branch
+git push origin               // fetch origin changes
+```
+
+**WARNING:** Be **very careful** updating to and from origin. It can cause loss of work, specially if you work on more than one machine. Make sure your remote origin repo **always** holds the most up-to-date version of your code. **No, seriously**. Make a mental rule: *remote origin repo always holds the most up-to-date version of my code!* and **stick to it!** It's almost always possible to recover lost work with `git` but it's hard and unnecessary work if you follow some simple rules.
+
+**[back to top](#table-of-contents)** | **[back to section top](#6-syncing-branches)**
+
+## 7. Working with commits
+All commit manipulating operations (commit, amend or fix a commit, etc.), start by adding your changes before committing:
+```
+git add path/to/file/filename // stage single file
+git add .                     // stage all files on current directory
+git add *                     // stage all files in current directory and subdirectories
+```
+
+### 7.1. Create commit
+```
+git commit -m "<commit-description>"
+```
+
+### 7.2. Amend last commit
+```
+git commit --amend
+```
+
+### 7.3. Rename last commit
+```
+git commit --amend // change commit message in your editor and save
+```
+
+### 7.4. Delete last commit
+Delete last commit but keep all the changes it encompasses:
+```
+git reset HEAD~
+```
+
+Delete last commit, **including all the changes** it encompasses:
+```
+git reset --hard HEAD~
+```
+
+### 7.5. Fix commit
+```
+git commit --fixup <commit-sha>
+```
+
+### 7.6. List commits
+```
+git log --pretty=oneline --abbrev-commit
+```
+
+### 7.7. Cherry-pick commits
+```
+git checkout <feature-branch>            // switch to branch with commit(s) you want to cherry-pick
+git log --pretty=oneline --abbrev-commit // list commits. take note of the commit(s) `sha`
+git checkout <other-feature-branch>      // switch to branch that will receive cherry-picked commit(s)
+git cherry-pick <sha>                    // cherry-pick commit
+git cherry-pick <sha>                    // cherry-pick another commit
+git cherry-pick <sha>                    // you get the point
+```
+
+**[back to top](#table-of-contents)** | **[back to section top](#7-working-with-commits)**
+
+## 8. Examples with nice screenies
+A picture is worth a thousand words.
+
+### 8.1. Rebase branch
+
+Check if branch is clean and has no uncommitted changes:
+![Rebase branch 01](resources/gitfu/rebase_branch_01.png)
+
+Fetch upstream changes and rebase feature branch on top of upstream master branch:
+![Rebase branch 02](resources/gitfu/rebase_branch_02.png)
+
+Force push branch to remote origin:
+![Rebase branch 03](resources/gitfu/rebase_branch_03.png)
+
+**[back to top](#table-of-contents)** | **[back to section top](#8-examples)** | **[back to subsection top](#81-rebase-branch)**
+
+### 8.2. Fix commits
+
+Check unstaged changes:
+![Fix commits 01](resources/gitfu/fix_commits_01.png)
+
+Add changes and check again:
+![Fix commits 02](resources/gitfu/fix_commits_02.png)
+
+Print a nice commits log and copy `b2184ab68a`, the `sha` of the commit we want to fix:
+![Fix commits 03](resources/gitfu/fix_commits_03.png)
+
+Commit the changes with `git commit --fixup b2184ab68a` to reference the commit in need of fixing:
+![Fix commits 04](resources/gitfu/fix_commits_04.png)
+
+Check if everything is OK and count how many commits we need to use for an `autosquash` rebase (we need nine commits because commit in need of fixing is the ninth commit, including the `fixup` commit):
+![Fix commits 05](resources/gitfu/fix_commits_05.png)
+
+Due to the nature of the `git rebase -i --autosquash HEAD~9` command (opens editor right away), command doesn't show up on this screenshot. See next screenshot.
+How it looks after `git` re-orders commits automagically:
+![Fix commits 06](resources/gitfu/fix_commits_06.png)
+
+**NOTE**: These examples use `nano` as default `git` editor to keep things simple. Press `Ctrl+X` to exit and accept the changes.
+
+A successful message after rebase with `autosquash`:
+![Fix commits 07](resources/gitfu/fix_commits_07.png)
+
+Finally, force push branch to remote origin:
+![Fix commits 08](resources/gitfu/fix_commits_08.png)
+
+**TIP**: It doesn't matter how many `fixup` commits you have on your feature branch. The only thing that matters is the number of the **first** commit with a `fixup` commit. If you're unsure of how many commits that is, issue `git log --pretty=oneline --abbrev-commit`, count from your **first commit** on the feature branch and use that number instead. In this example, that would be 28, e.g. `git rebase -i --autosquash HEAD~28`. `git` will take care of the rest automagically.
+
+**[back to top](#table-of-contents)** | **[back to section top](#8-examples)** | **[back to subsection top](#82-fix-commits)**
+
+## 9. Going pro
+Got this far? Congrats! Now it gets fun!
+
+### 9.1. Fetch an upstream pull request
+The ability to test pull requests before merging them is very useful. This is how to do it:
+```
+git fetch upstream pull/<pull-request-ID>/head:<branch-name-or-pull-request-ID-or-whatever>
+git checkout <branch-name-or-pull-request-ID-or-whatever>
+```
+
+Build Kodi as usual, following our **[build guides](README.md)**.
+
+### 9.2. Fetch a pull request someone submitted to your repository
+Yes, someone might open a pull request to your repository. Be happy that folks want to work with you.
+
+Same thing as above except that `upstream` is now `origin`. They are both remote repositories, remember?
+```
+git fetch origin pull/<pull-request-ID>/head:<branch-name-or-pull-request-ID-or-whatever>
+git checkout <branch-name-or-pull-request-ID-or-whatever>
+```
+
+**TIP**: Every pull request has an unique ID. For instance, the original pull request for this guide is **[PR14072](https://github.com/xbmc/xbmc/pull/14072)**. Its ID is **14072**.
+
+If you want to try it, issue:
+```
+git fetch upstream pull/14072/head:PR14072 // branch name can be anything
+git checkout PR14072
+```
+
+and see the original version of this documentation in all its glorious might.
+
+### 9.3. Fetch a pull request or commit and apply them to another branch:
+Also very useful is the ability to fetch a complete pull request or a single commit and apply it to your **current** branch, instead of creating a new branch like the method outlined above.
+
+Similarly to the method above, find the PR you want to fetch, **[PR14072](https://github.com/xbmc/xbmc/pull/14072)** for instance. Append `.patch` to the URL. GitHub will generate a formatted patch and show you the formatted output. Copy that URL and choose your next move below.
+
+Apply the changes to your branch but do not commit them (changes will be kept unstaged):
+```
+curl -L https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/14072.patch | git apply -
+```
+
+Apply the changes to your branch with the original commit(s) message(s):
+```
+curl -L https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/14072.patch | git am -
+```
+
+The same tricks work for a single commit. Just find a commit you'd like to fetch, **[[README] Kodi's codebase new face](https://github.com/xbmc/xbmc/pull/14072/commits/bb62d22f0d62b20ebc2325f7820a37759839efe0)** for instance, append `.patch` to the URL and follow the instructions above.
+
+**[back to top](#table-of-contents)** | **[back to section top](#9-going-pro)**
+
+## 10. Other resources
+`git` is an incredibly powerful VCS. It's next to impossible to document everything it can do because it's so versatile, many tasks can be achieved in more than one way, and what works for a developer might not work for another. How one uses it heavily depends on the implemented workflow and, to some extent, personal taste. With that in mind, below are listed some external git resources worth a look with many exotic examples. Some you might only need once in a lifetime.
+
+* **[git-tips](https://github.com/git-tips/tips)**
+* **[git-cheat-sheet](https://github.com/arslanbilal/git-cheat-sheet)**
+
+### 10.1. Using git alias
+Aliases are a great `git` feature. Instead of typing - and remembering - a long and boring command, one can instruct `git` to perform an action with a much shorter command. Hence the name aliases.
+
+The command to add an alias to `git` is simple: `git config --global --add alias.<alias> <command>`.
+
+For example, add an alias `st` to `status`:
+```
+git config --global --add alias.st status
+```
+
+Now you can just type `git st` instead of `git status`. Saves you a mammoth four keystrokes.
+
+Some of my favorite aliases are:
+
+`slog` instead of `log --pretty=oneline --abbrev-commit`:
+```
+git config --global --add alias.slog "log --pretty=oneline --abbrev-commit"
+```
+
+`ema` instead of `cherry-pick`:
+```
+git config --global --add alias.ema cherry-pick
+```
+
+`lg` instead of `log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative`:
+```
+git config --global --add alias.lg "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"
+
+```
+
+`fix` instead of `commit --fixup`:
+```
+git config --global --add alias.fix "commit --fixup" // git fix <commit-sha>
+```
+
+`fixer` instead of `rebase -i --autosquash`:
+```
+git config --global --add alias.fixer "rebase -i --autosquash" // git fixer HEAD~10 will autosquash the last 10 commits
+```
+
+**[back to top](#table-of-contents)** | **[back to section top](#10-other-resources)**
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/HOWTO.CleanUpLogic.md kodi-18.0+git20180704.0202-f0dda3a/docs/HOWTO.CleanUpLogic.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/HOWTO.CleanUpLogic.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/HOWTO.CleanUpLogic.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,164 @@
+![Kodi Logo](resources/banner_slim.png)
+
+# HOW-TO: Clean Up Logic
+Guide originally published at **[PR13717](https://github.com/xbmc/xbmc/pull/13717)**. To better understand this document, you should read the original *Pull Request*.
+
+## Table of Contents
+1. **[Why clean logic is important](#1-why-clean-logic-is-important)**
+2. **[What bad `if` and ternary (`? :`) statements look like](#2-what-bad-if-and-ternary-statements-look-like)**
+3. **[How to clean up OR's](#3-how-to-clean-up-ors)**
+4. **[How to clean up AND's](#4-how-to-clean-up-ands)**
+5. **[How to clean up ternary (`? :`) statements](#5-how-to-clean-up-ternary-statements)**
+6. **[Extra credit: the `switch` statement](#6-extra-credit-the-switch-statement)**  
+7. **[Choosing AND vs. OR](#7-choosing-and-vs-or)**
+
+## 1. Why clean logic is important
+
+It's all about readability. We should strive to write code for people, not computers. `if` statements impact the control flow. We want the control flow to be as easy to read and follow as possible.
+
+**[back to top](#table-of-contents)**
+
+## 2. What bad if and ternary statements look like
+
+Take the **[first commit](https://github.com/xbmc/xbmc/commit/2d85c66~6)**. The previous logic roughly translates to:
+
+```c++
+if (A || B || (C &&D) || ((E || (F && G)) && (H && I && J && K)) || L)
+  something();
+```
+
+Wow.
+
+Ternary logic can also be unwieldy. For example, the previous logic in the second commit translates to:
+
+```c++
+X = (A && !B) ? Y : Z;
+```
+
+This statement isn't as offensive, but wouldn't it be more readable and maintanable by using a few more lines?
+
+**[back to top](#table-of-contents)**
+
+## 3. How to clean up OR's
+
+Generally, OR's are separated by creating a *sequence* of `if`'s on new lines with the same indentation. An initial flag is set, and the `if` statements are used to flip the flag. We can then use a final `if` that only depends on a single flag.
+
+For example:
+
+```c++
+if (A || B)
+  something()
+```
+
+becomes:
+
+```c++
+bool flag = false;
+
+if (A)
+  flag = true;
+else if (B)
+  flag = true;
+
+if (flag)
+  something();
+```
+
+This is demonstrated in the commit **[Improve logic for GUI_MSG_QUEUE_NEXT_ITEM in CApplication::OnMessage()](https://github.com/xbmc/xbmc/commit/2d85c66~2)**.
+
+**[back to top](#table-of-contents)**
+
+## 4. How to clean up AND's
+
+Generally, AND's are separated by creating a *series* of `if`'s by embedding indented blocks.
+
+For example:
+
+```c++
+if (A && B)
+  something()
+```
+
+becomes:
+
+```c++
+if (A)
+{
+  if (B)
+    something();
+}
+```
+
+This is demonstrated in the commit **[Improve logic in CAutorun::ExecuteAutorun()](https://github.com/xbmc/xbmc/commit/2d85c66~1)**.
+
+**[back to top](#table-of-contents)**
+
+## 5. How to clean up ternary statements
+
+As the name suggests, ternary statements can be split into three lines. For example,
+
+```c++
+X = (A && !B) ? Y : Z;
+```
+
+becomes:
+
+```c++
+X = Y;
+if (!A || B)
+  X = Z;
+```
+
+This is demonstrated in the commit **[Improve sleep time logic in CApplication::FrameMove()](https://github.com/xbmc/xbmc/commit/2d85c66~5)**.
+
+**[back to top](#table-of-contents)**
+
+## 6. Extra credit: the `switch` statement
+
+As a bonus, if the logic compares the same value to multiple constants, you can use a `switch` statement for a small performance boost.
+
+For example (notice how I add a tricky OR at the end):
+
+```c++
+if (x == A || x == B || x == C || y == D)
+  something();
+```
+
+becomes:
+
+```
+bool flag = false;
+
+switch (x)
+{
+case A:
+case B:
+case C:
+  flag = true;
+  break;
+default:
+  if (y == D)
+    flag = true;
+  break;
+}
+
+if (flag)
+  something();
+```
+
+This is demonstrated in the commit **[Clean up player notification logic in CApplication::OnAction()](https://github.com/xbmc/xbmc/commit/2d85c66~6)**.
+
+Switch statements use *jump tables*, which can be faster than `if`s in some cases because branching slows down speculative execution.
+
+**[back to top](#table-of-contents)**
+
+## 7. Choosing AND vs. OR
+
+In general, I prefer the flag approach (OR) over the embedding indented blocks approach (AND) because less indentation makes the control flow easier to follow. Boolean algebra can be used to convert AND statements into ORs.
+
+However, when a bunch of ANDs and ORs are combined, sometimes it makes things more complicated to use a single OR operator. It's really a process of trying different algebraic combinations to get the simplest-to-read control flow.
+
+The last commit shows how I was given a convoluted condition and played around with boolean algebra until I eventually settled on what I considered most readable, **[Improve logic in CGraphicContext::SetFullScreenVideo()](https://github.com/xbmc/xbmc/commit/2d85c66)**.
+
+**[back to top](#table-of-contents)**
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/HOWTO.KillAGlobal.md kodi-18.0+git20180704.0202-f0dda3a/docs/HOWTO.KillAGlobal.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/HOWTO.KillAGlobal.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/HOWTO.KillAGlobal.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,167 @@
+![Kodi Logo](resources/banner_slim.png)
+
+# HOW-TO: Kill a Global
+Guide originally published at **[PR13658](https://github.com/xbmc/xbmc/pull/13658)**. To better understand this document, you should read the original *Pull Request*.
+
+## Table of Contents
+1. **[What is the root issue?](#1-what-is-the-root-issue)**
+2. **[Globals? Singletons? What's the difference?](#2-globals-singletons-whats-the-difference)**
+3. **[What is the solution?](#3-what-is-the-solution)**
+4. **[Step 1: Identify and remove the instance](#4-step-1-identify-and-remove-the-instance)**
+5. **[Step 2: Add instance to CServiceManager](#5-step-2-add-instance-to-cservicemanager)**
+6. **[Step 3: Move initialization and deinitialization to CServiceManager](#6-step-3-move-initialization-and-deinitialization-to-cservicemanager)**  
+7. **[Step 4: Replace local dependencies with references](#7-step-4-replace-local-dependencies-with-references)**  
+  7.1. **[Step 4.1 - Settings](#71-step-41---settings)**  
+  7.2. **[Step 4.2 - Data Cache Core](#72-step-42---data-cache-core)**  
+8. **[Step 5: Make service registration local](#8-step-5-make-service-registration-local)**
+9. **[Step 6: Const-correctness and static cleanup](#9-step-6-const-correctness-and-static-cleanup)**
+10. **[Step 7: Replace external uses with CServiceBroker calls](#10-step-7-replace-external-uses-with-cservicebroker-calls)**
+11. **[Step 8: Cleanup](#11-step-8-cleanup)**
+12. **[Step 9: Submit your PR](#12-step-9-submit-your-pr)**
+13. **[Appendix: Dealing with the human aspect](#13-appendix-dealing-with-the-human-aspect)**
+
+## 1. What is the root issue?
+The root issue is that Kodi has a complicated dependency graph, so the order in which things are initialized/deinitialized is very important. When a class is global, we can't control this order, which is why things break.
+
+**[back to top](#table-of-contents)**
+
+## 2. Globals? Singletons? What's the difference?
+A global is a variable not owned by a class, e.g.
+
+```c++
+CApplication g_application;
+```
+
+A singleton is a static variable owned by a class, e.g.
+
+```c++
+CStereoscopicsManager& CStereoscopicsManager::GetInstance()
+{
+  static CStereoscopicsManager sStereoscopicsManager;
+  return sStereoscopicsManager;
+}
+```
+
+With singletons, the constructor is called on first access, so as long as things are accessed in order, Kodi doesn't crash on startup.
+
+However, on shutdown, singletons are effectively globals, because we don't control the order of destruction. Therefore, I sometimes refer to singletons as globals.
+
+**[back to top](#table-of-contents)**
+
+## 3. What is the solution?
+
+Fernet has implemented a useful architectural tool for removing globals from our codebase. See **[PR13657](https://github.com/xbmc/xbmc/pull/13657)** for an overview of this system.
+
+**[back to top](#table-of-contents)**
+
+## 4. Step 1: Identify and remove the instance
+
+Identify if the service is instantiated as a global or singleton. Remove this instance: **[Remove CStereoscopicsManager instance](https://github.com/garbear/xbmc/commit/35dc0e9~11)**.
+Singletons usually have private constructors. Make all constructors public.
+
+**[back to top](#table-of-contents)**
+
+## 5. Step 2: Add instance to CServiceManager
+
+First, identify if lines of code are listed in alphabetical or chronological order. Add the instance and try to match the ordering. In this case, services in CServiceManager are roughly in chronological order: **[Add CStereoscopicsManager instance to CServiceManager](https://github.com/garbear/xbmc/commit/35dc0e9~10)**.
+
+**[back to top](#table-of-contents)**
+
+## 6. Step 3: Move initialization and deinitialization to CServiceManager
+
+This part is tricky. Identify the closest stage where the instance is initialized and move it to CServiceManager: **[Move CStereoscopicsManager init/deinit to CServiceManager](https://github.com/garbear/xbmc/commit/35dc0e9~9)**.
+
+In this case, it was pretty easy. Init occurred right before Stage 3, so we move it into CServiceManager at the top of Stage 3.
+
+Notice how deinit is done at the same relative place in the opposite order.
+
+Before, CStereoscopicsManager was never deinitialized, so adding a deinit step in CServiceManager might cause crashes on shutdown. Regardless, we must be strict in CServiceManager, so we'll have to deal with shutdown crashes if any arise.
+
+**[back to top](#table-of-contents)**
+
+## 7. Step 4: Replace local dependencies with references
+
+A dependency is the use of a variable in another part of Kodi. These can be identified by searching StereoscopicsManager.cpp for all globals (starting with `g_`) and external services (starting with `CServiceBroker::`).
+
+Here is a list of all dependencies in StereoscopicsManager.cpp:
+
+* `CServiceBroker::GetSettings()`
+* `CServiceBroker::GetDataCacheCore()`
+* `CServiceBroker::GetRenderSystem()`
+* `g_advancedSettings`
+* `g_windowManager`
+* `g_localizeStrings`
+* `g_graphicsContext`
+* `g_application`
+
+We'll ignore the `g_` globals and Render System for now and focus on removing the first two CServiceBroker ones. If you're feeling adventurous, you can recursively kill the globals and singletons you come across. **[PR13443](https://github.com/xbmc/xbmc/pull/13443)** is my record of 4 in a single PR :)
+
+### 7.1. Step 4.1 - Settings
+
+Because CStereoscopicsManager now belongs to CServiceManager, we can remove the use of CServiceBroker by passing references to the constructor upon creation. For example, here we replace access to CSettings with a reference that comes from CServiceManager: **[Replace global access to Settings with a reference](https://github.com/garbear/xbmc/commit/35dc0e9~8)**.
+
+Note that the reference was placed first in the list of private variables. Some helpful comments were added so future authors will know where to add new variables.
+
+### 7.2. Step 4.2 - Data Cache Core
+
+Next, we do the same thing with CDataCacheCore. Notice that we place the new reference on the next line so we can scale to handle lots of dependencies with a clean git history: **[Replace global access to Data Cache Core with reference](https://github.com/garbear/xbmc/commit/35dc0e9~7)**.
+
+**[back to top](#table-of-contents)**
+
+## 8. Step 5: Make service registration local
+
+Now we begin removing external access to the service. Move all service registration to the constructor, using the references we just exposed: **[Make service registration local](https://github.com/garbear/xbmc/commit/35dc0e9~6)**.
+
+**[back to top](#table-of-contents)**
+
+## 9. Step 6: Const-correctness and static cleanup
+
+Take this opportunity to fix non-const and non-static functions:
+
+* **[Make functions const-correct and static](https://github.com/garbear/xbmc/commit/35dc0e9~5)**
+* **[Make functions private that are only used internally](https://github.com/garbear/xbmc/commit/35dc0e9~4)**
+
+Calls to these functions are made throughout the codebase. Because we're touching all these calls, we can take this opportunity to propagate const-correctness and static-correctness through the codebase.
+
+**[back to top](#table-of-contents)**
+
+## 10. Step 7: Replace external uses with CServiceBroker calls
+
+The final step is to grep the codebase and make all the substitutions required: **[Replace uses of singleton with CServiceBroker](https://github.com/garbear/xbmc/commit/35dc0e9~3)**.
+
+Notice how our const-correctness and static-correctness are extended almost everywhere.
+
+Congratulations! Global killed.
+
+**[back to top](#table-of-contents)**
+
+## 11. Step 8: Cleanup
+
+Some code in Kodi goes back 17 years, long before our current style guide was in place. If you touch code that doesn't conform to our style, it's courteous to clean up after yourself.
+
+It's important that all code cleanup is separate from functional changes. Cleanup commits should be grouped together at the very beginning or very end of the PR. They should be marked as such in the commit message.
+
+I've performed the following cleanup:
+
+* **[Cleanup: Replace C-style casts with C++ style casts](https://github.com/garbear/xbmc/commit/35dc0e9~2)**
+* **[Cleanup: Fix early return](https://github.com/garbear/xbmc/commit/35dc0e9~1)**
+* **[Cleanup: Whitespace improvements](https://github.com/garbear/xbmc/commit/35dc0e9)**
+
+**[back to top](#table-of-contents)**
+
+## 12. Step 9: Submit your PR
+
+The commits in your PR should look like this one, except steps 1-7 should be squashed into a single commit. My steps were for demonstration purposes, and compilation breaks until all 7 are committed. Kodi should always compile between commits to aid in bisecting problems.
+
+**[back to top](#table-of-contents)**
+
+## 13. Appendix: Dealing with the human aspect
+
+Most globals were added in a time before our technomancers gifted us with information on what good architecture looks like. This doesn't mean the original authors wrote "crappy" code, just that they did the best with what they were given.
+
+As a result, globals are pervasive and dependencies are tangled and, in the nightmare cases, circular. It is almost guaranteed that your hard work will break something for someone else. Fortunately, you'll find most devs are understanding of this.
+
+This can daisy-chain, because a fix for your breakage can cause even more breakage. If you feel any author of downstream breakage gets undue blame, stick up for them as other devs were understanding for you.
+
+**[back to top](#table-of-contents)**
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/PULL_REQUEST_TEMPLATE.md kodi-18.0+git20180704.0202-f0dda3a/docs/PULL_REQUEST_TEMPLATE.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/PULL_REQUEST_TEMPLATE.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/PULL_REQUEST_TEMPLATE.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,34 @@
+<!--- Provide a general summary of your change in the Pull Request title above -->
+
+## Description
+<!--- Describe your change in detail -->
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your change -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc -->
+
+## Screenshots (if appropriate):
+
+## Types of change
+<!--- What type of change does your code introduce? Put an `x` in all the boxes that apply like this: [X] -->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] Improvement (non-breaking change which improves existing functionality)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+- [ ] Cosmetic change (non-breaking change that doesn't touch code)
+- [ ] None of the above (please explain below)
+
+## Checklist:
+<!--- Go over all the following points, and put an `X` in all the boxes that apply like this: [X] -->
+<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+- [ ] My code follows the **[Code Guidelines](CODE_GUIDELINES.md)** of this project 
+- [ ] My change requires a change to the documentation, either Doxygen or wiki
+- [ ] I have updated the documentation accordingly
+- [ ] I have read the **[Contributing](CONTRIBUTING.md)** document
+- [ ] I have added tests to cover my change
+- [ ] All new and existing tests passed
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.android kodi-18.0+git20180704.0202-f0dda3a/docs/README.android
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.android	2018-05-01 00:00:12.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.android	1970-01-01 00:00:00.000000000 +0000
@@ -1,389 +0,0 @@
-TOC
-1. Introduction
-2. Installing the required Ubuntu packages
-3. Installing and setting up the Android environment
-4. Getting the source code
-5. How to compile
-6. Installing Kodi in an Android system
-7. Running and debugging Kodi in an Android system
-8. Architecture
-9. Useful Commands
-
------------------------------------------------------------------------------
-1. Introduction
------------------------------------------------------------------------------
-
-We currently recommend Ubuntu "Xenial Xerus" (16.04) 64Bit. This is what our continuous
-integration system "jenkins" is using.
-Additionally, building from OSX Snow Leopard or Mavericks (others on your own risk ;) ) is working (see 3.1).
-
-NOTE TO NEW USERS: All lines that are prefixed with the '$'
-character are commands that need to be typed into a terminal window /
-console (similar to the command prompt for Windows). Note that the '$'
-character itself should NOT be typed as part of the command.
-
------------------------------------------------------------------------------
-2. Installing the required Ubuntu packages
------------------------------------------------------------------------------
-These are the minimum packages necessary for building Kodi.
-Non-Ubuntu users will need to get the equivalents.
-
-    $ sudo apt-get install build-essential default-jdk git curl autoconf \
-      unzip zlib1g-dev gawk gperf cmake libcurl4-openssl-dev
-
-If you run a 64bit operating system you will also need to get ia32-libs
-
-Ubuntu >= 14.04:
-    $ sudo apt-get install lib32stdc++6 lib32z1 lib32z1-dev
-
-Older versions:
-    $ sudo apt-get install ia32-libs
-
-The following versions are used on our continuous integration system "jenkins". Other (newer)
-versions might work as well.
-
-JDK: openjdk-6-jdk (java version "1.6.0_27")
-JRE: openjre-6-jre (java version "1.6.0_27")
-
-
------------------------------------------------------------------------------
-3. Installing and setting up the Android environment
------------------------------------------------------------------------------
-
-To develop Kodi for Android the Android SDK and NDK are required.
-
---------------------------------------------------------------------
-3.1. Prerequisites when compiling on Mac OSX
---------------------------------------------------------------------
-
-a. When building on Mac OSX you need to download the java JDK (development kit) from http://www.oracle.com
-   Or ensure otherwise that you are using java 1.8 (java -version tells you the version).
-b. The compilation for android needs a case sensitive filesystem. The
-   filesystem used on normal OSX installations is case insensitive. So you
-   need to generate a writeable hdd image and format it with hfs+ (case sensitive).
-   The size should be 20GB.
-c. Generate a writable dmg with the following command:
-    $ hdiutil create -type UDIF -fs 'Case-sensitive Journaled HFS+' -size 20g -volname android-dev ~/android-dev.dmg
-
-d. Whenever you want to compile/develop you need to mount it:
-    $ open ~/android-dev.dmg
-
-e. Your workspace can be accessed in /Volumes/android-dev/ then
-f. Once you have your hdd image with case sensitive hfs+ file system do all steps
-   below inside of this filesystem. In the end you need to adapt all paths in this
-   document so that they match your local environment. As an example here is a
-   configure line from step 5.1 which demonstrates possible paths. In this
-   example the hdd image is mounted on /Volumes/android-dev.
-    $ ./configure --with-tarballs=/Users/Shared/xbmc-depends/tarballs --host=arm-linux-androideabi \
-                  --with-sdk-path=/Volumes/android-dev/android/android-sdk-macosx \
-                  --with-ndk-path=/Volumes/android-dev/android/android-ndk-r16 \
-                  --with-toolchain=/Volumes/android-dev/android/android-toolchain-arm/android-21 \
-                  --prefix=/Volumes/android-dev/android/xbmc-depends
-
---------------------------------------------------------------------
-3.2. Getting the Android SDK and NDK
---------------------------------------------------------------------
-
-To get the Android SDK, go to http://developer.android.com/sdk and
-download the latest version for your operating system. The NDK
-can be downloaded from http://developer.android.com/tools/sdk/ndk/
-
-[NOTICE] Compiling Kodi for Android requires Android NDK
-         Revision 16. For the SDK just use the latest available.
-         It will work.
-
-After downloading the SDK and NDK extract the files contained in the
-archives to your harddisk. For our example we are extracting in the following
-directories (this matches the example from tools/depends/README as well):
-
-NDK (referenced as <android-ndk> from now on):
-/opt/android-ndk-r16
-
-TOOLCHAIN (arm) (referenced as <android-toolchain-arm> from now on):
-/opt/arm-linux-androideabi-4.9-vanilla/android-21
-
-TOOLCHAIN (aarch64) (referenced as <android-toolchain-aarch64> from now on):
-/opt/aarch64-linux-android-4.9-vanilla/android-21
-
-TOOLCHAIN (x86) (referenced as <android-toolchain-x86> from now on):
-/opt/x86-linux-4.9-vanilla/android-21
-
-SDK (referenced as <android-sdk> from now on):
-/opt/android-sdk-linux
-
-Make sure you have a recent JRE and JDK installed otherwise the
-Android SDK will not work. (see point 2.)
-
---------------------------------------------------------------------
-3.3. Installing Android SDK packages
---------------------------------------------------------------------
-
-After having extracted the Android SDK to <android-sdk> you need to
-install some android packages using the Android SDK Manager:
-
-    $ cd <android-sdk>/tools
-    $ ./android update sdk -u -t platform,platform-tool
-    $ ./android update sdk --all -u -t build-tools-25.0.3
-
-As of newest SDKs the android tool is deprecated. Use sdkmanager instead:
-    $ cd <android-sdk>/tools/bin
-    $ ./sdkmanager  platform-tools
-    $ ./sdkmanager "platforms;android-26"
-    $ ./sdkmanager "build-tools;25.0.3"
-
---------------------------------------------------------------------
-3.4. Setup the Android toolchain
---------------------------------------------------------------------
-
-To be able to compile Kodi and the libraries it depends on for the
-Android platform you first need to setup an Android toolchain using
-the Android NDK which you earlier extracted to <android-ndk>. The
-following commands will create a toolchain suitable for the most
-common scenario.
-The --install-dir option (and therefore the <android-toolchain-arm>/<android-toolchain-x86> value)
-specifies where the resulting toolchain should be installed (your choice).
-
-[NOTICE] Kodi uses the android API Version 21 and clang version 5.0!
-
-Building for arm architecture:
-
-    $ cd <android-ndk>
-    $ ls platforms
-    $ cd build/tools
-    $ ./make-standalone-toolchain.sh \
-      --install-dir=<android-toolchain-arm> --platform=android-21 \
-      --toolchain=arm-linux-androideabi-4.9 --stl=libc++
-
-Building for aarch64 architecture:
-
-    $ cd <android-ndk>
-    $ ls platforms
-    $ cd build/tools
-    $ ./make-standalone-toolchain.sh \
-      --install-dir=<android-toolchain-aarch64> --platform=android-21 \
-      --toolchain=aarch64-linux-android-4.9 --stl=libc++
-
-Building for x86 architecture:
-
-    $ cd <android-ndk>
-    $ ls platforms
-    $ cd build/tools
-    $ ./make-standalone-toolchain.sh \
-      --install-dir=<android-toolchain-x86> --platform=android-21 \
-      --toolchain=x86-4.9 --arch=x86 --stl=libc++
-
-Make sure to pick a toolchain for your desired architecture. If an error about
-the used system is shown - please add proper --system parameter as mentioned
-in the error message.
-
---------------------------------------------------------------------
-3.5. Create a (new) debug key to sign debug APKs
---------------------------------------------------------------------
-
-All packages must be signed. The following command will generate a
-self-signed debug key. If the result is a cryptic error, it
-probably just means a debug key already existed, no cause for alarm.
-
-    $ keytool -genkey -keystore ~/.android/debug.keystore -v -alias \
-      androiddebugkey -dname "CN=Android Debug,O=Android,C=US" -keypass \
-      android -storepass android -keyalg RSA -keysize 2048 -validity 10000
-
------------------------------------------------------------------------------
-4. Getting the source code
------------------------------------------------------------------------------
-
-    $ cd $HOME
-    $ git clone git://github.com/xbmc/xbmc.git kodi-android
-    $ cd kodi-android
-
------------------------------------------------------------------------------
-5. How to compile
------------------------------------------------------------------------------
-
-Compiling Kodi for Android consists of compiling the libraries Kodi depends
-on with the Android toolchain and creating an Android Application Package
-(APK) which can be installed in an Android system.
-
---------------------------------------------------------------------
-5.1. Building dependencies
---------------------------------------------------------------------
-
-    $ cd $HOME/kodi-android/tools/depends
-    $ ./bootstrap
-    $ ./configure --help
-
-Run configure with the correct settings for you local configuration.
-See tools/depends/README for examples.
-
-Anyone working on the dependencies themselves will want to set the
-environment variables specified in ~/.bashrc or similar, to avoid
-having to input these with each configure.
-
-    $ make -j <jobs>
-    $ make -j <jobs> -C target/binary-addons
-
-NOTE: if you only want to build specific addons you can specify like this:
-    $ make -C target/binary-addons ADDONS="pvr.hts pvr.dvblink"
-
-This build was designed to be massively parallel. Don't be afraid to
-give it a 'make -j20' or so.
-
-Verify that all dependencies are built correctly (it will tell you so)
-before continuing to avoid errors. If in doubt run another 'make' (single threaded)
-until the message "Dependencies built successfully." appears. If the single make
-fails, keep cleaning the specific library by issuing:
-    $ make -C target/<name_of_failed_lib> distclean
-
-Then try make again.
-Rinse and repeat until you are really done and all libs are built.
-
---------------------------------------------------------------------
-5.2. Building Kodi
---------------------------------------------------------------------
-
-    $ cd $HOME/kodi-android
-    $ make -C tools/depends/target/cmakebuildsys
-    $ cd build
-    $ make
-    $ make apk
-
-After the first build (assuming bootstrap and configure are successful),
-subsequent builds can be run with a simple 'make' and 'make apk'.
-
-The built APK will be present in $HOME/kodi-android
-
------------------------------------------------------------------------------
-6. Installing Kodi in an Android system
------------------------------------------------------------------------------
-
-To install Kodi through the previously built APK in an Android system you can
-either install it on a real device (smartphone/tablet/...) running Android
- >= 5.x
-
---------------------------------------------------------------------
-6.1. Installing Kodi on the Android device
---------------------------------------------------------------------
-
-Make sure your Android device is connected to your computer through
-USB. Furthermore you have to enable the following option in your
-device's Android settings:
-
-  - Applications
-    [X] Unknown sources
-
-    $ cd $HOME/kodi-android
-    $ adb devices
-    $ adb -s <device-id> install -r xbmcapp-debug.apk
-
-The <device-id> can be retrieved from the list returned by the
-"adb devices" command and is the first value in the row representing
-your device.
-
------------------------------------------------------------------------------
-7. Running and debugging Kodi in an Android system
------------------------------------------------------------------------------
-
-After installing Kodi's APK in an Android system you can start it using its
-Launcher icon in Android's Application Launcher.
-
---------------------------------------------------------------------
-7.1. Debugging Kodi
---------------------------------------------------------------------
-
-To be able to see what is happening while running Kodi you first need
-to enable USB debugging in your Android settings (this is already done
-when using the emulator):
-
-  - Applications
-    [X] Unknown sources
-     -  Development
-        [X] USB debugging
-
-To access the log output of your Android system run (the -s parameter
-and the <device-id> may not be needed when using the Android emulator)
-
-    $ adb -s <device-id> logcat
-
-
---------------------------------------------------------------------
-7.2. GDB
---------------------------------------------------------------------
-
-GDB can be used to debug, though the support is rather primitive. Rather than
-using gdb directly, you will need to use ndk-gdb which wraps it. Do NOT trust
-the -p/--project switches, as they do not work. Instead you will need
-to cd to tools/android/packaging/xbmc and execute it from there.
-
-    $ ndk-gdb --start --delay=0
-
-This will open the installed version of Kodi and break. The warnings can be
-ignored as we have setup the appropriate paths already.
-
---------------------------------------------------------------------
-8. Architecture
---------------------------------------------------------------------
-
-During the early days of the android port, Kodi was launched via a stub lib
-that then dlopen'd libkodi. This was done to get around bionic's poor handling
-of shared libs. We now compile everything into libkodi itself so that it has
-no runtime dependencies beyond system libs. Done this way, we're able to launch
-into libkodi directly.
-
-But we still hit Bionic's loader's deficiencies when we dlopen a lib. There are
-two main issues to overcome for loading:
-
-1. Bionic imports all symbols for a lib as soon as it is loaded, and it will
-refuse to open a lib if it has a single unresolved symbol
-
-2. It does not search recursively during the resolve. So if liba depends on
-libb, dlopen'ing liba will _not_ pull in missing symbols from libb. This is
-particularly nasty considering #1.
-
-To work-around these problems we use our own recursive loader in place of
-dlopen. This loader mimics expected behavior. Using the example above, loading
-libb before liba will mean that everything will resolve correctly.
-
-Additionally, Android does not use versioned solibs. libfoo.so.1 which is
-typical on linux would not be found by the loader. This means that we must
-strip the SONAME and NEEDED values out of the libs as well as changing the
-filenames themselves. The cleaner solution would be to patch libtool/cmake/etc
-to not add versioning in the first place. For now, we use the brute-force
-approach of modifying the binary and blanking out the versions.
-
-See here for more info:
-http://www.bernawebdesign.ch/byteblog/2011/11/23/creating-non-versioned-shared-libraries-for-android/
-
-As a final gotcha, all libs must be in the form of ^lib.*so$ with no
-exceptions (they won't even install otherwise), and the soname must match.
-So we have to do some renaming to get some of our self-built libs loaded.
-
-Development:
-Typical android native activities are built with ndk-build which is a wrapper
-around Make. It would be a nightmare to port our entire buildsystem over, so
-instead we build as usual then package ourselves. It may be beneficial to use
-ndk-build to do the actual packaging, but for now its behavior is emulated.
-
-ABI:
-Presently we are targeting armv7a+neon for arm, and i686 for x86.
-
---------------------------------------------------------------------
-9. Useful Commands
---------------------------------------------------------------------
-
-Below are a few helpful commands when building/debugging. These assume that pwd
-is 'tools/android/packaging' and that the proper sdk/ndk paths are set.
-
--Install a new build over the existing one
-    $ adb -e install -r images/xbmcapp-debug.apk
-
--Launch Kodi on the emulator without the GUI
-    $ adb shell am start -a android.intent.action.MAIN -n org.xbmc.xbmc/android.app.NativeActivity
-
--Kill a misbehaving Kodi
-    $ adb shell ps | grep org.xbmc | awk '{print $2}' | xargs adb shell kill
-
--Filter logcat messages by a specific tag (e.g. "Kodi")
-    $ adb logcat -s Kodi:V
-
--Enable CheckJNI (BEFORE starting the application)
-    $ adb shell setprop debug.checkjni 1
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.Android.md kodi-18.0+git20180704.0202-f0dda3a/docs/README.Android.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.Android.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.Android.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,305 @@
+![Kodi Logo](resources/banner_slim.png)
+
+# Android build guide
+This guide has been tested with Ubuntu 16.04 (Xenial) x86_64. It is meant to cross-compile Kodi for Android using **[Kodi's unified depends build system](../tools/depends/README.md)**. Please read it in full before you proceed to familiarize yourself with the build procedure.
+
+It should work if you're using macOS. If that is the case, read **[macOS specific prerequisites](#35-macos-specific-prerequisites)** first.
+
+## Table of Contents
+1. **[Document conventions](#1-document-conventions)**
+2. **[Install the required packages](#2-install-the-required-packages)**
+3. **[Prerequisites](#3-prerequisites)**  
+  3.1. **[Extract Android SDK and NDK](#31-extract-android-sdk-and-ndk)**  
+  3.2. **[Configure Android SDK](#32-configure-android-sdk)**  
+  3.3. **[Set up the Android toolchain](#33-set-up-the-android-toolchain)**  
+  3.4. **[Create a key to sign debug APKs](#34-create-a-key-to-sign-debug-apks)**  
+  3.5. **[macOS specific prerequisites](#35-macos-specific-prerequisites)**
+4. **[Get the source code](#4-get-the-source-code)**
+5. **[Build tools and dependencies](#5-build-tools-and-dependencies)**
+6. **[Build binary add-ons](#6-build-binary-add-ons)**
+7. **[Build Kodi](#7-build-kodi)**
+8. **[Package](#8-package)**
+9. **[Install](#9-install)**
+10. **[Debugging Kodi](#10-debugging-kodi)**
+
+## 1. Document conventions
+This guide assumes you are using `terminal`, also known as `console`, `command-line` or simply `cli`. Commands need to be run at the terminal, one at a time and in the provided order.
+
+This is a comment that provides context:
+```
+this is a command
+this is another command
+and yet another one
+```
+
+**Example:** Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+Commands that contain strings enclosed in angle brackets denote something you need to change to suit your needs.
+```
+git clone -b <branch-name> https://github.com/xbmc/xbmc kodi
+```
+
+**Example:** Clone Kodi's current Krypton branch:
+```
+git clone -b Krypton https://github.com/xbmc/xbmc kodi
+```
+
+Several different strategies are used to draw your attention to certain pieces of information. In order of how critical the information is, these items are marked as a note, tip, or warning. For example:
+ 
+**NOTE:** Linux is user friendly... It's just very particular about who its friends are.  
+**TIP:** Algorithm is what developers call code they do not want to explain.  
+**WARNING:** Developers don't change light bulbs. It's a hardware problem.
+
+**[back to top](#table-of-contents)** | **[back to section top](#1-document-conventions)**
+
+## 2. Install the required packages
+Install build dependencies needed to cross-compile Kodi for Android:
+```
+sudo apt install autoconf build-essential curl default-jdk gawk git gperf lib32stdc++6 lib32z1 lib32z1-dev libcurl4-openssl-dev unzip zlib1g-dev
+```
+**NOTE:** If you're running a 32bit Debian/Ubuntu distribution,  remove `lib32stdc++6 lib32z1 lib32z1-dev` from the command.
+
+**[back to top](#table-of-contents)**
+
+## 3. Prerequisites
+Building Kodi for Android requires Android NDK revision 16. For the SDK just use the latest available.
+
+* **[Android SDK](https://developer.android.com/studio/index.html)** (Look for `Get just the command line tools`)
+* **[Android NDK](https://developer.android.com/ndk/downloads/index.html)**
+
+### 3.1. Extract Android SDK and NDK
+Create needed directories:
+```
+mkdir -p $HOME/android-tools/android-sdk-linux
+```
+
+Extract Android SDK:
+```
+unzip $HOME/Downloads/sdk-tools-linux-4333796.zip -d $HOME/android-tools/android-sdk-linux
+```
+
+**NOTE:** Since we're using the latest SDK available, filename can change over time. Adapt the `unzip` command accordingly.
+
+Extract Android NDK:
+```
+unzip $HOME/Downloads/android-ndk-r16b-linux-x86_64.zip -d $HOME/android-tools
+```
+
+### 3.2. Configure Android SDK
+Before Android SDK can be used, you need to accept the licenses and configure it:
+```
+cd $HOME/android-tools/android-sdk-linux/tools/bin
+./sdkmanager --licenses
+./sdkmanager platform-tools
+./sdkmanager "platforms;android-26"
+./sdkmanager "build-tools;25.0.3"
+```
+
+### 3.3. Set up the Android toolchain
+To be able to build Kodi and the libraries it depends on for the Android platform you first need to set up an Android toolchain using the Android NDK.
+
+Change to Android NDK tools directory:
+```
+cd $HOME/android-tools/android-ndk-r16b/build/tools
+```
+
+Set up the aarch64 toolchain:
+```
+./make-standalone-toolchain.sh --install-dir=$HOME/android-tools/aarch64-linux-androideabi-4.9-vanilla/android-21 --platform=android-21 --toolchain=arm-linux-androideabi-4.9 --stl=libc++
+```
+
+Set up the arm toolchain:
+```
+./make-standalone-toolchain.sh --install-dir=$HOME/android-tools/arm-linux-androideabi-4.9-vanilla/android-21 --platform=android-21 --toolchain=arm-linux-androideabi-4.9 --stl=libc++
+```
+
+Set up the x86 toolchain:
+```
+./make-standalone-toolchain.sh --install-dir=$HOME/android-tools/x86-linux-androideabi-4.9-vanilla/android-21 --platform=android-21 --toolchain=arm-linux-androideabi-4.9 --stl=libc++
+```
+
+**NOTE:** You only need the toolchain for your target architecture but toolchains are installed in different directories and will not interfere with each other.
+
+### 3.4. Create a key to sign debug APKs
+All packages must be signed. The following command will generate a self-signed debug key. If the result is a cryptic error, it probably just means a debug key already existed.
+
+```
+keytool -genkey -keystore ~/.android/debug.keystore -v -alias androiddebugkey -dname "CN=Android Debug,O=Android,C=US" -keypass android -storepass android -keyalg RSA -keysize 2048 -validity 10000
+```
+
+### 3.5. macOS specific prerequisites
+* **[Java Development Kit (JDK)](http://www.oracle.com/technetwork/java/javase/downloads/index.html)** installed.
+* Normal macOS installations filesystem is case insensitive but compiling for Android requires a case sensitive filesystem. Generate a writeable hdd image and format it with hfs+ (case sensitive) issuing
+  * `hdiutil create -type UDIF -fs 'Case-sensitive Journaled HFS+' -size 20g -volname android-dev $HOME/android-dev.dmg`
+* Whenever you want to compile/develop you need to mount the image
+  * `open ~/android-dev.dmg`
+* Once you have your hdd image with case sensitive hfs+ file system execute all the steps inside of this filesystem. You need to adapt all paths in this guide so that they match your local environment. As an example here is a configure line that demonstrates possible paths:
+  * `./configure --with-tarballs=/Users/Shared/xbmc-depends/tarballs --host=arm-linux-androideabi --with-sdk-path=/Volumes/android-dev/android/android-sdk-macosx --with-ndk-path=/Volumes/android-dev/android/android-ndk-r16b --with-toolchain=/Volumes/android-dev/android/android-toolchain-arm/android-21 --prefix=/Volumes/android-dev/android/xbmc-depends`
+  
+**[back to top](#table-of-contents)** | **[back to section top](#3-prerequisites)**
+
+## 4. Get the source code
+Change to your `home` directory:
+```
+cd $HOME
+```
+
+Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+## 5. Build tools and dependencies
+Prepare to configure build:
+```
+cd $HOME/kodi/tools/depends
+./bootstrap
+```
+
+**TIP:** Look for comments starting with `Or ...` and only execute the command(s) you need.
+
+Configure build for aarch64:
+```
+./configure --with-tarballs=$HOME/android-tools/xbmc-tarballs --host=aarch64-linux-android --with-sdk-path=$HOME/android-tools/android-sdk-linux --with-ndk-path=$HOME/android-tools/android-ndk-r16b --with-toolchain=$HOME/android-tools/aarch64-linux-androideabi-4.9-vanilla/android-21 --prefix=$HOME/android-tools/xbmc-depends
+```
+
+Or configure build for arm:
+```
+./configure --with-tarballs=$HOME/android-tools/xbmc-tarballs --host=arm-linux-androideabi --with-sdk-path=$HOME/android-tools/android-sdk-linux --with-ndk-path=$HOME/android-tools/android-ndk-r16b --with-toolchain=$HOME/android-tools/arm-linux-androideabi-4.9-vanilla/android-21 --prefix=$HOME/android-tools/xbmc-depends
+```
+
+Or configure build for x86:
+```
+./configure --with-tarballs=$HOME/android-tools/xbmc-tarballs --host=i686-linux-android --with-sdk-path=$HOME/android-tools/android-sdk-linux --with-ndk-path=$HOME/android-tools/android-ndk-r16b --with-toolchain=$HOME/android-tools/x86-linux-androideabi-4.9-vanilla/android-21 --prefix=$HOME/android-tools/xbmc-depends
+```
+
+Build tools and dependencies:
+```
+make -j$(getconf _NPROCESSORS_ONLN)
+```
+
+**TIP:** By adding `-j<number>` to the make command, you can choose how many concurrent jobs will be used and expedite the build process. It is recommended to use `-j$(getconf _NPROCESSORS_ONLN)` to compile on all available processor cores. The build machine can also be configured to do this automatically by adding `export MAKEFLAGS="-j(getconf _NPROCESSORS_ONLN)"` to your shell config (e.g. `~/.bashrc`).
+
+**WARNING:** Look for the `Dependencies built successfully.` success message. If in doubt run a single threaded `make` command until the message appears. If the single make fails, clean the specific library by issuing `make -C target/<name_of_failed_lib> distclean` and run `make`again.
+
+
+**[back to top](#table-of-contents)** | **[back to section top](#5-build-tools-and-dependencies)**
+
+## 6. Build binary add-ons
+You can find a complete list of available binary add-ons **[here](https://github.com/xbmc/repo-binary-addons)**.
+
+Change to Kodi's source code directory:
+```
+cd $HOME/kodi
+```
+
+Build all add-ons:
+```
+make -j$(getconf _NPROCESSORS_ONLN) -C tools/depends/target/binary-addons
+```
+
+Build specific add-ons:
+```
+make -j$(getconf _NPROCESSORS_ONLN) -C tools/depends/target/binary-addons ADDONS="audioencoder.flac pvr.vdr.vnsi audiodecoder.snesapu"
+```
+
+Build a specific group of add-ons:
+```
+make -j$(getconf _NPROCESSORS_ONLN) -C tools/depends/target/binary-addons ADDONS="pvr.*"
+```
+
+**[back to top](#table-of-contents)**
+
+## 7. Build Kodi
+Configure CMake build:
+```
+cd $HOME/kodi
+make -C tools/depends/target/cmakebuildsys
+```
+
+Build Kodi:
+```
+cd $HOME/kodi/build
+make -j$(getconf _NPROCESSORS_ONLN)
+```
+
+**[back to top](#table-of-contents)**
+
+## 8. Package
+CMake generates a target called `apk` which will package Kodi ready for distribution.
+
+Create package:
+```
+make apk
+```
+
+Generated `apk` file will be inside `$HOME/kodi`.
+
+**[back to top](#table-of-contents)**
+
+## 9. Install
+Connect your Android device to your computer through USB and enable the `Unknown sources` option in your device settings.
+
+Make sure `adb` is installed:
+```
+sudo apt install adb
+```
+
+Install Kodi:
+```
+cd $HOME/kodi-android
+adb devices
+adb -s <device-id> install -r <generated-apk-name-here>.apk
+```
+
+The *device-id* can be retrieved from the list returned by the `adb devices` command and is the first value in the row representing your device.
+
+**[back to top](#table-of-contents)**
+
+## 10. Debugging Kodi
+To be able to see what is happening while running Kodi you need to enable `USB debugging` in your device settings (already enabled in the Android Emulator).
+
+Access the log output of your Android device:
+```
+adb -s <device-id> logcat
+```
+
+Install a new build over the existing one:
+```
+adb -e install -r images/xbmcapp-debug.apk
+```
+
+Launch Kodi on Android Emulator without the GUI:
+```
+adb shell am start -a android.intent.action.MAIN -n org.xbmc.xbmc/android.app.NativeActivity
+```
+
+Kill a misbehaving Kodi:
+```
+adb shell ps | grep org.xbmc | awk '{print $2}' | xargs adb shell kill
+```
+
+Filter logcat messages by a specific tag (e.g. `Kodi`):
+```
+adb logcat -s Kodi:V
+```
+
+Enable CheckJNI (**before** starting the Kodi):
+```
+adb shell setprop debug.checkjni 1
+```
+
+**NOTE:** These commands assume that current directory is `tools/android/packaging` and that the proper SDK/NDK paths are set.
+
+GDB can be used to debug, though the support is rather primitive. Rather than using gdb directly, you will need to use ndk-gdb which wraps it. Do **not** trust the `-p/--project` switches, as they do not work. Instead you will need to `cd` to `tools/android/packaging/xbmc` and execute it from there.
+```
+ ndk-gdb --start --delay=0
+```
+
+This will open the installed version of Kodi and break. The warnings can be ignored as we have the appropriate paths already setup.
+
+**[back to top](#table-of-contents)** | **[back to section top](#10-debugging-kodi)**
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.armel kodi-18.0+git20180704.0202-f0dda3a/docs/README.armel
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.armel	2018-05-01 00:00:12.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.armel	1970-01-01 00:00:00.000000000 +0000
@@ -1,274 +0,0 @@
-TOC
-1. Introduction
-2. Using Scratchbox
-   2.1 Automatic Installation
-   2.2 Manual Installation
-   2.3 Installation Continued for both Automatic and Manual Methods
-   2.4 Setup Scratchbox
-3. Getting the source code
-4. Installing the required ARMEL packages
-5. Obtaining the SGX files
-6. How to compile
-   6.1 Configure & Make
-   6.2 Install
-7. How to run
-   7.1 Obtaining the Packages
-   7.2 Installing the Files
-   7.3 Running Kodi
-8. Troubleshooting
-
------------------------------------------------------------------------------
-1. Introduction
------------------------------------------------------------------------------
-
-This is a port of Kodi for use on ARM Architecture.
-As this is not an official version of Kodi, in-depth testing on various setups has not been done. USE WITH CAUTION!
-For the purpose of this port, the following Hardware and Software was used.
-Software: Scratchbox (cross-compiler) on a Linux (Ubuntu) machine.
-Hardware: BeagleBoard (ARM Cortex-A8 with IMG POWERVR SGX).
-The source code is based on Kodi for Linux - version 9.11 (Camelot).
-
-All lines that are prefixed with the '$' character are commands that need to be typed into a standard linux terminal
-All lines that are prefixed with the '>' character are commands that need to be typed into scratchbox
-All lines that are prefixed with the '#' character are commands that need to be typed into a terminal on the beagleboard
-
-
------------------------------------------------------------------------------
-2. Using Scratchbox
------------------------------------------------------------------------------
-
-First, you need scratch box, along with some other packages.
-The easiest way is to do the following automatic installation.
-If you don't succeed, or want to do it manually, follow the next step instead.
-
------------------------------------------------------------------------------
-2.1 Automatic Installation:
------------------------------------------------------------------------------
-
-    $ sudo gedit /etc/apt/sources.list
-
-Add this to the end of the file, then save and exit gedit:
-    deb http://scratchbox.org/debian stable main
-    deb http://scratchbox.org/debian legacy main
-
-Now enter the following command:
-    $ sudo apt-get install scratchbox-core scratchbox-libs scratchbox-devkit-cputransp scratchbox-devkit-git scratchbox-devkit-mtd scratchbox-devkit-perl scratchbox-devkit-doctools scratchbox-toolchain-arm-linux-cs2007q3-51sb3 scratchbox-toolchain-host-gcc scratchbox-devkit-debian
-
------------------------------------------------------------------------------
-2.2 Manual Installation:
------------------------------------------------------------------------------
-
-Go to the following website:
-http://www.scratchbox.org/download/files/sbox-releases/stable/tarball/
-and download the following files (Unless specified, choose latest version):
-  - core
-  - libs
-  - cputransp
-  - doctools
-  - git
-  - mtd
-  - perl
-  - toolchain (cs2007q3-51sb3)
-  - host-gcc
-  - debian
-
-To install
-    $ cd /
-    $ sudo tar xvf /<location of files>/scratchbox-core.tar.gz
-
-Repeat for all the downloaded files.
-
------------------------------------------------------------------------------
-2.3 Installation Continued for both Automatic and Manual Methods:
------------------------------------------------------------------------------
-
-Now, a few changes needs to me made in order for it to work correctly:
-    $ sudo gedit /etc/sysctl.conf
-
-Change/Add these variables:
-		vm.mmap_min_addr = 4096
-    vm.vdso_enabled = 0
-Save and Close.
-
-Add yourself to scratchbox:
-    $ sb-adduser <username>
-
-Make sure it worked by doing the following command, and see if sbox is listed.
-    $ groups
-
-If it isn't listed, restart and try again. If it still isnt listed, then do the following:
-    $ usermod -a -G sbox <username>
-
-It should now list (possibly after another logout)
-Now you have access to scratchbox.
-
------------------------------------------------------------------------------
-2.4 Setup Scratchbox:
------------------------------------------------------------------------------
-
-Before setting up your target, you need a rootstrap. Obtain the latest rootstrap from:
-http://linux.onarm.com/download/images/generic-X/
-You want to download the file 'beagleboard-<date>-rootstrap.tar.gz'.
-
-Do this every time you want to access scratchbox:
-    $ /scratchbox/login
-
-Time to setup your target:
-    $ sb-menu
-
-A GUI will appear for the setup procedure.
-  - Choose Setup
-  - Create a NEW target, give it any name
-  - Select the compiler you downloaded (arm-linux-cs2007q3-51sb3)
-  - Select all development kits listed by highlighting each one and pressing enter, then Done and enter
-  - Select CPU transparency (qemu-arm-cvs-m)
-  - Yes to rootstrap. Locate the previously downloaded rootstrap to install.
-  - Yes to install files
-  - Only select DEVKIT and ETC. Remove all other files in list, then continue
-  - And finally Yes to selecting target.
-
-Now scratchbox is setup
-
-
------------------------------------------------------------------------------
-3. Getting the source code
------------------------------------------------------------------------------
-
-    $ sudo apt-get install git-core
-    $ cd /scratchbox/users/<username>/home/<username>/
-    $ git clone git://github.com/xbmc/xbmc.git
-
-
------------------------------------------------------------------------------
-4. Installing the required ARMEL packages
------------------------------------------------------------------------------
-
-There is a simple shell script that downloads a list of packages that are required and installs them into scratchbox.
-
-    $ cd tools/arm/arm-scripts/
-    $ ./install-pkgs.sh
-
-Please check the output files for any possible errors that may have occured.
-
-Note. You will need the headers and shared object files for EGL and GLESv2 to continue.
-
-
------------------------------------------------------------------------------
-5. Obtaining the SGX files
------------------------------------------------------------------------------
-
-In order to continue, you will need the SGX SDK from TI's website.
-Once you have installed said SDK on a standard Linux machine, copy the necessary .h and .so files to the appropriate directories in scratchbox:
-e.g /scratchbox/users/<username>/targets/<target_name>/usr/include/EGL/egl.h
-These files will also need to be transferred over to the board eventually.
-
-NOTE: Kodi has only been tested with the following versions of the OMAP35x Graphics SDK:
-3.00.00.05, 3.00.00.06, 3.00.00.08, 3.00.00.09
-
-
------------------------------------------------------------------------------
-6. How to compile
------------------------------------------------------------------------------
-
-To create the Kodi executable manually perform these following steps:
-
------------------------------------------------------------------------------
-6.1 Configure & Make:
------------------------------------------------------------------------------
-
-    $ ./bootstrap
-    $ ./configure --enable-gles
-
-This will configure Kodi inside scratchbox ready for compilation on ARM.
-Because the default is to build for OpenGL, we require the --enable-gles flag to be set for OpenGL ES 2.0.
-Note: No OpenGL ES 1.x available
-Now, build with the following:
-
-    $ make
-
------------------------------------------------------------------------------
-6.2 Install:
------------------------------------------------------------------------------
-
-There is no need to do 'make install' as we dont want it installed into scratchbox.
-There is also the slight problem of the fact that scratchbox's 'find' command is outdated and wont execute Kodi's 'make install' correctly.
-Instead, use the provided shell script:
-    $ cd /tools/arm/arm-scripts/
-    $ ./create-xbmcfile.sh
-
-This will create a tar file tools/arm/arm-scripts/xbmc.tar.bz2 containing the Kodi files, ready for you to transfer to the board.
-
-
------------------------------------------------------------------------------
-7. How to run
------------------------------------------------------------------------------
-
-It is assumed you have a beagleboard with all the necessary hardware installed.
-(e.g. keyboard, mouse, and Ethernet adapter)
-It is also assumed that you have it setup with either Angstrom or Ubuntu.
-
------------------------------------------------------------------------------
-7.1 Obtaining the Packages:
------------------------------------------------------------------------------
-
-For Ubuntu: See README.linux for list of packages to install.
-If planning on not extracting the pkgs file, a few additional packages are required to be installed.
-These are python and liblzo2
-
-For Angstrom:
-    $ opkg update
-    $ opkg install subversion make g++ gcc gawk pmount libtool automake gperf bison libsdl-1.2-dev libsdl-gfx-dev libfribidi-dev liblzo-dev libfreetype-dev libsqlite3-dev libasound2 python-sqlite3 libcurl4 libxrandr-dev libxrender-dev libmysqlclient-dev libpcre-dev libdbus-glib-1-dev hal-dev libfontconfig-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev
-
-Unfortunately this will only install the packages that are available through opkg. There will be further packages that need to be installed.
-Either use the method mentioned below, or selectively find and install packages, mentioned at the bottom of this README.
-
-Alternatively, do the following:
-First make sure you have done section 4. then do the following:
-    $ cd xbmc_on_arm/arm-scripts/
-    $ ./create-pkgsfile.sh
-
-This will create a tar file xbmc_on_arm/arm-scripts/pkgs.tar.bz2 containing the packages, ready for you to transfer to the board.
-
------------------------------------------------------------------------------
-7.2 Installing the Files:
------------------------------------------------------------------------------
-
-Transfer the file(s), armel-pkgs.tar.bz2 (if using alternative method mentioned above) and xbmc.tar.bz2 to the beagleboard.
-Do the following to extract them:
-    $ tar xjf armel-pkgs.tar.bz2 -C /
-    $ tar xjf xbmc.tar.bz2 -C /usr/
-
-After this initial setup, during development, you should only need to replace /usr/share/kodi/kodi.bin with the newly created binary.
-
------------------------------------------------------------------------------
-7.3 Running Kodi:
------------------------------------------------------------------------------
-
-Now, run Kodi by executing the binary:
-    $ /usr/share/kodi/kodi.bin
-
-Run the binary and not the script as the script will fail.
-
-
------------------------------------------------------------------------------
-8. Troubleshooting
------------------------------------------------------------------------------
-
-If it fails to run correctly, there are a few things to try out.
-First, is there any helpful output on the terminal?
-Check the log file, usually located ~/.kodi/temp/kodi.log
-It may have failed because of a missing package.
-If so, you will need to download the appropriate armel package from packages.debian.org,
-Extract the files with the command: dpkg-deb -x packagename.deb /path/to/extract/to
-Then tarball the extracted files: tar cjf pkg.tar.bz2 /path/to/extracted/files
-Then transfer them to the board, and extract: tar xjf pkg.tar.bz2
-This is because the .deb files cannot be extracted in Angstrom.
-
-If this is not the case, try various different parameters for kodi.bin such as:
-    $ kodi.bin --standalone
-    $ kodi.bin -p
-    $ kodi.bin -fs
-
-Or build with debug for a more in-depth kodi.log file by omitting the line --disable-debug on configure.
-
-Feel free to contact me on mcgeagh@xbmc.org
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.fedora kodi-18.0+git20180704.0202-f0dda3a/docs/README.fedora
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.fedora	2018-06-26 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.fedora	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-TOC
-1. Introduction
-2. Getting the source code
-3. Installing the required libraries and headers
-4. How to compile
-5. Uninstalling
-
------------------------------------------------------------------------------
-1. Introduction
------------------------------------------------------------------------------
-
-A graphics-adapter with OpenGL or OpenGLES acceleration is required.
-
-Note to new Linux users:
-All lines that are prefixed with the '$' character are commands,
-that need to be typed into a terminal window / console. The '$' equals the prompt.
-Note: The '$' character itself should NOT be typed as part of the command.
-
------------------------------------------------------------------------------
-2. Getting the source code
------------------------------------------------------------------------------
-
-You will have to grab the source code of course, here we use git as example.
-First install the git package using the command line
-
-  $ sudo dnf install git
-
-.0  $ cd $HOME
-.1  $ git clone git://github.com/xbmc/xbmc.git kodi
-
-Note: You can clone any specific branch.
-
-.1  $ git clone -b <branch> git://github.com/xbmc/xbmc.git kodi
-
------------------------------------------------------------------------------
-3. Installing the required libraries and headers
------------------------------------------------------------------------------
-
-You will then need the required libraries. The following is the list of packages
-that are used to build Kodi packages on FEDORA (with all supported
-external libraries enabled).
-
-$ sudo dnf install autoconf automake gettext cmake curl \
-jre gawk gperf java-9-openjdk-headless libao-devel alsa-lib-devel \
-libass-devel libva-devel avahi-devel avahi-compat-libdns_sd-devel bluez-libs-devel \
-libbluray-devel bzip2-devel libcap-devel \
-libcdio-devel libcec-devel openssl-libs \
-dbus-devel mesa-libEGL-devel fmt-devel fontconfig-devel freetype-devel \
-fribidi-devel giflib-devel \
-libjpeg-turbo-devel libtool-ltdl-devel lzo-devel libmicrohttpd-devel \
-libmpc-devel mariadb-devel libnfs-devel \
-pcre-devel libplist-devel libpng12-devel \
-shairplay-devel libsmbclient-devel sqlite-devel openssl-devel ffmpeg-devel \
-taglib-devel tinyxml-devel libtool-ltdl-devel libudev-devel \
-libusb-devel libva-devel libvdpau-devel libxml2-devel \
-libXmu-devel libXrandr-devel libxslt-devel libXt-devel rapidjson-devel \
-nasm python-devel yasm swig uuid-devel zlib-devel python-pillow \
-trousers-devel libidn2-devel gcc-c++ mesa-libGLw-devel libuuid-devel \
-libcurl-devel gtkglext-devel libtool gettext-devel
-
-
------------------------------------------------------------------------------
-4. How to compile
------------------------------------------------------------------------------
-See README.linux
-
------------------------------------------------------------------------------
-4.1. Test Suite
------------------------------------------------------------------------------
-See README.linux
-
------------------------------------------------------------------------------
-5. Uninstalling
------------------------------------------------------------------------------
-See README.linux/Uninstalling for removing compiled versions of Kodi.
-
-EOF
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.Fedora.md kodi-18.0+git20180704.0202-f0dda3a/docs/README.Fedora.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.Fedora.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.Fedora.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,104 @@
+![Kodi Logo](resources/banner_slim.png)
+
+# Fedora build guide
+This guide has been tested with Fedora 28 1.1 x86_64. Please read it in full before you proceed to familiarize yourself with the build procedure.
+
+Several other distributions have **[specific build guides](README.md)** and a general **[Linux build guide](README.Linux.md)** is also available.
+
+## Table of Contents
+1. **[Document conventions](#1-document-conventions)**
+2. **[Get the source code](#2-get-the-source-code)**
+3. **[Install the required packages](#3-install-the-required-packages)**
+4. **[Build Kodi](#4-build-kodi)**
+
+## 1. Document conventions
+This guide assumes you are using `terminal`, also known as `console`, `command-line` or simply `cli`. Commands need to be run at the terminal, one at a time and in the provided order.
+
+This is a comment that provides context:
+```
+this is a command
+this is another command
+and yet another one
+```
+
+**Example:** Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+Commands that contain strings enclosed in angle brackets denote something you need to change to suit your needs.
+```
+git clone -b <branch-name> https://github.com/xbmc/xbmc kodi
+```
+
+**Example:** Clone Kodi's current Krypton branch:
+```
+git clone -b Krypton https://github.com/xbmc/xbmc kodi
+```
+
+Several different strategies are used to draw your attention to certain pieces of information. In order of how critical the information is, these items are marked as a note, tip, or warning. For example:
+ 
+**NOTE:** Linux is user friendly... It's just very particular about who its friends are.  
+**TIP:** Algorithm is what developers call code they do not want to explain.  
+**WARNING:** Developers don't change light bulbs. It's a hardware problem.
+
+**[back to top](#table-of-contents)** | **[back to section top](#1-document-conventions)**
+
+## 2. Get the source code
+Make sure `git` is installed:
+```
+sudo dnf install git
+```
+
+Clone Kodi's current master branch:
+```
+cd $HOME
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+**[back to top](#table-of-contents)**
+
+## 3. Install the required packages
+If you get a `package not found` type of message with the below command, remove the offending package(s) from the install list and reissue the command. Take a note of the missing dependencies and, after a successful step completion, **[build the missing dependencies manually](README.Linux.md#31-build-missing-dependencies)**.
+
+Install build dependencies:
+```
+sudo dnf install alsa-lib-devel autoconf automake avahi-compat-libdns_sd-devel avahi-devel bluez-libs-devel bzip2-devel cmake curl dbus-devel fmt-devel fontconfig-devel freetype-devel fribidi-devel gawk gcc gcc-c++ gettext gettext-devel giflib-devel gperf java-9-openjdk-headless jre lcms2-devel libao-devel libass-devel libbluray-devel libcap-devel libcdio-devel libcec-devel libcurl-devel libidn2-devel libjpeg-turbo-devel libmicrohttpd-devel libmpc-devel libnfs-devel libplist-devel libpng12-devel libsmbclient-devel libtool libtool-ltdl-devel libudev-devel libusb-devel libuuid-devel libva-devel libvdpau-devel libxml2-devel libXmu-devel libXrandr-devel libxslt-devel libXt-devel lirc-devel lzo-devel mariadb-devel mesa-libEGL-devel mesa-libGL-devel mesa-libGLU-devel mesa-libGLw-devel mesa-libOSMesa-devel nasm openssl-devel openssl-libs patch pcre-devel pulseaudio-libs-devel python-devel python-pillow rapidjson-devel shairplay-devel sqlite-devel swig taglib-devel tinyxml-devel trousers-devel uuid-devel yasm zlib-devel
+```
+
+**WARNING:** Make sure you copy paste the entire line or you might receive an error or miss a few dependencies.
+
+Building for Wayland requires some extra packages:
+```
+sudo dnf install mesa-libGLES-devel wayland-devel waylandpp-devel wayland-protocols-devel
+```
+
+Similarly, building for GBM also requires some extra packages:
+```
+sudo dnf install libinput-devel libxkbcommon-devel mesa-libGLES-devel mesa-libgbm-devel
+```
+
+Optional packages that you might want to install for extra functionality (generating doxygen documentation, for instance):
+```
+sudo apt install doxygen mariadb-devel
+```
+
+**NOTE:** For developers and anyone else who builds frequently it is recommended to install `ccache` to expedite subsequent builds of Kodi.
+
+You can install it with:
+```
+sudo dnf install ccache
+```
+
+**TIP:** If you have multiple computers at home, `distcc` will distribute build workloads of C and C++ code across several machines on a network. Team Kodi may not be willing to give support if problems arise using such a build configuration.
+
+You can install it with:
+```
+sudo dnf install distcc
+```
+
+## 4. Build Kodi
+See the general **[Linux build guide](README.Linux.md)** for reference.
+
+**[back to top](#table-of-contents)**
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.FreeBSD kodi-18.0+git20180704.0202-f0dda3a/docs/README.FreeBSD
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.FreeBSD	2018-06-21 18:59:46.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.FreeBSD	1970-01-01 00:00:00.000000000 +0000
@@ -1,486 +0,0 @@
-TOC
-1. Introduction
-2. Getting the source code
-3. Installing the required libraries and headers
-4. How to compile
-   4.4 Binary addons
-   4.5 Test suite
-5. How to run
-6. Uninstalling
-7. Example basic setup of a KODI machine running on FreeBSD
-   7.1 Setting up X Server
-   7.2 Install SLiM login manager
-   7.3 Solving the troubles with HDMI Audio
------------------------------------------------------------------------------
-1. Introduction
------------------------------------------------------------------------------
-
-A graphics-adapter with OpenGL acceleration is highly recommended.
-24/32 bitdepth is required along with OpenGL.
-
-Note to new FreeBSD users:
-All lines that are prefixed with the '$' character are commands,
-that need to be typed into a terminal window / console. The '$' equals the prompt.
-Note: The '$' character itself should NOT be typed as part of the command.
-
------------------------------------------------------------------------------
-2. Getting the source code
------------------------------------------------------------------------------
-
-You will have to grab the source code of course, here we use git as example.
-First install the git package provided by your distribution.
-Then from a terminal, type:
-
-.0  $ cd $HOME
-.1  $ git clone git://github.com/xbmc/xbmc.git kodi
-
-Note: You can clone any specific branch.
-
-.1  $ git clone -b <branch> git://github.com/xbmc/xbmc.git kodi
-
------------------------------------------------------------------------------
-3. Installing the required libraries and headers
------------------------------------------------------------------------------
-
-You will then need the required libraries. The following is the list of packages
-that are used to build Kodi packages on Debian/Ubuntu (with all supported
-external libraries enabled).
-
-$ pkg install taglib gstreamer1-vaapi hal libcapn \
-enca gawk gperf cmake zip nasm swig30 openjdk8 libtool gettext-tools \
-gmake pkgconf rapidjson mesa-libs doxygen glproto dri2proto dri3proto libass \
-flac libcdio curl dbus fontconfig freetype2 fribidi \
-libgcrypt gmp libgpg-error gnutls libidn libinotify lzo2 \
-libogg sqlite3 tiff tinyxml e2fsprogs-libuuid git libvorbis libxslt libplist \
-shairplay avahi-app libcec libbluray samba46 libnfs librtmp libva libvdpau \
-jpeg-turbo glew xrandr libedit inputproto giflib m4 encodings \
-font-util mysql57-client xf86vidmodeproto python2 p8-platform libbdplus \
-libaacs libudev-devd sndio ccache xorg-server binutils libmicrohttpd \
-xorg-server xf86-input-mouse xf86-input-keyboard lirc libfmt autoconf automake
-
------------------------------------------------------------------------------
-4. How to compile
------------------------------------------------------------------------------
-Cmake build instructions V18.0 Leia and higher
-
-Create and change to build directory 
-    $ mkdir kodi-build && cd kodi-build
-
-Run CMake
-- for X11
-    $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local
-
-Compiling on FreeBSD -DENABLE_ALSA=OFF recommended. Or build would fail due to Linux
-specific portion of code in xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp. After build
-KODI would use SNDIO on FreeBSD.
-
-Build
-    $ cmake --build . -- VERBOSE=1
-    
-Tip: By adding -j<number> to the make command, you describe how many
-     concurrent jobs will be used, it will speed up the build process.
-     So for quadcore the command is:
-    
-    $ cmake --build . -- VERBOSE=1 -j4
-
-If the build process completes succesfully you would want to test if it is working.
-Still in the build directory type the following:
-
-    $ ./kodi.bin
-
-If everything was okay during your test you can now install the binaries to their place
-in this example "/usr/local".
-
-    $su
-    $gmake install
-    $exit
-
-NB! 'gmake' stands for 'GNU Make'. BSD's own make does not work here.
-
-This will install Kodi in the prefix provided in 4.1 as well as a launcher script.
-
-Tip: By adding -j<number> to the make command, you describe how many
-     concurrent jobs will be used. So for dualcore the command is:
-
-    $ su
-    $ gmake install -j2
-
-Tip: To override the location that Kodi is installed, use PREFIX=<path>.
-For example.
-
-    $ gmake install DESTDIR=$HOME/kodi
-
------------------------------------------------------------------------------
-4.4. Binary addons - compile
------------------------------------------------------------------------------
-
-From v14 with commit 4090a5f a new API for binary addons is available.
-You can compile all addons or only specific addons by specifying e.g. ADDONS="audioencoder.foo pvr.bar audiodecoder.baz"
-
-.0  All addons
-    $ gmake -C tools/depends/target/binary-addons PREFIX=/<system prefix added on step 4.1>
-
-.1  Specific addons
-    $ gmake -C tools/depends/target/binary-addons PREFIX=/<system prefix added on step 4.1> ADDONS="audioencoder.flac pvr.vdr.vnsi audiodecoder.snesapu"
-
-Audio decoders:
-    audiodecoder.modplug, audiodecoder.nosefart, audiodecoder.sidplay, audiodecoder.snesapu,
-    audiodecoder.stsound, audiodecoder.timidity, audiodecoder.vgmstream
-
-Audio encoders:
-    audioencoder.flac, audioencoder.lame, audioencoder.vorbis, audioencoder.wav
-
-Inputstream addons:
-    inputstream.mpd
-
-Peripheral addons:
-    peripheral.joystick
-
-PVR addons:
-    pvr.argustv, pvr.demo, pvr.dvblink, pvr.dvbviewer, pvr.filmon, pvr.hdhomerun, pvr.hts, pvr.iptvsimple,
-    pvr.mediaportal.tvserver,pvr.mythtv, pvr.nextpvr, pvr.njoy, pvr.pctv, pvr.stalker, pvr.vbox, pvr.vdr.vnsi,
-    pvr.vuplus, pvr.wmc
-
-Screensavers:
-    screensaver.asteroids, screensaver.biogenesis, screensaver.greynetic, screensaver.matrixtrails,
-    screensaver.pingpong, screensaver.pyro, screensavers.rsxs, screensaver.stars
-
-Visualizations
-    visualization.fishbmc, visualization.goom, visualization.projectm, visualization.shadertoy
-    visualization.spectrum, visualization.vsxu, visualization.waveform
-
------------------------------------------------------------------------------
-4.5. Test suite
------------------------------------------------------------------------------
-
-Kodi has a test suite which uses the Google C++ Testing Framework.
-This framework is provided directly in Kodi's source tree.
-It has very little requirements, in order to build and run.
-See the README file for the framework at 'lib/gtest/README' for specific requirements.
-
-To compile and run Kodi's test suite, type the following:
-
-    $ gmake check
-
-To compile the test suite without running it, type the following.
-
-    $ gmake kodi-test
-
-The test suite program can be run manually as well.
-The name of the test suite program is 'kodi-test' and will build in the Kodi source tree.
-To bring up the 'help' notes for the program, type the following:
-
-    $ ./kodi-test --gtest_help
-
-The most useful options are,
-
-    --gtest_list_tests
-      List the names of all tests instead of running them.
-	  The name of TEST(Foo, Bar) is "Foo.Bar".
-
-    --gtest_filter=POSITIVE_PATTERNS[-NEGATIVE_PATTERNS]
-      Run only the tests whose name matches one of the positive patterns but
-      none of the negative patterns. '?' matches any single character; '*'
-      matches any substring; ':' separates two patterns.
-
------------------------------------------------------------------------------
-5. How to run
------------------------------------------------------------------------------
-
-How to run Kodi depends on the type of installation you have done.
-It is possible to run Kodi without the requirement to install Kodi anywhere else.
-In this case, type the following from the top source directory.
-
-    $ ./kodi.bin
-
-Or run in 'portable' mode
-
-    $ ./kodi.bin -p
-
-If you chose to install Kodi using '/usr' or '/usr/local' as the PREFIX,
-you can just issue 'kodi' in a terminal session.
-
-If you have overridden PREFIX to install Kodi into some non-standard location,
-you will have to run Kodi by directly running 'kodi.bin'.
-
-For example:
-
-    $ $HOME/kodi/usr/lib/kodi/kodi.bin
-
-You should still run the wrapper via
-    $ $PREFIX/bin/kodi
-
-If you wish to use VDPAU decoding you will now have to change the Render Method
-in Settings->Videos->Player from "Auto Detect" to "VDPAU".
-
------------------------------------------------------------------------------
-6. Uninstalling
------------------------------------------------------------------------------
-
-Prepend "sudo" or "doas" to commands (if installed, if not use just 'su'), if your
-user doesn't have write permission to the install directory.
-
-Note: If you have rerun configure with a different prefix,
-you will either need to rerun configure with the correct prefix for this step to work correctly.
-
-    $ gmake uninstall
-.0  $ sudo make uninstall
-
-If you would like to also remove any settings and 3rd party addons (skins, scripts, etc)
-you should also run:
-
-.1  $ rm -rf ~/.kodi
-
------------------------------------------------------------------------------
-7. Example basic setup of a KODI machine running on FreeBSD
------------------------------------------------------------------------------
-If having installed FreeBSD 'RELEASE' and not 'STABLE' or 'CURRENT, do system 
-update first: (have to be 'root'). Also, if you have Radeon graphics card and
-plan using HDMI Audio, better install FreeBSD source files during installation.
-    
-    $ freebsd-update fetch
-    $ freebsd-update install
-
-Update binary package repository:
-    
-    $pkg update
-
-Install convenient text editor ('nano' in this case).
-    
-    $pkg install nano
-
-Open /boot/loader.conf
-
-    $ nano /boot/loader.conf
-
-Add into file following rows:
-
-    kern.ipc.shmseg=1024
-    kern.ipc.shmmni=1024
-    kern.maxproc=10000
-    hint.acpi_throttle.0.disabled=1
-    machdep.disable_mtrrs=1
-    kern.cam.scsi_delay=500
-
-Open /etc/rc.conf
-   
-    $ nano /etc/rc.conf
-
-Add into the beginning of a /etc/rc.conf
-   
-    kld_list="radeonkms acpi_asus_wmi acpi_asus acpi_video amdtemp tmpfs libiconv msdosfs_iconv snd_driver"
-
-Brief explanation:
-   
-    radeonkms - Radeon KMS driver.
-    acpi_asus_wmi - both ASUS board specific drivers.
-    acpi_asus
-    amdtemp - temperature sensor module for AMD CPU. For Intel CPU that would be 'coretemp'
-
------------------------------------------------------------------------------
-7.1 Setting up X server
------------------------------------------------------------------------------
-
-You may had some X packages during install of KODI's dependency packages but
-'xorg' is a metapackage, installing the missing bits as well.
-
-    $ pkg install xorg hal
-
-Add keyboard and mouse support
-
-    $ pkg install xf86-input-mouse xf86-input-keyboard
-
-According to your actual hardware, pick one:
-
-    $ pkg install xf86-video-ati
-    $ pkg install xf86-video-nv
-    $ pkg install xf86-video intel
-    
-NB! Nvidia's driver could also be downloaded from https://www.geforce.com/drivers.
-Both FreeBSD 32-bit and 64-bit official driver exist there.
-
-Open /etc/rc.conf and add:
-
-    dbus_enable="YES"
-    hald_enable="YES" 
-
-Add user running KODI into group 'video'. Necessity for having an working OpenGL
-acceleration in KODI.
-
-    $ pw groupmod video -m kodiuser
-
------------------------------------------------------------------------------
-7.2 Install SLiM login manager
------------------------------------------------------------------------------
-
-    $ pkg install slim
-    $ nano /etc/rc.conf
-
-Add:
-
-    slim_enable="YES"
-
-NB! Has to be below 'dbus_enable="YES"' and 'hald_enable="YES"' entries in the file.
-
-Open SLiM configuration file.
-
-    $ nano /usr/local/etc/slim.conf
-
-Edit until it looks like:
-
-    default_path        /sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin
-    default_xserver     /usr/local/bin/X 
-    xserver_arguments   -nolisten tcp vt09 
-    halt_cmd            /sbin/shutdown -p now 
-    reboot_cmd          /sbin/shutdown -r now 
-    console_cmd         /usr/local/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/motd; exec /usr/bin/login" 
-    suspend_cmd        /usr/sbin/acpiconf -s 3 
-    xauth_path         /usr/local/bin/xauth 
-    authfile           /var/run/slim.auth 
-    login_cmd           exec /bin/sh - ~/.xinitrc %session 
-    sessiondir              /usr/local/share/xsessions 
-    screenshot_cmd      import -window root /slim.png 
-    default_user        kodi #or whatever user was chosen 
-    auto_login      yes 
-    current_theme       default 
-    lockfile            /var/run/slim.pid 
-    logfile             /var/log/slim.log 
-
-
-Exit root user and log into user you plan to run KODI with:
-create .xinitrc file into it's home directory
-
-    $touch .xinitrc
-
-Add into it:
-
-    exec /usr/local/bin/kodi
-
-Log out of normal user, back to 'root' and add package 'doas' (something like sudo)
-
-    $ pkg install doas
-
-Edit it's config
-
-    $ nano /usr/local/etc/doas.conf
-
-Add into file following rows:
-
-    permit persist :wheel #assuming group 'wheel' has user 
-    permit nopass kodi as root cmd reboot 
-    permit nopass kodi as root cmd shutdown 
-
-It will allow KODI user basic ability to shut down/reboot machine without needing
-privilege escalation. To complete it.
-
-    $ pkg install upower
-
-
-Create file
-
-    $ nano /usr/local/etc/polkit-1/localauthority/50-local.d/custom-actions.pkla
-
-
-Add into it:
-
-    [Actions for KODI users] 
-    Identity=kodi:kodi 
-    Action=org.freedesktop.upower.* 
-    ResultAny=yes 
-    ResultInactive=yes 
-    ResultActive=yes 
-
-On restart (assuming you meanwhile also installed KODI itself), machine should:
-
--start SLiM
--autologin with user kodi (or whatever was chosen)
--autostart KODI
-
-For the rest: FreeBSD has excellent documentation:
-https://www.freebsd.org/doc/handbook/
-
-And active forum you can ask advice from:
-https://forums.freebsd.org/
-
------------------------------------------------------------------------------
-7.3 Solving the troubles with HDMI Audio.
------------------------------------------------------------------------------
-
-Nvidia graphics.
-
-    $ pkg install nvidia-driver nvidia-xconfig
-
-Add into /boot/loader.conf rows:
-    snd_hda_load="YES" 
-    nvidia_load="YES" 
-    hw.snd.default_unit="0" #ID could be something else besides 0. If it is,
-                            #correct it accordingly
-
-You can find it by:
-
-    $ cat /dev/sndstat
-
-After saving the /boot/loader.conf you can force the change in live using
-
-    $ sysctl hw.snd.default_unit=0 (or whatever number your particular machine's
-                                   'cat's would make you choose).
-    $ kldload nvidia
-    $ kldload snd_hda
-
-or just reboot..
-
-
-Radeon graphics.
-First check that HDMI sound output and active sound device in system would be
-both the same.
-
-    $ cat /dev/sndstat 
-    $ sysctl -a | grep hw.snd.default_unit 
-
-For example:
-If former shows:
-
-    pcm0: <ATI R6xx (HDMI)> (play) 
-    pcm1: <Realtek ALC269 (Right Analog)> (play/rec) default 
-    pcm2: <Realtek ALC269 (Internal Analog)> (play/rec) 
-    No devices installed from userspace. 
-
-and latter:
-
-    hw.snd.default_unit: 1
-
-
-then you should give command:
-
-    $ sysctl hw.snd.default_unit=0
-
-
-Assuming you did install system sources during installation (you better have!)
-Open and find:
-
-    int radeon_audio = 0;
-
-From:
-
-    $ nano /usr/src/sys/dev/drm2/radeon/radeon_drv.c
-
-Change it to:
-
-    int radeon_audio = 1;
-
-Save the file, close the editor. Then
-
-    $ cd /usr/src 
-    $ make buildkernel 
-
-Wait until Clang/LLVM finish.
-
-    $make installkernel 
-
-Reboot and now your Radeon's HDMI Audio should function properly.
-
-
-Intel iGPU. Problem may be  in wrong output ID. Find it, correct
-it in a similar manner like demonstrated in examples above.
-
-EOF
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.FreeBSD.md kodi-18.0+git20180704.0202-f0dda3a/docs/README.FreeBSD.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.FreeBSD.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.FreeBSD.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,238 @@
+![Kodi Logo](resources/banner_slim.png)
+
+# FreeBSD build guide
+This guide has been tested with FreeBSD 11.1 x86_64. Please read it in full before you proceed to familiarize yourself with the build procedure.
+
+Several other distributions have **[specific build guides](README.md)** and a general **[Linux build guide](README.Linux.md)** is also available.
+
+## Table of Contents
+1. **[Document conventions](#1-document-conventions)**
+2. **[Get the source code](#2-get-the-source-code)**
+3. **[Install the required packages](#3-install-the-required-packages)**  
+  3.1. **[Build missing dependencies](#31-build-missing-dependencies)**
+4. **[Build Kodi](#4-build-kodi)**  
+  4.1. **[Configure build](#41-configure-build)**  
+  4.2. **[Build](#42-build)**
+5. **[Build binary add-ons](#5-build-binary-add-ons)**
+6. **[Run Kodi](#6-run-kodi)**
+7. **[Uninstall Kodi](#7-uninstall-kodi)**
+8. **[Test suite](#8-test-suite)**
+
+## 1. Document conventions
+This guide assumes you are using `terminal`, also known as `console`, `command-line` or simply `cli`. Commands need to be run at the terminal, one at a time and in the provided order.
+
+This is a comment that provides context:
+```
+this is a command
+this is another command
+and yet another one
+```
+
+**Example:** Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+Commands that contain strings enclosed in angle brackets denote something you need to change to suit your needs.
+```
+git clone -b <branch-name> https://github.com/xbmc/xbmc kodi
+```
+
+**Example:** Clone Kodi's current Krypton branch:
+```
+git clone -b Krypton https://github.com/xbmc/xbmc kodi
+```
+
+Several different strategies are used to draw your attention to certain pieces of information. In order of how critical the information is, these items are marked as a note, tip, or warning. For example:
+ 
+**NOTE:** Linux is user friendly... It's just very particular about who its friends are.  
+**TIP:** Algorithm is what developers call code they do not want to explain.  
+**WARNING:** Developers don't change light bulbs. It's a hardware problem.
+
+**[back to top](#table-of-contents)** | **[back to section top](#1-document-conventions)**
+
+## 2. Get the source code
+Make sure `git` is installed:
+```
+sudo pkg install git
+```
+
+Change to your `home` directory:
+```
+cd $HOME
+```
+
+Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+**[back to top](#table-of-contents)**
+
+## 3. Install the required packages
+If you get a `package not found` type of message with the below command, remove the offending package(s) from the install list and reissue the command. Take a note of the missing dependencies and, after a successful step completion, **[build the missing dependencies manually](#31-build-missing-dependencies)**.
+
+Install build dependencies:
+```
+sudo pkg install autoconf automake avahi-app binutils cmake curl dbus doxygen dri2proto dri3proto e2fsprogs-libuuid enca encodings flac font-util fontconfig freetype2 fribidi gawk gettext-tools giflib git glew glproto gmake gmp gnutls gperf gstreamer1-vaapi hal inputproto jpeg-turbo libaacs libass libbdplus libbluray libcapn libcdio libcec libedit libfmt libgcrypt libgpg-error libidn libinotify libmicrohttpd libnfs libogg libplist librtmp libtool libudev-devd libva libvdpau libvorbis libxslt lirc lzo2 m4 mesa-libs mysql57-client nasm openjdk8 p8-platform pkgconf python2 rapidjson samba46 shairplay sndio sqlite3 swig30 taglib tiff tinyxml xf86-input-keyboard xf86-input-mouse xf86vidmodeproto xorg-server xrandr zip
+```
+
+**WARNING:** Make sure you copy paste the entire line or you might receive an error or miss a few dependencies.
+
+**NOTE:** For developers and anyone else who builds frequently it is recommended to install `ccache` to expedite subsequent builds of Kodi.
+
+You can install it with:
+```
+sudo pkg install ccache
+```
+
+**TIP:** If you have multiple computers at home, `distcc` will distribute build workloads of C and C++ code across several machines on a network. Team Kodi may not be willing to give support if problems arise using such a build configuration.
+
+You can install it with:
+```
+sudo pkg install distcc
+```
+
+### 3.1. Build missing dependencies
+See the general **[Linux build guide](README.Linux.md)** for reference.
+
+**[back to top](#table-of-contents)** | **[back to section top](#3-install-the-required-packages)**
+
+## 4. Build Kodi
+### 4.1. Configure build
+If you get a `Could NOT find...` error message during CMake configuration step, take a note of the missing dependencies and either install them from repositories (if available) or **[build the missing dependencies manually](#31-build-missing-dependencies)**.
+
+Create an out-of-source build directory:
+```
+mkdir $HOME/kodi-build
+```
+
+Change to build directory:
+```
+cd $HOME/kodi-build
+```
+
+Configure build:
+```
+cmake ../kodi -DCMAKE_INSTALL_PREFIX=/usr/local
+```
+
+### 4.2. Build
+```
+cmake --build . -- VERBOSE=1 -j$(sysctl hw.ncpu | awk '{print $2}')
+```
+**TIP:** By adding `-j<number>` to the make command, you can choose how many concurrent jobs will be used and expedite the build process. It is recommended to use `-j$(sysctl hw.ncpu | awk '{print $2}')` to compile on all available processor cores.
+
+After the build process completes successfully you can test your shiny new Kodi build while in the build directory:
+```
+./kodi-x11
+```
+
+If everything was OK during your test you can now install the binaries to their place, in this example */usr/local*.
+```
+sudo gmake install
+```
+
+**NOTE:** `gmake` stands for *GNU Make*. BSD's own make does not work here.
+
+This will install Kodi in the prefix provided in **[section 4.1](#41-configure-build)**.
+
+**TIP:** To override Kodi's install location, use `DESTDIR=<path>`. For example:
+```
+sudo gmake install DESTDIR=$HOME/kodi
+```
+
+**[back to top](#table-of-contents)** | **[back to section top](#4-build-kodi)**
+
+## 5. Build binary add-ons
+You can find a complete list of available binary add-ons **[here](https://github.com/xbmc/repo-binary-addons)**.
+
+Change to Kodi's source code directory:
+```
+cd $HOME/kodi
+```
+
+Build all add-ons:
+```
+sudo gmake -j$(sysctl hw.ncpu | awk '{print $2}') -C tools/depends/target/binary-addons PREFIX=/usr/local
+```
+
+Build specific add-ons:
+```
+sudo gmake -j$(sysctl hw.ncpu | awk '{print $2}') -C tools/depends/target/binary-addons PREFIX=/usr/local ADDONS="audioencoder.flac pvr.vdr.vnsi audiodecoder.snesapu"
+```
+
+Build a specific group of add-ons:
+```
+sudo gmake -j$(sysctl hw.ncpu | awk '{print $2}') -C tools/depends/target/binary-addons PREFIX=/usr/local ADDONS="pvr.*"
+```
+
+**NOTE:** `PREFIX=/usr/local` should match Kodi's `-DCMAKE_INSTALL_PREFIX=` prefix used in **[section 4.1](#41-configure-build)**.
+
+**[back to top](#table-of-contents)**
+
+## 6. Run Kodi
+If you chose to install Kodi using `/usr` or `/usr/local` as the `-DCMAKE_INSTALL_PREFIX=`, you can just issue *kodi* in a terminal session.
+
+If you changed `-DCMAKE_INSTALL_PREFIX=` to install Kodi into some non-standard location, you will have to run Kodi directly:
+```
+<CMAKE_INSTALL_PREFIX>/bin/kodi
+```
+
+To run Kodi in *portable* mode (useful for testing):
+```
+<CMAKE_INSTALL_PREFIX>/bin/kodi -p
+```
+
+**[back to top](#table-of-contents)**
+
+## 7. Uninstall Kodi
+```
+sudo gmake uninstall
+```
+**WARNING:**: If you reran CMakes' configure step with a different `-DCMAKE_INSTALL_PREFIX=`, you will need to rerun configure with the correct path for this step to work correctly.
+
+If you would like to also remove any settings and third-party addons (skins, scripts, etc.) and Kodi configuration files, you should also run:
+```
+rm -rf ~/.kodi
+```
+
+**[back to top](#table-of-contents)**
+
+## 8. Test suite
+Kodi has a test suite which uses the Google C++ Testing Framework. This framework is provided directly in Kodi's source tree.
+
+Build and run Kodi's test suite:
+```
+gmake check
+```
+
+Build Kodi's test suite without running it:
+```
+gmake kodi-test
+```
+
+Run Kodi's test suite manually:
+```
+./kodi-test
+```
+
+Show Kodi's test suite *help* notes:
+```
+./kodi-test --gtest_help
+```
+
+Useful options:
+```
+--gtest_list_tests
+  List the names of all tests instead of running them.
+  The name of TEST(Foo, Bar) is "Foo.Bar".
+
+--gtest_filter=POSITIVE_PATTERNS[-NEGATIVE_PATTERNS]
+  Run only the tests whose name matches one of the positive patterns but
+  none of the negative patterns. '?' matches any single character; '*'
+  matches any substring; ':' separates two patterns.
+```
+
+**[back to top](#table-of-contents)**
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.ios.md kodi-18.0+git20180704.0202-f0dda3a/docs/README.ios.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.ios.md	2018-06-21 18:59:46.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.ios.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,222 +0,0 @@
-# Kodi for Apple iOS
-
-## TOC
-
-1. [Introduction](#1-introduction)
-2. [Getting the source code](#2-getting-the-source-code)
-3. [Install build dependencies](#3-install-build-dependencies)
-   1. [Install Xcode](#31-install-xcode)
-   2. [Install Kodi build depends](#32-install-kodi-build-depends)
-   3. [Compile Kodi binary addons](#33-compile-kodi-binary-addons)
-4. [How to compile Kodi](#4-how-to-compile-kodi)
-   1. [Using Xcode (or xcodebuild)](#41-using-xcode-or-xcodebuild)
-   2. [Compilation using command-line (make)](#42-compilation-using-command-line-make)
-5. [Packaging](#5-packaging)
-6. [Gesture Handling on iPad/iphone/iPod touch](#6-gesture-handling-on-ipadiphoneipod-touch)
-7. [Usage on un-jailbroken devices](#7-usage-on-un-jailbroken-devices)
-8. [References](#8-references)
-
-## 1 Introduction
-
-This is a platform port of Kodi for the Apple iOS operating system.
-Starting with Kodi v18 the build system has been migrated from native Xcode to
-CMake (and generated project files).
-
-There are 3 ways to build Kodi for iOS:
-
-- Xcode IDE (easiest as it presents the build system in a GUI environment)
-- command-line with xcodebuild
-- command-line with make
-
-Kodi for iOS is composed of a main binary with numerous dynamic libraries and
-codecs that support a multitude of music and video formats.
-
-The minimum version of iOS you need to run(!) Kodi is 9.0 atm.
-
-- On El Capitan (OSX 10.11.x) we recommend using Xcode 8.x.
-- On Sierra (macOS 10.12.x) we recommend using Xcode 8.x.
-- On High Sierra (macOS 10.13.x) we recommend using Xcode 9.x.
-
-## 2 Getting the source code
-
-    cd $HOME
-    git clone git://github.com/xbmc/xbmc.git Kodi
-
-## 3 Install build dependencies
-
-### 3.1 Install Xcode
-
-Install the Xcode version recommended for your macOS version. You can download
-it either from the macOS AppStore (Xcode) or from the Apple Developer Homepage.
-
-As far as we know the compilation for iOS should work with the following
-constellations of Xcode and macOS versions (to be updated once we know more):
-
-8. Xcode 8.x against iOS SDK 10.x on 10.11 (El Capitan)
-9. Xcode 8.x against iOS SDK 10.x on 10.12 (Sierra)
-10. Xcode 9.x against iOS SDK 11.x on 10.12 (Sierra)
-11. Xcode 9.x against iOS SDK 11.x on 10.13 (High Sierra)
-
-The preferred iOS SDK Version is 8.1.
-
-### 3.2 Install Kodi build depends
-
-Kodi requires a set of build dependencies to be built and installed before you
-will be able to build the Kodi main binary. These often just called *depends*
-are installed using the commands described below (with the latest iOS SDK found
-on your system).
-
-In order to speedup compilation it is recommended to use `make -j$(getconf
-_NPROCESSORS_ONLN)` instead of `make` to compile on all available processor
-cores. The build machine can also be configured to do this automatically by
-adding `export MAKEFLAGS="-j(getconf _NPROCESSORS_ONLN)"` to your shell config
-(e.g. `~/.bashrc`).
-
-#### 3.2.a Compiling as 32 bit armv7 libraries - note 32 bit compiling is not supported anymore as of iOS SDK 11
-
-    cd $HOME/Kodi
-    cd tools/depends
-    ./bootstrap
-    ./configure --host=arm-apple-darwin
-    make
-
-#### 3.2.b Compiling as 64 bit arm64 libraries (recommended for most users)
-
-    cd $HOME/Kodi
-    cd tools/depends
-    ./bootstrap
-    ./configure --host=arm-apple-darwin --with-cpu=arm64
-    make
-
-#### 3.3.c Advanced topics
-
-The dependencies are built into `tools/depends` and installed into
-`/Users/Shared/xbmc-depends`.
-
-**ADVANCED developers only**: If you want to specify an iOS SDK version (if
-multiple versions are installed) - then append it to the configure line
-above. The example below would use the iOS SDK 9.0:
-
-    ./configure --host=arm-apple-darwin --with-sdk=9.0
-
-### 3.3 Compile Kodi binary addons
-
-Kodi maintains a set of binary addons (PVR clients, Visualizations
-plugins and more). They can be built as shown below:
-
-    cd $HOME/Kodi
-    cd tools/depends
-    make -C target/binary-addons
-
-**NOTE**: If you only want to build specific addons you can specify like this:
-
-    cd $HOME/Kodi
-    cd tools/depends
-    make -C target/binary-addons ADDONS="pvr.hts pvr.dvblink"
-
-## 4 How to compile Kodi
-
-### 4.1 Using Xcode (or xcodebuild)
-
-#### 4.1.1 Generate CMake project files
-
-Before you can use Xcode to build Kodi, the Xcode project has to be generated
-with CMake. Note that CMake is compiled as parts of the depends doesn't have
-to be installed separately. Also a Toolchain-file has been generated with is
-used to configure CMake.
-
-    mkdir $HOME/Kodi/build
-    cd $HOME/Kodi/build
-    /Users/Shared/xbmc-depends/x86_64-darwin15.6.0-native/bin/cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=/Users/Shared/xbmc-depends/iphoneos9.3_armv7-target/share/Toolchain.cmake ..
-
-The toolchain file location differs depending on your iOS and SDK version and
-you have to replace `x86_64-darwin15.6.0-native` and `iphoneos9.3_armv7` in the filename above with the correct
-file on your system. Check the directory content to get the filename.
-
-#### 4.1.2 Compilation using Xcode
-
-Start Xcode and open the Kodi project (kodi.xcodeproj) located in
-`$HOME/Kodi/build`.
-
-If you have selected a specific iOS SDK Version in step 3.2 then you might need
-to adapt the active target to use the same iOS SDK version. Else build will fail.
-
-Be sure to select a device configuration. Building for simulator is not
-supported.
-
-The build process will take a long time when building the first time.
-You can see the progress in "Build Results". There are a large number of static
-and dynamic libraries that will need to be built. Once these are built,
-subsequent builds will be faster.
-
-After the build, you can run Kodi for iOS from Xcode.
-
-Alternatively, you can also build via Xcode from the command-line with
-xcodebuild, triggered by CMake:
-
-    cd $HOME/Kodi/build
-    cmake --build . --config "Debug" -- -verbose -jobs $(getconf _NPROCESSORS_ONLN)
-
-You can specify `Release` instead of `Debug` as a configuration.
-
-### 4.2 Compilation using command-line (make)
-
-CMake is also able to generate a Makefile based project that can be used to
-compile with make:
-
-    cd $HOME/Kodi
-    make -C tools/depends/target/cmakebuildsys
-    make -C build
-
-## 5 Packaging
-
-CMake generate a target called `deb` which will package Kodi.app for
-distribution.
-
-After Kodi has been build, the target can be triggered with by selecting it in
-Xcode, or if using makefiles by issuing:
-
-    make deb
-
-On jailbroken devices the resulting deb file can be copied to the iOS device
-via ssh/scp and then be installed manually. For this you need to SSH into the
-iOS device and issue
-
-    dpkg -i <name of the deb file>
-
-## 6 Gesture Handling on iPad/iPhone/iPod touch
-
-| Gesture                                  | Action                     |
-| ---------------------------------------- | -------------------------- |
-| Double finger swipe left                 | Back                       |
-| Double finger tap/single finger long tap | Right mouse                |
-| Single finger tap                        | Left mouse                 |
-| Panning, and flicking                    | For navigating in lists    |
-| Dragging                                 | For scrollbars and sliders |
-| Zoom gesture                             | In the picture viewer      |
-
-Gestures can be adapted in [system/keymaps/touchscreen.xml](https://github.com/xbmc/xbmc/blob/master/system/keymaps/touchscreen.xml).
-
-## 7 Usage on un-jailbroken devices
-
-If you are a developer with an official apple code signing identity you can
-deploy Kodi via xcode to work on it on non-jailbroken devices. For this to
-happen you just need to alter the Xcode project by setting your codesign
-identity. Just select the "iPhone Developer" shortcut. It's also important
-that you select the signing on all 4 spots in the project settings. After that
-the last buildstep in our support script will do a full sign of all binaries
-and the bundle with the given identity (all `*.viz`, `*.pvr`, `*.so` files
-Xcode doesn't know anything about). This should allow you to deploy Kodi to all
-non-jailbroken devices which you can deploy normal apps to. In that case (Kodi
-will be sandboxed like any other app) - all Kodi files are then located in the
-sandboxed *Documents* folder and can be easily accessed via iTunes file
-sharing.
-
-From Xcode7 on this approach is also available for non paying app developers
-(apple allows self signing from now on).
-
-## 6 References
-
-- [cmake/README.md](https://github.com/xbmc/xbmc/tree/master/cmake/README.md)
-- [tools/depends/README](https://github.com/xbmc/xbmc/tree/master/tools/depends/README)
-- [iOS section in forum.kodi.tv](http://forum.kodi.tv/forumdisplay.php?fid=137)
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.iOS.md kodi-18.0+git20180704.0202-f0dda3a/docs/README.iOS.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.iOS.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.iOS.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,256 @@
+![Kodi Logo](resources/banner_slim.png)
+
+# iOS build guide
+This guide has been tested with macOS 10.13.4()17E199 High Sierra and Xcode 9.3(9E145). It is meant to cross-compile Kodi for iOS using **[Kodi's unified depends build system](../tools/depends/README.md)**. Please read it in full before you proceed to familiarize yourself with the build procedure.
+
+## Table of Contents
+1. **[Document conventions](#1-document-conventions)**
+2. **[Prerequisites](#2-prerequisites)**
+3. **[Get the source code](#3-get-the-source-code)**
+4. **[Configure and build tools and dependencies](#4-configure-and-build-tools-and-dependencies)**
+5. **[Build binary add-ons](#5-build-binary-add-ons)**
+6. **[Build Kodi](#6-build-kodi)**  
+  6.1. **[Build with Xcode](#61-build-with-xcode)**  
+  6.2. **[Build with xcodebuild](#62-build-with-xcodebuild)**  
+  6.3. **[Build with make](#63-build-with-make)**
+7. **[Package](#7-package)**
+8. **[Install](#8-install)**
+9. **[Gesture Handling](#9-gesture-handling)**
+
+## 1. Document conventions
+This guide assumes you are using `terminal`, also known as `console`, `command-line` or simply `cli`. Commands need to be run at the terminal, one at a time and in the provided order.
+
+This is a comment that provides context:
+```
+this is a command
+this is another command
+and yet another one
+```
+
+**Example:** Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+Commands that contain strings enclosed in angle brackets denote something you need to change to suit your needs.
+```
+git clone -b <branch-name> https://github.com/xbmc/xbmc kodi
+```
+
+**Example:** Clone Kodi's current Krypton branch:
+```
+git clone -b Krypton https://github.com/xbmc/xbmc kodi
+```
+
+Several different strategies are used to draw your attention to certain pieces of information. In order of how critical the information is, these items are marked as a note, tip, or warning. For example:
+ 
+**NOTE:** Linux is user friendly... It's just very particular about who its friends are.  
+**TIP:** Algorithm is what developers call code they do not want to explain.  
+**WARNING:** Developers don't change light bulbs. It's a hardware problem.
+
+**[back to top](#table-of-contents)** | **[back to section top](#1-document-conventions)**
+
+## 2. Prerequisites
+* **[Java Development Kit (JDK)](http://www.oracle.com/technetwork/java/javase/downloads/index.html)**
+* **[Xcode](https://developer.apple.com/xcode/)**. Install it from the AppStore or from the **[Apple Developer Homepage](https://developer.apple.com/)**.
+* Device with **iOS 9.0 or newer** to install Kodi after build.
+
+Building for iOS should work with the following constellations of Xcode and macOS versions:
+  * Xcode 8.x against iOS SDK 10.x on 10.11.x (El Capitan)(recommended)
+  * Xcode 8.x against iOS SDK 10.x on 10.12.x (Sierra)(recommended)
+  * Xcode 9.x against iOS SDK 11.x on 10.12.x (Sierra)
+  * Xcode 9.x against iOS SDK 11.x on 10.13.x (High Sierra)(recommended)
+
+**WARNING:** Start Xcode after installation finishes. You need to accept the licenses and install missing components.
+
+**[back to top](#table-of-contents)**
+
+## 3. Get the source code
+Change to your `home` directory:
+```
+cd $HOME
+```
+
+Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+**[back to top](#table-of-contents)**
+
+## 4. Configure and build tools and dependencies
+Kodi can be built as either a 32bit or 64bit program. The dependencies are built in `$HOME/kodi/tools/depends` and installed into `/Users/Shared/xbmc-depends`.
+
+**TIP:** Look for comments starting with `Or ...` and only execute the command(s) you need.
+
+Configure build for 64bit (**recommended**):
+```
+cd $HOME/kodi/tools/depends
+./bootstrap
+./configure --host=arm-apple-darwin --with-cpu=arm64
+```
+
+Or configure build for 32bit:
+```
+cd $HOME/kodi/tools/depends
+./bootstrap
+./configure --host=arm-apple-darwin --with-sdk=9.3
+```
+**WARNING:** iOS SDK 11 no longer supports 32bit.
+
+Build tools and dependencies:
+```
+make -j$(getconf _NPROCESSORS_ONLN)
+```
+
+**TIP:** By adding `-j<number>` to the make command, you can choose how many concurrent jobs will be used and expedite the build process. It is recommended to use `-j$(getconf _NPROCESSORS_ONLN)` to compile on all available processor cores. The build machine can also be configured to do this automatically by adding `export MAKEFLAGS="-j(getconf _NPROCESSORS_ONLN)"` to your shell config (e.g. `~/.bashrc`).
+
+**WARNING:** Look for the `Dependencies built successfully.` success message. If in doubt run a single threaded `make` command until the message appears. If the single make fails, clean the specific library by issuing `make -C target/<name_of_failed_lib> distclean` and run `make`again.
+
+**NOTE:** **Advanced developers** may want to specify an iOS SDK version (if multiple versions are installed) in the configure line(s) shown above. The example below would use the iOS SDK 9.0:
+```
+./configure --host=arm-apple-darwin --with-cpu=arm64 --with-sdk=9.0
+```
+
+**[back to top](#table-of-contents)** | **[back to section top](#4-configure-and-build-tools-and-dependencies)**
+
+## 5. Build binary add-ons
+You can find a complete list of available binary add-ons **[here](https://github.com/xbmc/repo-binary-addons)**.
+
+Change to Kodi's source code directory:
+```
+cd $HOME/kodi
+```
+
+Build all add-ons:
+```
+make -C tools/depends/target/binary-addons
+```
+
+Build specific add-ons:
+```
+make -C tools/depends/target/binary-addons ADDONS="audioencoder.flac pvr.vdr.vnsi audiodecoder.snesapu"
+```
+
+Build a specific group of add-ons:
+```
+make -j$(getconf _NPROCESSORS_ONLN) -C tools/depends/target/binary-addons ADDONS="pvr.*"
+```
+
+**[back to top](#table-of-contents)**
+
+## 6. Build Kodi
+Before you can use Xcode to build Kodi, the Xcode project has to be generated with CMake. CMake is built as part of the dependencies and doesn't have to be installed separately. A toolchain file is also generated and is used to configure CMake.
+
+### 6.1. Build with Xcode
+Create an out-of-source build directory:
+```
+mkdir $HOME/kodi-build
+```
+
+Change to build directory:
+```
+cd $HOME/kodi-build
+```
+
+Generate Xcode project for ARM 64bit (**recommended**):
+```
+/Users/Shared/xbmc-depends/x86_64-darwin17.5.0-native/bin/cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=/Users/Shared/xbmc-depends/iphoneos11.3_arm64-target-debug/share/Toolchain.cmake ../kodi
+```
+
+Or generate Xcode project for ARM 32bit:
+```
+/Users/Shared/xbmc-depends/x86_64-darwin15.6.0-native/bin/cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=/Users/Shared/xbmc-depends/iphoneos9.3_armv7-target/share/Toolchain.cmake ../kodi
+```
+
+**WARNING:** The toolchain file location differs depending on your iOS and SDK version. You have to replace `x86_64-darwin15.6.0-native` and `iphoneos11.3_arm64-target-debug` or `iphoneos9.3_armv7-target` in the paths above with the correct ones on your system.
+
+You can check `Users/Shared/xbmc-depends` directory content with:
+```
+ls -l /Users/Shared/xbmc-depends
+```
+
+**Start Xcode, open the Kodi project file** (`kodi.xcodeproj`) located in `$HOME/kodi-build` and hit `Build`.
+
+**WARNING:** If you have selected a specific iOS SDK Version in step 4 then you might need to adapt the active target to use the same iOS SDK version, otherwise build will fail. Be sure to select a device configuration. Building for simulator is not supported.
+
+### 6.2. Build with xcodebuild
+Alternatively, you can also build via Xcode from the command-line with `xcodebuild`, triggered by CMake:
+
+Change to build directory:
+```
+cd $HOME/kodi-build
+```
+
+Build Kodi:
+```
+/Users/Shared/xbmc-depends/x86_64-darwin17.5.0-native/bin/cmake --build . --config "Debug" -- -verbose -jobs $(getconf _NPROCESSORS_ONLN)
+```
+
+**TIP:** You can specify `Release` instead of `Debug` as `--config` parameter.
+
+### 6.3. Build with make
+CMake is also able to generate makefiles that can be used to build with make.
+
+Change to Kodi's source code directory:
+```
+cd $HOME/kodi
+```
+
+Generate makefiles:
+```
+make -C tools/depends/target/cmakebuildsys
+```
+
+Build Kodi:
+```
+make -j$(getconf _NPROCESSORS_ONLN) -C build
+```
+
+**[back to top](#table-of-contents)** | **[back to section top](#6-build-kodi)**
+
+## 7. Package
+CMake generates a target called `deb` which will package Kodi ready for distribution. After Kodi has been built, the target can be triggered by selecting it in Xcode active scheme or manually running
+
+```
+cd $HOME/kodi-build/build
+/Users/Shared/xbmc-depends/x86_64-darwin17.5.0-native/bin/cmake --build . --target "deb" --config "Debug"
+```
+
+Alternatively, if you built using makefiles issue:
+```
+cd $HOME/kodi/build
+make deb
+```
+
+**[back to top](#table-of-contents)**
+
+## 8. Install
+On jailbroken devices the resulting deb file can be copied to the iOS device via *ssh/scp* and installed manually. You need to SSH into the iOS device and issue:
+```
+dpkg -i <name of the deb file>
+```
+
+If you are a developer with an official Apple code signing identity you can deploy Kodi via Xcode to work on it on non-jailbroken devices. For this to work you need to alter the Xcode project by setting your codesign identity. Just select the *iPhone Developer* shortcut.
+It's also important that you select the signing on all 4 spots in the project settings. After the last buildstep, our support script will do a full sign of all binaries and bundle them with the given identity, including all the `*.viz`, `*.pvr`, `*.so`, etc. files Xcode doesn't know anything about. This should allow you to deploy Kodi to all non-jailbroken devices the same way you deploy normal apps to.
+In that case Kodi will be sandboxed like any other app. All Kodi files are then located in the sandboxed *Documents* folder and can be easily accessed via iTunes file sharing.
+
+From Xcode7 on this approach is also available for non paying app developers (Apple allows self signing from now on).
+
+**[back to top](#table-of-contents)**
+
+## 9. Gesture Handling
+
+| Gesture                                  | Action                     |
+| ---------------------------------------- | -------------------------- |
+| Double finger swipe left                 | Back                       |
+| Double finger tap/single finger long tap | Right mouse                |
+| Single finger tap                        | Left mouse                 |
+| Panning, and flicking                    | For navigating in lists    |
+| Dragging                                 | For scrollbars and sliders |
+| Zoom gesture                             | In the picture viewer      |
+
+Gestures can be adapted in **[system/keymaps/touchscreen.xml](https://github.com/xbmc/xbmc/blob/master/system/keymaps/touchscreen.xml)**.
+
+**[back to top](#table-of-contents)**
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.linux kodi-18.0+git20180704.0202-f0dda3a/docs/README.linux
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.linux	2018-06-21 18:59:46.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.linux	1970-01-01 00:00:00.000000000 +0000
@@ -1,279 +0,0 @@
-TOC
-1. Introduction
-2. Getting the source code
-3. Installing the required libraries and headers
-4. How to compile
-   4.4 Binary addons
-   4.5 Test suite
-5. How to run
-6. Uninstalling
-
------------------------------------------------------------------------------
-1. Introduction
------------------------------------------------------------------------------
-
-A graphics-adapter with OpenGL acceleration is highly recommended.
-24/32 bitdepth is required along with OpenGL.
-
-Note to new Linux users:
-All lines that are prefixed with the '$' character are commands,
-that need to be typed into a terminal window / console. The '$' equals the prompt.
-Note: The '$' character itself should NOT be typed as part of the command.
-
------------------------------------------------------------------------------
-2. Getting the source code
------------------------------------------------------------------------------
-
-You will have to grab the source code of course, here we use git as example.
-First install the git package provided by your distribution.
-Then from a terminal, type:
-
-.0  $ cd $HOME
-.1  $ git clone git://github.com/xbmc/xbmc.git kodi
-
-Note: You can clone any specific branch.
-
-.1  $ git clone -b <branch> git://github.com/xbmc/xbmc.git kodi
-
------------------------------------------------------------------------------
-3. Installing the required libraries and headers
------------------------------------------------------------------------------
-
-You will then need the required libraries. The following is the list of packages
-that are used to build Kodi packages on Debian/Ubuntu (with all supported
-external libraries enabled).
-
-Build-Depends: autoconf, automake, autopoint, autotools-dev, cmake, curl,
-  default-jre, gawk, gperf, libao-dev, libasound2-dev,
-  libass-dev (>= 0.9.8), libavahi-client-dev, libavahi-common-dev, libbluetooth-dev,
-  libbluray-dev (>= 0.9.3), libbz2-dev, libcap-dev,
-  libcdio-dev, libcec-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev,
-  libcwiid-dev, libdbus-1-dev, libegl1-mesa-dev, libfmt3-dev, libfontconfig-dev, libfreetype6-dev,
-  libfribidi-dev, libgif-dev (>= 4.1.6), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
-  libiso9660-dev, libjpeg-dev, libltdl-dev, liblzo2-dev, libmicrohttpd-dev,
-  libmpcdec-dev, libmysqlclient-dev, libnfs-dev,
-  libpcre3-dev, libplist-dev, libpng12-dev | libpng-dev, libpulse-dev,
-  libshairplay-dev, libsmbclient-dev, libsqlite3-dev, libssl-dev, libswscale-dev,
-  libtag1-dev (>= 1.8), libtinyxml-dev (>= 2.6.2), libtool, libudev-dev,
-  libusb-dev, libva-dev, libvdpau-dev, libxml2-dev,
-  libxmu-dev, libxrandr-dev, libxslt1-dev, libxt-dev, lsb-release, rapidjson-dev,
-  nasm [!amd64], python-dev, python-imaging, python-support, swig, uuid-dev, yasm, zlib1g-dev,
-  liblirc-dev
-
-If you want to build with Wayland instead of X11, you will need:
-  wayland-protocols (>= 1.7), libwaylandpp-dev
-
-[NOTICE] crossguid / libcrossguid-dev all Linux distributions.
-Kodi now requires crossguid which is not available in Ubuntu repositories at this time.
-We supply a Makefile in tools/depends/target/crossguid
-to make it easy to install into /usr/local.
-    $ make -C tools/depends/target/crossguid PREFIX=/usr/local
-
-[NOTICE] libfmt / libfmt3-dev all Linux distributions.
-Kodi now requires libfmt which is not available in Ubuntu repositories at this time.
-We supply a Makefile in tools/depends/target/libfmt
-to make it easy to install into /usr/local.
-    $ make -C tools/depends/target/libfmt PREFIX=/usr/local
-
-[NOTICE] wayland-protocols all Linux distributions.
-Building Kodi with Wayland requires a recent version of wayland-protocols (at least 1.7)
-which is not available in the Ubuntu LTS repostiories at this time.
-We supply a Makefile in tools/depends/target/wayland-protocols to make it easy to install
-into /usr/local.
-    $ make -C tools/depends/target/wayland-protocols PREFIX=/usr/local
-
-[NOTICE] waylandpp all Linux distributions.
-Building Kodi with Wayland requires waylandpp which is not available in repositories
-of most major distributions at this time.
-We supply a Makefile in tools/depends/target/waylandpp to make it easy to install
-into /usr/local.
-Note that building waylandpp has some dependencies of its own: scons,
-libwayland-dev (>= 1.11.0), libwayland-egl1-mesa
-    $ make -C tools/depends/target/waylandpp PREFIX=/usr/local
-
-Note: For developers and anyone else who compiles frequently it is recommended to use ccache.
-    $ sudo apt-get install ccache
-
------------------------------------------------------------------------------
-3.1. Using the Kodi PPA to get all build dependencies (Debian/Ubuntu only)
------------------------------------------------------------------------------
-
-For this, you need to specify the PPA in your apt sources.
-Please find them on the following wiki link:
-Note: See README.ubuntu as well
-
-http://kodi.wiki/index.php?title=Official_Ubuntu_PPA
-
-Update apt:
-    $ sudo apt-get update
-
-The command to get the build dependencies, used to compile the version on the PPA.
-    $ sudo apt-get build-dep kodi
-
------------------------------------------------------------------------------
-4. How to compile
------------------------------------------------------------------------------
-Cmake build instructions V18.0 Leia and higher
-
-Create and change to build directory 
-    $ mkdir kodi-build && cd kodi-build
-
-Run CMake
-- for X11
-    $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local
-- for Wayland
-    $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local -DCORE_PLATFORM_NAME=wayland -DWAYLAND_RENDER_SYSTEM=gl
-    (You can use "gles" instead of "gl" if you want to build with GLES)
-
-Build
-    $ cmake --build . -- VERBOSE=1
-    
-Tip: By adding -j<number> to the make command, you describe how many
-     concurrent jobs will be used, it will speed up the build process.
-     So for quadcore the command is:
-    
-    $ cmake --build . -- VERBOSE=1 -j4
-
-If the build process completes succesfully you would want to test if it is working.
-Still in the build directory type the following:
-
-    $ ./kodi.bin
-
-If everything was okay during your test you can now install the binaries to their place
-in this example "/usr/local".
-
-    $ sudo make install
-
-This will install Kodi in the prefix provided in 4.1 as well as a launcher script.
-
-Tip: By adding -j<number> to the make command, you describe how many
-     concurrent jobs will be used. So for dualcore the command is:
-
-    $ sudo make install -j2
-
-Tip: To override the location that Kodi is installed, use PREFIX=<path>.
-For example.
-
-    $ make install DESTDIR=$HOME/kodi
-
------------------------------------------------------------------------------
-4.4. Binary addons - compile
------------------------------------------------------------------------------
-
-From v14 with commit 4090a5f a new API for binary addons is available.
-You can compile all addons or only specific addons by specifying e.g. ADDONS="audioencoder.foo pvr.bar audiodecoder.baz"
-
-.0  All addons
-    $ make -C tools/depends/target/binary-addons PREFIX=/<system prefix added on step 4.1>
-
-.1  Specific addons
-    $ make -C tools/depends/target/binary-addons PREFIX=/<system prefix added on step 4.1> ADDONS="audioencoder.flac pvr.vdr.vnsi audiodecoder.snesapu"
-
-Audio decoders:
-    audiodecoder.modplug, audiodecoder.nosefart, audiodecoder.sidplay, audiodecoder.snesapu,
-    audiodecoder.stsound, audiodecoder.timidity, audiodecoder.vgmstream
-
-Audio encoders:
-    audioencoder.flac, audioencoder.lame, audioencoder.vorbis, audioencoder.wav
-
-Inputstream addons:
-    inputstream.mpd
-
-Peripheral addons:
-    peripheral.joystick
-
-PVR addons:
-    pvr.argustv, pvr.demo, pvr.dvblink, pvr.dvbviewer, pvr.filmon, pvr.hdhomerun, pvr.hts, pvr.iptvsimple,
-    pvr.mediaportal.tvserver,pvr.mythtv, pvr.nextpvr, pvr.njoy, pvr.pctv, pvr.stalker, pvr.vbox, pvr.vdr.vnsi,
-    pvr.vuplus, pvr.wmc
-
-Screensavers:
-    screensaver.asteroids, screensaver.biogenesis, screensaver.greynetic, screensaver.matrixtrails,
-    screensaver.pingpong, screensaver.pyro, screensavers.rsxs, screensaver.stars
-
-Visualizations
-    visualization.fishbmc, visualization.goom, visualization.projectm, visualization.shadertoy
-    visualization.spectrum, visualization.vsxu, visualization.waveform
-
------------------------------------------------------------------------------
-4.5. Test suite
------------------------------------------------------------------------------
-
-Kodi has a test suite which uses the Google C++ Testing Framework.
-This framework is provided directly in Kodi's source tree.
-It has very little requirements, in order to build and run.
-See the README file for the framework at 'lib/gtest/README' for specific requirements.
-
-To compile and run Kodi's test suite, type the following:
-
-    $ make check
-
-To compile the test suite without running it, type the following.
-
-    $ make kodi-test
-
-The test suite program can be run manually as well.
-The name of the test suite program is 'kodi-test' and will build in the Kodi source tree.
-To bring up the 'help' notes for the program, type the following:
-
-    $ ./kodi-test --gtest_help
-
-The most useful options are,
-
-    --gtest_list_tests
-      List the names of all tests instead of running them.
-	  The name of TEST(Foo, Bar) is "Foo.Bar".
-
-    --gtest_filter=POSITIVE_PATTERNS[-NEGATIVE_PATTERNS]
-      Run only the tests whose name matches one of the positive patterns but
-      none of the negative patterns. '?' matches any single character; '*'
-      matches any substring; ':' separates two patterns.
-
------------------------------------------------------------------------------
-5. How to run
------------------------------------------------------------------------------
-
-How to run Kodi depends on the type of installation you have done.
-It is possible to run Kodi without the requirement to install Kodi anywhere else.
-In this case, type the following from the top source directory.
-
-    $ ./kodi.bin
-
-Or run in 'portable' mode
-
-    $ ./kodi.bin -p
-
-If you chose to install Kodi using '/usr' or '/usr/local' as the PREFIX,
-you can just issue 'kodi' in a terminal session.
-
-If you have overridden PREFIX to install Kodi into some non-standard location,
-you will have to run Kodi by directly running 'kodi.bin'.
-
-For example:
-
-    $ $HOME/kodi/usr/lib/kodi/kodi.bin
-
-You should still run the wrapper via
-    $ $PREFIX/bin/kodi
-
-If you wish to use VDPAU decoding you will now have to change the Render Method
-in Settings->Videos->Player from "Auto Detect" to "VDPAU".
-
------------------------------------------------------------------------------
-6. Uninstalling
------------------------------------------------------------------------------
-
-Prepend "sudo" to commands, if your user doesn't have write permission to the install directory.
-
-Note: If you have rerun configure with a different prefix,
-you will either need to rerun configure with the correct prefix for this step to work correctly.
-
-    $ make uninstall
-.0  $ sudo make uninstall
-
-If you would like to also remove any settings and 3rd party addons (skins, scripts, etc)
-you should also run:
-
-.1  $ rm -rf ~/.kodi
-
-EOF
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.Linux.md kodi-18.0+git20180704.0202-f0dda3a/docs/README.Linux.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.Linux.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.Linux.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,283 @@
+![Kodi Logo](resources/banner_slim.png)
+
+# Linux build guide
+This is the general Linux build guide. Please read it in full before you proceed to familiarize yourself with the build procedure.
+
+Several distribution **[specific build guides](README.md)** are available.
+
+## Table of Contents
+1. **[Document conventions](#1-document-conventions)**
+2. **[Get the source code](#2-get-the-source-code)**
+3. **[Install the required packages](#3-install-the-required-packages)**  
+  3.1. **[Build missing dependencies](#31-build-missing-dependencies)**  
+  3.2. **[Enable internal dependencies](#32-enable-internal-dependencies)**
+4. **[Build Kodi](#4-build-kodi)**  
+  4.1. **[Configure build](#41-configure-build)**  
+  4.2. **[Build](#42-build)**
+5. **[Build binary add-ons](#5-build-binary-add-ons)**
+6. **[Run Kodi](#6-run-kodi)**
+7. **[Uninstall Kodi](#7-uninstall-kodi)**
+8. **[Test suite](#8-test-suite)**
+
+## 1. Document conventions
+This guide assumes you are using `terminal`, also known as `console`, `command-line` or simply `cli`. Commands need to be run at the terminal, one at a time and in the provided order.
+
+This is a comment that provides context:
+```
+this is a command
+this is another command
+and yet another one
+```
+
+**Example:** Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+Commands that contain strings enclosed in angle brackets denote something you need to change to suit your needs.
+```
+git clone -b <branch-name> https://github.com/xbmc/xbmc kodi
+```
+
+**Example:** Clone Kodi's current Krypton branch:
+```
+git clone -b Krypton https://github.com/xbmc/xbmc kodi
+```
+
+Several different strategies are used to draw your attention to certain pieces of information. In order of how critical the information is, these items are marked as a note, tip, or warning. For example:
+ 
+**NOTE:** Linux is user friendly... It's just very particular about who its friends are.  
+**TIP:** Algorithm is what developers call code they do not want to explain.  
+**WARNING:** Developers don't change light bulbs. It's a hardware problem.
+
+**[back to top](#table-of-contents)** | **[back to section top](#1-document-conventions)**
+
+## 2. Get the source code
+First install the `git` package provided by your distribution. How to do it can be found with a quick search in your favorite search engine.
+
+Change to your `home` directory:
+```
+cd $HOME
+```
+
+Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+**[back to top](#table-of-contents)**
+
+## 3. Install the required packages
+The following is the list of packages that are used to build Kodi on Debian/Ubuntu (with all supported external libraries enabled).
+
+* autoconf, automake, autopoint, gettext, autotools-dev, cmake, curl, default-jre | openjdk-6-jre | openjdk-7-jre, gawk, gcc (>= 4.9) | gcc-4.9, g++ (>= 4.9) | g++-4.9, cpp (>= 4.9) | cpp-4.9, gdc, gperf, libasound2-dev | libasound-dev, libass-dev (>= 0.9.8), libavahi-client-dev, libavahi-common-dev, libbluetooth-dev, libbluray-dev, libbz2-dev, libcdio-dev, libcec4-dev | libcec-dev, libp8-platform-dev, libcrossguid-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev, libcwiid-dev, libdbus-1-dev, libegl1-mesa-dev, libenca-dev, libflac-dev, libfontconfig-dev, libfmt3-dev | libfmt-dev, libfreetype6-dev, libfribidi-dev, libgcrypt-dev, libgif-dev (>= 5.0.5), libgles2-mesa-dev [armel] | libgl1-mesa-dev | libgl-dev, libglew-dev, libglu1-mesa-dev | libglu-dev, libgnutls-dev | libgnutls28-dev, libgpg-error-dev, libiso9660-dev, libjpeg-dev, liblcms2-dev, liblirc-dev, libltdl-dev, liblzo2-dev, libmicrohttpd-dev, libmysqlclient-dev, libnfs-dev, libogg-dev, libomxil-bellagio-dev [armel], libpcre3-dev, libplist-dev, libpng12-dev | libpng-dev, libpulse-dev, libshairplay-dev, libsmbclient-dev, libsqlite3-dev, libssl-dev, libtag1-dev (>= 1.8) | libtag1x8, libtiff5-dev | libtiff-dev | libtiff4-dev, libtinyxml-dev, libtool, libudev-dev, libva-dev, libvdpau-dev, libvorbis-dev, libxkbcommon-dev, libxmu-dev, libxrandr-dev, libxslt1-dev | libxslt-dev, libxt-dev, waylandpp-dev | netcat, wayland-protocols | wipe, lsb-release, nasm [!amd64], python-dev, python-pil | python-imaging, python-support | python-minimal, rapidjson-dev, swig, unzip, uuid-dev, yasm, zip, zlib1g-dev
+
+### 3.1. Build missing dependencies
+Some packages may be missing or outdated in older distributions. Notably `crossguid, libfmt, waylandpp, wayland-protocols, etc.` are known to be outdated or missing. Fortunately there is an easy way to build individual dependencies with **[Kodi's unified depends build system](../tools/depends/README.md)**.
+
+Change to Kodi's source code directory:
+```
+cd $HOME/kodi
+```
+
+Build and install crossguid:
+```
+sudo make -C tools/depends/target/crossguid PREFIX=/usr/local
+```
+
+Build and install libfmt:
+```
+sudo make -C tools/depends/target/libfmt PREFIX=/usr/local
+```
+
+Build and install wayland-protocols:
+```
+sudo make -C tools/depends/target/wayland-protocols PREFIX=/usr/local
+```
+
+Build and install waylandpp:
+```
+sudo make -C tools/depends/target/waylandpp PREFIX=/usr/local
+```
+
+**WARNING:** Building `waylandpp` has some dependencies of its own, namely `scons, libwayland-dev (>= 1.11.0) and libwayland-egl1-mesa`
+
+**TIP:** Complete list of dependencies is available **[here](https://github.com/xbmc/xbmc/tree/master/tools/depends/target)**.
+
+### 3.2. Enable internal dependencies
+Some dependencies can be configured to build before Kodi. That's the case with `crossguid, libfmt and rapidjson`. To enable the internal build of a dependency, append `-DENABLE_INTERNAL_<DEPENDENCY_NAME>=ON` to the configure command below. For example, configuring an X11 build with internal `fmt` would become `cmake ../kodi -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_INTERNAL_FMT=ON` instead of `cmake ../kodi -DCMAKE_INSTALL_PREFIX=/usr/local`.
+
+**[back to top](#table-of-contents)** | **[back to section top](#3-installing-the-required-packages)**
+
+## 4. Build Kodi
+### 4.1. Configure build
+If you get a `Could NOT find...` error message during CMake configuration step, take a note of the missing dependencies and either install them from repositories (if available) or **[build the missing dependencies manually](#31-build-missing-dependencies)**.
+
+Create an out-of-source build directory:
+```
+mkdir $HOME/kodi-build
+```
+
+**TIP:** Look for comments starting with `Or ...` and only execute the command(s) you need.
+
+Change to build directory:
+```
+cd $HOME/kodi-build
+```
+
+Configure build for X11:
+```
+cmake ../kodi -DCMAKE_INSTALL_PREFIX=/usr/local
+```
+
+Or configure build for Wayland:
+```
+cmake ../kodi -DCMAKE_INSTALL_PREFIX=/usr/local -DCORE_PLATFORM_NAME=wayland -DWAYLAND_RENDER_SYSTEM=gl
+```
+
+**NOTE:** You can use `gles` instead of `gl` if you want to build with `GLES`.
+
+Or configure build for GBM:
+```
+cmake ../kodi -DCMAKE_INSTALL_PREFIX=/usr/local -DCORE_PLATFORM_NAME=gbm
+```
+
+### 4.2. Build
+```
+cmake --build . -- VERBOSE=1 -j$(getconf _NPROCESSORS_ONLN)
+```
+**TIP:** By adding `-j<number>` to the make command, you can choose how many concurrent jobs will be used and expedite the build process. It is recommended to use `-j$(getconf _NPROCESSORS_ONLN)` to compile on all available processor cores. The build machine can also be configured to do this automatically by adding `export MAKEFLAGS="-j(getconf _NPROCESSORS_ONLN)"` to your shell config (e.g. `~/.bashrc`).
+
+After the build process completes successfully you can test your shiny new Kodi build while in the build directory:
+```
+./kodi-x11
+```
+
+Or if you built for Wayland:
+```
+./kodi-wayland
+```
+
+Or if you built for GBM:
+```
+./kodi-gbm
+```
+
+**WARNING:** User running `kodi-gbm` needs to be part of `input` and `video` groups. Otherwise you'll have to use `sudo`.
+
+Add user to input and video groups:
+```
+sudo usermod -a -G input,video <username>
+```
+
+You will need to log out and log back in to see the new groups added to your user. Check groups your user belongs to with:
+```
+groups
+```
+
+If everything was OK during your test you can now install the binaries to their place, in this example */usr/local*.
+```
+sudo make install
+```
+
+This will install Kodi in the prefix provided in **[section 4.1](#41-configure-build)**.
+
+**TIP:** To override Kodi's install location, use `DESTDIR=<path>`. For example:
+```
+sudo make install DESTDIR=$HOME/kodi
+```
+
+**[back to top](#table-of-contents)** | **[back to section top](#4-build-kodi)**
+
+## 5. Build binary add-ons
+You can find a complete list of available binary add-ons **[here](https://github.com/xbmc/repo-binary-addons)**.
+
+Change to Kodi's source code directory:
+```
+cd $HOME/kodi
+```
+
+Build all add-ons:
+```
+sudo make -j$(getconf _NPROCESSORS_ONLN) -C tools/depends/target/binary-addons PREFIX=/usr/local
+```
+
+Build specific add-ons:
+```
+sudo make -j$(getconf _NPROCESSORS_ONLN) -C tools/depends/target/binary-addons PREFIX=/usr/local ADDONS="audioencoder.flac pvr.vdr.vnsi audiodecoder.snesapu"
+```
+
+Build a specific group of add-ons:
+```
+sudo make -j$(getconf _NPROCESSORS_ONLN) -C tools/depends/target/binary-addons PREFIX=/usr/local ADDONS="pvr.*"
+```
+
+**NOTE:** `PREFIX=/usr/local` should match Kodi's `-DCMAKE_INSTALL_PREFIX=` prefix used in **[section 4.1](#41-configure-build)**.
+
+**[back to top](#table-of-contents)**
+
+## 6. Run Kodi
+If you chose to install Kodi using `/usr` or `/usr/local` as the `-DCMAKE_INSTALL_PREFIX=`, you can just issue *kodi* in a terminal session.
+
+If you changed `-DCMAKE_INSTALL_PREFIX=` to install Kodi into some non-standard location, you will have to run Kodi directly:
+```
+<CMAKE_INSTALL_PREFIX>/bin/kodi
+```
+
+To run Kodi in *portable* mode (useful for testing):
+```
+<CMAKE_INSTALL_PREFIX>/bin/kodi -p
+```
+
+**[back to top](#table-of-contents)**
+
+## 7. Uninstall Kodi
+```
+sudo make uninstall
+```
+**WARNING:**: If you reran CMakes' configure step with a different `-DCMAKE_INSTALL_PREFIX=`, you will need to rerun configure with the correct path for this step to work correctly.
+
+If you would like to also remove any settings and third-party addons (skins, scripts, etc.) and Kodi configuration files, you should also run:
+```
+rm -rf ~/.kodi
+```
+
+**[back to top](#table-of-contents)**
+
+## 8. Test suite
+Kodi has a test suite which uses the Google C++ Testing Framework. This framework is provided directly in Kodi's source tree.
+
+Build and run Kodi's test suite:
+```
+make check
+```
+
+Build Kodi's test suite without running it:
+```
+make kodi-test
+```
+
+Run Kodi's test suite manually:
+```
+./kodi-test
+```
+
+Show Kodi's test suite *help* notes:
+```
+./kodi-test --gtest_help
+```
+
+Useful options:
+```
+--gtest_list_tests
+  List the names of all tests instead of running them.
+  The name of TEST(Foo, Bar) is "Foo.Bar".
+
+--gtest_filter=POSITIVE_PATTERNS[-NEGATIVE_PATTERNS]
+  Run only the tests whose name matches one of the positive patterns but
+  none of the negative patterns. '?' matches any single character; '*'
+  matches any substring; ':' separates two patterns.
+```
+
+**[back to top](#table-of-contents)**
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.macOS.md kodi-18.0+git20180704.0202-f0dda3a/docs/README.macOS.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.macOS.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.macOS.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,258 @@
+![Kodi Logo](resources/banner_slim.png)
+
+# macOS build guide
+This guide has been tested with macOS 10.13.4()17E199 High Sierra and Xcode 9.3(9E145). It is meant to build Kodi for macOS using **[Kodi's unified depends build system](../tools/depends/README.md)**. Please read it in full before you proceed to familiarize yourself with the build procedure.
+
+## Table of Contents
+1. **[Document conventions](#1-document-conventions)**
+2. **[Prerequisites](#2-prerequisites)**
+3. **[Get the source code](#3-get-the-source-code)**
+4. **[Configure and build tools and dependencies](#4-configure-and-build-tools-and-dependencies)**
+5. **[Build binary add-ons](#5-build-binary-add-ons)**
+6. **[Build Kodi](#6-build-kodi)**  
+  6.1. **[Build with Xcode](#61-build-with-xcode)**  
+  6.2. **[Build with xcodebuild](#62-build-with-xcodebuild)**  
+  6.3. **[Build with make](#63-build-with-make)**
+7. **[Run Kodi](#7-run-kodi)**  
+  7.1. **[Built with Xcode or xcodebuild](#71-built-with-xcode-or-xcodebuild)**  
+  7.2. **[Built with make](#72-built-with-make)**
+8. **[Package](#8-package)**
+9. **[Install](#9-install)**
+
+## 1. Document conventions
+This guide assumes you are using `terminal`, also known as `console`, `command-line` or simply `cli`. Commands need to be run at the terminal, one at a time and in the provided order.
+
+This is a comment that provides context:
+```
+this is a command
+this is another command
+and yet another one
+```
+
+**Example:** Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+Commands that contain strings enclosed in angle brackets denote something you need to change to suit your needs.
+```
+git clone -b <branch-name> https://github.com/xbmc/xbmc kodi
+```
+
+**Example:** Clone Kodi's current Krypton branch:
+```
+git clone -b Krypton https://github.com/xbmc/xbmc kodi
+```
+
+Several different strategies are used to draw your attention to certain pieces of information. In order of how critical the information is, these items are marked as a note, tip, or warning. For example:
+ 
+**NOTE:** Linux is user friendly... It's just very particular about who its friends are.  
+**TIP:** Algorithm is what developers call code they do not want to explain.  
+**WARNING:** Developers don't change light bulbs. It's a hardware problem.
+
+**[back to top](#table-of-contents)** | **[back to section top](#1-document-conventions)**
+
+## 2. Prerequisites
+* **[Java Development Kit (JDK)](http://www.oracle.com/technetwork/java/javase/downloads/index.html)**
+* **[Xcode](https://developer.apple.com/xcode/)**. Install it from the AppStore or from the **[Apple Developer Homepage](https://developer.apple.com/)**.
+* Device with **OSX 10.9 or newer** to run Kodi after build.
+
+Building for OSX/macOS should work with the following constellations of Xcode and OSX/macOS versions:
+  * Xcode 8.x on OSX 10.11.x (El Capitan)
+  * Xcode 9.x on OSX 10.12.x (Sierra)
+  * Xcode 9.x on macOS 10.13.x (High Sierra)
+
+**WARNING:** Start Xcode after installation finishes. You need to accept the licenses and install missing components.
+
+**[back to top](#table-of-contents)**
+
+## 3. Get the source code
+Change to your `home` directory:
+```
+cd $HOME
+```
+
+Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+**[back to top](#table-of-contents)**
+
+## 4. Configure and build tools and dependencies
+Kodi can be built as either a 32bit or 64bit program. The dependencies are built in `$HOME/kodi/tools/depends` and installed into `/Users/Shared/xbmc-depends`.
+
+**TIP:** Look for comments starting with `Or ...` and only execute the command(s) you need.
+
+Configure build for 64bit (**recommended**):
+```
+cd $HOME/kodi/tools/depends
+./bootstrap
+./configure --host=x86_64-apple-darwin
+```
+
+Or configure build for 32bit:
+```
+cd $HOME/kodi/tools/depends
+./bootstrap
+./configure --host=i386-apple-darwin
+```
+
+Build tools and dependencies:
+```
+make -j$(getconf _NPROCESSORS_ONLN)
+```
+
+**TIP:** By adding `-j<number>` to the make command, you can choose how many concurrent jobs will be used and expedite the build process. It is recommended to use `-j$(getconf _NPROCESSORS_ONLN)` to compile on all available processor cores. The build machine can also be configured to do this automatically by adding `export MAKEFLAGS="-j(getconf _NPROCESSORS_ONLN)"` to your shell config (e.g. `~/.bashrc`).
+
+**WARNING:** Look for the `Dependencies built successfully.` success message. If in doubt run a single threaded `make` command until the message appears. If the single make fails, clean the specific library by issuing `make -C target/<name_of_failed_lib> distclean` and run `make`again.
+
+**NOTE:** **Advanced developers** may want to specify an SDK version (if multiple versions are installed) in the configure line(s) shown above. The example below would use SDK 10.9:
+```
+./configure --host=x86_64-apple-darwin --with-sdk=10.9
+```
+
+**[back to top](#table-of-contents)** | **[back to section top](#4-configure-and-build-tools-and-dependencies)**
+
+## 5. Build binary add-ons
+You can find a complete list of available binary add-ons **[here](https://github.com/xbmc/repo-binary-addons)**.
+
+Change to Kodi's source code directory:
+```
+cd $HOME/kodi
+```
+
+Build all add-ons:
+```
+make -j$(getconf _NPROCESSORS_ONLN) -C tools/depends/target/binary-addons
+```
+
+Build specific add-ons:
+```
+make -j$(getconf _NPROCESSORS_ONLN) -C tools/depends/target/binary-addons ADDONS="audioencoder.flac pvr.vdr.vnsi audiodecoder.snesapu"
+```
+
+Build a specific group of add-ons:
+```
+make -j$(getconf _NPROCESSORS_ONLN) -C tools/depends/target/binary-addons ADDONS="pvr.*"
+```
+
+**[back to top](#table-of-contents)**
+
+## 6. Build Kodi
+Before you can use Xcode to build Kodi, the Xcode project has to be generated with CMake. CMake is built as part of the dependencies and doesn't have to be installed separately. A toolchain file is also generated and is used to configure CMake.
+
+### 6.1. Build with Xcode
+Create an out-of-source build directory:
+```
+mkdir $HOME/kodi-build
+```
+
+Change to build directory:
+```
+cd $HOME/kodi-build
+```
+
+Generate Xcode project for 64bit (**recommended**):
+```
+/Users/Shared/xbmc-depends/x86_64-darwin17.5.0-native/bin/cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=/Users/Shared/xbmc-depends/macosx10.13_x86_64-target-debug/share/Toolchain.cmake ../kodi
+```
+
+Or generate Xcode project for 32bit:
+```
+/Users/Shared/xbmc-depends/x86_64-darwin17.5.0-native/bin/cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=/Users/Shared/xbmc-depends/macosx10.13_i386-target-debug/share/Toolchain.cmake ../kodi
+```
+
+**WARNING:** The toolchain file location differs depending on SDK version. You have to replace `x86_64-darwin17.5.0-native` and `macosx10.13_x86_64-target-debug` or `macosx10.13_i386-target-debug` in the paths above with the correct ones on your system.
+
+You can check `Users/Shared/xbmc-depends` directory content with:
+```
+ls -l /Users/Shared/xbmc-depends
+```
+
+**Start Xcode, open the Kodi project file** (`kodi.xcodeproj`) located in `$HOME/kodi-build` and hit `Build`.
+
+**WARNING:** If you have selected a specific SDK version in **[step 4](#4-configure-and-build-tools-and-dependencies)** then you might need to adapt the active target to use the same SDK version, otherwise build will fail. Be sure to select a device configuration. Building for simulator is **not** supported.
+
+### 6.2. Build with xcodebuild
+Alternatively, you can also build via Xcode from the command-line with `xcodebuild`, triggered by CMake:
+
+Change to build directory:
+```
+cd $HOME/kodi-build
+```
+
+Build Kodi:
+```
+/Users/Shared/xbmc-depends/x86_64-darwin17.5.0-native/bin/cmake --build . --config "Debug" -- -verbose -jobs $(getconf _NPROCESSORS_ONLN)
+```
+
+**TIP:** You can specify `Release` instead of `Debug` as `--config` parameter.
+
+### 6.3. Build with make
+CMake is also able to generate makefiles that can be used to build with make.
+
+Change to Kodi's source code directory:
+```
+cd $HOME/kodi
+```
+
+Generate makefiles:
+```
+make -C tools/depends/target/cmakebuildsys
+```
+
+Build Kodi:
+```
+make -j$(getconf _NPROCESSORS_ONLN) -C build
+```
+
+**[back to top](#table-of-contents)** | **[back to section top](#6-build-kodi)**
+
+## 7. Run Kodi
+### 7.1. Built with Xcode or xcodebuild
+After build finishes, you can run Kodi from Xcode or from terminal.
+
+Run `Debug` config from terminal:
+```
+$HOME/kodi-build/Debug/kodi.bin
+```
+
+Run `Release` config from terminal:
+```
+$HOME/kodi-build/Release/kodi.bin
+```
+
+### 7.2. Built with make
+After build finishes, you can run Kodi from terminal:
+```
+$HOME/kodi/build/kodi.bin
+```
+
+**[back to top](#table-of-contents)**
+
+## 8. Package
+CMake generates a target called `dmg` which will package Kodi ready for distribution. After Kodi has been built, the target can be triggered by selecting it in Xcode active scheme or manually running
+
+```
+cd $HOME/kodi-build/build
+/Users/Shared/xbmc-depends/x86_64-darwin17.5.0-native/bin/cmake --build . --target "dmg" --config "Debug"
+```
+
+Generated `dmg` file will be inside `$HOME/kodi-build/tools/darwin/packaging/osx/`.
+
+Alternatively, if you built using make:
+```
+cd $HOME/kodi/build
+make dmg
+```
+
+Generated `dmg` file will be inside `$HOME/kodi/build/tools/darwin/packaging/osx/`.
+
+**[back to top](#table-of-contents)**
+
+## 9. Install
+Kodi can be installed like any other app.
+
+**[back to top](#table-of-contents)**
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.md kodi-18.0+git20180704.0202-f0dda3a/docs/README.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,23 @@
+![Kodi Logo](resources/banner_slim.png)
+
+# Kodi's Documentation Home
+Welcome to Kodi's documentation home. Geared at developers, it contains platform specific build guides, **[code guidelines](CODE_GUIDELINES.md)**, a **[git guide](GIT-FU.md)** streamlined for Kodi's workflow and Doxygen's resources, ready to generate **[code documentation](doxygen/README.md)**.
+
+If you haven't done so, we encourage you to read our **[contributing guide](CONTRIBUTING.md)** first. It contains pertinent information about our development model.
+
+## Building Kodi
+Kodi uses CMake as its building system but instructions are highly dependent on your operating system and target platform. Choose your platform below and read the guide carefully before proceeding.
+
+<p align="center">
+  <a href="README.Android.md" title="Android"><img src="resources/android.svg" height="84"></a>
+  <a href="README.Fedora.md" title="Fedora"><img src="resources/fedora.svg" height="84"></a>
+  <a href="README.FreeBSD.md" title="FreeBSD"><img src="resources/freebsd.svg" height="84"></a>
+  <a href="README.iOS.md" title="iOS"><img src="resources/ios.svg" height="84"></a>
+  <a href="README.Linux.md" title="Linux"><img src="resources/linux.svg" height="84"></a>
+  <a href="README.macOS.md" title="macOS"><img src="resources/macos.svg" height="84"></a>
+  <a href="README.openSUSE.md" title="openSUSE"><img src="resources/opensuse.svg" height="84"></a>
+  <a href="README.RaspberryPi.md" title="Raspberry Pi"><img src="resources/raspberrypi.svg" height="84"></a>
+  <a href="README.Ubuntu.md" title="Ubuntu"><img src="resources/ubuntu.svg" height="84"></a>
+  <a href="README.Windows.md" title="Windows"><img src="resources/windows.svg" height="84"></a>
+</p>
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.opensuse kodi-18.0+git20180704.0202-f0dda3a/docs/README.opensuse
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.opensuse	2018-06-21 18:59:46.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.opensuse	1970-01-01 00:00:00.000000000 +0000
@@ -1,303 +0,0 @@
-TOC
-1. Introduction
-2. Getting the source code
-3. Installing the required libraries and headers
-4. How to compile
-   4.4 Binary addons
-   4.5 Test suite
-5. How to run
-6. Uninstalling
-
------------------------------------------------------------------------------
-1. Introduction
------------------------------------------------------------------------------
-
-A graphics-adapter with OpenGL acceleration is highly recommended.
-24/32 bitdepth is required along with OpenGL.
-
-Note to new Linux users:
-All lines that are prefixed with the '$' character are commands,
-that need to be typed into a terminal window / console. The '$' equals the prompt.
-Note: The '$' character itself should NOT be typed as part of the command.
-
------------------------------------------------------------------------------
-2. Getting the source code
------------------------------------------------------------------------------
-
-You will have to grab the source code of course, here we use git as example.
-First install the git package provided by your distribution.
-Then from a terminal, type:
-
-.0  $ cd $HOME
-.1  $ git clone git://github.com/xbmc/xbmc.git kodi
-
-Note: You can clone any specific branch.
-
-.1  $ git clone -b <branch> git://github.com/xbmc/xbmc.git kodi
-
------------------------------------------------------------------------------
-3. Installing the required libraries and headers
------------------------------------------------------------------------------
-
-You will then need the required libraries. The following is the list of packages
-that are used to build Kodi packages on Debian/Ubuntu (with all supported
-external libraries enabled).
-
-OpenSuse
-Since commit b2fa60d7c6fba907ecadc0cf36a3531985c4c367
-On OpenSuse there is a need for an extra dependency: libunistring-devel
-
-Full build dependency list is:
-make cmake autoconf automake gcc gcc-c++ libtool gettext-devel patch boost-devel glew-devel
-libmysqlclient-devel libass-devel libmpeg2-devel libmad-devel libjpeg-devel libsamplerate-devel libogg-devel
-libvorbis-devel libmodplug-devel libcurl-devel flac-devel libbz2-devel libtiff-devel lzo-devel libyajl-devel
-fribidi-devel sqlite3-devel libpng12-devel pcre-devel libcdio-devel libjasper-devel
-libmicrohttpd-devel libsmbclient-devel python-devel gperf nasm tinyxml-devel libtag-devel libbluray-devel
-libnfs-devel shairplay-devel swig libvdpau-devel libavahi-devel libcec-devel libdvdread-devel libva-devel libplist-devel
-libxst-devel alsa-devel libpulse-devel libXrandr-devel libXrender-devel randrproto-devel renderproto-devel
-libudev-devel libpcap-devel libgudev-1_0-devel libcap-ng-devel libcap-devel ccache doxygen capi4linux-devel liblcms2-devel
-libunistring-devel
-
-
-Build-Depends: autoconf, automake, autopoint, autotools-dev, cmake, curl,
-  default-jre, gawk, gperf, libao-dev, libasound2-dev,
-  libass-dev (>= 0.9.8), libavahi-client-dev, libavahi-common-dev, libbluetooth-dev,
-  libbluray-dev (>= 0.9.3), libbz2-dev, libcap-dev,
-  libcdio-dev, libcec-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev,
-  libcwiid-dev, libdbus-1-dev, libegl1-mesa-dev, libfontconfig-dev, libfreetype6-dev,
-  libfribidi-dev, libgif-dev (>= 4.1.6), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
-  libiso9660-dev, libjpeg-dev, libltdl-dev, liblzo2-dev, libmicrohttpd-dev,
-  libmpcdec-dev, libmysqlclient-dev, libnfs-dev,
-  libpcre3-dev, libplist-dev, libpng12-dev | libpng-dev, libpulse-dev,
-  libshairplay-dev, libsmbclient-dev, libsqlite3-dev, libssl-dev, libswscale-dev,
-  libtag1-dev (>= 1.8), libtinyxml-dev (>= 2.6.2), libtool, libudev-dev,
-  libusb-dev, libva-dev, libvdpau-dev, libxml2-dev,
-  libxmu-dev, libxrandr-dev, libxslt1-dev, libxt-dev, libyajl-dev (>=2.0), lsb-release,
-  nasm [!amd64], python-dev, python-imaging, python-support, swig, uuid-dev, yasm,
-  zip, zlib1g-dev
-
-[NOTICE] crossguid / libcrossguid-dev all Linux distributions.
-Kodi now requires crossguid which is not available in Ubuntu repositories at this time.
-We supply a Makefile in tools/depends/target/crossguid
-to make it easy to install into /usr/local.
-    $ make -C tools/depends/target/crossguid PREFIX=/usr/local
-    
-[NOTICE] yail got changed for rapidjson which is not available in OpenSuse repositories.
-To build rapidjson for OpenSuse you must get the source from github and configure, build and install them yourself.
-Next lines explain how to do that.
-First download the sources from github to your local disk.
-
-    $ git clone https://github.com/miloyip/rapidjson
-    $ cd rapidjson
-
-To get the files of thirdparty submodules (google test).
-
-    $ git submodule update --init
-
-Create directory called build in rapidjson source directory.
-    $ mkdir build
-
-Change to build directory
-    $ cd build
-
-Run the following command to configure your build.
-It will default to /usr/local
-    $ cmake ..
-
-Run the following command to build the sources for installation.
-    $ cmake --build .
-
-Tip: By adding -j<number> to the make command, you describe how many
-     concurrent jobs will be used, it will speed up the build process.
-     So for octacore the command is:
-
-    $ cmake --build . -- -j8
-
-Run the following command to install the builded sources.
-    $ sudo make install
-
-Tip: By adding -j<number> to the make command, you describe how many
-     concurrent jobs will be used, it will speed up the build process.
-     So for octacore the command is:
-
-    $ sudo make install -j8
-
-If everything went well it is installed to "/usr/local".
-
-Tip: To override the location that the module is installed, use DESTDIR=<path>.
-For example.
-
-    $ make install DESTDIR=/usr
-
-
-Note: For developers and anyone else who compiles frequently it is recommended to use ccache.
-    $ sudo apt-get install ccache
-
-    $ sudo apt-get build-dep kodi
-
-
------------------------------------------------------------------------------
-4. How to compile
------------------------------------------------------------------------------
-Cmake build instructions V18.0 and higher OpenSuse
-
-Create and change to build directory 
-    $ mkdir kodi-build && cd kodi-build
-    $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local
-    $ cmake --build . -- VERBOSE=1
-    
-Tip: By adding -j<number> to the make command, you describe how many
-     concurrent jobs will be used, it will speed up the build process.
-     So for quadcore the command is:
-    
-    $ cmake --build . -- VERBOSE=1 -j4
-
-If the build process completes succesfully you would want to test if it is working.
-Still in the build directory type the following:
-
-    $ ./kodi.bin
-
-If everything was okay during your test you can now install the binaries to their place
-in this example "/usr/local".
-
-    $ sudo make install
-
-This will install Kodi in the prefix provided in 4.1 as well as a launcher script.
-
-Tip: By adding -j<number> to the make command, you describe how many
-     concurrent jobs will be used. So for dualcore the command is:
-
-    $ sudo make install -j2
-
-Tip: To override the location that Kodi is installed, use PREFIX=<path>.
-For example.
-
-    $ make install DESTDIR=$HOME/kodi
-
------------------------------------------------------------------------------
-4.4. Binary addons - compile
------------------------------------------------------------------------------
-
-From v14 with commit 4090a5f a new API for binary addons is available.
-You can compile all addons or only specific addons by specifying e.g. ADDONS="audioencoder.foo pvr.bar audiodecoder.baz"
-
-.0  All addons
-    $ make -C tools/depends/target/binary-addons PREFIX=/<system prefix added on step 4.1>
-
-.1  Specific addons
-    $ make -C tools/depends/target/binary-addons PREFIX=/<system prefix added on step 4.1> ADDONS="audioencoder.flac pvr.vdr.vnsi audiodecoder.snesapu"
-
-Audio decoders:
-    audiodecoder.modplug, audiodecoder.nosefart, audiodecoder.sidplay, audiodecoder.snesapu,
-    audiodecoder.stsound, audiodecoder.timidity, audiodecoder.vgmstream
-
-Audio encoders:
-    audioencoder.flac, audioencoder.lame, audioencoder.vorbis, audioencoder.wav
-
-Inputstream addons:
-    inputstream.mpd
-
-Peripheral addons:
-    peripheral.joystick
-
-PVR addons:
-    pvr.argustv, pvr.demo, pvr.dvblink, pvr.dvbviewer, pvr.filmon, pvr.hdhomerun, pvr.hts, pvr.iptvsimple,
-    pvr.mediaportal.tvserver,pvr.mythtv, pvr.nextpvr, pvr.njoy, pvr.pctv, pvr.stalker, pvr.vbox, pvr.vdr.vnsi,
-    pvr.vuplus, pvr.wmc
-
-Screensavers:
-    screensaver.asteroids, screensaver.biogenesis, screensaver.greynetic, screensaver.matrixtrails,
-    screensaver.pingpong, screensaver.pyro, screensavers.rsxs, screensaver.stars
-
-Visualizations
-    visualization.fishbmc, visualization.goom, visualization.projectm, visualization.shadertoy
-    visualization.spectrum, visualization.vsxu, visualization.waveform
-
------------------------------------------------------------------------------
-4.5. Test suite
------------------------------------------------------------------------------
-
-Kodi has a test suite which uses the Google C++ Testing Framework.
-This framework is provided directly in Kodi's source tree.
-It has very little requirements, in order to build and run.
-See the README file for the framework at 'lib/gtest/README' for specific requirements.
-
-To compile and run Kodi's test suite:
-The configure option '--enable-gtest' is enabled by default during the configure stage.
-Once configured, to build the testsuite, type the following:
-
-    $ make check
-
-To compile the test suite without running it, type the following.
-
-    $ make testsuite
-
-The test suite program can be run manually as well.
-The name of the test suite program is 'kodi-test' and will build in the Kodi source tree.
-To bring up the 'help' notes for the program, type the following:
-
-    $ ./kodi-test --gtest_help
-
-The most useful options are,
-
-    --gtest_list_tests
-      List the names of all tests instead of running them.
-	  The name of TEST(Foo, Bar) is "Foo.Bar".
-
-    --gtest_filter=POSTIVE_PATTERNS[-NEGATIVE_PATTERNS]
-      Run only the tests whose name matches one of the positive patterns but
-      none of the negative patterns. '?' matches any single character; '*'
-      matches any substring; ':' separates two patterns.
-
-Note: If the '--enable-gtest' option is not set during the configure stage,
-the make targets 'check,' 'testsuite,' and 'testframework' will simply show a message saying
-the framework has not been configured, and then silently succeed (i.e. it will not return an error).
-
------------------------------------------------------------------------------
-5. How to run
------------------------------------------------------------------------------
-
-How to run Kodi depends on the type of installation you have done.
-It is possible to run Kodi without the requirement to install Kodi anywhere else.
-In this case, type the following from the top source directory.
-
-    $ ./kodi.bin
-
-Or run in 'portable' mode
-
-    $ ./kodi.bin -p
-
-If you chose to install Kodi using '/usr' or '/usr/local' as the PREFIX,
-you can just issue 'kodi' in a terminal session.
-
-If you have overridden PREFIX to install Kodi into some non-standard location,
-you will have to run Kodi by directly running 'kodi.bin'.
-
-For example:
-
-    $ $HOME/kodi/usr/lib/kodi/kodi.bin
-
-You should still run the wrapper via
-    $ $PREFIX/bin/kodi
-
-If you wish to use VDPAU decoding you will now have to change the Render Method
-in Settings->Videos->Player from "Auto Detect" to "VDPAU".
-
------------------------------------------------------------------------------
-6. Uninstalling
------------------------------------------------------------------------------
-
-Prepend "sudo" to commands, if your user doesn't have write permission to the install directory.
-
-Note: If you have rerun configure with a different prefix,
-you will either need to rerun configure with the correct prefix for this step to work correctly.
-
-    $ make uninstall
-.0  $ sudo make uninstall
-
-If you would like to also remove any settings and 3rd party addons (skins, scripts, etc)
-you should also run:
-
-.1  $ rm -rf ~/.kodi
-
-EOF
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.openSUSE.md kodi-18.0+git20180704.0202-f0dda3a/docs/README.openSUSE.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.openSUSE.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.openSUSE.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,135 @@
+![Kodi Logo](resources/banner_slim.png)
+
+# openSUSE build guide
+This guide has been tested with openSUSE Tumbleweed x86_64. Please read it in full before you proceed to familiarize yourself with the build procedure.
+
+Several other distributions have **[specific build guides](README.md)** and a general **[Linux build guide](README.Linux.md)** is also available.
+
+**Do not use openSUSE Leap**. Wiser people than us decided that in 2018 `gcc v4.8.5` is the best **stable** release openSUSE Leap 42.3 can provide by default. Installing/using another release along side it is a real PITA.
+
+## Table of Contents
+1. **[Document conventions](#1-document-conventions)**
+2. **[Get the source code](#2-get-the-source-code)**
+3. **[Install the required packages](#3-install-the-required-packages)**  
+  3.1. **[Build missing dependencies](#31-build-missing-dependencies)**
+4. **[Build Kodi](#4-build-kodi)**
+
+## 1. Document conventions
+This guide assumes you are using `terminal`, also known as `console`, `command-line` or simply `cli`. Commands need to be run at the terminal, one at a time and in the provided order.
+
+This is a comment that provides context:
+```
+this is a command
+this is another command
+and yet another one
+```
+
+**Example:** Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+Commands that contain strings enclosed in angle brackets denote something you need to change to suit your needs.
+```
+git clone -b <branch-name> https://github.com/xbmc/xbmc kodi
+```
+
+**Example:** Clone Kodi's current Krypton branch:
+```
+git clone -b Krypton https://github.com/xbmc/xbmc kodi
+```
+
+Several different strategies are used to draw your attention to certain pieces of information. In order of how critical the information is, these items are marked as a note, tip, or warning. For example:
+ 
+**NOTE:** Linux is user friendly... It's just very particular about who its friends are.  
+**TIP:** Algorithm is what developers call code they do not want to explain.  
+**WARNING:** Developers don't change light bulbs. It's a hardware problem.
+
+**[back to top](#table-of-contents)** | **[back to section top](#1-document-conventions)**
+
+## 2. Get the source code
+Make sure `git` is installed:
+```
+sudo zypper install git
+```
+
+Clone Kodi's current master branch:
+```
+cd $HOME
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+**[back to top](#table-of-contents)**
+
+## 3. Install the required packages
+Add `opensuse-multimedia-libs` repository because some needed packages are non-OSS:
+```
+sudo zypper ar -f http://ftp.gwdg.de/pub/opensuse/repositories/multimedia:/libs/openSUSE_Tumbleweed/ opensuse-multimedia-libs
+sudo zypper ref
+```
+
+**NOTE:** A message will ask you to accept the key. Enter `a`, the *trust always* option.
+
+If you get a `package not found` type of message with the below command, remove the offending package(s) from the install list and reissue the command. Take a note of the missing dependencies and, after a successful step completion, **[build the missing dependencies manually](#31-build-missing-dependencies)**.
+
+Install build dependencies:
+```
+sudo zypper install alsa-devel autoconf automake bluez-devel boost-devel capi4linux-devel ccache cmake doxygen flac-devel fribidi-devel gcc gcc-c++ gettext-devel giflib-devel glew-devel gperf java-openjdk libass-devel libavahi-devel libbluray-devel libbz2-devel libcap-devel libcap-ng-devel libcdio-devel libcec-devel libcurl-devel libdvdread-devel libgudev-1_0-devel libidn2-devel libjasper-devel libjpeg-devel liblcms2-devel libmad-devel libmicrohttpd-devel libmodplug-devel libmpeg2-devel libmysqlclient-devel libnfs-devel libogg-devel libpcap-devel libplist-devel libpng12-devel libpulse-devel libsamplerate-devel libsmbclient-devel libtag-devel libtiff-devel libtool libudev-devel libuuid-devel libva-devel libvdpau-devel libvorbis-devel libXrandr-devel libXrender-devel libxslt-devel libyajl-devel lirc-devel lzo-devel make Mesa-libEGL-devel Mesa-libGLESv2-devel Mesa-libGLESv3-devel nasm patch pcre-devel python-devel randrproto-devel renderproto-devel shairplay-devel sqlite3-devel swig tinyxml-devel
+```
+
+**WARNING:** Make sure you copy paste the entire line or you might receive an error or miss a few dependencies.
+
+Building for Wayland requires some extra packages:
+```
+sudo zypper install wayland-devel libwayland-egl1 libwayland-egl-devel libxkbcommon-devel scons wayland-protocols-devel
+```
+
+Similarly, building for GBM also requires some extra packages:
+```
+sudo zypper install libgbm-devel libinput-devel libxkbcommon-devel
+```
+
+**WARNING:** Fedora repositories don't have install candidates for `libfmt`, `rapidjson` and `waylandpp`. See **[build missing dependencies manually](#31-build-missing-dependencies)** section before you proceed.
+
+Optional packages that you might want to install for extra functionality (generating doxygen documentation, for instance):
+```
+sudo zypper install doxygen sndio-devel libmariadb-devel
+```
+
+**NOTE:** For developers and anyone else who builds frequently it is recommended to install `ccache` to expedite subsequent builds of Kodi.
+
+You can install it with:
+```
+sudo zypper install ccache
+```
+
+**TIP:** If you have multiple computers at home, `distcc` will distribute build workloads of C and C++ code across several machines on a network. Team Kodi may not be willing to give support if problems arise using such a build configuration.
+
+You can install it with:
+```
+sudo zypper install distcc
+```
+
+### 3.1. Build missing dependencies
+See the general **[Linux build guide](README.Linux.md)** for reference.
+
+Change to Kodi's source code directory:
+```
+cd $HOME/kodi
+```
+
+Build and install missing dependencies from repositories (*libfmt*, *rapidjson* and *waylandpp*):
+```
+sudo make -C tools/depends/target/libfmt PREFIX=/usr/local
+sudo make -C tools/depends/target/rapidjson PREFIX=/usr/local
+sudo make -C tools/depends/target/waylandpp PREFIX=/usr/local
+```
+
+**[back to top](#table-of-contents)** | **[back to section top](#3-install-the-required-packages)**
+
+## 4. Build Kodi
+See the general **[Linux build guide](README.Linux.md)** for reference.
+
+**[back to top](#table-of-contents)**
+
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.osx.md kodi-18.0+git20180704.0202-f0dda3a/docs/README.osx.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.osx.md	2018-06-21 18:59:46.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.osx.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,184 +0,0 @@
-# Kodi for Apple macOS
-
-## TOC
-
-1. [Introduction](#1-introduction)
-2. [Getting the source code](#2-getting-the-source-code)
-3. [Install build dependencies](#3-install-build-dependencies)
-   1. [Install Xcode](#31-install-xcode)
-   2. [Install Kodi build depends](#32-install-kodi-build-depends)
-   3. [Compile Kodi binary addons](#33-compile-kodi-binary-addons)
-4. [How to compile Kodi](#4-how-to-compile-kodi)
-   1. [Using Xcode (or xcodebuild)](#41-using-xcode-or-xcodebuild)
-   2. [Compilation using command-line (make)](#42-compilation-using-command-line-make)
-5. [Packaging](#5-packaging)
-6. [References](#6-references)
-
-## 1 Introduction
-
-This is a platform port of Kodi for the Apple macOS operating system.
-Starting with Kodi v18 the build system has been migrated from native Xcode to
-CMake (and generated project files).
-
-There are 3 ways to build Kodi for Mac:
-
-- Xcode IDE (easiest as it presents the build system in a GUI environment)
-- command-line with xcodebuild
-- command-line with make
-
-Kodi for Mac is composed of a main binary with numerous dynamic libraries and
-codecs that support a multitude of music and video formats.
-
-The minimum version of OSX you need to run(!) Kodi is 10.9 atm.
-
-- On El Capitan (OSX 10.11.x) we recommend using Xcode 8.x.
-- On Sierra (macOS 10.12.x) we recommend using Xcode 8.x.
-- On High Sierra (macOS 10.13.x) we recommend using Xcode 9.x.
-
-## 2 Getting the source code
-
-    cd $HOME
-    git clone git://github.com/xbmc/xbmc.git Kodi
-
-## 3 Install build dependencies
-
-### 3.1 Install Xcode
-
-Install the Xcode version recommended for your macOS version. You can download
-it either from the macOS AppStore (Xcode) or from the Apple Developer Homepage.
-
-As far as we know the compilation for macOS should work with the following
-constellations of Xcode and macOS versions (to be updated once we know more):
-
-7 Xcode 8.0 against OSX SDK 10.12 (EC)
-8 Xcode 8.0 against OSX SDK 10.12 (S)
-9 Xcode 9.0 against OSX SDK 10.13 (HS)
-
-### 3.2 Install Kodi build depends
-
-Kodi requires a set of build dependencies to be built and installed before you
-will be able to build the Kodi main binary. These often just called *depends*
-are installed using the commands described below (with the latest macOS SDK
-found on your system).
-
-In order to speedup compilation it is recommended to use `make -j$(getconf
-_NPROCESSORS_ONLN)` instead of `make` to compile on all available processor
-cores. The build machine can also be configured to do this automatically by
-adding `export MAKEFLAGS="-j(getconf _NPROCESSORS_ONLN)"` to your shell config
-(e.g. `~/.bashrc`).
-
-#### 3.2.a Compiling as 64 bit libraries (recommended for most users)
-
-    cd $HOME/Kodi
-    cd tools/depends
-    ./bootstrap
-    ./configure --host=x86_64-apple-darwin
-    make
-
-#### 3.2.b Compiling as 32 bit libraries
-
-    cd $HOME/Kodi
-    cd tools/depends
-    ./bootstrap
-    ./configure --host=i386-apple-darwin
-    make
-
-#### 3.3.c Advanced topics
-
-The dependencies are built into `tools/depends` and installed into
-`/Users/Shared/xbmc-depends`.
-
-**ADVANCED developers only**: If you want to specify an macOS SDK version (if
-multiple versions are installed) - then append it to the configure line
-above. The example below would use the macOS SDK 10.9:
-
-    ./configure --host=arm-apple-darwin --with-sdk=10.9
-
-### 3.3 Compile Kodi binary addons
-
-Kodi maintains a set of binary addons (PVR clients, Visualizations
-plugins and more). They can be built as shown below:
-
-    cd $HOME/Kodi
-    cd tools/depends
-    make -C target/binary-addons
-
-**NOTE**: If you only want to build specific addons you can specify like this:
-
-    cd $HOME/Kodi
-    cd tools/depends
-    make -C target/binary-addons ADDONS="pvr.hts pvr.dvblink"
-
-## 4 How to compile Kodi
-
-### 4.1 Using Xcode (or xcodebuild)
-
-#### 4.1.1 Generate CMake project files
-
-Before you can use Xcode to build Kodi, the Xcode project has to be generated
-with CMake. Note that CMake is compiled as parts of the depends doesn't have
-to be installed separately. Also a Toolchain-file has been generated with is
-used to configure CMake.
-
-    mkdir $HOME/Kodi/build
-    cd $HOME/Kodi/build
-    /Users/Shared/xbmc-depends/x86_64-darwin15.6.0-native/bin/cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=/Users/Shared/xbmc-depends/macosx10.12_x86_64-target/share/Toolchain.cmake ..
-
-The toolchain file location differs depending on your macOS and SDK version and
-you have to replace `x86_64-darwin15.6.0-native` and `macosx10.12_x86_64` in the filename above with the correct
-file on your system. Check the directory content to get the filename.
-
-#### 4.1.2 Compilation using Xcode
-
-Start Xcode and open the Kodi project (kodi.xcodeproj) located in
-`$HOME/Kodi/build`.
-
-If you have selected a specific OSX SDK Version in step 3.2 then you might need
-to adapt the active target to use the same OSX SDK version. Else build will fail.
-
-The build process will take a long time when building the first time.
-You can see the progress in "Build Results". There are a large number of static
-and dynamic libraries that will need to be built. Once these are built,
-subsequent builds will be faster.
-
-After the build, you can ether run Kodi for Mac from Xcode or run it from
-the command-line. If you run it from the command-line:
-
-    $HOME/Kodi/build/Debug/kodi.bin
-
-Or the release version:
-
-    $HOME/Kodi/build/Release/kodi.bin
-
-Alternatively, you can also build via Xcode from the command-line with
-xcodebuild, triggered by CMake:
-
-    cd $HOME/Kodi/build
-    cmake --build . --config "Debug" -- -verbose -jobs $(getconf _NPROCESSORS_ONLN)
-
-You can specify `Release` instead of `Debug` as a configuration.
-
-### 4.2 Compilation using command-line (make)
-
-CMake is also able to generate a Makefile based project that can be used to
-compile with make:
-
-    cd $HOME/Kodi
-    make -C tools/depends/target/cmakebuildsys
-    make -C build
-
-## 5 Packaging
-
-CMake generate a target called `dmg` which will package Kodi.app for
-distribution.
-
-After Kodi has been build, the target ca be triggered with by selecting it in
-Xcode, or if using makefiles by issuing:
-
-    make dmg
-
-## 6 References
-
-- [cmake/README.md](https://github.com/xbmc/xbmc/tree/master/cmake/README.md)
-- [tools/depends/README](https://github.com/xbmc/xbmc/tree/master/tools/depends/README)
-- [MAC OS X section in forum.kodi.tv](http://forum.kodi.tv/forumdisplay.php?fid=56)
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.pvr kodi-18.0+git20180704.0202-f0dda3a/docs/README.pvr
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.pvr	2015-06-14 19:32:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.pvr	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-TOC
-1. Getting the source code
-2. How to compile
-
------------------------------------------------------------------------------
-1. The source for PVR addons
------------------------------------------------------------------------------
-
-PVR add-ons source is not included in Kodi's tree directly.
-
-The source code can be found at: https://github.com/kodi-pvr/
-
------------------------------------------------------------------------------
-2. How to compile
------------------------------------------------------------------------------
-
-Consult README.linux for compile instructions.
-See the PVR portion under - 4.4 Binary addons
\ No newline at end of file
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.raspberrypi kodi-18.0+git20180704.0202-f0dda3a/docs/README.raspberrypi
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.raspberrypi	2018-06-25 00:01:15.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.raspberrypi	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-TOC
-1. Introduction
-2. Building Kodi for the Raspberry Pi
-3. Building Kodi using buildroot environment
-
------------------------------------------------------------------------------
-1. Introduction
------------------------------------------------------------------------------
-
-You can build Kodi for the Raspberry Pi in different ways. This document
-shows two different methods. The first assumes that you want to run Kodi
-on top of an image like Raspbian, the second shows how to create an entire
-image which includes Linux.
-
------------------------------------------------------------------------------
-2. Building Kodi for the Raspberry Pi
------------------------------------------------------------------------------
-
-The following steps were tested with Ubuntu 16.04 x64. (Note that building on
-a 32 bit machine requires slightly different setting).
-
-The following commands build for newer Raspberry Pi 2 generation. In order to
-build for the first Raspberry Pi, the commands have to be adapted to use
-`--with-platform=raspberry-pi` instead of `--with-platform=raspberry-pi2`.
-
-    $ sudo apt-get install git autoconf curl g++ zlib1g-dev libcurl4-openssl-dev gawk gperf libtool autopoint swig default-jre bison make
-
-    $ RPI_DEV=$PWD
-    $ git clone https://github.com/raspberrypi/tools
-    $ git clone https://github.com/raspberrypi/firmware
-    $ git clone https://github.com/xbmc/xbmc
-
-    $ mkdir kodi-bcm
-    $ cd xbmc/tools/depends
-    $ ./bootstrap
-    $ ./configure --host=arm-linux-gnueabihf \
-       --prefix=$RPI_DEV/kodi-bcm \
-       --with-toolchain=$RPI_DEV/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf \
-       --with-firmware=$RPI_DEV/firmware \
-       --with-platform=raspberry-pi2 \
-       --disable-debug
-
-    $ make
-    $ cd ../..
-
-    $ make -C tools/depends/target/cmakebuildsys
-    $ cd build
-    $ make
-    $ make install
-
------------------------------------------------------------------------------
-3. Building Kodi using buildroot environment
------------------------------------------------------------------------------
-
-Installing and setting up the buildroot environment:
-
-Create a top level directory where you checkout Kodi and buildroot.
-
-For example :
-
-    $ mkdir /opt/kodi-raspberrypi
-    $ cd /opt/kodi-raspberrypi
-
-Checkout kodi :
-
-    $ git clone https://github.com/xbmc/xbmc.git kodi
-
-Checkout buildroot :
-
-    $ git clone https://github.com/huceke/buildroot-rbp.git
-
-    $ cd /opt/kodi-raspberrypi/buildroot-rbp
-
-Follow the instructions in README.rbp how to build the system and Kodi.
-
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.RaspberryPi.md kodi-18.0+git20180704.0202-f0dda3a/docs/README.RaspberryPi.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.RaspberryPi.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.RaspberryPi.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,136 @@
+![Kodi Logo](resources/banner_slim.png)
+
+# Raspberry Pi build guide
+This guide has been tested with Ubuntu 16.04 (Xenial) x86_64 and 18.04 (Bionic). It is meant to cross-compile Kodi for the Raspberry Pi using **[Kodi's unified depends build system](../tools/depends/README.md)**. Please read it in full before you proceed to familiarize yourself with the build procedure.
+
+If you're looking to build Kodi natively using **[Raspbian](https://www.raspberrypi.org/downloads/raspbian/)**, you should follow the **[Ubuntu guide](README.Ubuntu.md)** instead. Several other distributions have **[specific guides](README.md)** and a general **[Linux guide](README.Linux.md)** is also available.
+
+## Table of Contents
+1. **[Document conventions](#1-document-conventions)**
+2. **[Install the required packages](#2-install-the-required-packages)**
+3. **[Get the source code](#3-get-the-source-code)**  
+  3.1. **[Get Raspberry Pi tools and firmware](#31-get-raspberry-pi-tools-and-firmware)**
+4. **[Build tools and dependencies](#4-build-tools-and-dependencies)**
+5. **[Build Kodi](#5-build-kodi)**
+
+## 1. Document conventions
+This guide assumes you are using `terminal`, also known as `console`, `command-line` or simply `cli`. Commands need to be run at the terminal, one at a time and in the provided order.
+
+This is a comment that provides context:
+```
+this is a command
+this is another command
+and yet another one
+```
+
+**Example:** Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+Commands that contain strings enclosed in angle brackets denote something you need to change to suit your needs.
+```
+git clone -b <branch-name> https://github.com/xbmc/xbmc kodi
+```
+
+**Example:** Clone Kodi's current Krypton branch:
+```
+git clone -b Krypton https://github.com/xbmc/xbmc kodi
+```
+
+Several different strategies are used to draw your attention to certain pieces of information. In order of how critical the information is, these items are marked as a note, tip, or warning. For example:
+ 
+**NOTE:** Linux is user friendly... It's just very particular about who its friends are.  
+**TIP:** Algorithm is what developers call code they do not want to explain.  
+**WARNING:** Developers don't change light bulbs. It's a hardware problem.
+
+**[back to top](#table-of-contents)** | **[back to section top](#1-document-conventions)**
+
+## 2. Install the required packages
+Install build dependencies needed to cross-compile Kodi for the Raspberry Pi:
+```
+sudo apt install autoconf bison build-essential curl default-jdk gawk git gperf libcurl4-openssl-dev zlib1g-dev
+```
+
+**[back to top](#table-of-contents)**
+
+## 3. Get the source code
+Change to your `home` directory:
+```
+cd $HOME
+```
+
+Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+### 3.1. Get Raspberry Pi tools and firmware
+Clone Raspberry Pi tools:
+```
+git clone https://github.com/raspberrypi/tools --depth=1
+```
+
+Clone Raspberry Pi firmware:
+```
+git clone https://github.com/raspberrypi/firmware --depth=1
+```
+
+**[back to top](#table-of-contents)**
+
+## 4. Build tools and dependencies
+Create target directory:
+```
+mkdir $HOME/kodi-rpi
+```
+
+Prepare to configure build:
+```
+cd $HOME/kodi/tools/depends
+./bootstrap
+```
+
+**TIP:** Look for comments starting with `Or ...` and only execute the command(s) you need.
+
+Configure build for Raspberry Pi 1:
+```
+./configure --host=arm-linux-gnueabihf --prefix=$HOME/kodi-rpi --with-toolchain=$HOME/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf --with-firmware=$HOME/firmware --with-platform=raspberry-pi --disable-debug
+```
+
+Or configure build for Raspberry Pi 2 and 3:
+```
+./configure --host=arm-linux-gnueabihf --prefix=$HOME/kodi-rpi --with-toolchain=$HOME/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf --with-firmware=$HOME/firmware --with-platform=raspberry-pi2 --disable-debug
+```
+
+Build tools and dependencies:
+```
+make -j$(getconf _NPROCESSORS_ONLN)
+```
+
+**TIP:** By adding `-j<number>` to the make command, you can choose how many concurrent jobs will be used and expedite the build process. It is recommended to use `-j$(getconf _NPROCESSORS_ONLN)` to compile on all available processor cores. The build machine can also be configured to do this automatically by adding `export MAKEFLAGS="-j(getconf _NPROCESSORS_ONLN)"` to your shell config (e.g. `~/.bashrc`).
+
+**[back to top](#table-of-contents)** | **[back to section top](#4-build-tools-and-dependencies)**
+
+## 5. Build Kodi
+Configure CMake build:
+```
+cd $HOME/kodi
+make -C tools/depends/target/cmakebuildsys
+```
+
+Build Kodi:
+```
+cd $HOME/kodi/build
+make -j$(getconf _NPROCESSORS_ONLN)
+```
+
+Install to target directory:
+```
+make install
+```
+
+After the build process is finished, you can find the files ready to be installed inside `$HOME/kodi-rpi`. Look for a directory called `raspberry-pi-release` or `raspberry-pi2-release`.
+
+**[back to top](#table-of-contents)**
+
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.ubuntu kodi-18.0+git20180704.0202-f0dda3a/docs/README.ubuntu
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.ubuntu	2018-06-28 00:01:37.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.ubuntu	1970-01-01 00:00:00.000000000 +0000
@@ -1,129 +0,0 @@
-TOC
-1. Introduction
-2. Getting the source code
-3. Installing the required Ubuntu packages
-4. How to compile
-5. Uninstalling
-
------------------------------------------------------------------------------
-1. Introduction
------------------------------------------------------------------------------
-
-A graphics-adapter with OpenGL acceleration is highly recommended.
-24/32 bitdepth is required along with OpenGL.
-
-Note to new Linux users.
-All lines that are prefixed with the '$' character are commands, that need to be typed
-into a terminal window / console (similar to the command prompt for Windows).
-Note that the '$' character itself should NOT be typed as part of the command.
-
------------------------------------------------------------------------------
-2. Getting the source code
------------------------------------------------------------------------------
-
-.0  $ cd $HOME
-.1  $ git clone git://github.com/xbmc/xbmc.git kodi
-
-Note: You can clone any specific branch.
-
-.1  $ git clone -b <branch> git://github.com/xbmc/xbmc.git kodi
-
------------------------------------------------------------------------------
-3. Installing the required Ubuntu packages
------------------------------------------------------------------------------
-
-Two methods exist to install the required Ubuntu packages:
-
-[NOTICE] For supported older Ubuntu versions, some packages might be outdated.
-         For those, you can either compile them manually, or use our backports
-         available from our official stable PPA:
-
-         http://launchpad.net/~team-xbmc/+archive/ppa
-
------------------------------------------------------------------------------
-3a. Use a single command to get all build dependencies
------------------------------------------------------------------------------
-[NOTICE] Supported on Ubuntu >= 16.04
-
-You can get all build dependencies used for building the packages on the PPA
-
-Add the unstable PPA:
-
-For >= 16.04 lts:
-    $ sudo apt-get install software-properties-common
-    $ sudo add-apt-repository -s ppa:team-xbmc/xbmc-nightly
-
-Add build-depends PPA:
-    $ sudo add-apt-repository ppa:team-xbmc/xbmc-ppa-build-depends
-
-Here is the magic command to get the build dependencies (used to compile the version on the PPA).
-    $ sudo apt-get update
-    $ sudo apt-get build-dep kodi
-
-Optional: If you do not want Kodi to be installed via PPA, you can removed the PPAs again:
-    $ sudo add-apt-repository -r ppa:team-xbmc/xbmc-nightly
-    $ sudo add-apt-repository -r ppa:team-xbmc/xbmc-ppa-build-depends
-
-Note: Do not use "aptitude" for the build-dep command. It doesn't resolve everything properly.
-      For developers and anyone else who compiles frequently it is recommended to use ccache
-    $ sudo apt-get install ccache
-
-Tip: For those with multiple computers at home is to try out distcc
-    (fully unsupported from Kodi of course)
-    $ sudo apt-get install distcc
-
------------------------------------------------------------------------------
-3b. Alternative: Manual dependency installation
------------------------------------------------------------------------------
-
-For Ubuntu (all versions >= 16.04):
-    $ sudo apt-get install automake bison build-essential cmake curl cvs \
-      default-jre fp-compiler gawk gdc gettext git-core gperf libasound2-dev libass-dev \
-      libbz2-dev libcap-dev libcdio-dev libcurl3 \
-      libcurl4-openssl-dev libdbus-1-dev libfontconfig-dev libegl1-mesa-dev libfreetype6-dev \
-      libfribidi-dev libgif-dev libiso9660-dev libjpeg-dev liblzo2-dev \
-      libmicrohttpd-dev libmysqlclient-dev libnfs-dev \
-      libpcre3-dev libplist-dev libpng-dev libpulse-dev libsmbclient-dev \
-      libsqlite3-dev libssl-dev libtinyxml-dev libtool libudev-dev libusb-dev \
-      libva-dev libvdpau-dev libxml2-dev libxmu-dev libxrandr-dev \
-      libxrender-dev libxslt1-dev libxt-dev mesa-utils nasm pmount python-dev python-imaging \
-      python-sqlite rapidjson-dev swig uuid-dev yasm zlib1g-dev liblirc-dev
-
-[NOTICE] crossguid / libcrossguid-dev all Linux distributions.
-Kodi now requires crossguid which is not available in Ubuntu repositories at this time.
-If build-deps PPA doesn't provide a pre-packaged version for your distribution, see (1.) below.
-
-Use prepackaged from the Kodi build-depends PPA.
-0.  $ sudo apt-get install libcrossguid-dev
-
-We also supply a Makefile in tools/depends/target/crossguid
-to make it easy to install into /usr/local.
-1.  $ make -C tools/depends/target/crossguid PREFIX=/usr/local
-
-[NOTICE] libfmt / libfmt3-dev all Linux distributions.
-Kodi now requires libfmt which is not available in Ubuntu repositories at this time.
-If build-deps PPA doesn't provide a pre-packaged version for your distribution, we supply a
-Makefile in tools/depends/target/libfmt to make it easy to install into /usr/local.
-1.  $ make -C tools/depends/target/libfmt PREFIX=/usr/local
-
-Unless you are proficient with how Linux libraries and versions work, do not
-try to provide it yourself, as you will likely mess up for other programs.
-
------------------------------------------------------------------------------
-4. How to compile
------------------------------------------------------------------------------
-See README.linux
-
------------------------------------------------------------------------------
-4.1. Test Suite
------------------------------------------------------------------------------
-See README.linux
-
------------------------------------------------------------------------------
-5. Uninstalling
------------------------------------------------------------------------------
-Remove any PPA installed Kodi.
-    $ sudo apt-get remove kodi* xbmc*
-
-See README.linux/Uninstalling for removing compiled versions of Kodi.
-EOF
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.Ubuntu.md kodi-18.0+git20180704.0202-f0dda3a/docs/README.Ubuntu.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.Ubuntu.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.Ubuntu.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,152 @@
+![Kodi Logo](resources/banner_slim.png)
+
+# Debian/Ubuntu build guide
+This guide has been tested with Ubuntu 16.04.4 (Xenial) x86_64 and 18.04 (Bionic). Please read it in full before you proceed to familiarize yourself with the build procedure.
+
+Several other distributions have **[specific build guides](README.md)** and a general **[Linux build guide](README.Linux.md)** is also available.
+
+## Table of Contents
+1. **[Document conventions](#1-document-conventions)**
+2. **[Get the source code](#2-get-the-source-code)**
+3. **[Install the required packages](#3-install-the-required-packages)**  
+  3.1. **[Get build dependencies automagically](#31-get-build-dependencies-automagically)**  
+  3.2. **[Get build dependencies manually](#32-get-build-dependencies-manually)**
+4. **[Build Kodi](#4-build-kodi)**
+
+## 1. Document conventions
+This guide assumes you are using `terminal`, also known as `console`, `command-line` or simply `cli`. Commands need to be run at the terminal, one at a time and in the provided order.
+
+This is a comment that provides context:
+```
+this is a command
+this is another command
+and yet another one
+```
+
+**Example:** Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+Commands that contain strings enclosed in angle brackets denote something you need to change to suit your needs.
+```
+git clone -b <branch-name> https://github.com/xbmc/xbmc kodi
+```
+
+**Example:** Clone Kodi's current Krypton branch:
+```
+git clone -b Krypton https://github.com/xbmc/xbmc kodi
+```
+
+Several different strategies are used to draw your attention to certain pieces of information. In order of how critical the information is, these items are marked as a note, tip, or warning. For example:
+ 
+**NOTE:** Linux is user friendly... It's just very particular about who its friends are.  
+**TIP:** Algorithm is what developers call code they do not want to explain.  
+**WARNING:** Developers don't change light bulbs. It's a hardware problem.
+
+**[back to top](#table-of-contents)** | **[back to section top](#1-document-conventions)**
+
+## 2. Get the source code
+Make sure `git` is installed:
+```
+sudo apt install git
+```
+
+Change to your `home` directory:
+```
+cd $HOME
+```
+
+Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+**[back to top](#table-of-contents)**
+
+## 3. Install the required packages
+You can install the required packages using one of two methods: automagically or manually. Please use the former whenever possible.
+
+**WARNING:** Oldest supported Ubuntu version is 16.04 (Xenial). It is possible to build on older Ubuntu releases but due to outdated packages it will require considerable fiddling. Sorry, you're on your own if you decide to go down that particular rabbit hole.
+
+### 3.1. Get build dependencies automagically
+Add Kodi's *nightly* PPA to grab dependencies:
+```
+sudo add-apt-repository -s ppa:team-xbmc/xbmc-nightly
+```
+
+If you're using Ubuntu 16.04, *build-depends* PPA is also required:
+```
+sudo add-apt-repository ppa:team-xbmc/xbmc-ppa-build-depends
+sudo apt update
+```
+
+Super-duper magic command to get the build dependencies:
+```
+sudo apt build-dep kodi
+```
+
+**WARNING:** Do not use `aptitude` for the `build-dep` command. It doesn't resolve everything properly.
+
+If at a later point you decide you do not want Kodi's PPAs on your system, removing them is as easy as:
+```
+sudo add-apt-repository -r ppa:team-xbmc/xbmc-nightly
+sudo add-apt-repository -r ppa:team-xbmc/xbmc-ppa-build-depends
+```
+
+**NOTE:** For developers and anyone else who builds frequently it is recommended to install `ccache` to expedite subsequent builds of Kodi.
+
+You can install it with:
+```
+sudo apt install ccache
+```
+
+**TIP:** If you have multiple computers at home, `distcc` will distribute build workloads of C and C++ code across several machines on a network. Team Kodi may not be willing to give support if problems arise using such a build configuration.
+
+You can install it with:
+```
+sudo apt install distcc
+```
+
+### 3.2. Get build dependencies manually
+If you get a `package not found` type of message with the below command, remove the offending package(s) from the install list and reissue the command. Take a note of the missing dependencies and, after a successful step completion, **[build the missing dependencies manually](README.Linux.md#31-build-missing-dependencies)**.
+
+Install build dependencies manually:
+```
+sudo apt install debhelper autoconf automake autopoint gettext autotools-dev cmake curl default-jre doxygen gawk gcc gdc gperf libasound2-dev libass-dev libavahi-client-dev libavahi-common-dev libbluetooth-dev libbluray-dev libbz2-dev libcdio-dev libp8-platform-dev libcrossguid-dev libcurl4-openssl-dev libcwiid-dev libdbus-1-dev libegl1-mesa-dev libenca-dev libflac-dev libfontconfig-dev libfreetype6-dev libfribidi-dev libgcrypt-dev libgif-dev libgles2-mesa-dev libgl1-mesa-dev libglu1-mesa-dev libgnutls28-dev libgpg-error-dev libiso9660-dev libjpeg-dev liblcms2-dev libltdl-dev liblzo2-dev libmicrohttpd-dev libmysqlclient-dev libnfs-dev libogg-dev libpcre3-dev libplist-dev libpng-dev libpulse-dev libshairplay-dev libsmbclient-dev libsqlite3-dev libssl-dev libtag1-dev libtiff5-dev libtinyxml-dev libtool libudev-dev libva-dev libvdpau-dev libvorbis-dev libxmu-dev libxrandr-dev libxslt1-dev libxt-dev lsb-release python-dev python-pil rapidjson-dev swig unzip uuid-dev yasm zip zlib1g-dev
+```
+
+**WARNING:** Make sure you copy paste the entire line or you might receive an error or miss a few dependencies.
+
+If you're using Ubuntu 16.04, you also need to install:
+```
+sudo apt install libcec4-dev libfmt3-dev liblircclient-dev
+```
+
+If you're using Ubuntu 18.04, you also need to install:
+```
+sudo apt install libcec-dev libfmt-dev liblirc-dev
+```
+
+Building for Wayland requires some extra packages:
+```
+sudo apt install libglew-dev libwayland-dev libxkbcommon-dev waylandpp-dev wayland-protocols
+```
+
+Similarly, building for GBM also requires some extra packages:
+```
+sudo apt install libgbm-dev libinput-dev libxkbcommon-dev
+```
+
+Optional packages that you might want to install for extra functionality (generating doxygen documentation, for instance):
+```
+sudo apt install doxygen libcap-dev libsndio-dev libmariadbd-dev
+```
+
+**[back to top](#table-of-contents)**
+
+## 4. Build Kodi
+See the general **[Linux build guide](README.Linux.md)** for reference.
+
+**[back to top](#table-of-contents)**
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/README.Windows.md kodi-18.0+git20180704.0202-f0dda3a/docs/README.Windows.md
--- kodi-18.0+git20180703.0201-a44e6e2/docs/README.Windows.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/README.Windows.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,242 @@
+![Kodi Logo](resources/banner_slim.png)
+
+# Windows build guide
+This guide has been tested with Windows 10 Pro x64, version 1709, build 16299.334. Please read it in full before you proceed to familiarize yourself with the build procedure.
+
+## Table of Contents
+1. **[Document conventions](#1-document-conventions)**
+2. **[Prerequisites](#2-prerequisites)**
+3. **[Get the source code](#3-get-the-source-code)**
+4. **[Set up the build environment](#4-set-up-the-build-environment)**
+5. **[Build Kodi automagically](#5-build-kodi-automagically)**
+6. **[Build Kodi manually](#6-build-kodi-manually)**
+
+## 1. Document conventions
+This guide assumes you are using `Developer Command Prompt for VS 2017`, also known as `terminal`, `console`, `command-line` or simply `cli`. Commands need to be run at the terminal, one at a time and in the provided order.
+
+This is a comment that provides context:
+```
+this is a command
+this is another command
+and yet another one
+```
+
+**Example:** Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+Commands that contain strings enclosed in angle brackets denote something you need to change to suit your needs.
+```
+git clone -b <branch-name> https://github.com/xbmc/xbmc kodi
+```
+
+**Example:** Clone Kodi's current Krypton branch:
+```
+git clone -b Krypton https://github.com/xbmc/xbmc kodi
+```
+
+Several different strategies are used to draw your attention to certain pieces of information. In order of how critical the information is, these items are marked as a note, tip, or warning. For example:
+ 
+**NOTE:** Linux is user friendly... It's just very particular about who its friends are.  
+**TIP:** Algorithm is what developers call code they do not want to explain.  
+**WARNING:** Developers don't change light bulbs. It's a hardware problem.
+
+**[back to top](#table-of-contents)** | **[back to section top](#1-document-conventions)**
+
+## 2. Prerequisites
+To build Kodi:
+* **[CMake](https://cmake.org/download/)**
+* **[Git for Windows](https://gitforwindows.org/)**
+* **[Java Runtime Environment (JRE)](http://www.oracle.com/technetwork/java/javase/downloads/index.html)**
+* **[Nullsoft scriptable install system (NSIS)](http://nsis.sourceforge.net/Download)** (Only needed if you want to generate an installer file)
+* **[Visual Studio 2017](https://www.visualstudio.com/downloads/)** (Community Edition is fine)
+
+To run Kodi you need a relatively recent CPU with integrated GPU or discrete GPU with up-to-date graphics device-drivers installed from the manufacturer's website.
+* **[AMD](https://support.amd.com/en-us/download)**
+* **[Intel](https://downloadcenter.intel.com/product/80939/Graphics-Drivers)**
+* **[NVIDIA](http://www.nvidia.com/Download/index.aspx)**
+
+### CMake install notes
+All install screens should remain at their default values with the exception of the following.
+* Under **Install options** change default to `Add CMake to system PATH for all users` or `Add CMake to system PATH for current user` (whichever you prefer).
+
+### Git for Windows install notes
+All install screens should remain at their default values with the exception of the following two.
+* Under **Choosing the default editor used by Git** change default to `Use Notepad++ as Git's default editor` or your favorite editor.
+* Under **Adjust your PATH environment** change default to `Use Git and optional Unix tools from the Windows Command Prompt`.
+
+### JRE install notes
+Default options are fine.
+After install finishes, add java's executable file path to your `PATH` **[environment variable](http://www.java.com/en/download/help/path.xml)**. Should be similar to `C:\Program Files\Java\jre-10\bin`.
+
+### NSIS install notes
+Default options are fine.
+
+### Visual Studio 2017 install notes
+Start the VS2017 installer and click `Individual components`.
+* Under **Compilers, build tools and runtimes** select
+  * `Msbuild`
+  * `VC++ 2017 v141 toolset (x86,x64)`
+  * `Visual C++ 2017 Redistributable Update`
+  * `Visual C++ compilers and libraries for ARM`
+  * `Visual C++ compilers and libraries for ARM64`
+  * `Visual C++ runtime for UWP`
+  * `Windows Universal CRT SDK`
+* Under **Development activities** select
+  * `Visual Studio C++ core features`
+* Under **SDKs, libraries, and frameworks** select
+  * `Windows 10 SDK (10.0.16299.0) for Desktop C++ [x86 and x64]`
+  * `Windows 10 SDK (10.0.16299.0) for UWP: C++`
+
+Hit `Install`. Yes, it will download and install almost 7GB of stuff.
+
+This is all you need to do a *normal* Kodi build for 32 or 64bit. Building for UWP (Universal Windows Platform) requires the above listed and quite a lot more.
+
+Under `Workloads` select
+ * `Universal Windows Platform development`
+ * `Desktop development with C++`
+
+Hit `Install`. It will download and install an extra 12GB of whatever for a grand total of almost 20GB. Yes, seriously!
+
+**[back to top](#table-of-contents)** | **[back to section top](#2-prerequisites)**
+
+## 3. Get the source code
+Change to your `home` directory:
+```
+cd %userprofile%
+```
+
+Clone Kodi's current master branch:
+```
+git clone https://github.com/xbmc/xbmc kodi
+```
+
+**[back to top](#table-of-contents)**
+
+## 4. Set up the build environment
+To set up the build environment, several scripts must be called.
+
+**WARNING:** The scripts may fail if you have a space in the path to the bat files.
+
+Kodi can be built as either a normal 32bit or 64bit program, UWP 32bit and 64bit and UWP ARM 32bit. Unless there is a reason to prefer 32bit builds, we advise you to build Kodi for 64bit.
+
+**TIP:** Look for comments starting with `Or ...` and only execute the command(s) you need.
+
+Change to the 64bit build directory (**recommended**):
+```
+cd %userprofile%\kodi\tools\buildsteps\windows\x64
+```
+
+Or change to the 32bit build directory:
+```
+cd %userprofile%\kodi\tools\buildsteps\windows\win32
+```
+
+Or change to the UWP 64bit build directory:
+```
+cd %userprofile%\kodi\tools\buildsteps\windows\x64-uwp
+```
+
+Or change to the UWP 32bit build directory:
+```
+cd %userprofile%\kodi\tools\buildsteps\windows\win32-uwp
+```
+
+Or change to the UWP ARM 32bit build directory:
+```
+cd %userprofile%\kodi\tools\buildsteps\windows\arm-uwp
+```
+
+Download dependencies:
+```
+download-dependencies.bat
+```
+**TIP:** Look for the `All formed packages ready!` success message. If you see the message `ERROR: Not all formed packages are ready!`, execute the command again until you see the success message.
+
+Download and setup the build environment for libraries:
+```
+download-msys2.bat
+```
+
+Build FFmpeg:
+```
+make-mingwlibs.bat
+```
+
+**[back to top](#table-of-contents)** | **[back to section top](#4-set-up-the-build-environment)**
+
+## 5. Build Kodi automagically
+If all you want is to build a Kodi package ready to install, execute the command below and you're done. If you want to find out more about building, ignore this step and continue reading. Or execute the command below, grab some coffee and keep reading. Building takes a while anyway.
+
+Build a package ready to install:
+```
+BuildSetup.bat
+```
+
+*Normal* 32bit and 64bit builds generate an `exe` file ready to run, located at `%userprofile%\kodi\kodi-build\Debug` or `%userprofile%\kodi\kodi-build\Release`, depending on the build config. An installer `exe` file, located at `%userprofile%\kodi\project\Win32BuildSetup`, is also generated.
+
+UWP builds generate `appx`, `appxsym` and `cer` files, located at `%userprofile%\kodi\`. You can install them following this **[guide](https://kodi.wiki/view/HOW-TO:Install_Kodi_for_Universal_Windows_Platform)**.
+
+**[back to top](#table-of-contents)**
+
+## 6. Build Kodi manually
+Change to your `home` directory:
+```
+cd %userprofile%
+```
+
+Create an out-of-source build directory:
+```
+mkdir kodi-build
+```
+
+Change to build directory:
+```
+cd kodi-build
+```
+
+Configure build for 64bit (**recommended**):
+```
+cmake -G "Visual Studio 15 Win64" -T host=x64 %userprofile%\kodi
+```
+
+Or configure build for 32bit:
+```
+cmake -G "Visual Studio 15" -T host=x64 %userprofile%\kodi
+```
+
+Or configure build for UWP 64bit:
+```
+cmake -G "Visual Studio 15 Win64" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 -T host=x64 %userprofile%\kodi
+```
+
+Or configure build for UWP 32bit:
+```
+cmake -G "Visual Studio 15" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 -T host=x64 %userprofile%\kodi
+```
+
+Or configure build for UWP ARM 32bit:
+```
+cmake -G "Visual Studio 15 ARM" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 -T host=x64 %userprofile%\kodi
+```
+
+**WARNING:** `-T host=x64` requires CMake version >= 3.8. If your version is older, drop `-T host=x64` from the command.
+
+Build Kodi:
+Build a `Debug` binary:
+```
+cmake --build . --config "Debug"
+```
+
+Or build a `Release` binary:
+```
+cmake --build . --config "Release"
+```
+
+*Normal* 32bit and 64bit builds generate an `exe` file ready to run, located at `%userprofile%\kodi-build\Debug` or `%userprofile%\kodi-build\Release`, depending on the build config.
+UWP builds generate `appx`, `appxsym` and `cer` files, located inside directories at `%userprofile%\kodi-build\AppPackages\kodi\`. You can install them following this **[guide](https://kodi.wiki/view/HOW-TO:Install_Kodi_for_Universal_Windows_Platform)**.
+
+
+**[back to top](#table-of-contents)** | **[back to section top](#6-build-kodi-manually)**
+
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/resources/android.svg kodi-18.0+git20180704.0202-f0dda3a/docs/resources/android.svg
--- kodi-18.0+git20180703.0201-a44e6e2/docs/resources/android.svg	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/resources/android.svg	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="100" height="100" version="1.1" viewBox="0 0 26.458333 26.458334" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(0 -270.54)">
+  <rect x="-1.4211e-14" y="270.54" width="26.458" height="26.458" fill="#a4c639" stroke-width=".27763"/>
+  <path d="m21.059 281.63c0-0.62897-0.50779-1.1406-1.1391-1.1406-0.63126 0-1.1421 0.50935-1.1421 1.1422v4.7769c0 0.62508 0.51165 1.1421 1.1445 1.1421 0.62818 0 1.1391-0.51705 1.1391-1.1421v-4.7846h-0.0079zm-12.929-0.92221 0.0032 7.4085c0 0.68298 0.54328 1.227 1.2139 1.227h0.82033v2.5312c0 0.63281 0.50933 1.1437 1.1344 1.1437 0.62509 0 1.1321-0.50932 1.1421-1.1328v-2.5312h1.538v2.5312c0 0.63511 0.50933 1.1444 1.1344 1.1444 0.63512 0 1.1437-0.50932 1.1437-1.1499v-2.5312h0.83191c0.67139 0 1.2139-0.54791 1.2139-1.2178v-7.4316l-10.209 6e-3 0.03086 2e-3zm7.4455-2.2611c-0.23923 0-0.43216-0.1928-0.43216-0.43214 0-0.23538 0.19294-0.43063 0.43216-0.43217 0.23923 0 0.43216 0.19688 0.43216 0.43217 0 0.23917-0.19294 0.43214-0.43216 0.43214m-4.6766 0c-0.23923 0-0.43216-0.1928-0.43216-0.43214 0-0.23684 0.19294-0.43063 0.43216-0.43063 0.23923 0 0.43216 0.19688 0.43216 0.43987 0 0.24297-0.19449 0.43757-0.43988 0.43757m4.8541-2.238 0.7941-1.4593c0.04629-0.0811 0.01079-0.17442-0.05866-0.21992-0.08027-0.0347-0.17287-0.0117-0.21916 0.0694l-0.8103 1.4662c-0.66985-0.31253-1.4323-0.48616-2.2303-0.48616-0.79795 0-1.5573 0.16596-2.2318 0.46534l-0.79795-1.4686c-0.04089-0.0755-0.13892-0.10413-0.21452-0.0618-0.07718 0.0347-0.10494 0.13884-0.06175 0.20826l0.79487 1.447c-1.5666 0.80799-2.6238 2.346-2.6238 4.1132h10.285c0-1.7672-1.0557-3.3053-2.6207-4.1132m-9.2127 4.3002c-0.63049 0-1.1421 0.51319-1.1421 1.1445v4.7785c0 0.63281 0.51242 1.1421 1.1452 1.1421 0.62817 0 1.1398-0.50932 1.1398-1.1421v-4.7769c0-0.62897-0.50933-1.1406-1.1344-1.1406" fill="#ffffff" stroke-width=".77172"/>
+ </g>
+</svg>
Binary files /tmp/tmp33JEKE/GdvMXzQCHR/kodi-18.0+git20180703.0201-a44e6e2/docs/resources/banner.png and /tmp/tmp33JEKE/pLCpt9PTkh/kodi-18.0+git20180704.0202-f0dda3a/docs/resources/banner.png differ
Binary files /tmp/tmp33JEKE/GdvMXzQCHR/kodi-18.0+git20180703.0201-a44e6e2/docs/resources/banner_slim.png and /tmp/tmp33JEKE/pLCpt9PTkh/kodi-18.0+git20180704.0202-f0dda3a/docs/resources/banner_slim.png differ
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/resources/fedora.svg kodi-18.0+git20180704.0202-f0dda3a/docs/resources/fedora.svg
--- kodi-18.0+git20180703.0201-a44e6e2/docs/resources/fedora.svg	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/resources/fedora.svg	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="100" height="100" version="1.1" viewBox="0 0 26.458333 26.458334" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <rect x="-1.4211e-14" y="8.5449e-6" width="26.458" height="26.458" fill="#294172" stroke-width=".27763"/>
+ <path id="voice" d="m22.489 13.23c0-5.1145-4.1461-9.2611-9.2602-9.2611-5.1122 0-9.2567 4.1428-9.2602 9.2541v7.1663c0.00273 1.1606 0.94405 2.1001 2.1054 2.1001h7.1587c5.1128-0.0018 9.2567-4.1468 9.2567-9.2602" fill="#ffffff" stroke-width=".069562"/>
+ <path id="in" d="m9.3076 13.825h3.3282v3.3282c0 1.8372-1.491 3.3282-3.3282 3.3282s-3.3282-1.491-3.3282-3.3282 1.491-3.3282 3.3282-3.3282z" fill="none" stroke="#3c6eb4" stroke-width="2.0319"/>
+ <use id="finity" transform="rotate(180 12.628 13.834)" width="100%" height="100%" xlink:href="#in"/>
+ <path id="free" d="m13.654 12.819v4.3369c0 2.4002-1.946 4.3463-4.3463 4.3463-0.36415 0-0.62303-0.04112-0.96015-0.12923-0.49152-0.12863-0.89321-0.53163-0.89339-1.0004 0-0.5666 0.41128-0.9787 1.026-0.9787 0.2926 0 0.39878 0.05618 0.82744 0.05618 1.2654 0 2.2919-1.025 2.2941-2.2904v-1.9934c0-0.17862-0.14515-0.32334-0.32407-0.32334l-1.5071-2.72e-4c-0.56151 0-1.0152-0.44787-1.0152-1.0109-2.996e-4 -0.56656 0.45833-1.0126 1.0259-1.0126" fill="#294172" stroke-width=".069562"/>
+ <use id="dom" transform="rotate(180 12.628 13.834)" width="100%" height="100%" xlink:href="#free"/>
+</svg>
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/resources/freebsd.svg kodi-18.0+git20180704.0202-f0dda3a/docs/resources/freebsd.svg
--- kodi-18.0+git20180703.0201-a44e6e2/docs/resources/freebsd.svg	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/resources/freebsd.svg	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="100" height="100" version="1.1" viewBox="0 0 26.458333 26.458334" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(0 -270.54)">
+  <rect x="-1.4211e-14" y="270.54" width="26.458" height="26.458" fill="#990000" stroke-width=".27763"/>
+  <path d="m22.42 274.83c0.99718 0.99658-1.7672 5.3777-2.2346 5.8453-0.46729 0.46662-1.6543 0.0373-2.6509-0.95968-0.99718-0.99659-1.4267-2.1838-0.95938-2.6512 0.46707-0.46751 4.8479-3.2317 5.8449-2.2345m-13.983 1.0545c-1.5223-0.86371-3.6886-1.8246-4.3776-1.1354-0.6982 0.6979 0.29779 2.9128 1.1707 4.4379a9.3614 9.3614 0 0 1 3.2069 -3.3025" fill="#ffffff" stroke-width=".073821"/>
+  <path d="m20.831 280.03c0.14342 0.48638 0.11767 0.88818-0.11495 1.1204-0.54326 0.54348-2.0108-0.0351-3.3337-1.2941a6.7507 6.7507 0 0 1 -0.27393 -0.25891c-0.47838-0.47853-0.85057-0.98787-1.0886-1.457-0.46335-0.83123-0.57928-1.5654-0.22907-1.9156 0.19085-0.19062 0.4962-0.24258 0.8687-0.17559 0.24289-0.15363 0.52966-0.32476 0.84408-0.50006-1.2786-0.66689-2.7322-1.0435-4.2742-1.0435-5.1145 0-9.2608 4.1456-9.2608 9.2606 0 5.1141 4.1464 9.2602 9.2608 9.2602 5.1146 0 9.2607-4.1461 9.2607-9.2602 0-1.6518-0.43352-3.2006-1.1908-4.5433-0.16366 0.2987-0.3228 0.57233-0.46811 0.80715" fill="#ffffff" stroke-width=".075526"/>
+ </g>
+</svg>
Binary files /tmp/tmp33JEKE/GdvMXzQCHR/kodi-18.0+git20180703.0201-a44e6e2/docs/resources/gitfu/fix_commits_01.png and /tmp/tmp33JEKE/pLCpt9PTkh/kodi-18.0+git20180704.0202-f0dda3a/docs/resources/gitfu/fix_commits_01.png differ
Binary files /tmp/tmp33JEKE/GdvMXzQCHR/kodi-18.0+git20180703.0201-a44e6e2/docs/resources/gitfu/fix_commits_02.png and /tmp/tmp33JEKE/pLCpt9PTkh/kodi-18.0+git20180704.0202-f0dda3a/docs/resources/gitfu/fix_commits_02.png differ
Binary files /tmp/tmp33JEKE/GdvMXzQCHR/kodi-18.0+git20180703.0201-a44e6e2/docs/resources/gitfu/fix_commits_03.png and /tmp/tmp33JEKE/pLCpt9PTkh/kodi-18.0+git20180704.0202-f0dda3a/docs/resources/gitfu/fix_commits_03.png differ
Binary files /tmp/tmp33JEKE/GdvMXzQCHR/kodi-18.0+git20180703.0201-a44e6e2/docs/resources/gitfu/fix_commits_04.png and /tmp/tmp33JEKE/pLCpt9PTkh/kodi-18.0+git20180704.0202-f0dda3a/docs/resources/gitfu/fix_commits_04.png differ
Binary files /tmp/tmp33JEKE/GdvMXzQCHR/kodi-18.0+git20180703.0201-a44e6e2/docs/resources/gitfu/fix_commits_05.png and /tmp/tmp33JEKE/pLCpt9PTkh/kodi-18.0+git20180704.0202-f0dda3a/docs/resources/gitfu/fix_commits_05.png differ
Binary files /tmp/tmp33JEKE/GdvMXzQCHR/kodi-18.0+git20180703.0201-a44e6e2/docs/resources/gitfu/fix_commits_06.png and /tmp/tmp33JEKE/pLCpt9PTkh/kodi-18.0+git20180704.0202-f0dda3a/docs/resources/gitfu/fix_commits_06.png differ
Binary files /tmp/tmp33JEKE/GdvMXzQCHR/kodi-18.0+git20180703.0201-a44e6e2/docs/resources/gitfu/fix_commits_07.png and /tmp/tmp33JEKE/pLCpt9PTkh/kodi-18.0+git20180704.0202-f0dda3a/docs/resources/gitfu/fix_commits_07.png differ
Binary files /tmp/tmp33JEKE/GdvMXzQCHR/kodi-18.0+git20180703.0201-a44e6e2/docs/resources/gitfu/fix_commits_08.png and /tmp/tmp33JEKE/pLCpt9PTkh/kodi-18.0+git20180704.0202-f0dda3a/docs/resources/gitfu/fix_commits_08.png differ
Binary files /tmp/tmp33JEKE/GdvMXzQCHR/kodi-18.0+git20180703.0201-a44e6e2/docs/resources/gitfu/rebase_branch_01.png and /tmp/tmp33JEKE/pLCpt9PTkh/kodi-18.0+git20180704.0202-f0dda3a/docs/resources/gitfu/rebase_branch_01.png differ
Binary files /tmp/tmp33JEKE/GdvMXzQCHR/kodi-18.0+git20180703.0201-a44e6e2/docs/resources/gitfu/rebase_branch_02.png and /tmp/tmp33JEKE/pLCpt9PTkh/kodi-18.0+git20180704.0202-f0dda3a/docs/resources/gitfu/rebase_branch_02.png differ
Binary files /tmp/tmp33JEKE/GdvMXzQCHR/kodi-18.0+git20180703.0201-a44e6e2/docs/resources/gitfu/rebase_branch_03.png and /tmp/tmp33JEKE/pLCpt9PTkh/kodi-18.0+git20180704.0202-f0dda3a/docs/resources/gitfu/rebase_branch_03.png differ
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/resources/ios.svg kodi-18.0+git20180704.0202-f0dda3a/docs/resources/ios.svg
--- kodi-18.0+git20180703.0201-a44e6e2/docs/resources/ios.svg	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/resources/ios.svg	2018-07-04 00:01:50.000000000 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="100" height="100" version="1.1" viewBox="0 0 26.458333 26.458334" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <defs>
+  <clipPath id="clipPath91">
+   <path d="m137.5 6.34h-0.16l-9.44 5.2-0.56-2.16 10.4-5.76h2.48v52h-2.72zm21.52 47.08c-2.29-2.053-4.09-5.08-5.4-9.08s-1.96-8.853-1.96-14.56c0-5.76 0.69-10.68 2.08-14.76s3.29-7.1467 5.72-9.2 5.16-3.08 8.2-3.08c4.64 0 8.29 2.2933 10.96 6.88 2.67 4.587 4 11.067 4 19.44 0 8.907-1.39 15.707-4.16 20.4s-6.67 7.04-11.68 7.04c-2.88 0-5.47-1.027-7.76-3.08zm17.44-5.68c2.24-4.347 3.36-10.52 3.36-18.52 0-7.68-1.08-13.64-3.24-17.88-2.16-4.24-5.21-6.36-9.16-6.36-2.51 0-4.73 0.9467-6.68 2.84-1.95 1.893-3.48 4.707-4.6 8.44s-1.68 8.267-1.68 13.6c0 5.173 0.53 9.6 1.6 13.28s2.53 6.453 4.4 8.32 4.03 2.8 6.48 2.8c4.11 0 7.28-2.173 9.52-6.52zm-174.52-38.44c-0.96-0.96-1.44-2.1867-1.44-3.68s0.48-2.72 1.44-3.68c0.96-0.96 2.1867-1.44 3.68-1.44 1.5467 0 2.8 0.48 3.76 1.44 0.96 0.96 1.44 2.1867 1.44 3.68s-0.48 2.72-1.44 3.68c-0.96 0.96-2.2133 1.44-3.76 1.44-1.4933 0-2.72-0.48-3.68-1.44zm-0.56 7.44h8.56v38.88h-8.56zm28.28 36.28c-3.653-2.32-6.48-5.547-8.48-9.68s-3-8.867-3-14.2c0-5.493 1.04-10.387 3.12-14.68s4.987-7.64 8.72-10.04 8.053-3.6 12.96-3.6c4.8 0 9.027 1.1467 12.68 3.44s6.48 5.52 8.48 9.68c2 4.16 3 8.907 3 14.24 0 5.6-1.013 10.533-3.04 14.8s-4.907 7.587-8.64 9.96-8.107 3.56-13.12 3.56c-4.8 0-9.027-1.16-12.68-3.48zm21.08-6.2c2.347-1.813 4.147-4.307 5.4-7.48s1.88-6.787 1.88-10.84c0-3.947-0.64-7.493-1.92-10.64s-3.08-5.613-5.4-7.4c-2.32-1.7867-5-2.68-8.04-2.68-3.093 0-5.8 0.9067-8.12 2.72-2.32 1.813-4.107 4.32-5.36 7.52s-1.88 6.827-1.88 10.88c0 3.893 0.627 7.413 1.88 10.56s3.053 5.613 5.4 7.4 5.04 2.68 8.08 2.68 5.733-0.907 8.08-2.72zm22.48 6.32 2-7.2c3.733 2.293 7.867 3.44 12.4 3.44 3.2 0 5.733-0.747 7.6-2.24s2.8-3.467 2.8-5.92c0-2.187-0.76-4.027-2.28-5.52s-4.013-2.907-7.48-4.24c-4.747-1.813-8.293-4-10.64-6.56s-3.52-5.547-3.52-8.96c0-2.933 0.76-5.533 2.28-7.8 1.52-2.2667 3.667-4.04 6.44-5.32s5.947-1.92 9.52-1.92c5.013 0 9.07 0.8533 12.16 2.56l-2.16 6.96c-2.987-1.6533-6.4-2.48-10.24-2.48-2.773 0-5.027 0.6533-6.76 1.96-1.733 1.307-2.6 3.027-2.6 5.16 0 1.387 0.307 2.587 0.92 3.6s1.653 1.973 3.12 2.88 3.56 1.92 6.28 3.04c4.64 1.867 8.07 4.093 10.28 6.68s3.32 5.693 3.32 9.32c0 3.147-0.8 5.92-2.4 8.32s-3.87 4.253-6.8 5.56c-2.933 1.307-6.4 1.96-10.4 1.96-5.653 0-10.267-1.093-13.84-3.28z" fill="#000000"/>
+  </clipPath>
+  <clipPath id="clipPath85">
+   <path class="st0" d="m54.357 55.615h-6.0355v-22.289c0-8.2067-2.8962-12.31-8.6898-12.31-1.3423 0-2.5749 0.28164-3.7012 0.84723-1.1215 0.56443-2.1052 1.3272-2.9371 2.2932-0.82947 0.96642-1.4744 2.0643-1.9323 3.2974-0.45563 1.233-0.68935 2.5219-0.68935 3.8617v24.3h-6.033v-23.735c0-3.2186-0.70104-5.8347-2.0924-7.8457-1.3949-2.011-3.4593-3.0177-6.1955-3.0177-1.3926 0-2.6824 0.30734-3.8613 0.92552-1.1799 0.61818-2.1998 1.4492-3.0586 2.494-0.86453 1.0447-1.5281 2.2271-2.0118 3.5415-0.479 1.3143-0.72429 2.6414-0.72429 3.9837v23.654h-6.0332v-28.723c0-1.556 0-3.178-0.11687-4.8687 0-1.6906-0.14022-3.4473-0.24541-5.2701h5.3929v6.3557h0.56068c2.7362-4.7745 6.7586-7.1617 12.069-7.1617 2.5761 0 4.8158 0.69882 6.72 2.0924 1.9043 1.3958 3.2561 3.3 4.0622 5.7127h0.16359c1.3937-2.5755 3.1778-4.5179 5.3497-5.8322 2.1729-1.3143 4.6521-1.9728 7.4443-1.9728 3.8075 0 6.8509 1.4618 9.1314 4.3855 2.2806 2.9237 3.4197 6.9889 3.4197 12.191v23.092zm31.385 0-0.56081-4.988h-0.24528c-2.6298 3.9151-6.5449 5.8728-11.748 5.8728-1.6624 0-3.193-0.26995-4.5867-0.80399-1.3961-0.53638-2.603-1.2991-3.6206-2.2932-1.0164-0.99447-1.8225-2.1585-2.4125-3.5009-0.59586-1.3398-0.88789-2.8169-0.88789-4.4262 0-4.7211 1.9569-8.3007 5.873-10.741 3.915-2.4407 9.6023-3.661 17.056-3.661v-0.88462c0-6.3812-2.9768-9.5744-8.9316-9.5744-3.7011 0-6.9735 0.93838-9.8148 2.8168l-1.4498-4.1847c3.4325-2.1991 7.4818-3.2999 12.15-3.2999 9.4398 0 14.161 5.1762 14.161 15.529v14.888c0 1.8762 0 3.5821 0.11687 5.11 0.11687 1.5306 0.23372 2.9111 0.44395 4.1441h-5.5529zm-1.0398-20.115h-1.2081c-10.406 0-15.61 3.0584-15.61 9.1728 0 2.4151 0.64249 4.21 1.9323 5.3922 1.2862 1.1796 2.895 1.7694 4.8273 1.7694 1.2338 0 2.4535-0.21387 3.6614-0.64389 1.2069-0.43004 2.2806-1.0319 3.2187-1.8101 0.93464-0.77828 1.7034-1.7287 2.2922-2.855 0.59586-1.1265 0.88789-2.3872 0.88789-3.7804zm41.923-12.633c-2.3624-1.2891-5.0972-1.9321-8.2072-1.9321-2.1988 0-4.1591 0.38914-5.8754 1.1674-1.7163 0.77828-3.1649 1.8508-4.3448 3.2185-1.1788 1.3678-2.0924 2.9898-2.735 4.8687-0.6426 1.8763-0.96969 3.9151-0.96969 6.1143 0 2.2525 0.33877 4.3193 1.0048 6.1956 0.66586 1.8763 1.6088 3.4728 2.8167 4.7872 1.2046 1.3143 2.6415 2.3339 4.304 3.0583 1.6625 0.72452 3.513 1.0856 5.5529 1.0856 2.8951 0 5.7656-0.64272 8.6104-1.9321l1.2044 4.6652c-3.0048 1.5025-6.6499 2.2525-10.941 2.2525-2.8459 0-5.4185-0.47094-7.7271-1.4085-2.305-0.93838-4.2911-2.2804-5.9536-4.0219-1.6625-1.744-2.9359-3.8212-3.8216-6.2364-0.88789-2.4151-1.3271-5.1228-1.3271-8.1278 0-3.0583 0.50238-5.8473 1.4872-8.3693 0.99307-2.5194 2.3751-4.6932 4.144-6.5161 1.77-1.8228 3.9032-3.2466 6.3964-4.2635 2.4943-1.0202 5.2432-1.5304 8.2482-1.5304 3.9149 0 7.1336 0.69882 9.6559 2.0922zm53.27 5.0695c0 4.238-0.5725 8.0997-1.7314 11.585-1.1567 3.488-2.7887 6.4906-4.9092 9.0125-2.1181 2.522-4.6685 4.4796-7.6453 5.8729-2.9768 1.3932-6.29 2.0922-9.9351 2.0922-3.4886 0-6.6791-0.68363-9.5742-2.0517-2.8985-1.3678-5.3928-3.2721-7.4852-5.7125-2.0924-2.4407-3.714-5.3389-4.8683-8.6898-1.1567-3.3508-1.7291-7.0397-1.7291-11.064 0-4.182 0.60755-8.0311 1.8109-11.545 1.2069-3.5134 2.8821-6.5159 5.0283-9.0125 2.1462-2.494 4.7059-4.4388 7.6827-5.832 2.9804-1.3932 6.2387-2.0925 9.781-2.0925 3.5389 0 6.7703 0.67194 9.6934 2.011 2.9242 1.3424 5.4057 3.2186 7.4444 5.6338 2.0387 2.4152 3.6206 5.311 4.7468 8.6898 1.1216 3.3786 1.6905 7.0804 1.6905 11.102zm-6.5191 0.32253c0-3.2185-0.43226-6.2084-1.2886-8.972-0.86452-2.7609-2.0515-5.176-3.5796-7.2405-1.5305-2.0643-3.353-3.6737-5.4712-4.8279-2.1181-1.1522-4.4663-1.7288-7.0401-1.7288-2.6287 0-5.0283 0.57728-7.2025 1.7288-2.1731 1.1546-4.0212 2.761-5.5517 4.8279-1.5305 2.0644-2.7233 4.533-3.582 7.4033-0.86464 2.8703-1.2864 5.9949-1.2864 9.3736 0 3.1652 0.43226 6.1296 1.2864 8.8906 0.85283 2.7635 2.0515 5.1633 3.582 7.2024 1.5281 2.039 3.3658 3.6482 5.512 4.8279 2.145 1.1796 4.5049 1.7695 7.0798 1.7695 2.6287 0 5.0284-0.59014 7.2025-1.7695 2.1742-1.1797 4.0225-2.8169 5.553-4.9094 1.5305-2.0922 2.7069-4.5456 3.5411-7.3626 0.82946-2.8169 1.2454-5.8879 1.2454-9.2134zm43.052 12.793c0 2.3059-0.43224 4.4135-1.2886 6.3177-0.85283 1.9042-2.0796 3.5287-3.6614 4.8685-1.5807 1.3424-3.4979 2.3746-5.7527 3.0992-2.2524 0.72452-4.7748 1.0856-7.5636 1.0856-5.5809 0-10.004-1.1522-13.276-3.4601l1.6882-5.0693c3.5925 2.2525 7.5892 3.3786 11.99 3.3786 3.7012 0 6.5716-0.88462 8.6103-2.6541 2.0398-1.7695 3.0586-4.1287 3.0586-7.0805 0-2.7356-0.79443-4.9473-2.374-6.6379-1.5842-1.6881-4.1977-3.2313-7.8463-4.627-9.2798-3.4856-13.919-8.5829-13.919-15.287 0-2.0899 0.40887-4.0221 1.2454-5.7915 0.82949-1.7695 1.999-3.3 3.5014-4.5864 1.5024-1.2864 3.2841-2.2779 5.3484-2.977 2.0644-0.69648 4.304-1.0447 6.72-1.0447 4.665 0 8.4736 0.86008 11.425 2.5753l-1.8506 4.988c-2.6287-1.6626-5.9011-2.4939-9.816-2.4939-3.1112 0-5.6335 0.77828-7.5635 2.3338-1.9324 1.5559-2.895 3.6203-2.895 6.1956 0 1.2331 0.17531 2.3339 0.52578 3.3 0.35043 0.96642 0.92293 1.8763 1.7314 2.7356 0.80608 0.86008 1.8915 1.678 3.2584 2.4533 1.3681 0.77828 3.0995 1.5966 5.1896 2.4535 2.4125 0.96642 4.4793 1.9983 6.1955 3.099 1.7162 1.1008 3.124 2.2932 4.2257 3.5796 1.0982 1.2891 1.8915 2.6975 2.374 4.2254 0.479 1.5203 0.72428 3.1956 0.72428 5.0211z" fill="#000000" stroke-width=".025423"/>
+  </clipPath>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(0 -270.54)">
+  <rect x="-1.4211e-14" y="270.54" width="26.458" height="26.458" fill="#2b2e34" stroke-width=".27763"/>
+  <path transform="matrix(.073349 0 0 .073349 9.0388 282.02)" d="m0 0h11.3v57h-11.3z" clip-path="url(#clipPath91)" fill="#ffffff"/>
+  <rect transform="matrix(.085574 0 0 .085574 -.97945 281.33)" x="131" width="86.5" height="57" clip-path="url(#clipPath85)" fill="#ffffff"/>
+ </g>
+</svg>
Binary files /tmp/tmp33JEKE/GdvMXzQCHR/kodi-18.0+git20180703.0201-a44e6e2/docs/resources/kodi.gif and /tmp/tmp33JEKE/pLCpt9PTkh/kodi-18.0+git20180704.0202-f0dda3a/docs/resources/kodi.gif differ
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/resources/linux.svg kodi-18.0+git20180704.0202-f0dda3a/docs/resources/linux.svg
--- kodi-18.0+git20180703.0201-a44e6e2/docs/resources/linux.svg	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/resources/linux.svg	2018-07-04 00:01:50.000000000 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="100" height="100" version="1.1" viewBox="0 0 26.458333 26.458334" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <defs>
+  <clipPath id="clipPath1114">
+   <path d="m11.986 274.51c-0.1196 0-0.24304 6e-3 -0.3696 0.0175-3.2616 0.25693-2.3966 3.7091-2.446 4.8595-0.0594 0.84336-0.23147 1.5077-0.81095 2.331-0.68287 0.81096-1.6412 2.1219-2.0957 3.4884-0.21449 0.64196-0.31636 1.2994-0.22146 1.9205-0.0301 0.0262-0.05865 0.0525-0.08565 0.10411-0.20061 0.20676-0.34645 0.46372-0.5108 0.64736-0.15354 0.15339-0.37422 0.20618-0.61496 0.30866-0.24153 0.10498-0.50771 0.20764-0.66666 0.52545-0.06944 0.14494-0.10493 0.30324-0.10187 0.46372 0 0.15369 0.020709 0.30942 0.04243 0.41359 0.04474 0.30787 0.0895 0.56249 0.0301 0.74843-0.19137 0.5247-0.21528 0.88428-0.08101 1.1458 0.13427 0.2578 0.41281 0.36188 0.72453 0.46372 0.62577 0.15427 1.4738 0.10411 2.1412 0.4622 0.7145 0.36034 1.4398 0.51776 2.0185 0.36264 0.40586-0.0886 0.74845-0.35724 0.93209-0.72916 0.45293-2e-3 0.94907-0.20763 1.7438-0.2578 0.53935-0.0446 1.2145 0.20619 1.9892 0.1534 0.01925 0.10411 0.04861 0.15369 0.08796 0.2578l0.0023 2e-3c0.3017 0.60029 0.85879 0.87346 1.4537 0.82639 0.5949-0.0464 1.2284-0.41359 1.7415-1.0077 0.48688-0.59026 1.2986-0.83642 1.8349-1.1597 0.26853-0.1534 0.48534-0.36188 0.50077-0.65818 0.01779-0.30863-0.15354-0.62653-0.55092-1.0625v-0.075l-0.0023-2e-3c-0.13117-0.15427-0.19291-0.4128-0.2608-0.71449-0.06559-0.30942-0.14042-0.60647-0.37963-0.80708h-0.0023c-0.04552-0.0417-0.0949-0.0516-0.14506-0.10411-0.04322-0.0295-0.09335-0.0478-0.1466-0.0493 0.33256-0.98608 0.2037-1.9676-0.13348-2.8503-0.41126-1.088-1.1304-2.0355-1.6782-2.6875-0.6142-0.77547-1.216-1.51-1.2045-2.5995 0.02071-1.6605 0.18288-4.7322-2.7346-4.7369zm0.40818 2.6273h0.0099c0.16436 0 0.30555 0.0478 0.45062 0.15281 0.14736 0.10411 0.25462 0.25634 0.33873 0.41128 0.08101 0.19977 0.1219 0.35416 0.12808 0.55865 0-0.0146 0.0047-0.0309 0.0047-0.0455v0.0802c-0.0015-6e-3 -0.0032-0.0117-0.0032-0.0175l-0.0032-0.0175c-0.0015 0.18751-0.04089 0.37267-0.11575 0.54473-0.03628 0.0965-0.09183 0.18518-0.16436 0.25838-0.02246-0.0117-0.04398-0.0233-0.06789-0.0324-0.08101-0.0347-0.15354-0.0493-0.21992-0.10265-0.0548-0.0204-0.11187-0.0394-0.16897-0.051 0.03782-0.0455 0.11187-0.10265 0.14042-0.15281 0.04089-0.0989 0.06328-0.20385 0.06789-0.31018v-0.0146c0.0015-0.10411-0.014-0.2091-0.04707-0.30863-0.03473-0.10411-0.07792-0.15515-0.14121-0.2578-0.0648-0.051-0.12884-0.10178-0.20601-0.10178h-0.01225c-0.07177 0-0.13581 0.0233-0.20216 0.10178-0.07329 0.0726-0.12808 0.15981-0.15818 0.2578-0.04089 0.098-0.0648 0.20356-0.06944 0.30863v0.0146c0.0015 0.0688 0.0061 0.13824 0.01546 0.20618-0.14894-0.0516-0.33796-0.10411-0.46836-0.15573-0.0079-0.0502-0.01225-0.10177-0.014-0.15368v-0.0146c-0.0061-0.20356 0.03319-0.40586 0.11575-0.59338 0.06328-0.16885 0.179-0.31327 0.33179-0.41126 0.13193-0.0994 0.29244-0.15339 0.45833-0.15339zm-2.2855 0.0455h0.0277c0.10956 0 0.20834 0.037 0.30787 0.10411 0.11266 0.0994 0.2037 0.22222 0.26544 0.35879 0.06944 0.15369 0.10881 0.30939 0.11805 0.51464v3e-3c0.0053 0.10352 0.0047 0.15514-0.0015 0.2053v0.0618c-0.02304 6e-3 -0.04322 0.0146-0.06404 0.0175-0.11729 0.0423-0.21143 0.10411-0.30324 0.15427 0.0093-0.0685 0.0099-0.13824 0.0023-0.20589v-0.0117c-0.0093-0.10265-0.03009-0.15369-0.06327-0.25692-0.02391-0.0787-0.06789-0.14903-0.12808-0.20618-0.03782-0.0347-0.08874-0.0525-0.14121-0.0493h-0.01633c-0.0548 6e-3 -0.10032 0.0318-0.14351 0.10178-0.04937 0.0595-0.08101 0.13211-0.09259 0.20822-0.020709 0.0834-0.02712 0.16915-0.017791 0.25547v0.0117c0.0093 0.10411 0.02858 0.15515 0.0625 0.2578 0.03473 0.10353 0.07483 0.15427 0.12732 0.20677 0.0085 6e-3 0.01633 0.0146 0.02625 0.0175-0.05401 0.044-0.09029 0.054-0.13581 0.10498-0.02858 0.0204-0.06174 0.0464-0.10108 0.0525-0.08026-0.0965-0.15124-0.20065-0.21219-0.31021-0.07407-0.16215-0.11266-0.33794-0.1196-0.51464-0.013121-0.17439 0.0085-0.34876 0.06174-0.51542 0.04243-0.15194 0.11729-0.29245 0.21837-0.41283 0.09877-0.10265 0.20061-0.15427 0.32253-0.15427zm1.0579 1.3164c0.25541 0 0.56481 0.0502 0.9375 0.30785 0.22607 0.15427 0.40355 0.20764 0.81249 0.36112h0.0023c0.19676 0.10499 0.3125 0.20531 0.36883 0.30787v-0.10119c0.05634 0.11344 0.06019 0.24526 0.01225 0.36264-0.0949 0.24001-0.39815 0.4969-0.82098 0.65048v2e-3c-0.20679 0.10411-0.38657 0.25693-0.59799 0.35879-0.21298 0.10411-0.4537 0.22514-0.78086 0.20589-0.11729 6e-3 -0.23534-0.0117-0.34568-0.0516-0.08486-0.0464-0.16821-0.0971-0.24847-0.15281-0.15045-0.10411-0.28008-0.25634-0.47222-0.35882v-3e-3h-0.0038c-0.30864-0.18985-0.47531-0.39507-0.52932-0.54861-0.05325-0.20676-0.0038-0.36188 0.14894-0.46296 0.17285-0.10411 0.29321-0.2091 0.37268-0.25926 0.08026-0.0572 0.11032-0.0787 0.13581-0.10119h0.0015v-2e-3c0.13039-0.15572 0.33642-0.36188 0.64737-0.46374 0.10726-0.0292 0.22686-0.0502 0.35956-0.0502zm2.1597 1.6535c0.27702 1.0933 0.9236 2.6813 1.3395 3.4514 0.22068 0.41205 0.65972 1.2801 0.8503 2.3333 0.12036-3e-3 0.25386 0.0146 0.39583 0.0493 0.49846-1.2894-0.4213-2.6751-0.84028-3.0602-0.17052-0.15514-0.179-0.25838-0.0949-0.25838 0.45447 0.41204 1.0532 1.2129 1.2701 2.1273 0.09953 0.41281 0.12269 0.85185 0.01633 1.2886 0.05171 0.0204 0.10417 0.047 0.15818 0.0516 0.79629 0.41202 1.0903 0.72377 0.94907 1.1859v-0.0332c-0.04707-2e-3 -0.09259 0-0.13966 0h-0.01167c0.1165-0.36034-0.14042-0.63657-0.82175-0.94444-0.70602-0.30863-1.2701-0.25926-1.3665 0.35882-0.0052 0.0332-0.0093 0.051-0.01312 0.10411-0.05246 0.0175-0.10726 0.0408-0.16127 0.0493-0.33179 0.20677-0.5108 0.51619-0.61188 0.91589-0.10032 0.41126-0.13118 0.89198-0.15818 1.4421v2e-3c-0.01633 0.2578-0.13193 0.6466-0.24613 1.0424-1.1574 0.82715-2.7623 1.1867-4.1273 0.2578-0.08565-0.14902-0.18982-0.28871-0.31018-0.41125-0.0571-0.0965-0.12963-0.18285-0.21219-0.2578 0.14042 0 0.2608-0.0233 0.35879-0.0516 0.11187-0.0516 0.19831-0.14494 0.24228-0.2578 0.08335-0.20589 0-0.53779-0.2662-0.89737-0.2662-0.36033-0.71836-0.76774-1.3796-1.1736-0.48611-0.30787-0.7608-0.6713-0.88734-1.0772-0.12732-0.41204-0.11032-0.83718-0.011671-1.2693 0.18903-0.8256 0.67361-1.6281 0.98302-2.1319 0.08256-0.0502 0.02858 0.10412-0.31481 0.75153-0.30555 0.57947-0.88039 1.9267-0.09414 2.9737 0.02931-0.76311 0.19907-1.5162 0.49923-2.2191 0.43518-0.98608 1.3449-2.7037 1.4167-4.0648 0.03704 0.0292 0.16742 0.10411 0.22298 0.15573 0.16821 0.10265 0.29321 0.25693 0.45525 0.35882 0.16282 0.15515 0.36805 0.25838 0.67592 0.25838 0.0301 2e-3 0.05786 6e-3 0.08565 6e-3 0.31712 0 0.5625-0.10353 0.76851-0.20677 0.22377-0.10323 0.402-0.2578 0.57098-0.30863h0.0038c0.36034-0.10411 0.64506-0.3102 0.80632-0.54012zm1.6867 6.912c0.02858 0.46372 0.26465 0.96063 0.68055 1.0625 0.4537 0.10323 1.1065-0.25693 1.3819-0.59029l0.16282-6e-3c0.24304-6e-3 0.44522 9e-3 0.65355 0.20589l0.0023 2e-3c0.16048 0.1534 0.23534 0.40971 0.3017 0.67591 0.06559 0.30942 0.11884 0.60186 0.31559 0.82254 0.375 0.40661 0.49768 0.69906 0.49074 0.87961l0.0023-6e-3v0.0146l-0.0023-9e-3c-0.01167 0.2021-0.14275 0.30557-0.38426 0.45911-0.48611 0.30942-1.3472 0.54937-1.8958 1.2114-0.47685 0.56865-1.0579 0.87885-1.571 0.91895-0.51234 0.0408-0.95447-0.15427-1.2145-0.69288l-0.0038-2e-3c-0.16203-0.30939-0.09259-0.79087 0.04322-1.304 0.13581-0.51542 0.33025-1.0378 0.35725-1.4645 0.02858-0.55091 0.05865-1.0301 0.15045-1.3997 0.09259-0.35882 0.23765-0.61499 0.4946-0.75926l0.03473-0.0175zm-8.3449 0.0379h0.0076c0.04089 0 0.08102 3e-3 0.12114 0.0117 0.29011 0.0426 0.54475 0.25693 0.78935 0.58026l0.70216 1.284 0.0023 2e-3c0.18749 0.41126 0.58179 0.821 0.91744 1.2639 0.33487 0.46142 0.59413 0.87267 0.5625 1.2114v6e-3c-0.04398 0.57407-0.3696 0.88579-0.86805 0.99845-0.49768 0.10411-1.1728 2e-3 -1.848-0.358-0.74691-0.41359-1.6343-0.36189-2.2045-0.46451-0.28472-0.051-0.47145-0.15515-0.55787-0.30942-0.08565-0.15339-0.0872-0.46375 0.0949-0.94907v-2e-3l0.00151-2e-3c0.09029-0.2578 0.02304-0.58101-0.020709-0.8634-0.04243-0.30941-0.06404-0.54706 0.03319-0.72531 0.12345-0.2578 0.30555-0.30787 0.53163-0.41128 0.22762-0.10411 0.49459-0.15573 0.70678-0.36188h0.00151v-2e-3c0.19752-0.20676 0.34336-0.46371 0.51543-0.6466 0.1466-0.15514 0.29321-0.25925 0.51157-0.25925zm5.5239-7.0015c-0.33564 0.15515-0.72916 0.4128-1.1481 0.4128-0.41821 0-0.74845-0.20589-0.98688-0.35955-0.1196-0.10353-0.21604-0.20676-0.28857-0.25838-0.12654-0.10353-0.11111-0.2578-0.0571-0.2578 0.08411 0.0117 0.09953 0.10411 0.15354 0.15514 0.07407 0.051 0.16591 0.1534 0.27853 0.25693 0.22452 0.15427 0.52469 0.36034 0.89969 0.36034 0.37423 0 0.8125-0.20589 1.0787-0.35958 0.15045-0.10411 0.34336-0.2578 0.5-0.36034 0.12036-0.10557 0.11496-0.20676 0.21528-0.20676 0.09953 0.0117 0.02625 0.10352-0.11341 0.25692-0.13966 0.10411-0.35571 0.25838-0.5324 0.36112v-7.7e-4zm-0.83487-1.2222v-0.0175c-0.0047-0.0146 0.0099-0.0324 0.02246-0.0385 0.0571-0.0332 0.13888-0.0204 0.20061 3e-3 0.04861 0 0.12345 0.0516 0.11575 0.10411-0.0047 0.0379-0.06559 0.051-0.10417 0.051-0.04243 0-0.07098-0.0332-0.10881-0.0525-0.04013-0.0146-0.11266-6e-3 -0.12578-0.0502zm-0.42515 0c-0.01546 0.0449-0.0872 0.0379-0.12808 0.051-0.03628 0.0204-0.06635 0.0525-0.10726 0.0525-0.03934 0-0.10108-0.0146-0.10572-0.0525-7e-3 -0.051 0.06789-0.10265 0.11575-0.10265 0.0625-0.0233 0.14196-0.0362 0.19985-3e-3 0.01458 6e-3 0.02771 0.0233 0.02304 0.0385v0.0175h0.0023z" stroke-width=".7716"/>
+  </clipPath>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(0 -270.54)" stroke-width=".27763">
+  <rect y="270.54" width="26.458" height="26.458" fill="#fcc624"/>
+  <rect transform="matrix(1 0 0 1 1.6321 -.0051893)" x="-1.4211e-14" y="270.54" width="26.458" height="26.458" clip-path="url(#clipPath1114)" fill="#ffffff"/>
+ </g>
+</svg>
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/resources/macos.svg kodi-18.0+git20180704.0202-f0dda3a/docs/resources/macos.svg
--- kodi-18.0+git20180703.0201-a44e6e2/docs/resources/macos.svg	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/resources/macos.svg	2018-07-04 00:01:50.000000000 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="100" height="100" version="1.1" viewBox="0 0 26.458333 26.458334" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(0 -270.54)">
+  <rect x="-1.4211e-14" y="270.54" width="26.458" height="26.458" fill="#2b2e34" stroke-width=".27763"/>
+  <path class="st0" d="m8.6203 286.09h-0.51648v-1.9073c0-0.70227-0.24783-1.0534-0.74361-1.0534-0.11487 0-0.22034 0.0241-0.31672 0.0725-0.09597 0.0483-0.18014 0.11357-0.25133 0.19624-0.07098 0.0827-0.12617 0.17665-0.16536 0.28217-0.03899 0.10551-0.05899 0.21581-0.05899 0.33046v2.0794h-0.51627v-2.0311c0-0.27543-0.05999-0.49929-0.17906-0.67138-0.11937-0.17209-0.29602-0.25823-0.53017-0.25823-0.11917 0-0.22954 0.0263-0.33042 0.0792-0.10097 0.0529-0.18824 0.12401-0.26173 0.21342-0.07398 0.0894-0.13077 0.19058-0.17216 0.30306-0.04099 0.11247-0.06198 0.22603-0.06198 0.3409v2.0241h-0.51628v-2.4579c0-0.13315 0-0.27195-0.01-0.41663 0-0.14467-0.012-0.295-0.021-0.45098h0.46149v0.54388h0.04798c0.23414-0.40857 0.57835-0.61285 1.0327-0.61285 0.22044 0 0.4121 0.0598 0.57506 0.17905 0.16296 0.11944 0.27863 0.28239 0.34761 0.48885h0.014c0.11927-0.22039 0.27193-0.38661 0.45779-0.49908 0.18594-0.11247 0.3981-0.16882 0.63703-0.16882 0.32582 0 0.58626 0.12509 0.7814 0.37528 0.19515 0.25019 0.29263 0.59806 0.29263 1.0432v1.976zm2.6857 0-0.04799-0.42684h-0.02099c-0.22504 0.33503-0.56006 0.50255-1.0054 0.50255-0.14226 0-0.27323-0.0231-0.3925-0.0688-0.11947-0.0459-0.22274-0.11117-0.30982-0.19624-0.08698-0.0851-0.15596-0.18471-0.20644-0.29958-0.05099-0.11465-0.07598-0.24105-0.07598-0.37876 0-0.404 0.16746-0.71032 0.50257-0.91917 0.33502-0.20886 0.8217-0.31328 1.4595-0.31328v-0.0757c0-0.54606-0.25473-0.81931-0.76431-0.81931-0.31671 0-0.59674 0.0803-0.83989 0.24104l-0.12407-0.3581c0.29373-0.18818 0.64024-0.28238 1.0397-0.28238 0.80779 0 1.2118 0.44294 1.2118 1.3288v1.274c0 0.16055 0 0.30653 0.01 0.43728 0.01 0.13098 0.02 0.24911 0.03799 0.35462h-0.47518zm-0.08898-1.7213h-0.10338c-0.89048 0-1.3358 0.26172-1.3358 0.78495 0 0.20667 0.05498 0.36026 0.16536 0.46143 0.11007 0.10094 0.24773 0.15141 0.41309 0.15141 0.10558 0 0.20996-0.0183 0.31332-0.0551 0.10328-0.0368 0.19516-0.0883 0.27543-0.1549 0.07998-0.0666 0.14577-0.14793 0.19616-0.24431 0.05099-0.0964 0.07598-0.20428 0.07598-0.3235zm3.5875-1.081c-0.20215-0.11031-0.43619-0.16534-0.70232-0.16534-0.18816 0-0.35591 0.0333-0.50278 0.0999s-0.27083 0.15838-0.3718 0.27542c-0.10088 0.11705-0.17906 0.25585-0.23404 0.41663-0.05499 0.16056-0.08298 0.33503-0.08298 0.52322 0 0.19275 0.02899 0.36962 0.08598 0.53018 0.05698 0.16056 0.13767 0.29718 0.24103 0.40966 0.10308 0.11247 0.22604 0.19972 0.36831 0.26171 0.14227 0.062 0.30062 0.0929 0.47518 0.0929 0.24774 0 0.49338-0.055 0.73682-0.16534l0.10307 0.39922c-0.25713 0.12857-0.56906 0.19275-0.93626 0.19275-0.24353 0-0.46368-0.0403-0.66123-0.12053-0.19724-0.0803-0.3672-0.19514-0.50947-0.34417-0.14227-0.14924-0.25123-0.32699-0.32702-0.53367-0.07598-0.20667-0.11357-0.43837-0.11357-0.69552 0-0.26171 0.04299-0.50037 0.12727-0.71619 0.08498-0.21559 0.20324-0.40161 0.35461-0.5576 0.15147-0.15598 0.33401-0.27782 0.54736-0.36484 0.21344-0.0873 0.44868-0.13096 0.70582-0.13096 0.33501 0 0.61044 0.0598 0.82629 0.17904zm4.5584 0.43381c0 0.36266-0.04899 0.69312-0.14816 0.9914-0.09898 0.29848-0.23864 0.55542-0.42009 0.77123-0.18126 0.21582-0.3995 0.38333-0.65424 0.50256-0.25474 0.11922-0.53826 0.17904-0.85018 0.17904-0.29853 0-0.57156-0.0585-0.8193-0.17557-0.24803-0.11705-0.46148-0.28-0.64053-0.48884-0.17906-0.20886-0.31782-0.45687-0.4166-0.74361-0.09898-0.28674-0.14797-0.60241-0.14797-0.94681 0-0.35787 0.05199-0.68725 0.15497-0.98792 0.10328-0.30065 0.24663-0.55759 0.43029-0.77123 0.18366-0.21342 0.4027-0.37984 0.65743-0.49906 0.25504-0.11922 0.53387-0.17906 0.83699-0.17906 0.30283 0 0.57935 0.0575 0.82949 0.17209 0.25024 0.11487 0.46258 0.27543 0.63704 0.4821 0.17446 0.20668 0.30982 0.45448 0.4062 0.74361 0.09598 0.28912 0.14466 0.60589 0.14466 0.95007zm-0.55786 0.0276c0-0.27542-0.03699-0.53127-0.11027-0.76776-0.07398-0.23626-0.17556-0.44293-0.30632-0.61959-0.13097-0.17665-0.28693-0.31437-0.46819-0.41314-0.18126-0.0986-0.3822-0.14794-0.60244-0.14794-0.22494 0-0.43029 0.0494-0.61634 0.14794-0.18596 0.0988-0.34411 0.23627-0.47508 0.41314-0.13097 0.17666-0.23304 0.3879-0.30652 0.63352-0.07399 0.24562-0.11008 0.513-0.11008 0.80213 0 0.27086 0.03699 0.52453 0.11008 0.7608 0.07298 0.23648 0.17556 0.44184 0.30652 0.61633 0.13077 0.17448 0.28802 0.31219 0.47168 0.41314 0.18356 0.10094 0.3855 0.15142 0.60584 0.15142 0.22494 0 0.4303-0.0505 0.61634-0.15142 0.18606-0.10095 0.34422-0.24105 0.47518-0.42011 0.13097-0.17904 0.23164-0.38898 0.30302-0.63004 0.07098-0.24105 0.10657-0.50385 0.10657-0.78842zm3.6841 1.0947c0 0.19732-0.03699 0.37768-0.11027 0.54063-0.07298 0.16295-0.17796 0.30196-0.31332 0.41661-0.13527 0.11487-0.29933 0.2032-0.49228 0.26521-0.19275 0.062-0.4086 0.0929-0.64724 0.0929-0.47758 0-0.85608-0.0986-1.1361-0.29609l0.14446-0.4338c0.30742 0.19275 0.64944 0.28912 1.026 0.28912 0.31672 0 0.56236-0.0757 0.73681-0.22712 0.17456-0.15142 0.26173-0.35331 0.26173-0.6059 0-0.23409-0.06798-0.42336-0.20315-0.56803-0.13557-0.14446-0.35921-0.27651-0.67143-0.39595-0.7941-0.29827-1.1911-0.73447-1.1911-1.3082 0-0.17884 0.03499-0.34418 0.10657-0.4956 0.07098-0.15142 0.17106-0.28239 0.29962-0.39247s0.28103-0.19493 0.45768-0.25475c0.17666-0.0596 0.36831-0.0894 0.57506-0.0894 0.3992 0 0.72512 0.0736 0.97765 0.22038l-0.15836 0.42684c-0.22494-0.14227-0.50497-0.21341-0.83999-0.21341-0.26623 0-0.48208 0.0666-0.64724 0.19971-0.16536 0.13314-0.24774 0.3098-0.24774 0.53018 0 0.10552 0.015 0.19972 0.04499 0.28239 0.02999 0.0827 0.07898 0.16056 0.14816 0.23409 0.06898 0.0736 0.16186 0.14359 0.27883 0.20994 0.11707 0.0666 0.26523 0.13663 0.44409 0.20995 0.20645 0.0827 0.3833 0.171 0.53017 0.26519 0.14686 0.0942 0.26733 0.19624 0.36161 0.30632 0.09398 0.11031 0.16186 0.23083 0.20315 0.36158 0.04099 0.1301 0.06198 0.27346 0.06198 0.42967z" fill="#ffffff" stroke-width=".0021756"/>
+ </g>
+</svg>
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/resources/opensuse.svg kodi-18.0+git20180704.0202-f0dda3a/docs/resources/opensuse.svg
--- kodi-18.0+git20180703.0201-a44e6e2/docs/resources/opensuse.svg	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/resources/opensuse.svg	2018-07-04 00:01:50.000000000 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="100" height="100" version="1.1" viewBox="0 0 26.458333 26.458334" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(0 -270.54)">
+  <rect x="-1.4211e-14" y="270.54" width="26.458" height="26.458" fill="#73ba25" stroke-width=".27763"/>
+  <path d="m11.815 286.7 0.0272-3e-3 0.0049-0.0319c-0.0073-0.0247-0.02355-0.0471-0.04953-0.35762-0.02172-0.27466-0.06577-1.0274 0.32276-1.401 0.15042-0.14554 0.38102-0.27545 0.5621-0.31703 0.74439-0.17742 1.6173-0.0547 2.442 0.87606 0.4267 0.4812 0.63517 0.70041 0.73992 0.79883l0.03613 0.0321 0.04324 0.0311c0.03451 0.0186 1.4185 0.64 1.4185 0.64l0.02822-7e-3 3.91e-4 -0.0289c-0.0087-0.0101-0.87694-1.1044-0.72307-2.0056 0.1222-0.71783 0.70805-0.65327 1.5178-0.56376 0.2645 0.0295 0.56616 0.0636 0.87735 0.0701 0.87024 5e-3 1.8079-0.1507 2.386-0.39724 0.37351-0.15901 0.61183-0.26417 0.76123-0.39684 0.054-0.0434 0.08161-0.11426 0.11063-0.18971l0.0203-0.0507c0.02416-0.061 0.05948-0.1909 0.07491-0.2614 0.0071-0.0315 0.01035-0.065-0.01197-0.082l-0.08039 0.0145c-0.25293 0.14871-0.8873 0.4309-1.4809 0.44219-0.73586 0.0149-2.2179-0.722-2.3728-0.79982l-0.01462-0.0172c-0.03694-0.0863-0.25882-0.59941-0.30652-0.70793 1.0674 0.68555 1.9518 1.0646 2.6294 1.1236 0.75454 0.0653 1.342-0.33585 1.5939-0.50754 0.04913-0.0321 0.08648-0.0584 0.1015-0.0642l0.01624-0.0257c-0.04162-0.25821-0.43563-1.5089-0.73342-1.8099-0.08242-0.082-0.14859-0.16237-0.28196-0.23841-1.0781-0.61309-3.6369-0.983-3.7571-1l-0.0203 6e-3 -0.0075 0.0178s-0.01035 0.51764-0.01117 0.57506c-0.26227-0.085-2.1621-0.68358-3.943-0.74378-1.5101-0.0521-3.7091-0.24218-6.6238 1.5054l-0.08627 0.0527c-1.371 0.83467-2.3174 1.863-2.8123 3.0587-0.15509 0.37585-0.36418 1.225-0.15793 2.0234 0.08972 0.34912 0.25618 0.69941 0.48008 1.0139 0.50607 0.70932 1.3552 1.18 2.2707 1.2596 1.2913 0.11227 2.2701-0.45348 2.6176-1.5131 0.23933-0.73109 0-1.8042-0.91673-2.3515-0.74581-0.44535-1.548-0.34357-2.0131-0.044-0.40416 0.26119-0.63294 0.66654-0.62888 1.1123 0.0093 0.79011 0.70764 1.2101 1.2092 1.2111 0.14616 0 0.29231-0.0244 0.45735-0.077 0.05846-0.0176 0.11449-0.039 0.17498-0.0756l0.01908-0.0115 0.01259-8e-3 -0.0049 2e-3c0.11449-0.0754 0.18391-0.1992 0.18391-0.33207 0-0.036-0.0055-0.0731-0.01604-0.1101-0.05887-0.19961-0.26146-0.32061-0.47156-0.28377l-0.02842 6e-3 -0.03857 0.0121-0.05582 0.0182c-0.1155 0.0283-0.20218 0.0301-0.22045 0.0309-0.05927-4e-3 -0.34794-0.0881-0.34794-0.39684v-4e-3c6.12e-4 -0.11308 0.04709-0.19288 0.07288-0.23625 0.08911-0.13723 0.33535-0.27248 0.66847-0.24357 0.43583 0.0364 0.75007 0.25446 0.95814 0.66616 0.19366 0.38298 0.14311 0.85327-0.13032 1.1986-0.271 0.34218-0.75352 0.48694-1.3962 0.41902-0.64776-0.0695-1.195-0.43328-1.5018-0.99942-0.30003-0.55289-0.31667-1.2089-0.04243-1.7127 0.65588-1.207 1.8938-1.1943 2.5728-1.0806 1.0052 0.1701 2.1479 1.0749 2.5539 2.1188 0.06516 0.16634 0.09845 0.29842 0.12667 0.41823l0.04405 0.18079 1.1352 0.5408zm7.9773-5.8922c-0.21416 0.19426-0.33616 0.45902-0.34651 0.74418-0.0199 0.58813 0.45309 1.0832 1.0554 1.1054 0.29414 0.01 0.57204-0.0913 0.7858-0.28653 0.21376-0.19426 0.33576-0.45863 0.34692-0.74319 0.0203-0.58833-0.45268-1.0846-1.0566-1.106-0.29211-0.01-0.57123 0.0915-0.78498 0.28613" clip-rule="evenodd" fill="#ffffff" fill-rule="evenodd" stroke-width=".20049"/>
+ </g>
+</svg>
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/resources/raspberrypi.svg kodi-18.0+git20180704.0202-f0dda3a/docs/resources/raspberrypi.svg
--- kodi-18.0+git20180703.0201-a44e6e2/docs/resources/raspberrypi.svg	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/resources/raspberrypi.svg	2018-07-04 00:01:50.000000000 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="100" height="100" version="1.1" viewBox="0 0 26.458333 26.458334" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <rect x="-1.4211e-14" y="8.5449e-6" width="26.458" height="26.458" fill="#c51a4a" stroke-width=".27763"/>
+ <path d="m9.9286 3.97c-0.093646 3e-3 -0.19449 0.0375-0.30893 0.12775-0.2802-0.10803-0.55196-0.14559-0.79495 0.0744-0.37521-0.0487-0.49712 0.0518-0.58952 0.16905-0.082373-2e-3 -0.61632-0.0847-0.86123 0.2806-0.61536-0.0728-0.80985 0.36195-0.58947 0.76742-0.12571 0.19454-0.25596 0.38676 0.037957 0.75772-0.10396 0.20656-0.039487 0.43068 0.20542 0.70187-0.06464 0.29046 0.062431 0.49532 0.29034 0.65502-0.042659 0.39742 0.36444 0.6285 0.48596 0.71082 0.046682 0.23154 0.14395 0.4501 0.6089 0.57089 0.076707 0.34512 0.35612 0.40472 0.62675 0.47713-0.89437 0.5199-1.6613 1.2039-1.6561 2.8822l-0.13104 0.2337c-1.0255 0.62363-1.9482 2.6281-0.50534 4.2573 0.094213 0.50999 0.25227 0.8763 0.393 1.2817 0.21046 1.6336 1.5841 2.3986 1.9465 2.4891 0.53089 0.40438 1.0963 0.78809 1.8615 1.0569 0.7213 0.7439 1.5028 1.0274 2.2885 1.027 0.01156 0 1.602-0.28303 2.3233-1.027 0.76515-0.26882 1.3306-0.65253 1.8615-1.0569 0.36229-0.0905 1.7359-0.85546 1.9464-2.4891 0.14072-0.40541 0.29878-0.77172 0.39306-1.2817 1.4427-1.6294 0.52012-3.6339-0.5054-4.2576l-0.13121-0.23369c0.0052-1.6782-0.76175-2.3622-1.6561-2.8822 0.27057-0.0724 0.55004-0.132 0.62669-0.47713 0.46495-0.12084 0.56228-0.33935 0.6089-0.57089 0.12158-0.0823 0.52862-0.3134 0.48602-0.71082 0.22786-0.1597 0.35493-0.36461 0.29029-0.65501 0.24496-0.2712 0.30938-0.49532 0.20542-0.70193 0.29397-0.37073 0.16356-0.56296 0.03801-0.7575 0.22026-0.40546 0.02589-0.84027-0.5897-0.76742-0.2448-0.36529-0.77863-0.28235-0.86123-0.28065-0.09234-0.11722-0.21426-0.21766-0.58947-0.169-0.24298-0.21998-0.51469-0.18247-0.79495-0.0744-0.33278-0.26259-0.55298-0.0521-0.80452 0.0275-0.40286-0.13166-0.49503 0.0487-0.69297 0.12215-0.4394-0.0929-0.57293 0.10928-0.78356 0.32263l-0.24502-5e-3c-0.66272 0.39056-0.99198 1.1858-1.1087 1.5947-0.11676-0.40891-0.44523-1.2042-1.1078-1.5947l-0.24502 5e-3c-0.21092-0.21335-0.34439-0.41549-0.78379-0.32263-0.198-0.0735-0.28983-0.25381-0.69303-0.12215-0.16508-0.0522-0.31691-0.16078-0.49565-0.15522l-4.5488 7.9878" fill="#ffffff" stroke-width=".056652"/>
+ <g transform="translate(0,-270.54)" fill="#c51a4a" stroke-width=".056652">
+  <path d="m8.6091 276.23c1.7583 0.9065 2.7804 1.6398 3.3405 2.2643-0.28678 1.1494-1.7829 1.2019-2.3299 1.1696 0.112-0.0521 0.20548-0.1146 0.23862-0.21052-0.13727-0.0976-0.62397-0.0103-0.96377-0.20117 0.13053-0.0271 0.1916-0.0534 0.25261-0.14973-0.32099-0.10237-0.6668-0.19064-0.87018-0.36026 0.10974 1e-3 0.21222 0.0246 0.35555-0.0748-0.28751-0.15495-0.59434-0.27777-0.83273-0.51464 0.14866-4e-3 0.30893-1e-3 0.35555-0.0561-0.26315-0.16305-0.48523-0.34433-0.66901-0.54267 0.20803 0.0251 0.2959 4e-3 0.3462-0.0328-0.19896-0.20378-0.45073-0.37583-0.57077-0.62692 0.15443 0.0533 0.29578 0.0736 0.39764-5e-3 -0.067586-0.15251-0.35719-0.24248-0.52398-0.59888 0.16265 0.0158 0.3351 0.0355 0.3696 0-0.075461-0.30751-0.20497-0.48041-0.33198-0.65955 0.34802-5e-3 0.87534 1e-3 0.85149-0.028l-0.21522-0.21987c0.33997-0.0915 0.68782 0.0147 0.94037 0.0935 0.11336-0.0895-0.00204-0.20259-0.14038-0.31811 0.28893 0.0386 0.54998 0.10498 0.786 0.19647 0.12605-0.11381-0.081863-0.22768-0.18248-0.3415 0.44636 0.0846 0.63547 0.20367 0.82339 0.32281 0.13636-0.1307 0.0078-0.2418-0.084185-0.35555 0.33657 0.12463 0.50993 0.28558 0.6924 0.44444 0.06186-0.0835 0.15721-0.14475 0.04209-0.34621 0.23896 0.13772 0.41894 0.30003 0.55208 0.48189 0.14786-0.0942 0.08809-0.22287 0.08889-0.34156 0.24836 0.20202 0.40597 0.41702 0.59887 0.62692 0.03886-0.0283 0.07286-0.12424 0.10294-0.27601 0.59241 0.57474 1.4296 2.0225 0.21516 2.5965-1.0335-0.8524-2.2679-1.472-3.6357-1.9368l3.966e-4 -2.3e-4"/>
+  <path d="m17.939 276.23c-1.758 0.90661-2.7802 1.6397-3.3402 2.2643 0.28678 1.1494 1.7828 1.2019 2.3298 1.1696-0.112-0.0521-0.20548-0.1146-0.23856-0.21052 0.13727-0.0976 0.62397-0.0103 0.96371-0.20117-0.13053-0.0271-0.19154-0.0534-0.25261-0.14973 0.32105-0.10237 0.66686-0.19064 0.87018-0.36026-0.10974 1e-3 -0.21222 0.0246-0.35555-0.0748 0.28757-0.15495 0.5944-0.27777 0.83279-0.51464-0.14871-4e-3 -0.30898-1e-3 -0.35555-0.0561 0.26315-0.16305 0.48523-0.34433 0.66901-0.54267-0.20808 0.0251-0.2959 4e-3 -0.3462-0.0328 0.19891-0.20378 0.45073-0.37583 0.57077-0.62692-0.15449 0.0533-0.29584 0.0736-0.3977-5e-3 0.06759-0.15251 0.35725-0.24248 0.52398-0.59888-0.16259 0.0158-0.3351 0.0355-0.3696 0 0.07563-0.30762 0.20514-0.48052 0.33215-0.65966-0.34802-5e-3 -0.87534 1e-3 -0.85149-0.028l0.21522-0.21993c-0.33997-0.0915-0.68782 0.0147-0.94037 0.0936-0.11336-0.0894 2e-3 -0.20259 0.14033-0.3181-0.28887 0.0385-0.54998 0.10498-0.78594 0.19647-0.12611-0.11382 0.08186-0.22769 0.18248-0.3415-0.44636 0.0846-0.63547 0.20366-0.82344 0.3228-0.13636-0.13069-0.0078-0.24179 0.08424-0.35555-0.33657 0.12464-0.50993 0.28559-0.6924 0.44444-0.06192-0.0835-0.15721-0.14474-0.04215-0.3462-0.2389 0.13772-0.41889 0.30003-0.55202 0.48189-0.14786-0.0942-0.08809-0.22293-0.08889-0.34156-0.24836 0.20202-0.40597 0.41696-0.59887 0.62691-0.03886-0.0283-0.07286-0.12423-0.10294-0.27606-0.59241 0.57479-1.4296 2.0226-0.21516 2.5966 1.0329-0.85262 2.2672-1.4721 3.6352-1.9369h-2.26e-4"/>
+  <path d="m15.403 287.93c0.0061 1.0726-0.93188 1.9467-2.095 1.9523-1.1632 6e-3 -2.1111-0.85924-2.1172-1.9318-5.6e-5 -7e-3 -5.6e-5 -0.0136 0-0.0204-0.0061-1.0726 0.93182-1.9466 2.095-1.9523 1.1632-6e-3 2.111 0.85925 2.1172 1.9318v0.0205"/>
+  <path d="m12.078 282.39c0.87267 0.5718 1.03 1.8678 0.35136 2.8947s-1.9362 1.396-2.8089 0.82423c-0.87267-0.57179-1.0299-1.8678-0.35136-2.8947 0.67864-1.0269 1.9362-1.396 2.8089-0.82424"/>
+  <path d="m14.434 282.28c-0.87262 0.57174-1.0299 1.8678-0.35136 2.8947 0.67864 1.0269 1.9362 1.396 2.8089 0.82418 0.87267-0.57174 1.03-1.8677 0.35136-2.8947-0.67858-1.0269-1.9362-1.3959-2.8089-0.82418"/>
+  <path d="m7.7169 283.32c0.94219-0.25256 0.3181 3.8979-0.44852 3.5573-0.84327-0.67825-1.1149-2.6645 0.44852-3.5573"/>
+  <path d="m18.605 283.27c-0.9423-0.2525-0.3181 3.8981 0.44852 3.5576 0.84327-0.6783 1.1149-2.6648-0.44852-3.5576"/>
+  <path d="m15.404 280.18c1.626-0.27454 2.979 0.6915 2.9243 2.4546-0.05348 0.67598-3.5234-2.354-2.9243-2.4546"/>
+  <path d="m10.911 280.13c-1.6261-0.2746-2.979 0.69167-2.9243 2.4547 0.05348 0.67592 3.5234-2.354 2.9243-2.4547"/>
+  <path d="m13.247 279.71c-0.97046-0.0253-1.9018 0.72023-1.9041 1.1527-0.0027 0.52539 0.7673 1.0634 1.9107 1.077 1.1676 8e-3 1.9127-0.43062 1.9164-0.97284 0.0043-0.61434-1.0619-1.2664-1.9231-1.2569v5e-5"/>
+  <path d="m13.306 290.49c0.8461-0.0369 1.9814 0.2725 1.9837 0.68306 0.01405 0.39861-1.0297 1.2993-2.0398 1.2819-1.0461 0.0451-2.0719-0.85693-2.0585-1.1696-0.01569-0.45843 1.2738-0.81636 2.1146-0.79534"/>
+  <path d="m10.181 288.06c0.60238 0.72572 0.87704 2.0008 0.3743 2.3766-0.4756 0.28694-1.6306 0.16876-2.4515-1.0106-0.55366-0.98961-0.48234-1.9966-0.09359-2.2924 0.58131-0.35408 1.4795 0.12424 2.1708 0.92638h-5.7e-5"/>
+  <path d="m16.311 287.83c-0.65179 0.76339-1.0147 2.1558-0.53927 2.6043 0.45464 0.34841 1.675 0.29969 2.5765-0.95114 0.65456-0.8401 0.43526-2.2431 0.06135-2.6156-0.55542-0.4296-1.3528 0.12022-2.0986 0.9623v2.3e-4"/>
+ </g>
+</svg>
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/resources/ubuntu.svg kodi-18.0+git20180704.0202-f0dda3a/docs/resources/ubuntu.svg
--- kodi-18.0+git20180703.0201-a44e6e2/docs/resources/ubuntu.svg	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/resources/ubuntu.svg	2018-07-04 00:01:50.000000000 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="100" height="100" version="1.1" viewBox="0 0 26.458333 26.458334" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <rect x="-1.4211e-14" y="8.5449e-6" width="26.458" height="26.458" fill="#dd4814" stroke-width=".27763"/>
+ <circle cx="13.229" cy="13.229" r="9.2604" fill="#ffffff" stroke-width=".065339"/>
+ <g transform="matrix(.87503 0 0 .87503 1.6534 -235.08)" fill="#dd4814" stroke-width=".074671">
+  <circle cx="6.0325" cy="283.77" r="1.4129"/>
+  <path d="m9.8237 288.88c-1.2365-0.82612-2.1564-2.0891-2.5385-3.5684 0.44639-0.36374 0.73151-0.91772 0.73151-1.5387s-0.28512-1.175-0.73151-1.5387c0.38207-1.4793 1.3019-2.7423 2.5385-3.5684l1.033 1.7304c-1.0611 0.74683-1.7551 1.9802-1.7551 3.3767 0 1.3966 0.69392 2.6299 1.7551 3.3767z"/>
+  <circle transform="rotate(120)" cx="231.94" cy="-153.34" r="1.4129"/>
+  <path d="m10.509 278.27c1.3337-0.6578 2.8874-0.82293 4.3596-0.41416 0.0918 0.56846 0.42901 1.0924 0.96681 1.4029s1.1601 0.34057 1.6983 0.13585c1.0901 1.0705 1.7239 2.4987 1.8211 3.9826l-2.0151 0.0294c-0.1162-1.2924-0.83735-2.51-2.0468-3.2083-1.2094-0.69828-2.6245-0.714-3.8019-0.16843z"/>
+  <circle transform="rotate(240)" cx="-259.56" cy="-130.43" r="1.4129"/>
+  <path d="m19.355 284.17c-0.09718 1.4839-0.73103 2.912-1.8211 3.9826-0.5382-0.20472-1.1605-0.17465-1.6983 0.13585s-0.87501 0.83441-0.96681 1.4029c-1.4722 0.40877-3.0259 0.24364-4.3596-0.41416l0.98207-1.7598c1.1773 0.54557 2.5924 0.52985 3.8019-0.16843 1.2094-0.69827 1.9306-1.9159 2.0468-3.2083z"/>
+ </g>
+</svg>
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/docs/resources/windows.svg kodi-18.0+git20180704.0202-f0dda3a/docs/resources/windows.svg
--- kodi-18.0+git20180703.0201-a44e6e2/docs/resources/windows.svg	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/docs/resources/windows.svg	2018-07-04 00:01:50.000000000 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="100" height="100" version="1.1" viewBox="0 0 26.458333 26.458334" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(0 -270.54)">
+  <rect x="-1.4211e-14" y="270.54" width="26.458" height="26.458" fill="#0078d7" stroke-width=".27763"/>
+  <path d="m3.9688 277.17 7.5241-1.041v7.2933h-7.5241m8.4494-7.4099 10.071-1.504v8.7974h-10.071m-8.4494 0.92604h7.5241v7.2934l-7.5241-1.0434m8.4494-6.25h10.071v8.7974l-9.9549-1.3898" fill="#ffffff" stroke-width=".7717"/>
+ </g>
+</svg>
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/LICENSE.GPL kodi-18.0+git20180704.0202-f0dda3a/LICENSE.GPL
--- kodi-18.0+git20180703.0201-a44e6e2/LICENSE.GPL	2014-11-06 04:00:15.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/LICENSE.GPL	1970-01-01 00:00:00.000000000 +0000
@@ -1,287 +0,0 @@
-
- You may use, distribute and copy Kodi under the terms of GNU General
- Public License version 2, which is displayed below.
-
--------------------------------------------------------------------------
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. 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.
-
-  12. 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.
-
-		     END OF TERMS AND CONDITIONS
--------------------------------------------------------------------------
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/LICENSE.md kodi-18.0+git20180704.0202-f0dda3a/LICENSE.md
--- kodi-18.0+git20180703.0201-a44e6e2/LICENSE.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/LICENSE.md	2018-07-04 00:01:49.000000000 +0000
@@ -0,0 +1,361 @@
+### GNU GENERAL PUBLIC LICENSE
+
+Version 2, June 1991
+
+    Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+    Everyone is permitted to copy and distribute verbatim copies
+    of this license document, but changing it is not allowed.
+
+### Preamble
+
+The licenses for most software are designed to take away your freedom
+to share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on,
+we want its recipients to know that what they have is not the
+original, so that any problems introduced by others will not reflect
+on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at
+all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+**0.** This License applies to any program or other work which
+contains a notice placed by the copyright holder saying it may be
+distributed under the terms of this General Public License. The
+"Program", below, refers to any such program or work, and a "work
+based on the Program" means either the Program or any derivative work
+under copyright law: that is to say, a work containing the Program or
+a portion of it, either verbatim or with modifications and/or
+translated into another language. (Hereinafter, translation is
+included without limitation in the term "modification".) Each licensee
+is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the Program
+(independent of having been made by running the Program). Whether that
+is true depends on what the Program does.
+
+**1.** You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a
+fee.
+
+**2.** You may modify your copy or copies of the Program or any
+portion of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+  
+**a)** You must cause the modified files to carry prominent notices
+stating that you changed the files and the date of any change.
+
+  
+**b)** You must cause any work that you distribute or publish, that in
+whole or in part contains or is derived from the Program or any part
+thereof, to be licensed as a whole at no charge to all third parties
+under the terms of this License.
+
+  
+**c)** If the modified program normally reads commands interactively
+when run, you must cause it, when started running for such interactive
+use in the most ordinary way, to print or display an announcement
+including an appropriate copyright notice and a notice that there is
+no warranty (or else, saying that you provide a warranty) and that
+users may redistribute the program under these conditions, and telling
+the user how to view a copy of this License. (Exception: if the
+Program itself is interactive but does not normally print such an
+announcement, your work based on the Program is not required to print
+an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+**3.** You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+  
+**a)** Accompany it with the complete corresponding machine-readable
+source code, which must be distributed under the terms of Sections 1
+and 2 above on a medium customarily used for software interchange; or,
+
+  
+**b)** Accompany it with a written offer, valid for at least three
+years, to give any third party, for a charge no more than your cost of
+physically performing source distribution, a complete machine-readable
+copy of the corresponding source code, to be distributed under the
+terms of Sections 1 and 2 above on a medium customarily used for
+software interchange; or,
+
+  
+**c)** Accompany it with the information you received as to the offer
+to distribute corresponding source code. (This alternative is allowed
+only for noncommercial distribution and only if you received the
+program in object code or executable form with such an offer, in
+accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+**4.** You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt otherwise
+to copy, modify, sublicense or distribute the Program is void, and
+will automatically terminate your rights under this License. However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+**5.** You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+**6.** Each time you redistribute the Program (or any work based on
+the Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+**7.** If, as a consequence of a court judgment or allegation of
+patent infringement or for any other reason (not limited to patent
+issues), conditions are imposed on you (whether by court order,
+agreement or otherwise) that contradict the conditions of this
+License, they do not excuse you from the conditions of this License.
+If you cannot distribute so as to satisfy simultaneously your
+obligations under this License and any other pertinent obligations,
+then as a consequence you may not distribute the Program at all. For
+example, if a patent license would not permit royalty-free
+redistribution of the Program by all those who receive copies directly
+or indirectly through you, then the only way you could satisfy both it
+and this License would be to refrain entirely from distribution of the
+Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+**8.** If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+**9.** The Free Software Foundation may publish revised and/or new
+versions of the General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Program does not specify a
+version number of this License, you may choose any version ever
+published by the Free Software Foundation.
+
+**10.** If you wish to incorporate parts of the Program into other
+free programs whose distribution conditions are different, write to
+the author to ask for permission. For software which is copyrighted by
+the Free Software Foundation, write to the Free Software Foundation;
+we sometimes make exceptions for this. Our decision will be guided by
+the two goals of preserving the free status of all derivatives of our
+free software and of promoting the sharing and reuse of software
+generally.
+
+**NO WARRANTY**
+
+**11.** 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.
+
+**12.** 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.
+
+### END OF TERMS AND CONDITIONS
+
+### How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    one line to give the program's name and an idea of what it does.
+    Copyright (C) yyyy  name of author
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
+    type `show w'.  This is free software, and you are welcome
+    to redistribute it under certain conditions; type `show c' 
+    for details.
+
+The hypothetical commands \`show w' and \`show c' should show the
+appropriate parts of the General Public License. Of course, the
+commands you use may be called something other than \`show w' and
+\`show c'; they could even be mouse-clicks or menu items--whatever
+suits your program.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the program,
+if necessary. Here is a sample; alter the names:
+
+    Yoyodyne, Inc., hereby disclaims all copyright
+    interest in the program `Gnomovision'
+    (which makes passes at compilers) written 
+    by James Hacker.
+
+    signature of Ty Coon, 1 April 1989
+    Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library,
+you may consider it more useful to permit linking proprietary
+applications with the library. If this is what you want to do, use the
+[GNU Lesser General Public
+License](https://www.gnu.org/licenses/lgpl.html) instead of this
+License.
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/project/Win32BuildSetup/genNsisInstaller.nsi kodi-18.0+git20180704.0202-f0dda3a/project/Win32BuildSetup/genNsisInstaller.nsi
--- kodi-18.0+git20180703.0201-a44e6e2/project/Win32BuildSetup/genNsisInstaller.nsi	2018-06-21 18:59:46.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/project/Win32BuildSetup/genNsisInstaller.nsi	2018-07-04 00:01:50.000000000 +0000
@@ -73,7 +73,7 @@
 ;Pages
 
   !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "..\..\LICENSE.GPL"
+  !insertmacro MUI_PAGE_LICENSE "..\..\LICENSE.md"
   !insertmacro MUI_PAGE_COMPONENTS
   !define MUI_PAGE_CUSTOMFUNCTION_LEAVE CallbackDirLeave
   !insertmacro MUI_PAGE_DIRECTORY
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/PULL_REQUEST_TEMPLATE.md kodi-18.0+git20180704.0202-f0dda3a/PULL_REQUEST_TEMPLATE.md
--- kodi-18.0+git20180703.0201-a44e6e2/PULL_REQUEST_TEMPLATE.md	2018-05-01 00:00:07.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/PULL_REQUEST_TEMPLATE.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-<!--- Provide a general summary of your change in the Title above -->
-
-## Description
-<!--- Describe your change in detail -->
-
-## Motivation and Context
-<!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here -->
-
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your change -->
-<!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc -->
-
-## Screenshots (if appropriate):
-
-## Types of change
-<!--- What type of change does your code introduce? Put an `x` in all the boxes that apply like this: [X] -->
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] Improvement (non-breaking change which improves existing functionality)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to change)
-
-## Checklist:
-<!--- Go over all the following points, and put an `x` in all the boxes that apply like this: [X] -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] My code follows the [Code guidelines](https://codedocs.xyz/xbmc/xbmc/code_guidelines.html) of this project 
-- [ ] My change requires a change to the documentation, either Doxygen or wiki
-- [ ] I have updated the documentation accordingly
-- [ ] I have read the [CONTRIBUTING](https://github.com/xbmc/xbmc/blob/master/CONTRIBUTING.md) document
-- [ ] I have added tests to cover my change
-- [ ] All new and existing tests passed
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/README.md kodi-18.0+git20180704.0202-f0dda3a/README.md
--- kodi-18.0+git20180703.0201-a44e6e2/README.md	2018-05-01 00:00:07.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/README.md	2018-07-04 00:01:49.000000000 +0000
@@ -1,54 +1,63 @@
-[![Documentation](https://codedocs.xyz/xbmc/xbmc.svg)](https://codedocs.xyz/xbmc/xbmc/)
+![Kodi Logo](docs/resources/banner.png)
 
-![Kodi logo](media/banner.png)
-# Kodi Home Theater Software
+[![License](https://img.shields.io/badge/license-GPLv2-blue.svg?style=flat-square)](LICENSE.md)
+[![HitCount](http://hits.dwyl.io/xbmc/xbmc.svg)](http://hits.dwyl.io/xbmc/xbmc)
+[![Documentation](https://img.shields.io/badge/code-documented-brightgreen.svg?style=flat-square)](https://codedocs.xyz/xbmc/xbmc/)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://github.com/xbmc/xbmc/pulls)
+[![Contributions Welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat-square)](#how-to-contribute)
+[![Build](https://img.shields.io/badge/CI-jenkins-brightgreen.svg?style=flat-square)](http://jenkins.kodi.tv/)
+[![Commits](https://img.shields.io/github/commits-since/xbmc/xbmc/latest.svg?style=flat-square)](https://github.com/xbmc/xbmc/commits/master)
 
-**Welcome to Kodi!**
+# Welcome to Kodi Home Theater Software!
+Kodi is an award-winning **free and open source** software media player and entertainment hub for digital media. Available as a native application for **Android, Linux, macOS, iOS and Windows operating systems**, Kodi runs on most common processor architectures.
 
-Kodi is an award-winning free and open source (GPL) software media player and
-entertainment hub for digital media. Kodi is available for multiple platforms.
-Created in 2003 by a group of like minded programmers, Kodi is a non-profit
-project run and developed by volunteers located around the world.
-More than 450 software developers have contributed to Kodi to date, and 100-plus
-translators have worked to expand its reach, making it available in more
-than 70 languages.
+Created in 2003 by a group of like minded programmers, Kodi is a non-profit project run by the XBMC Foundation and developed by volunteers located around the world. More than 500 software developers have contributed to Kodi to date, and 100-plus translators have worked to expand its reach, making it available in more than 70 languages.
 
-While Kodi functions very well as a standard media player application for your
-computer, it has been designed to be the perfect companion for your HTPC.
-Supporting an almost endless range of remote controls, and combined with its
-beautiful interface and powerful skinning engine, Kodi feels very natural to
-use from the couch and is the ideal solution for your home theater.
+While Kodi functions very well as a standard media player application for your computer, it has been designed to be the perfect companion for your HTPC. With its **beautiful interface and powerful skinning engine**, Kodi feels very natural to use from the couch with a remote control and is the ideal solution for your home theater.
 
-Currently Kodi can be used to play almost all popular audio and video formats
-around. It was designed for network playback, so you can stream your multimedia
-from anywhere in the house or directly from the internet using practically any
-protocol available.
+## Give your media the love it deserves
+Kodi can be used to play almost all popular audio and video formats around. It was designed for network playback, so you can stream your multimedia from anywhere in the house or directly from the internet using practically any protocol available.
 
-Use your media as-is: Kodi can play CDs and DVDs directly
-from the disk or image file, almost all popular archive formats from your hard
-drive, and even files inside ZIP and RAR archives. It will even scan all of
-your media and automatically create a personalized library complete with box
-covers, descriptions, and fanart. There are playlist and slideshow functions, a
-weather forecast feature and many audio visualizations. Once installed, your
-computer will become a fully functional multimedia jukebox.
+Point Kodi to your media and watch it **scan and automagically create a personalized library** complete with box covers, descriptions, and fanart. There are playlist and slideshow functions, a weather forecast feature and many audio visualizations. Once installed, your computer or HTPC will become a fully functional multimedia jukebox.
 
+<p align="center">
+  <img src="docs/resources/kodi.gif" alt="Kodi">
+</p>
 
-## Installation
+## Getting Started
+Kodi's developers work hard to make it support a large range of devices and operating systems. We provide final as well as development builds. To get started, head over to the **[downloads section](https://kodi.tv/download)** and simply select the platform that you want to install it on. A **[quick start guide](https://kodi.wiki/view/quick_start_guide)** to help you get acquainted with Kodi is available in our wiki.
 
-See [docs/README.xxx](https://github.com/xbmc/xbmc/tree/master/docs) for specific platform build information.
+## How to Contribute
+Kodi is created by users for users and **we welcome every contribution**. There are no highly paid developers or poorly paid support personnel on the phones ready to take your call. There are only users who have seen a problem and done their best to fix it. This means Kodi will always need the contributions of users like you. How can you get involved?
 
-## Quick Kodi development links
+* **Coding:** Developers can help Kodi by **[fixing a bug](https://trac.kodi.tv/)**, adding new features, making our technology smaller and faster and making development easier for others. Kodi's codebase consists mainly of C++ with small parts written in a variety of coding languages. Our add-ons mainly consist of python and XML. For more information, please have a look at our **[contributing guide](docs/CONTRIBUTING.md)**.
+* **Helping users:** Our support process relies on enthusiastic contributors like you to help others get the most out of Kodi. The #1 priority is always answering questions in our **[support forums](https://forum.kodi.tv/)**. Everyday new people discover Kodi, and everyday they are virtually guaranteed to have questions.
+* **Localization:** Translate **[Kodi](https://www.transifex.com/teamxbmc/kodi-main/)**, **[add-ons](https://www.transifex.com/teamxbmc/xbmc-addons/)** and **[skins](https://www.transifex.com/teamxbmc/xbmc-skins/)** into your native language.
+* **Add-ons:** **[Add-ons](https://kodi.tv/addons)** are what make Kodi the most extensible and customizable entertainment hub available. **[Get started building an add-on](https://kodi.tv/create-an-addon)**.
+* **Documentation:** Kodi's **[wiki pages](https://kodi.wiki/)** are the hub for information about Kodi and surrounding ecosystem. Help make our documentation better by writing new content or correcting existing material.
 
-* [Contributing](https://github.com/xbmc/xbmc/blob/master/CONTRIBUTING.md)
-* [Submitting a patch](http://kodi.wiki/view/HOW-TO_submit_a_patch)
-* [Code guidelines](https://codedocs.xyz/xbmc/xbmc/code_guidelines.html)
-* [Kodi development](http://kodi.wiki/view/Development)
+**Not enough free time?** No problem! There are other ways to help Kodi.
 
-## Useful links
+* **Spread the word:** Share Kodi with the world! Tell your friends and family about how Kodi creates an amazing entertainment experience. Stay up to date on the latest stories about Kodi reading our **[news](https://kodi.tv/blog)** section, follow us on **[Twitter](https://twitter.com/koditv)** and **[Facebook](https://www.facebook.com/XBMC/)**, or **star Kodi's repo** if you want to follow development.
+* **Donate:** We are always happy to receive a **[donation](https://kodi.tv/contribute/donate)**. Donations are typically used for travel to attend conferences, any necessary paperwork and legal fees, and the yearly XBMC Foundation Developers Conference, where a great deal of coding and planning for the following year occurs. Donations may also be used to purchase necessary hardware and licenses for developers, along with t-shirts, stickers, and other accessories for conferences.
+* **Buy Kodi merchandise:** Purchasing Kodi gear helps just as much as a donation, and you get something in return! Checkout our **[store](https://kodi.tv/store)** for Kodi branded gear. We regularly add new products so check back often.
 
-* [Kodi wiki](http://kodi.wiki/)
-* [Kodi bug tracker](http://trac.kodi.tv)
-* [Kodi community forums](http://forum.kodi.tv/)
-* [Kodi website](http://kodi.tv)
+## Building
+Kodi uses CMake as its building system but instructions are highly dependent on your operating system and target platform. Fortunately **[we've got you covered](docs/README.md)**.
 
-**Enjoy Kodi and help us improve it today. :)**
+## Acknowledgements
+Kodi couldn't exist without
+
+* All the **[contributors](https://github.com/xbmc/xbmc/graphs/contributors)**. Big or small a change, it does make a difference.
+* All the developers that write the fantastic **software and libraries** that Kodi uses. We stand on the shoulders of giants.
+* Our **[fantastic community](https://forum.kodi.tv/)** for the never ending support, inspiration, feedback, and for keeping us on our toes when we screw up!
+* **[Our sponsors](https://kodi.tv/sponsors)**. Without them, keeping a huge project like this alive would be next to impossible.
+
+## License
+Kodi is **[GPLv2 licensed](LICENSE.md)**. You may use, distribute and copy it under the license terms.
+
+<a href="https://github.com/xbmc/xbmc/graphs/contributors"><img src="https://forthebadge.com/images/badges/built-by-developers.svg" height="25"></a>
+<a href="https://github.com/xbmc/xbmc"><img src="https://forthebadge.com/images/badges/certified-cousin-terio.svg" height="25"></a>
+<a href="https://github.com/xbmc/xbmc"><img src="https://forthebadge.com/images/badges/approved-by-george-costanza.svg" height="25"></a>
+<a href="https://kodi.tv/download"><img src="https://forthebadge.com/images/badges/check-it-out.svg" height="25"></a>
+<a href="https://github.com/xbmc/xbmc"><img src="https://forthebadge.com/images/badges/winter-is-coming.svg" height="25"></a>
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/tools/buildsteps/windows/BuildSetup.bat kodi-18.0+git20180704.0202-f0dda3a/tools/buildsteps/windows/BuildSetup.bat
--- kodi-18.0+git20180703.0201-a44e6e2/tools/buildsteps/windows/BuildSetup.bat	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/tools/buildsteps/windows/BuildSetup.bat	2018-07-04 00:01:50.000000000 +0000
@@ -145,7 +145,7 @@
   xcopy %EXE% BUILD_WIN32\application > NUL
   xcopy %D3D% BUILD_WIN32\application > NUL
   xcopy %base_dir%\userdata BUILD_WIN32\application\userdata /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
-  copy %base_dir%\LICENSE.GPL BUILD_WIN32\application > NUL
+  copy %base_dir%\LICENSE.md BUILD_WIN32\application > NUL
   copy %base_dir%\copying.txt BUILD_WIN32\application > NUL
   copy %base_dir%\privacy-policy.txt BUILD_WIN32\application > NUL
   copy %base_dir%\known_issues.txt BUILD_WIN32\application > NUL
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/tools/darwin/Support/CopyRootFiles-ios.command kodi-18.0+git20180704.0202-f0dda3a/tools/darwin/Support/CopyRootFiles-ios.command
--- kodi-18.0+git20180703.0201-a44e6e2/tools/darwin/Support/CopyRootFiles-ios.command	2017-11-15 01:02:44.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/tools/darwin/Support/CopyRootFiles-ios.command	2018-07-04 00:01:50.000000000 +0000
@@ -32,7 +32,7 @@
 mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/media"
 mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/tools/darwin/runtime"
 
-${SYNC} "$SRCROOT/LICENSE.GPL"  "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/"
+${SYNC} "$SRCROOT/LICENSE.md"  "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/"
 ${SYNC} "$SRCROOT/privacy-policy.txt"  "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome"
 ${SYNC} "$SRCROOT/xbmc/platform/darwin/Credits.html"  "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/"
 ${ADDONSYNC} "$SRCROOT/addons"  "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome"
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/tools/darwin/Support/CopyRootFiles-osx.command kodi-18.0+git20180704.0202-f0dda3a/tools/darwin/Support/CopyRootFiles-osx.command
--- kodi-18.0+git20180703.0201-a44e6e2/tools/darwin/Support/CopyRootFiles-osx.command	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/tools/darwin/Support/CopyRootFiles-osx.command	2018-07-04 00:01:50.000000000 +0000
@@ -28,7 +28,7 @@
 mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/tools/darwin/runtime"
 mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/extras/user"
 
-${SYNC} "$SRCROOT/LICENSE.GPL" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/"
+${SYNC} "$SRCROOT/LICENSE.md" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/"
 ${SYNC} "$SRCROOT/privacy-policy.txt" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
 ${SYNC} "$SRCROOT/xbmc/platform/darwin/Credits.html" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/"
 ${SYNC} "$SRCROOT/tools/darwin/runtime"	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/tools/darwin"
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/tools/depends/README kodi-18.0+git20180704.0202-f0dda3a/tools/depends/README
--- kodi-18.0+git20180703.0201-a44e6e2/tools/depends/README	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/tools/depends/README	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-Examples:
-
-#- Darwin
-#----------------------------------------------------------------------------
-
-OSX (i386):
-    ./configure --host=i386-apple-darwin
-
-OSX (x86_64):
-    ./configure --host=x86_64-apple-darwin
-
-IOS (armv7):
-    ./configure --host=arm-apple-darwin
-
-IOS (arm64):
-    ./configure --host=arm-apple-darwin --with-cpu=arm64
-
-TVOS:
-    ./configure --host=arm-apple-darwin --with-platform=tvos
-
-  You can target the same --prefix path, each setup will be done in an isolated directory. The
-  last configure/make you do is the one used for Kodi/Xcode.
-
-#- Android (the paths are examples and have to match those of docs/READM.android)
-#----------------------------------------------------------------------------
-
-  arm:
-    ./configure --with-tarballs=/opt/xbmc-tarballs --host=arm-linux-androideabi --with-sdk-path=/opt/android-sdk-linux --with-ndk-path=/opt/android-ndk-r16 --with-toolchain=/opt/arm-linux-androideabi-4.9-vanilla/android-21 --prefix=/opt/xbmc-depends
-
-  x86:
-    ./configure --with-tarballs=/opt/xbmc-tarballs --host=i686-linux-android --with-sdk-path=/opt/android-sdk-linux --with-ndk-path=/opt/android-ndk-r16 --with-toolchain=/opt/x86-linux-4.9-vanilla/android-21 --prefix=/opt/xbmc-depends
-
-#- Linux
-#----------------------------------------------------------------------------
-
-  ARM toolchain (codesourcery/lenaro/etc)
-    ./configure --with-toolchain=/opt/toolchains/my-example-toolchain/  --prefix=/opt/xbmc-deps --host=arm-linux-gnueabi
-
-  RASPBERRY-PI:
-    ./configure --with-platform=raspberry-pi --host=arm-linux-gnueabihf --prefix=/opt/xbmc-deps --with-tarballs=/opt/xbmc-tarballs --with-toolchain=/opt/rbp-dev/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf --with-firmware=/opt/rbp-dev/firmware --build=i686-linux
-
-  Native toolchain
-    ./configure --with-toolchain=/usr --prefix=/opt/xbmc-deps --host=x86_64-linux-gnu
-
-#----------------------------------------------------------------------------
-#----------------------------------------------------------------------------
-Details:
-  We build a native tools for platforms that do not have the native tools we need. OSX is
-  the largest builder of native tools as there is not much present. No cmake, no autotools, etc.
-
-  Cross compiling is a real pain is the rear :) Generally there are three forms,
-    autotools (configure/make), cmake driven, and hand crafted makefile. In term
-    of usage, 90 percent are autotools, followed by cmake and hand crafted makefiles.
-    Some libs need patching, most do not. Lib versions are picked for a reason, be prepared
-    for robust testing if you go bumping libs. Never commit bumps unless you have also done
-    a complete distclean nuke of EVERYTHING and rebuild from scratch on ALL platforms.
-    Epic fail if this is not tested.
-
-  1) autotool driven tend to be simple PROVIDED the authors followed proper autotool format.
-     Try with $(CONFIGURE) 1st, if problem, try adding $(AUTORECONF) -vif before the
-     $(CONFIGURE). Some are do silly things and only a config.site can correct the errors.
-     So watch for this in the config.site.in. config.site rules and this is the only way
-     to handle bad autotool behavior.
-
-  2) cmake driven tend to be simple, setup cmake flags right and go. On rare cases, you might
-     need to diddle the native cmake setup.
-
-  3) hand crafted Makefiles typically require manual sed tweaks or patching.
-
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/tools/depends/README.md kodi-18.0+git20180704.0202-f0dda3a/tools/depends/README.md
--- kodi-18.0+git20180703.0201-a44e6e2/tools/depends/README.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/tools/depends/README.md	2018-07-04 00:01:50.000000000 +0000
@@ -0,0 +1,60 @@
+![Kodi Logo](../../docs/resources/banner_slim.png)
+
+# Kodi's Unified Depends Build System
+This builds native tools and library dependencies for platforms that do not provide them. It is used on our continuous integration system, **[jenkins](http://jenkins.kodi.tv/)**. A nice side effect is that it allows us to use the same tools and library versions across all platforms.
+
+In terms of build system usage, largest percentage is Autotools, followed by CMake and, in rare cases, hand crafted Makefiles. Tools and libraries versions are picked for a reason. If you feel the urge to start bumping them, be prepared for robust testing. Some tools and libraries need patching, most do not.
+
+That said, we try to stay fairly current with used versions and send patches upstream whenever possible.
+
+
+* **Autotools driven tools and libraries** tend to just work **provided** the author(s) followed proper Autotools format. Execute `./bootstrap`, followed by `./configure --[...]` and you're all set. If `./configure --[...]` gives you problems, try `./autoreconf -vif` before `./configure --[...]`.
+Some authors do silly things and only a `config.site` can correct the errors. Watch for this in the config.site(.in) file(s). It is the only way to handle bad Autotools behaviour.
+
+* **CMake driven tools and libraries** also tend to just work. Setup CMake flags correctly and go. On rare cases, you might need to diddle the native CMake setup.
+
+* **Hand crafted Makefiles driven tools and libraries** typically require manual sed tweaks or patching. May give you nightmares.
+
+## Usage Examples
+Paths below are examples. If you want to build Kodi, follow our **[build guides](../../docs/README.md)**.
+### All platforms
+`./bootstrap`
+### Darwin
+**macOS (i386)**  
+`./configure --host=i386-apple-darwin`
+
+**macOS (x86_64)**  
+`./configure --host=x86_64-apple-darwin`
+
+**iOS (armv7)**  
+`./configure --host=arm-apple-darwin`
+
+**iOS (arm64)**  
+`./configure --host=arm-apple-darwin --with-cpu=arm64`
+
+**tvOS**  
+`./configure --host=arm-apple-darwin --with-platform=tvos`
+
+**NOTE:** You can target the same `--prefix=` path. Each setup will be done in an isolated directory. The last configure/make you do is the one used for Kodi/Xcode.
+ 
+### Android
+**arm**  
+`./configure --with-tarballs=/opt/xbmc-tarballs --host=arm-linux-androideabi --with-sdk-path=/opt/android-sdk-linux --with-ndk-path=/opt/android-ndk-r16b --with-toolchain=/opt/arm-linux-androideabi-4.9-vanilla/android-21 --prefix=/opt/xbmc-depends`
+
+**aarch64**  
+`./configure --with-tarballs=/opt/xbmc-tarballs --host=aarch64-linux-android-4.9 --with-sdk-path=/opt/android-sdk-linux --with-ndk-path=/opt/android-ndk-r16b --with-toolchain=/opt/aarch64-linux-android-4.9-vanilla/android-21 --prefix=/opt/xbmc-depends`
+
+**x86**  
+`./configure --with-tarballs=/opt/xbmc-tarballs --host=i686-linux-android --with-sdk-path=/opt/android-sdk-linux --with-ndk-path=/opt/android-ndk-r16b --with-toolchain=/opt/x86-linux-4.9-vanilla/android-21 --prefix=/opt/xbmc-depends`
+
+### Linux
+**ARM (codesourcery/lenaro/etc)**  
+`./configure --with-toolchain=/opt/toolchains/my-example-toolchain/ --prefix=/opt/xbmc-deps --host=arm-linux-gnueabi`
+
+**Raspberry Pi**  
+`./configure --with-platform=raspberry-pi --host=arm-linux-gnueabihf --prefix=/opt/xbmc-deps --with-tarballs=/opt/xbmc-tarballs --with-toolchain=/opt/rbp-dev/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf --with-firmware=/opt/rbp-dev/firmware --build=i686-linux`
+
+**Native**  
+`./configure --with-toolchain=/usr --prefix=/opt/xbmc-deps --host=x86_64-linux-gnu`
+
+Cross compiling is a PITA.
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/tools/Linux/packaging/README.debian kodi-18.0+git20180704.0202-f0dda3a/tools/Linux/packaging/README.debian
--- kodi-18.0+git20180703.0201-a44e6e2/tools/Linux/packaging/README.debian	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/tools/Linux/packaging/README.debian	2018-07-04 00:01:50.000000000 +0000
@@ -4,7 +4,7 @@
 1.) debuild / debhelper
   Requirements: debhelper, devscripts, all Kodi build deps
       sudo apt-get install debhelper devscripts
-      sudo apt-get build-dep kodi (if you have one of our repos/ppas added, else read docs/README.linux or docs/README.ubuntu)
+      sudo apt-get build-dep kodi (if you have one of our repos/ppas added, else read docs/README.Linux.md or docs/README.Ubuntu.md)
 
   Result: Debian package for your host distribution and architecture only
   Recommended for local installs
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/VERSION kodi-18.0+git20180704.0202-f0dda3a/VERSION
--- kodi-18.0+git20180703.0201-a44e6e2/VERSION	2018-07-03 00:01:53.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/VERSION	2018-07-04 00:02:18.000000000 +0000
@@ -1 +1 @@
-a44e6e2
+f0dda3a
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/AddonBuilder.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/AddonBuilder.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/AddonBuilder.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/AddonBuilder.h	2018-07-04 00:01:50.000000000 +0000
@@ -29,8 +29,6 @@
 class CAddonBuilder
 {
 public:
-  CAddonBuilder() : m_built(false), m_extPoint(nullptr) {}
-
   std::shared_ptr<IAddon> Build();
   void SetId(std::string id) { m_addonInfo.m_id = std::move(id); }
   void SetName(std::string name) { m_addonInfo.m_name = std::move(name); }
@@ -68,9 +66,9 @@
 private:
   static std::shared_ptr<IAddon> FromProps(CAddonInfo addonInfo);
 
-  bool m_built;
+  bool m_built = false;
   CAddonInfo m_addonInfo;
-  cp_extension_t* m_extPoint;
+  cp_extension_t* m_extPoint = nullptr;
 };
 
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/AddonInfo.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/AddonInfo.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/AddonInfo.cpp	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/AddonInfo.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -137,17 +137,9 @@
     return ADDON_UNKNOWN;
 }
 
-CAddonInfo::CAddonInfo()
-  : m_mainType(ADDON_UNKNOWN),
-    m_packageSize(0)
-{
-
-}
-
 CAddonInfo::CAddonInfo(std::string id, TYPE type)
   : m_id(std::move(id)),
-    m_mainType(type),
-    m_packageSize(0)
+    m_mainType(type)
 {
 
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/AddonInfo.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/AddonInfo.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/AddonInfo.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/AddonInfo.h	2018-07-04 00:01:50.000000000 +0000
@@ -113,7 +113,7 @@
   class CAddonInfo
   {
   public:
-    CAddonInfo();
+    CAddonInfo() = default;
     CAddonInfo(std::string id, TYPE type);
 
     void SetMainType(TYPE type) { m_mainType = type; }
@@ -163,7 +163,7 @@
     friend class ADDON::CAddonBuilder;
 
     std::string m_id;
-    TYPE m_mainType;
+    TYPE m_mainType = ADDON_UNKNOWN;
 
     AddonVersion m_version{"0.0.0"};
     AddonVersion m_minversion{"0.0.0"};
@@ -185,7 +185,7 @@
     CDateTime m_lastUpdated;
     CDateTime m_lastUsed;
     std::string m_origin;
-    uint64_t m_packageSize;
+    uint64_t m_packageSize = 0;
     std::string m_language;
     std::string m_libname;
     InfoMap m_extrainfo;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/AddonManager.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/AddonManager.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/AddonManager.cpp	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/AddonManager.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -290,10 +290,6 @@
   return true;
 }
 
-CAddonMgr::CAddonMgr()
-  : m_cp_context(nullptr)
-{ }
-
 CAddonMgr::~CAddonMgr()
 {
   DeInit();
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/AddonManager.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/AddonManager.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/AddonManager.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/AddonManager.h	2018-07-04 00:01:50.000000000 +0000
@@ -75,7 +75,7 @@
     bool Init();
     void DeInit();
 
-    CAddonMgr();
+    CAddonMgr() = default;
     CAddonMgr(const CAddonMgr&) = delete;
     virtual ~CAddonMgr();
 
@@ -294,7 +294,7 @@
   private:
     CAddonMgr& operator=(CAddonMgr const&) = delete;
     /* libcpluff */
-    cp_context_t *m_cp_context;
+    cp_context_t *m_cp_context = nullptr;
     VECADDONS    m_updateableAddons;
 
     /*! \brief Check whether this addon is supported on the current platform
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/GUIDialogAddonInfo.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/GUIDialogAddonInfo.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/GUIDialogAddonInfo.cpp	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/GUIDialogAddonInfo.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -72,8 +72,7 @@
 using KODI::MESSAGING::HELPERS::DialogResponse;
 
 CGUIDialogAddonInfo::CGUIDialogAddonInfo(void)
-  : CGUIDialog(WINDOW_DIALOG_ADDON_INFO, "DialogAddonInfo.xml"),
-  m_addonEnabled(false)
+  : CGUIDialog(WINDOW_DIALOG_ADDON_INFO, "DialogAddonInfo.xml")
 {
   m_item = CFileItemPtr(new CFileItem);
   m_loadType = KEEP_IN_MEMORY;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/GUIDialogAddonInfo.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/GUIDialogAddonInfo.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/GUIDialogAddonInfo.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/GUIDialogAddonInfo.h	2018-07-04 00:01:50.000000000 +0000
@@ -86,6 +86,6 @@
 
   CFileItemPtr m_item;
   ADDON::AddonPtr m_localAddon;
-  bool m_addonEnabled;
+  bool m_addonEnabled = false;
 };
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile	2018-07-04 00:01:50.000000000 +0000
@@ -1300,7 +1300,7 @@
 # files will be copied as-is; there are no commands or markers available.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_FILES       = LICENSE.GPL
+HTML_EXTRA_FILES       = LICENSE.md
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/kodi-addon-dev-kit/doxygen/main.txt kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/kodi-addon-dev-kit/doxygen/main.txt
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/kodi-addon-dev-kit/doxygen/main.txt	2016-05-24 00:00:39.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/kodi-addon-dev-kit/doxygen/main.txt	2018-07-04 00:01:50.000000000 +0000
@@ -33,7 +33,7 @@
 
 #### License
 
-Kodi is distributed under a [GNU General Public License version 2](./LICENSE.GPL).
+Kodi is distributed under a [GNU General Public License version 2](./LICENSE.md).
 
 \htmlonly
 <div style="display:none">
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h	2018-07-04 00:01:50.000000000 +0000
@@ -98,10 +98,7 @@
   public:
     Peripheral(PERIPHERAL_TYPE type = PERIPHERAL_TYPE_UNKNOWN, const std::string& strName = "") :
       m_type(type),
-      m_strName(strName),
-      m_vendorId(0),
-      m_productId(0),
-      m_index(0)
+      m_strName(strName)
     {
     }
 
@@ -150,9 +147,9 @@
   private:
     PERIPHERAL_TYPE  m_type;
     std::string      m_strName;
-    uint16_t         m_vendorId;
-    uint16_t         m_productId;
-    unsigned int     m_index;
+    uint16_t         m_vendorId = 0;
+    uint16_t         m_productId = 0;
+    unsigned int     m_index = 0;
   };
 
   typedef PeripheralVector<Peripheral, PERIPHERAL_INFO> Peripherals;
@@ -260,12 +257,7 @@
     Joystick(const std::string& provider = "", const std::string& strName = "") :
       Peripheral(PERIPHERAL_TYPE_JOYSTICK, strName),
       m_provider(provider),
-      m_requestedPort(NO_PORT_REQUESTED),
-      m_buttonCount(0),
-      m_hatCount(0),
-      m_axisCount(0),
-      m_motorCount(0),
-      m_supportsPowerOff(false)
+      m_requestedPort(NO_PORT_REQUESTED)
     {
     }
 
@@ -346,11 +338,11 @@
   private:
     std::string                   m_provider;
     int                           m_requestedPort;
-    unsigned int                  m_buttonCount;
-    unsigned int                  m_hatCount;
-    unsigned int                  m_axisCount;
-    unsigned int                  m_motorCount;
-    bool                          m_supportsPowerOff;
+    unsigned int                  m_buttonCount = 0;
+    unsigned int                  m_hatCount = 0;
+    unsigned int                  m_axisCount = 0;
+    unsigned int                  m_motorCount = 0;
+    bool                          m_supportsPowerOff = false;
   };
 
   typedef PeripheralVector<Joystick, JOYSTICK_INFO> Joysticks;
@@ -403,12 +395,7 @@
      */
     DriverPrimitive(JOYSTICK_DRIVER_PRIMITIVE_TYPE type, unsigned int driverIndex) :
       m_type(type),
-      m_driverIndex(driverIndex),
-      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
-      m_center(0),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
-      m_range(1),
-      m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
+      m_driverIndex(driverIndex)
     {
     }
 
@@ -416,16 +403,7 @@
     /*!
      * \brief Construct an invalid driver primitive
      */
-    DriverPrimitive(void) :
-      m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN),
-      m_driverIndex(0),
-      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
-      m_center(0),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
-      m_range(1),
-      m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
-    {
-    }
+    DriverPrimitive(void) = default;
 
     /*!
      * \brief Construct a driver primitive representing a joystick button
@@ -442,11 +420,7 @@
     DriverPrimitive(unsigned int hatIndex, JOYSTICK_DRIVER_HAT_DIRECTION direction) :
       m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION),
       m_driverIndex(hatIndex),
-      m_hatDirection(direction),
-      m_center(0),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
-      m_range(1),
-      m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
+      m_hatDirection(direction)
     {
     }
 
@@ -457,11 +431,9 @@
     DriverPrimitive(unsigned int axisIndex, int center, JOYSTICK_DRIVER_SEMIAXIS_DIRECTION direction, unsigned int range) :
       m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS),
       m_driverIndex(axisIndex),
-      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
       m_center(center),
       m_semiAxisDirection(direction),
-      m_range(range),
-      m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
+      m_range(range)
     {
     }
 
@@ -478,13 +450,7 @@
      */
     DriverPrimitive(std::string keycode) :
       m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY),
-      m_driverIndex(0),
-      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
-      m_center(0),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
-      m_range(1),
-      m_keycode(std::move(keycode)),
-      m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
+      m_keycode(std::move(keycode))
     {
     }
 
@@ -502,23 +468,12 @@
      */
     DriverPrimitive(JOYSTICK_DRIVER_RELPOINTER_DIRECTION direction) :
       m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION),
-      m_driverIndex(0),
-      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
-      m_center(0),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
-      m_range(1),
       m_relPointerDirection(direction)
     {
     }
 
     explicit DriverPrimitive(const JOYSTICK_DRIVER_PRIMITIVE& primitive) :
-      m_type(primitive.type),
-      m_driverIndex(0),
-      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
-      m_center(0),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
-      m_range(1),
-      m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
+      m_type(primitive.type)
     {
       switch (m_type)
       {
@@ -678,14 +633,14 @@
     }
 
   private:
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE     m_type;
-    unsigned int                       m_driverIndex;
-    JOYSTICK_DRIVER_HAT_DIRECTION      m_hatDirection;
-    int                                m_center;
-    JOYSTICK_DRIVER_SEMIAXIS_DIRECTION m_semiAxisDirection;
-    unsigned int                       m_range;
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE     m_type = JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN;
+    unsigned int                       m_driverIndex = 0;
+    JOYSTICK_DRIVER_HAT_DIRECTION      m_hatDirection = JOYSTICK_DRIVER_HAT_UNKNOWN;
+    int                                m_center = 0;
+    JOYSTICK_DRIVER_SEMIAXIS_DIRECTION m_semiAxisDirection = JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN;
+    unsigned int                       m_range = 1;
     std::string                        m_keycode;
-    JOYSTICK_DRIVER_RELPOINTER_DIRECTION m_relPointerDirection;
+    JOYSTICK_DRIVER_RELPOINTER_DIRECTION m_relPointerDirection = JOYSTICK_DRIVER_RELPOINTER_UNKNOWN;
   };
 
   typedef PeripheralVector<DriverPrimitive, JOYSTICK_DRIVER_PRIMITIVE> DriverPrimitives;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h	2018-07-04 00:01:50.000000000 +0000
@@ -319,8 +319,7 @@
     /// Used by an add-on that only supports visualizations.
     ///
     CInstanceVisualization()
-      : IAddonInstance(ADDON_INSTANCE_VISUALIZATION),
-        m_presetLockedByUser(false)
+      : IAddonInstance(ADDON_INSTANCE_VISUALIZATION)
     {
       if (CAddonBase::m_interface->globalSingleInstance != nullptr)
         throw std::logic_error("kodi::addon::CInstanceVisualization: Cannot create multiple instances of add-on.");
@@ -342,8 +341,7 @@
     /// @warning Only use `instance` from the CreateInstance call
     ///
     explicit CInstanceVisualization(KODI_HANDLE instance)
-      : IAddonInstance(ADDON_INSTANCE_VISUALIZATION),
-        m_presetLockedByUser(false)
+      : IAddonInstance(ADDON_INSTANCE_VISUALIZATION)
     {
       if (CAddonBase::m_interface->globalSingleInstance != nullptr)
         throw std::logic_error("kodi::addon::CInstanceVisualization: Creation of multiple together with single instance way is not allowed!");
@@ -759,7 +757,7 @@
       return addon->toAddon.addonInstance->IsLocked();
     }
 
-    bool m_presetLockedByUser;
+    bool m_presetLockedByUser = false;
     AddonInstance_Visualization* m_instanceData;
   };
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h	2018-07-04 00:01:50.000000000 +0000
@@ -1232,7 +1232,7 @@
     /// @ingroup cpp_kodi_vfs_CFile
     /// @brief Construct a new, unopened file
     ///
-    CFile() : m_file(nullptr) { }
+    CFile() = default;
     //--------------------------------------------------------------------------
 
     //==========================================================================
@@ -1638,7 +1638,7 @@
     //--------------------------------------------------------------------------
 
   private:
-    void* m_file;
+    void* m_file = nullptr;
   };
   //@}
   //----------------------------------------------------------------------------
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h	2018-07-04 00:01:50.000000000 +0000
@@ -40,7 +40,7 @@
   ///
   /// There becomes selected always set to false.
   ///
-  SSelectionEntry() : selected(false) { }
+  SSelectionEntry() = default;
   //----------------------------------------------------------------------------
 
   /// Entry identfication string
@@ -51,7 +51,7 @@
 
   /// Place where entry can be preselected and after return the from user
   /// selected is set.
-  bool selected;
+  bool selected = false;
 } SSelectionEntry;
 //------------------------------------------------------------------------------
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/Scraper.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/Scraper.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/Scraper.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/Scraper.h	2018-07-04 00:01:50.000000000 +0000
@@ -70,7 +70,7 @@
 class CScraperError
 {
 public:
-  CScraperError() : m_fAborted(true) {}
+  CScraperError() = default;
   CScraperError(const std::string &sTitle, const std::string &sMessage) :
     m_fAborted(false), m_sTitle(sTitle), m_sMessage(sMessage) {}
 
@@ -79,7 +79,7 @@
   const std::string &Message() const { return m_sMessage; }
 
 private:
-  bool m_fAborted;
+  bool m_fAborted = true;
   std::string m_sTitle;
   std::string m_sMessage;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/Skin.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/Skin.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/addons/Skin.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/addons/Skin.h	2018-07-04 00:01:50.000000000 +0000
@@ -77,16 +77,13 @@
 class CSkinSettingBool : public CSkinSetting
 {
 public:
-  CSkinSettingBool()
-    : value(false)
-  { }
   ~CSkinSettingBool() override = default;
 
   std::string GetType() const override { return "bool"; }
 
   bool Deserialize(const TiXmlElement* element) override;
 
-  bool value;
+  bool value = false;
 
 protected:
   bool SerializeSetting(TiXmlElement* element) const override;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/Application.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/Application.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/Application.cpp	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/Application.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -241,30 +241,9 @@
 #ifdef HAS_DVD_DRIVE
   m_Autorun(new CAutorun()),
 #endif
-  m_iScreenSaveLock(0)
-  , m_confirmSkinChange(true)
-  , m_ignoreSkinSettingChanges(false)
-  , m_saveSkinOnUnloading(true)
-  , m_autoExecScriptExecuted(false)
-  , m_screensaverActive(false)
-  , m_bInhibitIdleShutdown(false)
-  , m_dpmsIsActive(false)
-  , m_dpmsIsManual(false)
-  , m_itemCurrentFile(new CFileItem)
-  , m_threadID(0)
-  , m_bInitializing(true)
-  , m_bPlatformDirectories(true)
-  , m_nextPlaylistItem(-1)
-  , m_lastRenderTime(0)
-  , m_skipGuiRender(false)
-  , m_bStandalone(false)
-  , m_bTestMode(false)
-  , m_bSystemScreenSaverEnable(false)
-  , m_muted(false)
-  , m_volumeLevel(VOLUME_MAXIMUM)
+  m_itemCurrentFile(new CFileItem)
   , m_pInertialScrollingHandler(new CInertialScrollingHandler())
   , m_WaitingExternalCalls(0)
-  , m_ProcessedExternalCalls(0)
   , m_playerEvent(true, true)
 {
   TiXmlBase::SetCondenseWhiteSpace(false);
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/Application.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/Application.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/Application.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/Application.h	2018-07-04 00:01:50.000000000 +0000
@@ -306,7 +306,7 @@
   inline std::string ScreensaverIdInUse() { return m_screensaverIdInUse; }
 
   inline bool IsDPMSActive() { return m_dpmsIsActive; };
-  int m_iScreenSaveLock; // spiff: are we checking for a lock? if so, ignore the screensaver state, if -1 we have failed to input locks
+  int m_iScreenSaveLock = 0; // spiff: are we checking for a lock? if so, ignore the screensaver state, if -1 we have failed to input locks
 
   std::string m_strPlayListFile;
 
@@ -409,11 +409,11 @@
   std::deque<XBMC_Event> m_portEvents;
   CCriticalSection m_portSection;
 
-  bool m_confirmSkinChange;
-  bool m_ignoreSkinSettingChanges;
+  bool m_confirmSkinChange = true;
+  bool m_ignoreSkinSettingChanges = false;
 
-  bool m_saveSkinOnUnloading;
-  bool m_autoExecScriptExecuted;
+  bool m_saveSkinOnUnloading = true;
+  bool m_autoExecScriptExecuted = false;
 
 #if defined(TARGET_DARWIN_IOS)
   friend class CWinEventsIOS;
@@ -422,7 +422,7 @@
   friend class CWinEventsAndroid;
 #endif
   // screensaver
-  bool m_screensaverActive;
+  bool m_screensaverActive = false;
   std::string m_screensaverIdInUse;
   ADDON::AddonPtr m_pythonScreenSaver; // @warning: Fallback for Python interface, for binaries not needed!
   // OS screen saver inhibitor that is always active if user selected a Kodi screen saver
@@ -445,32 +445,32 @@
   CStopWatch m_shutdownTimer;
   XbmcThreads::EndTime m_guiRefreshTimer;
 
-  bool m_bInhibitIdleShutdown;
+  bool m_bInhibitIdleShutdown = false;
 
   std::unique_ptr<DPMSSupport> m_dpms;
-  bool m_dpmsIsActive;
-  bool m_dpmsIsManual;
+  bool m_dpmsIsActive = false;
+  bool m_dpmsIsManual = false;
 
   CFileItemPtr m_itemCurrentFile;
 
   std::string m_prevMedia;
-  ThreadIdentifier m_threadID;       // application thread ID.  Used in applicationMessenger to know where we are firing a thread with delay from.
-  bool m_bInitializing;
-  bool m_bPlatformDirectories;
-
-  int m_nextPlaylistItem;
-
-  unsigned int m_lastRenderTime;
-  bool m_skipGuiRender;
-
-  bool m_bStandalone;
-  bool m_bTestMode;
-  bool m_bSystemScreenSaverEnable;
+  ThreadIdentifier m_threadID = 0;       // application thread ID.  Used in applicationMessenger to know where we are firing a thread with delay from.
+  bool m_bInitializing = true;
+  bool m_bPlatformDirectories = true;
+
+  int m_nextPlaylistItem = -1;
+
+  unsigned int m_lastRenderTime = 0;
+  bool m_skipGuiRender = false;
+
+  bool m_bStandalone = false;
+  bool m_bTestMode = false;
+  bool m_bSystemScreenSaverEnable = false;
 
   std::unique_ptr<MUSIC_INFO::CMusicInfoScanner> m_musicInfoScanner;
 
-  bool m_muted;
-  float m_volumeLevel;
+  bool m_muted = false;
+  float m_volumeLevel = VOLUME_MAXIMUM;
 
   void Mute();
   void UnMute();
@@ -503,7 +503,7 @@
 
   CCriticalSection m_frameMoveGuard;              /*!< critical section for synchronizing GUI actions from inside and outside (python) */
   std::atomic_uint m_WaitingExternalCalls;        /*!< counts threads wich are waiting to be processed in FrameMove */
-  unsigned int m_ProcessedExternalCalls;          /*!< counts calls wich are processed during one "door open" cycle in FrameMove */
+  unsigned int m_ProcessedExternalCalls = 0;          /*!< counts calls wich are processed during one "door open" cycle in FrameMove */
   unsigned int m_ProcessedExternalDecay = 0;      /*!< counts to close door after a few frames of no python activity */
   CApplicationPlayer m_appPlayer;
   CEvent m_playerEvent;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/ApplicationStackHelper.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/ApplicationStackHelper.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/ApplicationStackHelper.cpp	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/ApplicationStackHelper.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -32,8 +32,6 @@
 
 CApplicationStackHelper::CApplicationStackHelper(void)
   : m_currentStack(new CFileItemList)
-  , m_currentStackPosition(0)
-  , m_currentStackIsDiscImageStack(false)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/ApplicationStackHelper.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/ApplicationStackHelper.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/ApplicationStackHelper.h	2018-05-01 00:00:21.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/ApplicationStackHelper.h	2018-07-04 00:01:50.000000000 +0000
@@ -204,6 +204,6 @@
   StackPartInformationPtr GetStackPartInformation(std::string key);
 
   std::unique_ptr<CFileItemList> m_currentStack;
-  int m_currentStackPosition;
-  bool m_currentStackIsDiscImageStack;
+  int m_currentStackPosition = 0;
+  bool m_currentStackIsDiscImageStack = false;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cdrip/EncoderFFmpeg.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/cdrip/EncoderFFmpeg.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cdrip/EncoderFFmpeg.cpp	2018-05-01 00:00:23.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cdrip/EncoderFFmpeg.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -47,12 +47,9 @@
   m_SwrCtx    (NULL),
   m_Stream    (NULL),
   m_Buffer    (NULL),
-  m_BufferSize(0),
   m_BufferFrame(NULL),
   m_ResampledBuffer(NULL),
-  m_ResampledBufferSize(0),
-  m_ResampledFrame(NULL),
-  m_NeedConversion(false)
+  m_ResampledFrame(NULL)
 {
   memset(&m_callbacks, 0, sizeof(m_callbacks));
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cdrip/EncoderFFmpeg.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/cdrip/EncoderFFmpeg.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cdrip/EncoderFFmpeg.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cdrip/EncoderFFmpeg.h	2018-07-04 00:01:50.000000000 +0000
@@ -60,12 +60,12 @@
   unsigned int      m_NeededFrames;
   unsigned int      m_NeededBytes;
   uint8_t          *m_Buffer;
-  unsigned int      m_BufferSize;
+  unsigned int      m_BufferSize = 0;
   AVFrame          *m_BufferFrame;
   uint8_t          *m_ResampledBuffer;
-  unsigned int      m_ResampledBufferSize;
+  unsigned int      m_ResampledBufferSize = 0;
   AVFrame          *m_ResampledFrame;
-  bool              m_NeedConversion;
+  bool              m_NeedConversion = false;
 
   AddonToKodiFuncTable_AudioEncoder m_callbacks;
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cdrip/IEncoder.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/cdrip/IEncoder.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cdrip/IEncoder.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cdrip/IEncoder.h	2018-07-04 00:01:50.000000000 +0000
@@ -27,13 +27,6 @@
 class IEncoder
 {
 public:
-  IEncoder() :
-    m_iTrackLength(0),
-    m_iInChannels(0),
-    m_iInSampleRate(0),
-    m_iInBitsPerSample(0)
-  {
-  }
   virtual ~IEncoder() = default;
   virtual bool Init(AddonToKodiFuncTable_AudioEncoder& callbacks) = 0;
   virtual int Encode(int nNumBytesRead, uint8_t* pbtStream) = 0;
@@ -49,9 +42,9 @@
   std::string m_strTrack;
   std::string m_strYear;
   std::string m_strFile;
-  int m_iTrackLength;
-  int m_iInChannels;
-  int m_iInSampleRate;
-  int m_iInBitsPerSample;
+  int m_iTrackLength = 0;
+  int m_iInChannels = 0;
+  int m_iInSampleRate = 0;
+  int m_iInBitsPerSample = 0;
 };
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/commons/Buffer.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/commons/Buffer.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/commons/Buffer.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/commons/Buffer.h	2018-07-04 00:01:50.000000000 +0000
@@ -91,10 +91,10 @@
   class Buffer
   {
     std::shared_ptr<unsigned char> bufferRef;
-    unsigned char* buffer;
-    size_t mposition;
-    size_t mcapacity;
-    size_t mlimit;
+    unsigned char* buffer = nullptr;
+    size_t mposition = 0;
+    size_t mcapacity = 0;
+    size_t mlimit = 0;
 
     inline void check(size_t count) const
     {
@@ -106,7 +106,7 @@
     /**
      * Construct an uninitialized buffer instance, perhaps as an lvalue.
      */
-    inline Buffer() : buffer(NULL), mposition(0), mcapacity(0), mlimit(0) { clear(); }
+    inline Buffer() { clear(); }
 
     /**
      * Construct a buffer given an externally managed memory buffer.
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp	2018-05-01 00:00:23.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -30,15 +30,8 @@
 #include <cassert>
 
 CAEEncoderFFmpeg::CAEEncoderFFmpeg():
-  m_BitRate       (0    ),
   m_CodecCtx      (NULL ),
-  m_SwrCtx        (NULL ),
-  m_BufferSize    (0    ),
-  m_OutputSize    (0    ),
-  m_OutputRatio   (0.0  ),
-  m_SampleRateMul (0.0  ),
-  m_NeededFrames  (0    ),
-  m_NeedConversion(false)
+  m_SwrCtx        (NULL )
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h	2018-07-04 00:01:50.000000000 +0000
@@ -51,18 +51,18 @@
 
   std::string m_CodecName;
   AVCodecID m_CodecID;
-  unsigned int m_BitRate;
+  unsigned int m_BitRate = 0;
   AEAudioFormat m_CurrentFormat;
   AVCodecContext *m_CodecCtx;
   SwrContext *m_SwrCtx;
   CAEChannelInfo m_Layout;
   AVPacket m_Pkt;
   uint8_t m_Buffer[8 + AV_INPUT_BUFFER_MIN_SIZE];
-  int m_BufferSize;
-  int m_OutputSize;
-  double m_OutputRatio;
-  double m_SampleRateMul;
-  unsigned int  m_NeededFrames;
-  bool m_NeedConversion;
+  int m_BufferSize = 0;
+  int m_OutputSize = 0;
+  double m_OutputRatio = 0.0;
+  double m_SampleRateMul = 0.0;
+  unsigned int  m_NeededFrames = 0;
+  bool m_NeedConversion = false;
 };
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -43,8 +43,6 @@
 #include "platform/linux/XTimeUtils.h"
 #endif
 
-#define AE_MIN_PERIODSIZE 256
-
 #define ALSA_OPTIONS (SND_PCM_NO_AUTO_FORMAT | SND_PCM_NO_AUTO_CHANNELS | SND_PCM_NO_AUTO_RESAMPLE)
 
 #define ALSA_MAX_CHANNELS 16
@@ -86,13 +84,7 @@
 };
 
 CAESinkALSA::CAESinkALSA() :
-  m_bufferSize(0),
-  m_formatSampleRateMul(0.0),
-  m_passthrough(false),
-  m_pcm(NULL),
-  m_timeout(0),
-  m_fragmented(false),
-  m_originalPeriodSize(AE_MIN_PERIODSIZE)
+  m_pcm(NULL)
 {
   /* ensure that ALSA has been initialized */
   if (!snd_config)
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h	2018-07-04 00:01:50.000000000 +0000
@@ -34,6 +34,8 @@
 // being destructed before CALSA*Monitor below.
 #include "platform/linux/FDEventMonitor.h"
 
+#define AE_MIN_PERIODSIZE 256
+
 class CAESinkALSA : public IAESink
 {
 public:
@@ -76,15 +78,15 @@
   std::string m_initDevice;
   AEAudioFormat m_initFormat;
   AEAudioFormat m_format;
-  unsigned int m_bufferSize;
-  double m_formatSampleRateMul;
-  bool m_passthrough;
+  unsigned int m_bufferSize = 0;
+  double m_formatSampleRateMul = 0.0;
+  bool m_passthrough = false;
   std::string m_device;
   snd_pcm_t *m_pcm;
-  int m_timeout;
+  int m_timeout = 0;
   // support fragmentation, e.g. looping in the sink to get a certain amount of data onto the device
-  bool m_fragmented;
-  unsigned int m_originalPeriodSize;
+  bool m_fragmented = false;
+  unsigned int m_originalPeriodSize = AE_MIN_PERIODSIZE;
 
 #if HAVE_LIBUDEV
   static CALSADeviceMonitor m_deviceMonitor;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Sinks/alsa/ALSADeviceMonitor.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Sinks/alsa/ALSADeviceMonitor.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Sinks/alsa/ALSADeviceMonitor.cpp	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Sinks/alsa/ALSADeviceMonitor.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -27,7 +27,6 @@
 #include "ServiceBroker.h"
 
 CALSADeviceMonitor::CALSADeviceMonitor() :
-  m_fdMonitorId(0),
   m_udev(NULL),
   m_udevMonitor(NULL)
 {
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Sinks/alsa/ALSADeviceMonitor.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Sinks/alsa/ALSADeviceMonitor.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Sinks/alsa/ALSADeviceMonitor.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Sinks/alsa/ALSADeviceMonitor.h	2018-07-04 00:01:50.000000000 +0000
@@ -37,7 +37,7 @@
 private:
   static void FDEventCallback(int id, int fd, short revents, void *data);
 
-  int m_fdMonitorId;
+  int m_fdMonitorId = 0;
 
   struct udev *m_udev;
   struct udev_monitor* m_udevMonitor;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Sinks/alsa/ALSAHControlMonitor.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Sinks/alsa/ALSAHControlMonitor.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Sinks/alsa/ALSAHControlMonitor.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Sinks/alsa/ALSAHControlMonitor.h	2018-07-04 00:01:50.000000000 +0000
@@ -52,10 +52,10 @@
   struct CTLHandle
   {
     snd_hctl_t *handle;
-    int useCount;
+    int useCount = 0;
 
-    explicit CTLHandle(snd_hctl_t *handle_) : handle(handle_), useCount(0) {}
-    CTLHandle() : handle(NULL), useCount(0) {}
+    explicit CTLHandle(snd_hctl_t *handle_) : handle(handle_) {}
+    CTLHandle() : handle(NULL) {}
   };
 
   std::map<std::string, CTLHandle> m_ctlHandles;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.cpp	2018-05-01 00:00:24.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -34,15 +34,8 @@
 
 CAEBitstreamPacker::CAEBitstreamPacker() :
   m_trueHD   (NULL),
-  m_trueHDPos(0),
   m_dtsHD    (NULL),
-  m_dtsHDSize(0),
-  m_eac3     (NULL),
-  m_eac3Size (0),
-  m_eac3FramesCount(0),
-  m_eac3FramesPerBurst(0),
-  m_dataSize (0),
-  m_pauseDuration(0)
+  m_eac3     (NULL)
 {
   Reset();
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.h	2018-07-04 00:01:50.000000000 +0000
@@ -48,18 +48,18 @@
 
   /* we keep the trueHD and dtsHD buffers separate so that we can handle a fast stream switch */
   uint8_t      *m_trueHD;
-  unsigned int  m_trueHDPos;
+  unsigned int  m_trueHDPos = 0;
 
   uint8_t      *m_dtsHD;
-  unsigned int  m_dtsHDSize;
+  unsigned int  m_dtsHDSize = 0;
 
   uint8_t      *m_eac3;
-  unsigned int  m_eac3Size;
-  unsigned int  m_eac3FramesCount;
-  unsigned int  m_eac3FramesPerBurst;
+  unsigned int  m_eac3Size = 0;
+  unsigned int  m_eac3FramesCount = 0;
+  unsigned int  m_eac3FramesPerBurst = 0;
 
-  unsigned int  m_dataSize;
+  unsigned int  m_dataSize = 0;
   uint8_t       m_packedBuffer[MAX_IEC61937_PACKET];
-  unsigned int m_pauseDuration;
+  unsigned int m_pauseDuration = 0;
 };
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -59,30 +59,11 @@
 };
 
 CAEStreamParser::CAEStreamParser() :
-  m_bufferSize    (0),
-  m_skipBytes     (0),
-  m_coreOnly      (false),
-  m_needBytes     (0),
-  m_syncFunc      (&CAEStreamParser::DetectType),
-  m_hasSync       (false),
-  m_coreSize      (0),
-  m_dtsBlocks     (0),
-  m_fsize         (0),
-  m_fsizeMain     (0),
-  m_substreams    (0)
+  m_syncFunc      (&CAEStreamParser::DetectType)
 {
   av_crc_init(m_crcTrueHD, 0, 16, 0x2D, sizeof(m_crcTrueHD));
 }
 
-CAEStreamInfo::CAEStreamInfo() :
-  m_type(STREAM_TYPE_NULL),
-  m_dataIsLE(true),
-  m_dtsPeriod(0),
-  m_repeat(0),
-  m_ac3FrameSize(0)
-{
-}
-
 double CAEStreamInfo::GetDuration()
 {
   double duration = 0;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Utils/AEStreamInfo.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Utils/AEStreamInfo.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.h	2018-07-04 00:01:50.000000000 +0000
@@ -34,7 +34,6 @@
 class CAEStreamInfo
 {
 public:
-  CAEStreamInfo();
   double GetDuration();
   bool operator==(const CAEStreamInfo& info) const;
 
@@ -51,13 +50,13 @@
     STREAM_TYPE_MLP,
     STREAM_TYPE_TRUEHD
   };
-  DataType m_type;
+  DataType m_type = STREAM_TYPE_NULL;
   unsigned int m_sampleRate;
   unsigned int m_channels;
-  bool m_dataIsLE;
-  unsigned int m_dtsPeriod;
-  unsigned int m_repeat;
-  unsigned int m_ac3FrameSize;
+  bool m_dataIsLE = true;
+  unsigned int m_dtsPeriod = 0;
+  unsigned int m_repeat = 0;
+  unsigned int m_ac3FrameSize = 0;
 };
 
 class CAEStreamParser
@@ -85,22 +84,22 @@
 
 private:
   uint8_t m_buffer[MAX_IEC61937_PACKET];
-  unsigned int m_bufferSize;
-  unsigned int m_skipBytes;
+  unsigned int m_bufferSize = 0;
+  unsigned int m_skipBytes = 0;
 
   typedef unsigned int (CAEStreamParser::*ParseFunc)(uint8_t *data, unsigned int size);
 
   CAEStreamInfo m_info;
-  bool m_coreOnly;
-  unsigned int m_needBytes;
+  bool m_coreOnly = false;
+  unsigned int m_needBytes = 0;
   ParseFunc m_syncFunc;
-  bool m_hasSync;
+  bool m_hasSync = false;
 
-  unsigned int m_coreSize;         /* core size for dtsHD */
-  unsigned int m_dtsBlocks;
-  unsigned int m_fsize;
-  unsigned int m_fsizeMain;        /* used for EAC3 substreams */
-  int m_substreams;       /* used for TrueHD  */
+  unsigned int m_coreSize = 0;         /* core size for dtsHD */
+  unsigned int m_dtsBlocks = 0;
+  unsigned int m_fsize = 0;
+  unsigned int m_fsizeMain = 0;        /* used for EAC3 substreams */
+  int m_substreams = 0;       /* used for TrueHD  */
   AVCRC m_crcTrueHD[1024];  /* TrueHD crc table */
 
   void GetPacket(uint8_t **buffer, unsigned int *bufferSize);
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Utils/AEUtil.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Utils/AEUtil.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/AudioEngine/Utils/AEUtil.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/AudioEngine/Utils/AEUtil.h	2018-07-04 00:01:50.000000000 +0000
@@ -53,18 +53,12 @@
 
 struct AEDelayStatus
 {
-  AEDelayStatus()
-  : delay(0.0)
-  , maxcorrection(0.0)
-  , tick(0)
-  {}
-
   void   SetDelay(double d);
   double GetDelay();
 
-  double delay;  // delay in sink currently
-  double maxcorrection; // time correction must not be greater than sink delay
-  int64_t tick;  // timestamp when delay was calculated
+  double delay = 0.0;  // delay in sink currently
+  double maxcorrection = 0.0; // time correction must not be greater than sink delay
+  int64_t tick = 0;  // timestamp when delay was calculated
 };
 
 /**
@@ -87,18 +81,13 @@
 class CAESpinSection
 {
 public:
-  CAESpinSection()
-  : m_enter(0)
-  , m_leave(0)
-  {}
-
   void enter() { m_enter++; }
   void leave() { m_leave = m_enter; }
 
 protected:
   friend class CAESpinLock;
-  volatile unsigned int m_enter;
-  volatile unsigned int m_leave;
+  volatile unsigned int m_enter = 0;
+  volatile unsigned int m_leave = 0;
 };
 
 class CAESpinLock
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp	2018-07-02 00:01:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -31,13 +31,6 @@
 class CDemuxStreamClientInternal
 {
 public:
-  CDemuxStreamClientInternal()
-  : m_parser(nullptr)
-  , m_context(nullptr)
-  , m_parser_split(false)
-  {
-  }
-
   ~CDemuxStreamClientInternal()
   {
     DisposeParser();
@@ -57,9 +50,9 @@
     }
   }
 
-  AVCodecParserContext *m_parser;
-  AVCodecContext *m_context;
-  bool m_parser_split;
+  AVCodecParserContext *m_parser = nullptr;
+  AVCodecContext *m_context = nullptr;
+  bool m_parser_split = false;
 };
 
 template <class T>
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -104,12 +104,8 @@
 
 struct SDirState
 {
-  SDirState()
-    : curr(0)
-  {}
-
   CFileItemList list;
-  int           curr;
+  int           curr = 0;
 };
 
 void DllLibbluray::dir_close(BD_DIR_H *dir)
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h	2018-07-04 00:01:50.000000000 +0000
@@ -149,13 +149,8 @@
   struct SPlane
   {
     SOverlays o;
-    int w;
-    int h;
-
-    SPlane()
-    : w(0)
-    , h(0)
-    {}
+    int w = 0;
+    int h = 0;
   };
 
   SPlane m_planes[2];
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/VideoPlayer/VideoPlayerAudio.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/VideoPlayer/VideoPlayerAudio.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/cores/VideoPlayer/VideoPlayerAudio.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/cores/VideoPlayer/VideoPlayerAudio.h	2018-07-04 00:01:50.000000000 +0000
@@ -112,14 +112,9 @@
 
   struct SInfo
   {
-    SInfo()
-    : pts(DVD_NOPTS_VALUE)
-    , passthrough(false)
-    {}
-
     std::string      info;
-    double           pts;
-    bool             passthrough;
+    double           pts = DVD_NOPTS_VALUE;
+    bool             passthrough = false;
   };
 
   CCriticalSection m_info_section;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/CueDocument.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/CueDocument.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/CueDocument.cpp	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/CueDocument.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -156,14 +156,6 @@
   size_t m_pos;
 };
 
-CCueDocument::CCueDocument()
-  : m_iYear(0)
-  , m_iTrack(0)
-  , m_iDiscNumber(0)
-  , m_bOneFilePerTrack(false)
-{
-}
-
 CCueDocument::~CCueDocument() = default;
 
 ////////////////////////////////////////////////////////////////////////////////////
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/CueDocument.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/CueDocument.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/CueDocument.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/CueDocument.h	2018-07-04 00:01:50.000000000 +0000
@@ -34,22 +34,15 @@
   class CCueTrack
   {
   public:
-    CCueTrack()
-      : iTrackNumber(0)
-      , iStartTime(0)
-      , iEndTime(0)
-    {
-    }
     std::string strArtist;
     std::string strTitle;
     std::string strFile;
-    int iTrackNumber;
-    int iStartTime;
-    int iEndTime;
+    int iTrackNumber = 0;
+    int iStartTime = 0;
+    int iEndTime = 0;
     ReplayGain::Info replayGain;
   };
 public:
-  CCueDocument(void);
   ~CCueDocument(void);
   // USED
   bool ParseFile(const std::string &strFilePath);
@@ -69,12 +62,12 @@
   std::string m_strArtist;  // album artist
   std::string m_strAlbum;  // album title
   std::string m_strGenre;  // album genre
-  int m_iYear;            //album year
-  int m_iTrack;   // current track
-  int m_iDiscNumber;  // Disc number
+  int m_iYear = 0;            //album year
+  int m_iTrack = 0;   // current track
+  int m_iDiscNumber = 0;  // Disc number
   ReplayGain::Info m_albumReplayGain;
 
-  bool m_bOneFilePerTrack;
+  bool m_bOneFilePerTrack = false;
 
   // cuetrack array
   typedef std::vector<CCueTrack> Tracks;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/dbwrappers/DatabaseQuery.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/dbwrappers/DatabaseQuery.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/dbwrappers/DatabaseQuery.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/dbwrappers/DatabaseQuery.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -412,10 +412,6 @@
   return query;
 }
 
-CDatabaseQueryRuleCombination::CDatabaseQueryRuleCombination()
-  : m_type(CombinationAnd)
-{ }
-
 void CDatabaseQueryRuleCombination::clear()
 {
   m_combinations.clear();
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/dbwrappers/DatabaseQuery.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/dbwrappers/DatabaseQuery.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/dbwrappers/DatabaseQuery.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/dbwrappers/DatabaseQuery.h	2018-07-04 00:01:50.000000000 +0000
@@ -117,7 +117,6 @@
 class CDatabaseQueryRuleCombination
 {
 public:
-  CDatabaseQueryRuleCombination();
   virtual ~CDatabaseQueryRuleCombination() = default;
 
   typedef enum {
@@ -143,7 +142,7 @@
   friend class CGUIDialogSmartPlaylistEditor;
   friend class CGUIDialogMediaFilter;
 
-  Combination m_type;
+  Combination m_type = CombinationAnd;
   CDatabaseQueryRuleCombinations m_combinations;
   CDatabaseQueryRules m_rules;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogBusy.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogBusy.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogBusy.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogBusy.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -114,8 +114,7 @@
 }
 
 CGUIDialogBusy::CGUIDialogBusy(void)
-  : CGUIDialog(WINDOW_DIALOG_BUSY, "DialogBusy.xml", DialogModalityType::MODAL),
-    m_bLastVisible(false)
+  : CGUIDialog(WINDOW_DIALOG_BUSY, "DialogBusy.xml", DialogModalityType::MODAL)
 {
   m_loadType = LOAD_ON_GUI_INIT;
   m_bCanceled = false;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogBusy.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogBusy.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogBusy.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogBusy.h	2018-07-04 00:01:50.000000000 +0000
@@ -61,6 +61,6 @@
 protected:
   void Open_Internal(const std::string &param = "") override;
   bool m_bCanceled;
-  bool m_bLastVisible;
+  bool m_bLastVisible = false;
   float m_progress; ///< current progress
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogBusyNoCancel.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogBusyNoCancel.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogBusyNoCancel.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogBusyNoCancel.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -30,8 +30,7 @@
 
 
 CGUIDialogBusyNoCancel::CGUIDialogBusyNoCancel(void)
-  : CGUIDialog(WINDOW_DIALOG_BUSY_NOCANCEL, "DialogBusy.xml", DialogModalityType::MODAL),
-    m_bLastVisible(false)
+  : CGUIDialog(WINDOW_DIALOG_BUSY_NOCANCEL, "DialogBusy.xml", DialogModalityType::MODAL)
 {
   m_loadType = LOAD_ON_GUI_INIT;
   m_progress = -1;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogBusyNoCancel.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogBusyNoCancel.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogBusyNoCancel.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogBusyNoCancel.h	2018-07-04 00:01:50.000000000 +0000
@@ -32,6 +32,6 @@
 
 protected:
   void Open_Internal(const std::string &param = "") override;
-  bool m_bLastVisible;
+  bool m_bLastVisible = false;
   float m_progress;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -81,8 +81,6 @@
 CGUIDialogKeyboardGeneric::CGUIDialogKeyboardGeneric()
 : CGUIDialog(WINDOW_DIALOG_KEYBOARD, "DialogKeyboard.xml")
 , CGUIKeyboard()
-, m_num(0)
-, m_listfont(nullptr)
 , m_pCharCallback(NULL)
 {
   m_bIsConfirmed = false;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogKeyboardGeneric.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogKeyboardGeneric.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogKeyboardGeneric.h	2018-05-01 00:00:26.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogKeyboardGeneric.h	2018-07-04 00:01:50.000000000 +0000
@@ -92,9 +92,9 @@
     std::vector<std::wstring> m_words;
     std::string m_hzcode;
     int         m_pos;
-    int         m_num;
+    int         m_num = 0;
     float       m_listwidth;
-    CGUIFont   *m_listfont;
+    CGUIFont   *m_listfont = nullptr;
     CCriticalSection  m_CS;
 
     char_callback_t m_pCharCallback;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogMediaSource.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogMediaSource.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogMediaSource.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogMediaSource.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -65,8 +65,6 @@
 
 CGUIDialogMediaSource::CGUIDialogMediaSource(void)
     : CGUIDialog(WINDOW_DIALOG_MEDIA_SOURCE, "DialogMediaSource.xml")
-    , m_confirmed(false)
-    , m_bNameChanged(false)
 {
   m_paths = new CFileItemList;
   m_loadType = KEEP_IN_MEMORY;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogMediaSource.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogMediaSource.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/dialogs/GUIDialogMediaSource.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/dialogs/GUIDialogMediaSource.h	2018-07-04 00:01:50.000000000 +0000
@@ -63,6 +63,6 @@
   std::string m_type;
   std::string m_name;
   CFileItemList* m_paths;
-  bool m_confirmed;
-  bool m_bNameChanged;
+  bool m_confirmed = false;
+  bool m_bNameChanged = false;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/FileItem.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/FileItem.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/FileItem.cpp	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/FileItem.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -1886,22 +1886,12 @@
 //////////////////////////////////////////////////////////////////////////////////
 
 CFileItemList::CFileItemList()
-: CFileItem("", true),
-  m_ignoreURLOptions(false),
-  m_fastLookup(false),
-  m_sortIgnoreFolders(false),
-  m_cacheToDisc(CACHE_IF_SLOW),
-  m_replaceListing(false)
+: CFileItem("", true)
 {
 }
 
 CFileItemList::CFileItemList(const std::string& strPath)
-: CFileItem(strPath, true),
-  m_ignoreURLOptions(false),
-  m_fastLookup(false),
-  m_sortIgnoreFolders(false),
-  m_cacheToDisc(CACHE_IF_SLOW),
-  m_replaceListing(false)
+: CFileItem(strPath, true)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/FileItem.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/FileItem.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/FileItem.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/FileItem.h	2018-07-04 00:01:50.000000000 +0000
@@ -800,12 +800,12 @@
 
   VECFILEITEMS m_items;
   MAPFILEITEMS m_map;
-  bool m_ignoreURLOptions;
-  bool m_fastLookup;
+  bool m_ignoreURLOptions = false;
+  bool m_fastLookup = false;
   SortDescription m_sortDescription;
-  bool m_sortIgnoreFolders;
-  CACHE_TYPE m_cacheToDisc;
-  bool m_replaceListing;
+  bool m_sortIgnoreFolders = false;
+  CACHE_TYPE m_cacheToDisc = CACHE_IF_SLOW;
+  bool m_replaceListing = false;
   std::string m_content;
 
   std::vector<GUIViewSortDetails> m_sortDetails;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/AudioBookFileDirectory.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/AudioBookFileDirectory.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/AudioBookFileDirectory.cpp	2018-05-01 00:00:26.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/AudioBookFileDirectory.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -44,11 +44,6 @@
     return pFile->Seek(pos, whence & ~AVSEEK_FORCE);
 }
 
-CAudioBookFileDirectory::CAudioBookFileDirectory(void) :
-  m_ioctx(nullptr), m_fctx(nullptr)
-{
-}
-
 CAudioBookFileDirectory::~CAudioBookFileDirectory(void)
 {
   if (m_fctx)
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/AudioBookFileDirectory.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/AudioBookFileDirectory.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/AudioBookFileDirectory.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/AudioBookFileDirectory.h	2018-07-04 00:01:50.000000000 +0000
@@ -29,14 +29,13 @@
   class CAudioBookFileDirectory : public IFileDirectory
   {
     public:
-      CAudioBookFileDirectory(void);
       ~CAudioBookFileDirectory(void) override;
       bool GetDirectory(const CURL& url, CFileItemList &items) override;
       bool Exists(const CURL& url) override;
       bool ContainsFiles(const CURL& url) override;
       bool IsAllowed(const CURL& url) const override { return true; };
     protected:
-      AVIOContext* m_ioctx;
-      AVFormatContext* m_fctx;
+      AVIOContext* m_ioctx = nullptr;
+      AVFormatContext* m_fctx = nullptr;
   };
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/CacheStrategy.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/CacheStrategy.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/CacheStrategy.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/CacheStrategy.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -42,11 +42,6 @@
 
 using namespace XFILE;
 
-CCacheStrategy::CCacheStrategy() : m_bEndOfInput(false)
-{
-}
-
-
 CCacheStrategy::~CCacheStrategy() = default;
 
 void CCacheStrategy::EndOfInput() {
@@ -67,9 +62,7 @@
   : m_cacheFileRead(new CacheLocalFile())
   , m_cacheFileWrite(new CacheLocalFile())
   , m_hDataAvailEvent(NULL)
-  , m_nStartPosition(0)
-  , m_nWritePosition(0)
-  , m_nReadPosition(0) {
+{
 }
 
 CSimpleFileCache::~CSimpleFileCache()
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/CacheStrategy.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/CacheStrategy.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/CacheStrategy.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/CacheStrategy.h	2018-07-04 00:01:50.000000000 +0000
@@ -35,7 +35,6 @@
 
 class CCacheStrategy{
 public:
-  CCacheStrategy();
   virtual ~CCacheStrategy();
 
   virtual int Open() = 0;
@@ -69,7 +68,7 @@
 
   CEvent m_space;
 protected:
-  bool  m_bEndOfInput;
+  bool  m_bEndOfInput = false;
 };
 
 /**
@@ -104,9 +103,9 @@
   IFile*   m_cacheFileRead;
   IFile*   m_cacheFileWrite;
   CEvent*  m_hDataAvailEvent;
-  volatile int64_t m_nStartPosition;
-  volatile int64_t m_nWritePosition;
-  volatile int64_t m_nReadPosition;
+  volatile int64_t m_nStartPosition = 0;
+  volatile int64_t m_nWritePosition = 0;
+  volatile int64_t m_nReadPosition = 0;
 };
 
 class CDoubleCache : public CCacheStrategy{
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/CurlFile.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/CurlFile.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/CurlFile.cpp	2018-06-28 00:01:37.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/CurlFile.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -412,11 +412,7 @@
 }
 
 CCurlFile::CCurlFile()
- : m_writeOffset(0)
- , m_proxytype(PROXY_HTTP)
- , m_proxyport(3128)
- , m_overflowBuffer(NULL)
- , m_overflowSize(0)
+ : m_overflowBuffer(NULL)
 {
   m_opened = false;
   m_forWrite = false;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/CurlFile.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/CurlFile.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/CurlFile.h	2018-06-28 00:01:37.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/CurlFile.h	2018-07-04 00:01:50.000000000 +0000
@@ -163,13 +163,13 @@
       CReadState* m_state;
       CReadState* m_oldState;
       unsigned int m_bufferSize;
-      int64_t m_writeOffset;
+      int64_t m_writeOffset = 0;
 
       std::string m_url;
       std::string m_userAgent;
-      ProxyType m_proxytype;
+      ProxyType m_proxytype = PROXY_HTTP;
       std::string m_proxyhost;
-      uint16_t m_proxyport;
+      uint16_t m_proxyport = 3128;
       std::string m_proxyuser;
       std::string m_proxypassword;
       std::string m_customrequest;
@@ -202,7 +202,7 @@
 
       CRingBuffer m_buffer; // our ringhold buffer
       char* m_overflowBuffer; // in the rare case we would overflow the above buffer
-      unsigned int m_overflowSize; // size of the overflow buffer
+      unsigned int m_overflowSize = 0; // size of the overflow buffer
 
       int  m_stillRunning; // Is background url fetch still in progress?
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/DAVFile.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/DAVFile.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/DAVFile.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/DAVFile.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -32,7 +32,6 @@
 
 CDAVFile::CDAVFile(void)
   : CCurlFile()
-  , m_lastResponseCode(0)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/DAVFile.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/DAVFile.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/DAVFile.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/DAVFile.h	2018-07-04 00:01:50.000000000 +0000
@@ -38,6 +38,6 @@
     virtual int GetLastResponseCode() { return m_lastResponseCode; }
 
   private:
-    int m_lastResponseCode;
+    int m_lastResponseCode = 0;
   };
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/Directory.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/Directory.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/Directory.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/Directory.h	2018-07-04 00:01:50.000000000 +0000
@@ -39,11 +39,8 @@
   class CHints
   {
   public:
-    CHints() : flags(DIR_FLAG_DEFAULTS)
-    {
-    };
     std::string mask;
-    int flags;
+    int flags = DIR_FLAG_DEFAULTS;
   };
 
   static bool GetDirectory(const CURL& url
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/File.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/File.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/File.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/File.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -1102,7 +1102,6 @@
   , m_file(NULL)
   , m_buffer(NULL)
   , m_backsize(backsize)
-  , m_frontsize(0)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/File.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/File.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/File.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/File.h	2018-07-04 00:01:50.000000000 +0000
@@ -209,7 +209,7 @@
   IFile* m_file;
   char*  m_buffer;
   int    m_backsize;
-  int    m_frontsize;
+  int    m_frontsize = 0;
 };
 
 // very basic file input stream
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/ISOFile.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/ISOFile.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/ISOFile.cpp	2018-05-01 00:00:26.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/ISOFile.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -34,8 +34,7 @@
 //////////////////////////////////////////////////////////////////////
 //*********************************************************************************************
 CISOFile::CISOFile()
-  : m_bOpened(false)
-  , m_hFile(INVALID_HANDLE_VALUE)
+  : m_hFile(INVALID_HANDLE_VALUE)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/ISOFile.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/ISOFile.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/ISOFile.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/ISOFile.h	2018-07-04 00:01:50.000000000 +0000
@@ -49,7 +49,7 @@
   int64_t Seek(int64_t iFilePosition, int iWhence = SEEK_SET) override;
   void Close() override;
 protected:
-  bool m_bOpened;
+  bool m_bOpened = false;
   HANDLE m_hFile;
   CRingBuffer m_cache;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/NFSFile.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/NFSFile.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/NFSFile.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/NFSFile.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -58,11 +58,6 @@
 , m_exportPath("")
 , m_hostName("")
 , m_resolvedHostName("")
-, m_readChunkSize(0)
-, m_writeChunkSize(0)
-, m_OpenConnections(0)
-, m_IdleTimeout(0)
-, m_lastAccessedTime(0)
 , m_pLibNfs(new DllLibNfs())
 {
 }
@@ -501,8 +496,7 @@
 CNfsConnection gNfsConnection;
 
 CNFSFile::CNFSFile()
-: m_fileSize(0)
-, m_pFileHandle(NULL)
+: m_pFileHandle(NULL)
 , m_pNfsContext(NULL)
 {
   gNfsConnection.AddActiveConnection();
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/NFSFile.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/NFSFile.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/NFSFile.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/NFSFile.h	2018-07-04 00:01:50.000000000 +0000
@@ -102,13 +102,13 @@
   std::string m_exportPath;//current connected export path
   std::string m_hostName;//current connected host
   std::string m_resolvedHostName;//current connected host - as ip
-  uint64_t m_readChunkSize;//current read chunksize of connected server
-  uint64_t m_writeChunkSize;//current write chunksize of connected server
-  int m_OpenConnections;//number of open connections
-  unsigned int m_IdleTimeout;//timeout for idle connection close and dyunload
+  uint64_t m_readChunkSize = 0;//current read chunksize of connected server
+  uint64_t m_writeChunkSize = 0;//current write chunksize of connected server
+  int m_OpenConnections = 0;//number of open connections
+  unsigned int m_IdleTimeout = 0;//timeout for idle connection close and dyunload
   tFileKeepAliveMap m_KeepAliveTimeouts;//mapping filehandles to its idle timeout
   tOpenContextMap m_openContextMap;//unique map for tracking all open contexts
-  uint64_t m_lastAccessedTime;//last access time for m_pNfsContext
+  uint64_t m_lastAccessedTime = 0;//last access time for m_pNfsContext
   DllLibNfs *m_pLibNfs;//the lib
   std::list<std::string> m_exportList;//list of exported paths of current connected servers
   CCriticalSection keepAliveLock;
@@ -155,7 +155,7 @@
   protected:
     CURL m_url;
     bool IsValidFile(const std::string& strFileName);
-    int64_t m_fileSize;
+    int64_t m_fileSize = 0;
     struct nfsfh *m_pFileHandle;
     struct nfs_context *m_pNfsContext;//current nfs context
     std::string m_exportPath;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/PipeFile.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/PipeFile.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/PipeFile.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/PipeFile.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -25,7 +25,7 @@
 
 using namespace XFILE;
 
-CPipeFile::CPipeFile() : m_pos(0), m_length(-1), m_pipe(NULL)
+CPipeFile::CPipeFile() : m_pipe(NULL)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/PipeFile.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/PipeFile.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/PipeFile.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/PipeFile.h	2018-07-04 00:01:50.000000000 +0000
@@ -80,8 +80,8 @@
   void SetOpenThreshold(int threshold);
 
 protected:
-  int64_t m_pos;
-  int64_t m_length;
+  int64_t m_pos = 0;
+  int64_t m_length = -1;
 
   XFILE::Pipe *m_pipe;
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/PipesManager.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/PipesManager.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/PipesManager.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/PipesManager.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -265,10 +265,6 @@
   return m_buffer.getMaxReadSize();
 }
 
-PipesManager::PipesManager() : m_nGenIdHelper(1)
-{
-}
-
 PipesManager::~PipesManager() = default;
 
 PipesManager &PipesManager::GetInstance()
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/PipesManager.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/PipesManager.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/PipesManager.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/PipesManager.h	2018-07-04 00:01:50.000000000 +0000
@@ -122,8 +122,7 @@
   bool         Exists(const std::string &name);
 
 protected:
-  PipesManager();
-  int    m_nGenIdHelper;
+  int    m_nGenIdHelper = 1;
   std::map<std::string, XFILE::Pipe *> m_pipes;
 
   CCriticalSection m_lock;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/PluginDirectory.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/PluginDirectory.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/PluginDirectory.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/PluginDirectory.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -73,8 +73,6 @@
 CPluginDirectory::CPluginDirectory()
   : m_fetchComplete(true)
   , m_cancelled(false)
-  , m_success(false)
-  , m_totalItems(0)
 {
   m_listItems = new CFileItemList;
   m_fileResult = new CFileItem;
@@ -170,9 +168,9 @@
   CLog::Log(LOGDEBUG, "%s - calling plugin %s('%s','%s','%s','%s')", __FUNCTION__, m_addon->Name().c_str(), argv[0].c_str(), argv[1].c_str(), argv[2].c_str(), argv[3].c_str());
   bool success = false;
   std::string file = m_addon->LibPath();
-  bool reuseLanguageInvoker = true;
+  bool reuseLanguageInvoker = false;
   if (m_addon->ExtraInfo().find("reuselanguageinvoker") != m_addon->ExtraInfo().end())
-    reuseLanguageInvoker = m_addon->ExtraInfo().at("reuselanguageinvoker") != "false";
+    reuseLanguageInvoker = m_addon->ExtraInfo().at("reuselanguageinvoker") == "true";
 
   int id = CScriptInvocationManager::GetInstance().ExecuteAsync(file, m_addon, argv, reuseLanguageInvoker, handle);
   if (id >= 0)
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/PluginDirectory.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/PluginDirectory.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/PluginDirectory.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/PluginDirectory.h	2018-07-04 00:01:50.000000000 +0000
@@ -84,8 +84,8 @@
   CEvent         m_fetchComplete;
 
   std::atomic<bool> m_cancelled;
-  bool          m_success;      // set by script in EndOfDirectory
-  int    m_totalItems;   // set by script in AddDirectoryItem
+  bool          m_success = false;      // set by script in EndOfDirectory
+  int    m_totalItems = 0;   // set by script in AddDirectoryItem
 
   class CScriptObserver : public CThread
   {
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/RSSDirectory.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/RSSDirectory.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/RSSDirectory.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/RSSDirectory.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -46,23 +46,15 @@
 
   struct SResource
   {
-    SResource()
-      : width(0)
-      , height(0)
-      , bitrate(0)
-      , duration(0)
-      , size(0)
-    {}
-
     std::string tag;
     std::string path;
     std::string mime;
     std::string lang;
-    int        width;
-    int        height;
-    int        bitrate;
-    int        duration;
-    int64_t    size;
+    int        width = 0;
+    int        height = 0;
+    int        bitrate = 0;
+    int        duration = 0;
+    int64_t    size = 0;
   };
 
   typedef std::vector<SResource> SResources;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/UDFFile.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/UDFFile.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/UDFFile.cpp	2018-05-01 00:00:26.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/UDFFile.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -34,8 +34,7 @@
 //////////////////////////////////////////////////////////////////////
 //*********************************************************************************************
 CUDFFile::CUDFFile()
-  : m_bOpened(false)
-  , m_hFile(INVALID_HANDLE_VALUE)
+  : m_hFile(INVALID_HANDLE_VALUE)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/UDFFile.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/UDFFile.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/UDFFile.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/UDFFile.h	2018-07-04 00:01:50.000000000 +0000
@@ -43,7 +43,7 @@
   int64_t Seek(int64_t iFilePosition, int iWhence = SEEK_SET) override;
   void Close() override;
 protected:
-  bool m_bOpened;
+  bool m_bOpened = false;
   HANDLE m_hFile;
   udf25 m_udfIsoReaderLocal;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/XbtFile.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/XbtFile.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/XbtFile.cpp	2018-05-01 00:00:26.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/XbtFile.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -47,13 +47,9 @@
 
 CXbtFile::CXbtFile()
   : m_url(),
-    m_open(false),
     m_xbtfReader(nullptr),
     m_xbtfFile(),
     m_frameStartPositions(),
-    m_frameIndex(0),
-    m_positionWithinFrame(0),
-    m_positionTotal(0),
     m_unpackedFrames()
 { }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/XbtFile.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/XbtFile.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/filesystem/XbtFile.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/filesystem/XbtFile.h	2018-07-04 00:01:50.000000000 +0000
@@ -61,14 +61,14 @@
   static bool GetFile(const CURL& url, CXBTFFile& file);
 
   CURL m_url;
-  bool m_open;
+  bool m_open = false;
   CXBTFReaderPtr m_xbtfReader;
   CXBTFFile m_xbtfFile;
 
   std::vector<uint64_t> m_frameStartPositions;
-  size_t m_frameIndex;
-  uint64_t m_positionWithinFrame;
-  int64_t m_positionTotal;
+  size_t m_frameIndex = 0;
+  uint64_t m_positionWithinFrame = 0;
+  int64_t m_positionTotal = 0;
 
   std::vector<uint8_t*> m_unpackedFrames;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/addons/savestates/SavestateReader.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/addons/savestates/SavestateReader.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/addons/savestates/SavestateReader.cpp	2018-05-01 00:00:27.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/addons/savestates/SavestateReader.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -27,11 +27,6 @@
 using namespace KODI;
 using namespace GAME;
 
-CSavestateReader::CSavestateReader() :
-  m_frameCount(0)
-{
-}
-
 CSavestateReader::~CSavestateReader() = default;
 
 bool CSavestateReader::Initialize(const std::string& path, const CGameClient* gameClient)
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/addons/savestates/SavestateReader.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/addons/savestates/SavestateReader.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/addons/savestates/SavestateReader.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/addons/savestates/SavestateReader.h	2018-07-04 00:01:50.000000000 +0000
@@ -36,7 +36,6 @@
   class CSavestateReader
   {
   public:
-    CSavestateReader();
     ~CSavestateReader();
 
     bool Initialize(const std::string& path, const CGameClient* gameClient);
@@ -46,7 +45,7 @@
   private:
     CSavestate         m_savestate;
     CSavestateDatabase m_db;
-    uint64_t           m_frameCount;
+    uint64_t           m_frameCount = 0;
   };
 }
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/addons/savestates/SavestateWriter.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/addons/savestates/SavestateWriter.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/addons/savestates/SavestateWriter.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/addons/savestates/SavestateWriter.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -33,11 +33,6 @@
 using namespace KODI;
 using namespace GAME;
 
-CSavestateWriter::CSavestateWriter() :
-  m_fps(0.0)
-{
-}
-
 CSavestateWriter::~CSavestateWriter() = default;
 
 bool CSavestateWriter::Initialize(const CGameClient* gameClient, uint64_t frameHistoryCount)
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/addons/savestates/SavestateWriter.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/addons/savestates/SavestateWriter.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/addons/savestates/SavestateWriter.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/addons/savestates/SavestateWriter.h	2018-07-04 00:01:50.000000000 +0000
@@ -36,7 +36,6 @@
   class CSavestateWriter
   {
   public:
-    CSavestateWriter();
     ~CSavestateWriter();
 
     bool Initialize(const CGameClient* gameClient, uint64_t frameHistoryCount);
@@ -48,7 +47,7 @@
 
   private:
     CSavestate         m_savestate;
-    double             m_fps; //! @todo
+    double             m_fps = 0.0; //! @todo
     CSavestateDatabase m_db;
   };
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/controllers/windows/GUIControllerWindow.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/controllers/windows/GUIControllerWindow.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/controllers/windows/GUIControllerWindow.cpp	2018-05-01 00:00:27.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/controllers/windows/GUIControllerWindow.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -47,9 +47,7 @@
 using namespace KODI::MESSAGING;
 
 CGUIControllerWindow::CGUIControllerWindow(void) :
-  CGUIDialog(WINDOW_DIALOG_GAME_CONTROLLERS, "DialogGameControllers.xml"),
-  m_controllerList(nullptr),
-  m_featureList(nullptr)
+  CGUIDialog(WINDOW_DIALOG_GAME_CONTROLLERS, "DialogGameControllers.xml")
 {
   // initialize CGUIWindow
   m_loadType = KEEP_IN_MEMORY;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/controllers/windows/GUIControllerWindow.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/controllers/windows/GUIControllerWindow.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/controllers/windows/GUIControllerWindow.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/controllers/windows/GUIControllerWindow.h	2018-07-04 00:01:50.000000000 +0000
@@ -59,8 +59,8 @@
     void ShowHelp(void);
     void ShowButtonCaptureDialog(void);
 
-    IControllerList* m_controllerList;
-    IFeatureList*    m_featureList;
+    IControllerList* m_controllerList = nullptr;
+    IFeatureList*    m_featureList = nullptr;
   };
 }
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/windows/GUIWindowGames.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/windows/GUIWindowGames.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/windows/GUIWindowGames.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/windows/GUIWindowGames.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -52,8 +52,7 @@
 #define CONTROL_BTNSORTASC          4
 
 CGUIWindowGames::CGUIWindowGames() :
-  CGUIMediaWindow(WINDOW_GAMES, "MyGames.xml"),
-  m_dlgProgress(nullptr)
+  CGUIMediaWindow(WINDOW_GAMES, "MyGames.xml")
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/windows/GUIWindowGames.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/windows/GUIWindowGames.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/games/windows/GUIWindowGames.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/games/windows/GUIWindowGames.h	2018-07-04 00:01:50.000000000 +0000
@@ -52,7 +52,7 @@
     void OnItemInfo(int itemNumber);
     bool PlayGame(const CFileItem &item);
 
-    CGUIDialogProgress *m_dlgProgress;
+    CGUIDialogProgress *m_dlgProgress = nullptr;
   };
 }
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/GUIInfoManager.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/GUIInfoManager.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/GUIInfoManager.cpp	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/GUIInfoManager.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -57,8 +57,7 @@
 
 CGUIInfoManager::CGUIInfoManager(void)
 : m_currentFile(new CFileItem),
-  m_bools(&InfoBoolComparator),
-  m_refreshCounter(0)
+  m_bools(&InfoBoolComparator)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/GUIInfoManager.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/GUIInfoManager.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/GUIInfoManager.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/GUIInfoManager.h	2018-07-04 00:01:50.000000000 +0000
@@ -210,7 +210,7 @@
 
   typedef std::set<INFO::InfoPtr, bool(*)(const INFO::InfoPtr&, const INFO::InfoPtr&)> INFOBOOLTYPE;
   INFOBOOLTYPE m_bools;
-  unsigned int m_refreshCounter;
+  unsigned int m_refreshCounter = 0;
   std::vector<INFO::CSkinVariableString> m_skinVariableStrings;
 
   CCriticalSection m_critInfo;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/FFmpegImage.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/FFmpegImage.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/FFmpegImage.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/FFmpegImage.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -35,17 +35,7 @@
 #include "libavutil/pixdesc.h"
 }
 
-Frame::Frame() :
-  m_pImage(nullptr),
-  m_delay(0),
-  m_imageSize(0),
-  m_height(0),
-  m_width(0)
-{}
-
-
 Frame::Frame(const Frame& src) :
-  m_pImage(nullptr),
   m_delay(src.m_delay),
   m_imageSize(src.m_imageSize),
   m_height(src.m_height),
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/FFmpegImage.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/FFmpegImage.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/FFmpegImage.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/FFmpegImage.h	2018-07-04 00:01:50.000000000 +0000
@@ -34,21 +34,21 @@
 public:
   friend class CFFmpegImage;
 
-  Frame();
+  Frame() = default;
   virtual ~Frame();
 
   int GetPitch() const { return m_pitch; }
 
-  unsigned char* m_pImage;
-  unsigned int m_delay;
+  unsigned char* m_pImage = nullptr;
+  unsigned int m_delay = 0;
 
 private:
   Frame(const Frame& src);
 
   int m_pitch = 0;
-  unsigned int m_imageSize;
-  unsigned int m_height;
-  unsigned int m_width;
+  unsigned int m_imageSize = 0;
+  unsigned int m_height = 0;
+  unsigned int m_width = 0;
 };
 
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/GUIControl.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/GUIControl.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/GUIControl.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/GUIControl.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -35,9 +35,7 @@
 
 using namespace KODI::GUILIB;
 
-CGUIControl::CGUIControl() :
-  m_hitColor(0xffffffff),
-  m_diffuseColor(0xffffffff)
+CGUIControl::CGUIControl()
 {
   m_hasProcessed = false;
   m_bHasFocus = false;
@@ -65,7 +63,6 @@
 
 CGUIControl::CGUIControl(int parentID, int controlID, float posX, float posY, float width, float height)
 : m_hitRect(posX, posY, posX + width, posY + height),
-  m_hitColor(0xffffffff),
   m_diffuseColor(0xffffffff)
 {
   m_posX = posX;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/GUIControl.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/GUIControl.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/GUIControl.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/GUIControl.h	2018-07-04 00:01:50.000000000 +0000
@@ -343,7 +343,7 @@
   float m_height;
   float m_width;
   CRect m_hitRect;
-  UTILS::Color m_hitColor;
+  UTILS::Color m_hitColor = 0xffffffff;
   KODI::GUILIB::GUIINFO::CGUIInfoColor m_diffuseColor;
   int m_controlID;
   int m_parentID;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/GUIControlProfiler.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/GUIControlProfiler.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/GUIControlProfiler.cpp	2018-05-01 00:00:27.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/GUIControlProfiler.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -229,7 +229,7 @@
 }
 
 CGUIControlProfiler::CGUIControlProfiler(void)
-: m_ItemHead(NULL, NULL, NULL), m_pLastItem(NULL), m_iMaxFrameCount(200), m_iFrameCount(0)
+: m_ItemHead(NULL, NULL, NULL), m_pLastItem(NULL)
 // m_bIsRunning(false), no isRunning because it is static
 {
   m_fPerfScale = 100000.0f / CurrentHostFrequency();
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/GUIControlProfiler.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/GUIControlProfiler.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/GUIControlProfiler.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/GUIControlProfiler.h	2018-07-04 00:01:50.000000000 +0000
@@ -89,8 +89,8 @@
 
   static bool m_bIsRunning;
   std::string m_strOutputFile;
-  int m_iMaxFrameCount;
-  int m_iFrameCount;
+  int m_iMaxFrameCount = 200;
+  int m_iFrameCount = 0;
 };
 
 #define GUIPROFILER_VISIBILITY_BEGIN(x) { if (CGUIControlProfiler::IsRunning()) CGUIControlProfiler::Instance().BeginVisibility(x); }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/GUIFontCache.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/GUIFontCache.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/GUIFontCache.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/GUIFontCache.h	2018-07-04 00:01:50.000000000 +0000
@@ -213,9 +213,9 @@
   typedef void* BufferHandleType;
 #define BUFFER_HANDLE_INIT nullptr
 #endif
-  BufferHandleType bufferHandle; // this is really a GLuint
-  size_t size;
-  CVertexBuffer() : bufferHandle(BUFFER_HANDLE_INIT), size(0), m_font(NULL) {}
+  BufferHandleType bufferHandle = BUFFER_HANDLE_INIT; // this is really a GLuint
+  size_t size = 0;
+  CVertexBuffer() : m_font(NULL) {}
   CVertexBuffer(BufferHandleType bufferHandle, size_t size, const CGUIFontTTFBase *font) : bufferHandle(bufferHandle), size(size), m_font(font) {}
   CVertexBuffer(const CVertexBuffer &other) : bufferHandle(other.bufferHandle), size(other.size), m_font(other.m_font)
   {
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/GUIControlsGUIInfo.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/GUIControlsGUIInfo.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/GUIControlsGUIInfo.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/GUIControlsGUIInfo.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -50,12 +50,6 @@
 using namespace KODI::GUILIB;
 using namespace KODI::GUILIB::GUIINFO;
 
-CGUIControlsGUIInfo::CGUIControlsGUIInfo()
-: m_nextWindowID(WINDOW_INVALID),
-  m_prevWindowID(WINDOW_INVALID)
-{
-}
-
 void CGUIControlsGUIInfo::SetContainerMoving(int id, bool next, bool scrolling)
 {
   // magnitude 2 indicates a scroll, sign indicates direction
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/GUIControlsGUIInfo.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/GUIControlsGUIInfo.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/GUIControlsGUIInfo.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/GUIControlsGUIInfo.h	2018-07-04 00:01:50.000000000 +0000
@@ -21,6 +21,7 @@
 #pragma once
 
 #include "guilib/guiinfo/GUIInfoProvider.h"
+#include "guilib/WindowIDs.h"
 
 #include <map>
 
@@ -36,7 +37,6 @@
 class CGUIControlsGUIInfo : public CGUIInfoProvider
 {
 public:
-  CGUIControlsGUIInfo();
   ~CGUIControlsGUIInfo() override = default;
 
   // KODI::GUILIB::GUIINFO::IGUIInfoProvider implementation
@@ -57,8 +57,8 @@
   void ResetContainerMovingCache();
 
 private:
-  int m_nextWindowID;
-  int m_prevWindowID;
+  int m_nextWindowID = WINDOW_INVALID;
+  int m_prevWindowID = WINDOW_INVALID;
 
   std::map<int, int> m_containerMoves;  // direction of list moving
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/GUIInfoProviders.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/GUIInfoProviders.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/GUIInfoProviders.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/GUIInfoProviders.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -22,6 +22,7 @@
 #include "guilib/guiinfo/IGUIInfoProvider.h"
 
 #include <algorithm>
+#include "threads/SingleLock.h"
 
 using namespace KODI::GUILIB::GUIINFO;
 
@@ -59,6 +60,8 @@
 
 void CGUIInfoProviders::RegisterProvider(IGUIInfoProvider *provider, bool bAppend /* = true */)
 {
+  CSingleLock lock(m_providerSection);
+
   auto it = std::find(m_providers.begin(), m_providers.end(), provider);
   if (it == m_providers.end())
   {
@@ -71,6 +74,8 @@
 
 void CGUIInfoProviders::UnregisterProvider(IGUIInfoProvider *provider)
 {
+  CSingleLock lock(m_providerSection);
+
   auto it = std::find(m_providers.begin(), m_providers.end(), provider);
   if (it != m_providers.end())
     m_providers.erase(it);
@@ -78,6 +83,7 @@
 
 bool CGUIInfoProviders::InitCurrentItem(CFileItem *item)
 {
+  CSingleLock lock(m_providerSection);
   bool bReturn = false;
 
   for (const auto& provider : m_providers)
@@ -89,6 +95,8 @@
 
 bool CGUIInfoProviders::GetLabel(std::string& value, const CFileItem *item, int contextWindow, const CGUIInfo &info, std::string *fallback) const
 {
+  CSingleLock lock(m_providerSection);
+
   for (const auto& provider : m_providers)
   {
     if (provider->GetLabel(value, item, contextWindow, info, fallback))
@@ -99,6 +107,8 @@
 
 bool CGUIInfoProviders::GetInt(int& value, const CGUIListItem *item, int contextWindow, const CGUIInfo &info) const
 {
+  CSingleLock lock(m_providerSection);
+
   for (const auto& provider : m_providers)
   {
     if (provider->GetInt(value, item, contextWindow, info))
@@ -109,6 +119,8 @@
 
 bool CGUIInfoProviders::GetBool(bool& value, const CGUIListItem *item, int contextWindow, const CGUIInfo &info) const
 {
+  CSingleLock lock(m_providerSection);
+
   for (const auto& provider : m_providers)
   {
     if (provider->GetBool(value, item, contextWindow, info))
@@ -119,6 +131,8 @@
 
 void CGUIInfoProviders::UpdateAVInfo(const AudioStreamInfo& audioInfo, const VideoStreamInfo& videoInfo)
 {
+  CSingleLock lock(m_providerSection);
+
   for (const auto& provider : m_providers)
   {
     provider->UpdateAVInfo(audioInfo, videoInfo);
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/GUIInfoProviders.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/GUIInfoProviders.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/GUIInfoProviders.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/GUIInfoProviders.h	2018-07-04 00:01:50.000000000 +0000
@@ -36,6 +36,8 @@
 #include "guilib/guiinfo/VisualisationGUIInfo.h"
 #include "guilib/guiinfo/WeatherGUIInfo.h"
 
+#include "threads/CriticalSection.h"
+
 class CFileItem;
 class CGUIListItem;
 
@@ -147,6 +149,7 @@
   CLibraryGUIInfo& GetLibraryInfoProvider() { return m_libraryGUIInfo; }
 
 private:
+  CCriticalSection m_providerSection;
   std::vector<IGUIInfoProvider *> m_providers;
 
   CAddonsGUIInfo m_addonsGUIInfo;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/PlayerGUIInfo.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/PlayerGUIInfo.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/PlayerGUIInfo.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/PlayerGUIInfo.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -44,9 +44,7 @@
 using namespace KODI::GUILIB::GUIINFO;
 
 CPlayerGUIInfo::CPlayerGUIInfo()
-: m_AfterSeekTimeout(0),
-  m_seekOffset(0),
-  m_playerShowTime(false),
+: m_playerShowTime(false),
   m_playerShowInfo(false)
 {
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/PlayerGUIInfo.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/PlayerGUIInfo.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/PlayerGUIInfo.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/PlayerGUIInfo.h	2018-07-04 00:01:50.000000000 +0000
@@ -58,8 +58,8 @@
 private:
   std::unique_ptr<CFileItem> m_currentItem;
 
-  unsigned int m_AfterSeekTimeout;
-  mutable int m_seekOffset;
+  unsigned int m_AfterSeekTimeout = 0;
+  mutable int m_seekOffset = 0;
   std::atomic_bool m_playerShowTime;
   std::atomic_bool m_playerShowInfo;
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/SystemGUIInfo.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/SystemGUIInfo.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/SystemGUIInfo.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/SystemGUIInfo.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -58,11 +58,7 @@
 using namespace KODI::GUILIB::GUIINFO;
 
 CSystemGUIInfo::CSystemGUIInfo()
-: m_lastSysHeatInfoTime(-SYSTEM_HEAT_UPDATE_INTERVAL),
-  m_fanSpeed(0),
-  m_fps(0.0),
-  m_frameCounter(0),
-  m_lastFPSTime(0)
+: m_lastSysHeatInfoTime(-SYSTEM_HEAT_UPDATE_INTERVAL)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/SystemGUIInfo.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/SystemGUIInfo.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/guiinfo/SystemGUIInfo.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/guiinfo/SystemGUIInfo.h	2018-07-04 00:01:50.000000000 +0000
@@ -57,10 +57,10 @@
   mutable unsigned int m_lastSysHeatInfoTime;
   mutable CTemperature m_gpuTemp;
   mutable CTemperature m_cpuTemp;
-  int m_fanSpeed;
-  float m_fps;
-  unsigned int m_frameCounter;
-  unsigned int m_lastFPSTime;
+  int m_fanSpeed = 0;
+  float m_fps = 0.0;
+  unsigned int m_frameCounter = 0;
+  unsigned int m_lastFPSTime = 0;
 };
 
 } // namespace GUIINFO
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/iimage.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/iimage.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/iimage.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/iimage.h	2018-07-04 00:01:50.000000000 +0000
@@ -26,7 +26,6 @@
 {
 public:
 
-  IImage():m_width(0), m_height(0), m_originalWidth(0), m_originalHeight(0), m_orientation(0), m_hasAlpha(false) {};
   virtual ~IImage() = default;
 
   /*!
@@ -77,11 +76,11 @@
 
 protected:
 
-  unsigned int m_width;
-  unsigned int m_height;
-  unsigned int m_originalWidth;   ///< original image width before scaling or cropping
-  unsigned int m_originalHeight;  ///< original image height before scaling or cropping
-  unsigned int m_orientation;
-  bool m_hasAlpha;
+  unsigned int m_width = 0;
+  unsigned int m_height = 0;
+  unsigned int m_originalWidth = 0;   ///< original image width before scaling or cropping
+  unsigned int m_originalHeight = 0;  ///< original image height before scaling or cropping
+  unsigned int m_orientation = 0;
+  bool m_hasAlpha = false;
 
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/Shader.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/Shader.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/Shader.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/Shader.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -217,15 +217,14 @@
 //////////////////////////////////////////////////////////////////////
 // CGLSLShaderProgram
 //////////////////////////////////////////////////////////////////////
-CGLSLShaderProgram::CGLSLShaderProgram() : m_validated(false)
+CGLSLShaderProgram::CGLSLShaderProgram()
 {
   m_pFP = new CGLSLPixelShader();
   m_pVP = new CGLSLVertexShader();
 }
 
 CGLSLShaderProgram::CGLSLShaderProgram(const std::string& vert,
-                                       const std::string& frag) :
-  m_validated(false)
+                                       const std::string& frag)
 {
   m_pFP = new CGLSLPixelShader();
   m_pFP->LoadSource(frag);
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/Shader.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/Shader.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/Shader.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/Shader.h	2018-07-04 00:01:50.000000000 +0000
@@ -172,7 +172,7 @@
     void Free();
 
     GLint m_lastProgram;
-    bool m_validated;
+    bool m_validated = false;
   };
 
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/Texture.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/Texture.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/Texture.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/Texture.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -44,8 +44,6 @@
 /*                                                                      */
 /************************************************************************/
 CBaseTexture::CBaseTexture(unsigned int width, unsigned int height, unsigned int format)
- : m_hasAlpha( true ),
-   m_mipmapping( false )
 {
   m_pixels = NULL;
   m_loadedToGPU = false;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/Texture.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/Texture.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/Texture.h	2018-05-01 00:00:27.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/Texture.h	2018-07-04 00:01:50.000000000 +0000
@@ -142,8 +142,8 @@
   bool m_loadedToGPU;
   unsigned int m_format;
   int m_orientation;
-  bool m_hasAlpha;
-  bool m_mipmapping;
+  bool m_hasAlpha =  true ;
+  bool m_mipmapping =  false ;
   TEXTURE_SCALING m_scalingMethod = TEXTURE_SCALING::LINEAR;
   bool m_bCacheMemory = false;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/XBTF.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/XBTF.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/XBTF.cpp	2018-05-01 00:00:27.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/XBTF.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -130,7 +130,6 @@
 
 CXBTFFile::CXBTFFile()
   : m_path(),
-    m_loop(0),
     m_frames()
 { }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/XBTF.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/XBTF.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/XBTF.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/XBTF.h	2018-07-04 00:01:50.000000000 +0000
@@ -96,7 +96,7 @@
 
 private:
   std::string m_path;
-  uint32_t m_loop;
+  uint32_t m_loop = 0;
   std::vector<CXBTFFrame> m_frames;
 };
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/XBTFReader.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/XBTFReader.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/XBTFReader.cpp	2018-05-01 00:00:27.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/XBTFReader.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -67,8 +67,7 @@
 
 CXBTFReader::CXBTFReader()
   : CXBTFBase(),
-    m_path(),
-    m_file(nullptr)
+    m_path()
 { }
 
 CXBTFReader::~CXBTFReader()
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/XBTFReader.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/XBTFReader.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/guilib/XBTFReader.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/guilib/XBTFReader.h	2018-07-04 00:01:50.000000000 +0000
@@ -44,7 +44,7 @@
 
 private:
   std::string m_path;
-  FILE* m_file;
+  FILE* m_file = nullptr;
 };
 
 typedef std::shared_ptr<CXBTFReader> CXBTFReaderPtr;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/InertialScrollingHandler.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/InertialScrollingHandler.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/InertialScrollingHandler.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/InertialScrollingHandler.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -41,10 +41,7 @@
 #define MAXIMUM_DELAY_FOR_INERTIA 200
 
 CInertialScrollingHandler::CInertialScrollingHandler()
-: m_bScrolling(false)
-, m_bAborting(false)
-, m_iLastGesturePoint(CPoint(0,0))
-, m_inertialStartTime(0)
+: m_iLastGesturePoint(CPoint(0,0))
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/InertialScrollingHandler.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/InertialScrollingHandler.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/InertialScrollingHandler.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/InertialScrollingHandler.h	2018-07-04 00:01:50.000000000 +0000
@@ -41,8 +41,8 @@
     bool ProcessInertialScroll(float frameTime);
 
     //-------------------------------------------vars for inertial scrolling animation with gestures
-    bool          m_bScrolling;        //flag indicating that we currently do the inertial scrolling emulation
-    bool          m_bAborting;         //flag indicating an abort of scrolling
+    bool          m_bScrolling = false;        //flag indicating that we currently do the inertial scrolling emulation
+    bool          m_bAborting = false;         //flag indicating an abort of scrolling
     CVector       m_iFlickVelocity;
 
     struct PanPoint
@@ -56,5 +56,5 @@
     std::deque<PanPoint> m_panPoints;
     CPoint        m_iLastGesturePoint;
     CVector       m_inertialDeacceleration;
-    unsigned int  m_inertialStartTime;
+    unsigned int  m_inertialStartTime = 0;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/joysticks/generic/FeatureHandling.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/joysticks/generic/FeatureHandling.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/joysticks/generic/FeatureHandling.cpp	2018-05-01 00:00:28.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/joysticks/generic/FeatureHandling.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -87,7 +87,6 @@
 
 CScalarFeature::CScalarFeature(const FeatureName& name, IInputHandler* handler, IButtonMap* buttonMap) :
   CJoystickFeature(name, handler, buttonMap),
-  m_inputType(INPUT_TYPE::UNKNOWN),
   m_bDigitalState(false),
   m_analogState(0.0f),
   m_bActivated(false),
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/joysticks/interfaces/IInputHandler.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/joysticks/interfaces/IInputHandler.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/joysticks/interfaces/IInputHandler.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/joysticks/interfaces/IInputHandler.h	2018-07-04 00:01:50.000000000 +0000
@@ -37,8 +37,6 @@
   class IInputHandler
   {
   public:
-    IInputHandler(void) : m_receiver(nullptr) { }
-
     virtual ~IInputHandler() = default;
 
     /*!
@@ -160,7 +158,7 @@
     IInputReceiver* InputReceiver(void) { return m_receiver; }
 
   private:
-    IInputReceiver* m_receiver;
+    IInputReceiver* m_receiver = nullptr;
   };
 }
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/joysticks/RumbleGenerator.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/joysticks/RumbleGenerator.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/joysticks/RumbleGenerator.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/joysticks/RumbleGenerator.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -38,9 +38,7 @@
 
 CRumbleGenerator::CRumbleGenerator() :
   CThread("RumbleGenerator"),
-  m_motors(GetMotors(ControllerID())),
-  m_receiver(nullptr),
-  m_type(RUMBLE_UNKNOWN)
+  m_motors(GetMotors(ControllerID()))
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/joysticks/RumbleGenerator.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/joysticks/RumbleGenerator.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/joysticks/RumbleGenerator.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/joysticks/RumbleGenerator.h	2018-07-04 00:01:50.000000000 +0000
@@ -63,8 +63,8 @@
     const std::vector<std::string> m_motors;
 
     // Test param
-    IInputReceiver* m_receiver;
-    RUMBLE_TYPE     m_type;
+    IInputReceiver* m_receiver = nullptr;
+    RUMBLE_TYPE     m_type = RUMBLE_UNKNOWN;
   };
 }
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/keyboard/KeyboardEasterEgg.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/keyboard/KeyboardEasterEgg.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/keyboard/KeyboardEasterEgg.cpp	2018-05-01 00:00:28.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/keyboard/KeyboardEasterEgg.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -38,11 +38,6 @@
   XBMCVK_A,
 };
 
-CKeyboardEasterEgg::CKeyboardEasterEgg(void) :
-  m_state(0)
-{
-}
-
 bool CKeyboardEasterEgg::OnKeyPress(const CKey& key)
 {
   bool bHandled = false;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/keyboard/KeyboardEasterEgg.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/keyboard/KeyboardEasterEgg.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/keyboard/KeyboardEasterEgg.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/keyboard/KeyboardEasterEgg.h	2018-07-04 00:01:50.000000000 +0000
@@ -35,7 +35,6 @@
   class CKeyboardEasterEgg : public IKeyboardDriverHandler
   {
   public:
-    CKeyboardEasterEgg(void);
     ~CKeyboardEasterEgg() override = default;
 
     // implementation of IKeyboardDriverHandler
@@ -45,7 +44,7 @@
   private:
     static std::vector<XBMCVKey> m_sequence;
 
-    unsigned int m_state;
+    unsigned int m_state = 0;
   };
 }
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/touch/generic/GenericTouchInputHandler.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/touch/generic/GenericTouchInputHandler.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/touch/generic/GenericTouchInputHandler.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/touch/generic/GenericTouchInputHandler.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -34,9 +34,7 @@
 }
 
 CGenericTouchInputHandler::CGenericTouchInputHandler()
-     : m_holdTimer(new CTimer(this)),
-       m_gestureState(TouchGestureUnknown),
-       m_gestureStateOld(TouchGestureUnknown)
+     : m_holdTimer(new CTimer(this))
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/touch/generic/GenericTouchInputHandler.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/touch/generic/GenericTouchInputHandler.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/input/touch/generic/GenericTouchInputHandler.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/input/touch/generic/GenericTouchInputHandler.h	2018-07-04 00:01:50.000000000 +0000
@@ -94,6 +94,6 @@
   std::array<Pointer, MAX_POINTERS> m_pointers;
   std::set<std::unique_ptr<IGenericTouchGestureDetector>> m_detectors;
 
-  TouchGestureState m_gestureState;
-  TouchGestureState m_gestureStateOld;
+  TouchGestureState m_gestureState = TouchGestureUnknown;
+  TouchGestureState m_gestureStateOld = TouchGestureUnknown;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/generic/ScriptInvocationManager.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/generic/ScriptInvocationManager.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/generic/ScriptInvocationManager.cpp	2018-07-03 00:01:37.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/generic/ScriptInvocationManager.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -39,10 +39,6 @@
 
 using namespace XFILE;
 
-CScriptInvocationManager::CScriptInvocationManager()
-  : m_nextId(0)
-{ }
-
 CScriptInvocationManager::~CScriptInvocationManager()
 {
   Uninitialize();
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/generic/ScriptInvocationManager.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/generic/ScriptInvocationManager.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/generic/ScriptInvocationManager.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/generic/ScriptInvocationManager.h	2018-07-04 00:01:50.000000000 +0000
@@ -136,7 +136,7 @@
   void OnExecutionDone(int scriptId);
 
 private:
-  CScriptInvocationManager();
+  CScriptInvocationManager() = default;
   CScriptInvocationManager(const CScriptInvocationManager&) = delete;
   CScriptInvocationManager const& operator=(CScriptInvocationManager const&) = delete;
   virtual ~CScriptInvocationManager();
@@ -157,6 +157,6 @@
   int m_lastPluginHandle;
 
   std::map<std::string, int> m_scriptPaths;
-  int m_nextId;
+  int m_nextId = 0;
   CCriticalSection m_critSection;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -252,28 +252,16 @@
     name(),
     ID(),
     referencedType(nullptr),
-    referencedTypeSet(false),
     extends(),
     description(),
-    type(AnyValue),
     unionTypes(),
-    optional(true),
     defaultValue(),
     minimum(-std::numeric_limits<double>::max()),
     maximum(std::numeric_limits<double>::max()),
-    exclusiveMinimum(false),
-    exclusiveMaximum(false),
-    divisibleBy(0),
-    minLength(-1),
-    maxLength(-1),
     enums(),
     items(),
-    minItems(0),
-    maxItems(0),
-    uniqueItems(false),
     additionalItems(),
     properties(),
-    hasAdditionalProperties(false),
     additionalProperties(nullptr)
 { }
 
@@ -1225,8 +1213,6 @@
   : missingReference(),
     name(),
     method(NULL),
-    transportneed(Response),
-    permission(ReadData),
     description(),
     parameters(),
     returns(new JSONSchemaTypeDefinition())
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/json-rpc/JSONServiceDescription.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/json-rpc/JSONServiceDescription.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/json-rpc/JSONServiceDescription.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/json-rpc/JSONServiceDescription.h	2018-07-04 00:01:50.000000000 +0000
@@ -78,7 +78,7 @@
      \brief Whether the type has been set
      based on the referenced type
      */
-    bool referencedTypeSet;
+    bool referencedTypeSet = false;
 
     /*!
      \brief Array of reference types
@@ -94,7 +94,7 @@
     /*!
      \brief JSON schema type of the parameter's value
      */
-    JSONSchemaType type;
+    JSONSchemaType type = AnyValue;
 
     /*!
      \brief JSON schema type definitions in case
@@ -106,7 +106,7 @@
      \brief Whether or not the parameter is
      optional
      */
-    bool optional;
+    bool optional = true;
 
     /*!
      \brief Default value of the parameter
@@ -129,29 +129,29 @@
      \brief Whether to exclude the defined Minimum
      value from the valid range or not
      */
-    bool exclusiveMinimum;
+    bool exclusiveMinimum = false;
 
     /*!
      \brief  Whether to exclude the defined Maximum
      value from the valid range or not
      */
-    bool exclusiveMaximum;
+    bool exclusiveMaximum = false;
 
     /*!
      \brief Integer by which the value (of type
      Integer) must be divisible without rest
      */
-    unsigned int divisibleBy;
+    unsigned int divisibleBy = 0;
 
     /*!
      \brief Minimum length for String types
      */
-    int minLength;
+    int minLength = -1;
 
     /*!
      \brief Maximum length for String types
      */
-    int maxLength;
+    int maxLength = -1;
 
     /*!
      \brief (Optional) List of allowed values
@@ -167,18 +167,18 @@
     /*!
      \brief Minimum amount of items in the array
      */
-    unsigned int minItems;
+    unsigned int minItems = 0;
 
     /*!
      \brief Maximum amount of items in the array
      */
-    unsigned int maxItems;
+    unsigned int maxItems = 0;
 
     /*!
      \brief Whether every value in the array
      must be unique or not
      */
-    bool uniqueItems;
+    bool uniqueItems = false;
 
     /*!
      \brief List of json schema definitions for
@@ -217,7 +217,7 @@
      \brief Whether the type can have additional properties
      or not
      */
-    bool hasAdditionalProperties;
+    bool hasAdditionalProperties = false;
 
     /*!
      \brief Type definition for additional properties
@@ -257,12 +257,12 @@
      \brief Definition of the type of
      request/response
      */
-    TransportLayerCapability transportneed;
+    TransportLayerCapability transportneed = Response;
     /*!
      \brief Definition of the permissions needed
      to execute the method
      */
-    OperationPermission permission;
+    OperationPermission permission = ReadData;
     /*!
      \brief Description of the method
      */
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/AddonClass.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/AddonClass.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/AddonClass.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/AddonClass.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -42,7 +42,7 @@
 #endif
   }
 
-  AddonClass::AddonClass() : refs(0L), m_isDeallocating(false),
+  AddonClass::AddonClass() : refs(0L),
                              languageHook(NULL)
   {
 #ifdef XBMC_ADDON_DEBUG_MEMORY
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/AddonClass.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/AddonClass.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/AddonClass.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/AddonClass.h	2018-07-04 00:01:50.000000000 +0000
@@ -69,7 +69,7 @@
   {
   private:
     mutable std::atomic<long> refs;
-    bool m_isDeallocating;
+    bool m_isDeallocating = false;
 
     // no copying
     inline AddonClass(const AddonClass&) = delete;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Alternative.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Alternative.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Alternative.h	2018-05-01 00:00:28.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Alternative.h	2018-07-04 00:01:50.000000000 +0000
@@ -30,13 +30,11 @@
   {
   public:
   private:
-    WhichAlternative pos;
+    WhichAlternative pos = none;
     T1 d1;
     T2 d2;
 
   public:
-    Alternative() : pos(none) {}
-
     inline WhichAlternative which() const { return pos; }
 
     inline T1& former()
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Control.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Control.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Control.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Control.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -205,7 +205,7 @@
                                  const char* _shadowColor, const char* _focusedColor) :
       textOffsetX(_textOffsetX), textOffsetY(_textOffsetY),
       align(alignment), strFont("font13"), textColor(0xffffffff), disabledColor(0x60ffffff),
-      iAngle(angle), shadowColor(0), focusedColor(0xffffffff)
+      iAngle(angle), focusedColor(0xffffffff)
     {
       dwPosX = x;
       dwPosY = y;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Control.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Control.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Control.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Control.h	2018-07-04 00:01:50.000000000 +0000
@@ -74,9 +74,7 @@
     class Control : public AddonClass
     {
     protected:
-      Control() : iControlId(0), iParentId(0), dwPosX(0), dwPosY(0), dwWidth(0),
-                  dwHeight(0), iControlUp(0), iControlDown(0), iControlLeft(0),
-                  iControlRight(0), pGUIControl(NULL) {}
+      Control() = default;
 
     public:
       ~Control() override;
@@ -629,17 +627,17 @@
 #endif
 
 #ifndef SWIG
-      int iControlId;
-      int iParentId;
-      int dwPosX;
-      int dwPosY;
-      int dwWidth;
-      int dwHeight;
-      int iControlUp;
-      int iControlDown;
-      int iControlLeft;
-      int iControlRight;
-      CGUIControl* pGUIControl;
+      int iControlId = 0;
+      int iParentId = 0;
+      int dwPosX = 0;
+      int dwPosY = 0;
+      int dwWidth = 0;
+      int dwHeight = 0;
+      int iControlUp = 0;
+      int iControlDown = 0;
+      int iControlLeft = 0;
+      int iControlRight = 0;
+      CGUIControl* pGUIControl = nullptr;
 #endif
 
     };
@@ -864,18 +862,15 @@
 #endif
 
 #ifndef SWIG
-      ControlLabel() :
-        bHasPath(false),
-        iAngle  (0)
-      {}
+      ControlLabel() = default;
 
       std::string strFont;
       std::string strText;
       UTILS::Color textColor;
       UTILS::Color disabledColor;
       uint32_t align;
-      bool bHasPath;
-      int iAngle;
+      bool bHasPath = false;
+      int iAngle = 0;
 
       SWIGHIDDENVIRTUAL CGUIControl* Create() override;
 
@@ -1065,9 +1060,7 @@
 #endif
 
 #ifndef SWIG
-      ControlEdit() :
-        bIsPassword (false)
-      {}
+      ControlEdit() = default;
 
       std::string strFont;
       std::string strText;
@@ -1076,7 +1069,7 @@
       UTILS::Color textColor;
       UTILS::Color disabledColor;
       uint32_t align;
-      bool bIsPassword;
+      bool bIsPassword = false;
 
       SWIGHIDDENVIRTUAL CGUIControl* Create() override;
 #endif
@@ -1627,14 +1620,7 @@
 
       // This is called from AddonWindow.cpp but shouldn't be available
       //  to the scripting languages.
-      ControlList() :
-        imageHeight     (0),
-        imageWidth      (0),
-        itemHeight      (0),
-        space           (0),
-        itemTextOffsetX (0),
-        itemTextOffsetY (0)
-      {}
+      ControlList() = default;
 
       std::vector<AddonClass::Ref<ListItem> > vecItems;
       std::string strFont;
@@ -1645,13 +1631,13 @@
       std::string strTextureButton;
       std::string strTextureButtonFocus;
 
-      int imageHeight;
-      int imageWidth;
-      int itemHeight;
-      int space;
+      int imageHeight = 0;
+      int imageWidth = 0;
+      int itemHeight = 0;
+      int space = 0;
 
-      int itemTextOffsetX;
-      int itemTextOffsetY;
+      int itemTextOffsetX = 0;
+      int itemTextOffsetY = 0;
       uint32_t alignmentY;
 
       SWIGHIDDENVIRTUAL CGUIControl* Create() override;
@@ -2096,12 +2082,10 @@
 #endif
 
 #ifndef SWIG
-      ControlImage() :
-        aspectRatio (0)
-      {}
+      ControlImage() = default;
 
       std::string strFileName;
-      int aspectRatio;
+      int aspectRatio = 0;
       UTILS::Color colorDiffuse;
 
       SWIGHIDDENVIRTUAL CGUIControl* Create() override;
@@ -2244,13 +2228,11 @@
       std::string strTextureRight;
       std::string strTextureBg;
       std::string strTextureOverlay;
-      int aspectRatio;
+      int aspectRatio = 0;
       UTILS::Color colorDiffuse;
 
       SWIGHIDDENVIRTUAL CGUIControl* Create() override;
-      ControlProgress() :
-        aspectRatio (0)
-      {}
+      ControlProgress() = default;
 #endif
     };
     /// @}
@@ -2459,15 +2441,15 @@
 #ifndef SWIG
       SWIGHIDDENVIRTUAL bool canAcceptMessages(int actionId) override { return true; }
 
-      int textOffsetX;
-      int textOffsetY;
+      int textOffsetX = 0;
+      int textOffsetY = 0;
       UTILS::Color align;
       std::string strFont;
       UTILS::Color textColor;
       UTILS::Color disabledColor;
-      int iAngle;
-      int shadowColor;
-      int focusedColor;
+      int iAngle = 0;
+      int shadowColor = 0;
+      int focusedColor = 0;
       std::string strText;
       std::string strText2;
       std::string strTextureFocus;
@@ -2475,13 +2457,7 @@
 
       SWIGHIDDENVIRTUAL CGUIControl* Create() override;
 
-      ControlButton() :
-        textOffsetX (0),
-        textOffsetY (0),
-        iAngle      (0),
-        shadowColor (0),
-        focusedColor(0)
-      {}
+      ControlButton() = default;
 #endif
     };
     /// @}
@@ -2780,20 +2756,16 @@
       std::string strTextureRadioOffDisabled;
       UTILS::Color textColor;
       UTILS::Color disabledColor;
-      int textOffsetX;
-      int textOffsetY;
+      int textOffsetX = 0;
+      int textOffsetY = 0;
      uint32_t align;
-      int iAngle;
+      int iAngle = 0;
       UTILS::Color shadowColor;
       UTILS::Color focusedColor;
 
       SWIGHIDDENVIRTUAL CGUIControl* Create() override;
 
-      ControlRadioButton() :
-        textOffsetX (0),
-        textOffsetY (0),
-        iAngle      (0)
-      {}
+      ControlRadioButton() = default;
 #endif
     };
     /// @}
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Dialog.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Dialog.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Dialog.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Dialog.h	2018-07-04 00:01:50.000000000 +0000
@@ -631,15 +631,15 @@
     ///
     class DialogProgress : public AddonClass
     {
-      CGUIDialogProgress* dlg;
-      bool                open;
+      CGUIDialogProgress* dlg = nullptr;
+      bool                open = false;
 
     protected:
       void deallocating() override;
 
     public:
 
-      DialogProgress() : dlg(NULL), open(false) {}
+      DialogProgress() = default;
       ~DialogProgress() override;
 
 #ifdef DOXYGEN_SHOULD_USE_THIS
@@ -875,16 +875,16 @@
     ///
     class DialogProgressBG : public AddonClass
     {
-      CGUIDialogExtendedProgressBar* dlg;
-      CGUIDialogProgressBarHandle* handle;
-      bool open;
+      CGUIDialogExtendedProgressBar* dlg = nullptr;
+      CGUIDialogProgressBarHandle* handle = nullptr;
+      bool open = false;
 
     protected:
       void deallocating() override;
 
     public:
 
-      DialogProgressBG() : dlg(NULL), handle(NULL), open(false) {}
+      DialogProgressBG() = default;
       ~DialogProgressBG() override;
 
 #ifdef DOXYGEN_SHOULD_USE_THIS
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Keyboard.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Keyboard.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Keyboard.cpp	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Keyboard.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -33,7 +33,7 @@
   {
 
     Keyboard::Keyboard(const String& line /* = nullString*/, const String& heading/* = nullString*/, bool hidden/* = false*/)
-      : strDefault(line), strHeading(heading), bHidden(hidden), bConfirmed(false)
+      : strDefault(line), strHeading(heading), bHidden(hidden)
     {
     }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Keyboard.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Keyboard.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Keyboard.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Keyboard.h	2018-07-04 00:01:50.000000000 +0000
@@ -71,7 +71,7 @@
       String strHeading;
       bool bHidden;
       String strText;
-      bool bConfirmed;
+      bool bConfirmed = false;
 #endif
 
       Keyboard(const String& line = emptyString, const String& heading = emptyString, bool hidden = false);
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/LanguageHook.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/LanguageHook.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/LanguageHook.h	2018-06-21 18:59:48.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/LanguageHook.h	2018-07-04 00:01:50.000000000 +0000
@@ -135,13 +135,13 @@
   class DelayedCallGuard
   {
     LanguageHook* languageHook;
-    bool clearOnExit;
+    bool clearOnExit = false;
 
   public:
-    inline explicit DelayedCallGuard(LanguageHook* languageHook_) : languageHook(languageHook_), clearOnExit(false)
+    inline explicit DelayedCallGuard(LanguageHook* languageHook_) : languageHook(languageHook_)
     { if (languageHook) languageHook->DelayedCallOpen(); }
 
-    inline DelayedCallGuard() : languageHook(LanguageHook::GetLanguageHook()), clearOnExit(false)
+    inline DelayedCallGuard() : languageHook(LanguageHook::GetLanguageHook())
     { if (languageHook) languageHook->DelayedCallOpen(); }
 
     inline ~DelayedCallGuard()
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Window.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Window.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Window.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Window.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -89,9 +89,9 @@
     CGUIWindow* ProxyExistingWindowInterceptor::get() { XBMC_TRACE; return cguiwindow; }
 
     Window::Window(bool discrim):
-      isDisposed(false), window(NULL), iWindowId(-1),
-      iOldWindowId(0), iCurrentControlId(3000), bModal(false), m_actionEvent(true),
-      canPulse(true), existingWindow(false), destroyAfterDeInit(false)
+      window(NULL),
+      m_actionEvent(true),
+      canPulse(true), existingWindow(false)
     {
       XBMC_TRACE;
     }
@@ -100,9 +100,8 @@
      * This just creates a default window.
      */
     Window::Window(int existingWindowId) :
-      isDisposed(false), window(NULL), iWindowId(-1),
-      iOldWindowId(0), iCurrentControlId(3000), bModal(false), m_actionEvent(true),
-      canPulse(false), existingWindow(true), destroyAfterDeInit(false)
+      window(NULL),
+      m_actionEvent(true)
     {
       XBMC_TRACE;
       SingleLockWithDelayGuard gslock(CServiceBroker::GetWinSystem()->GetGfxContext(),languageHook);
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Window.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Window.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/Window.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/Window.h	2018-07-04 00:01:50.000000000 +0000
@@ -55,20 +55,18 @@
     class Action : public AddonClass
     {
     public:
-      Action() : id(-1), fAmount1(0.0f), fAmount2(0.0f),
-                 fRepeat(0.0f), buttonCode(0), strAction("")
-      { }
+      Action() = default;
 
 #ifndef SWIG
       explicit Action(const CAction& caction) { setFromCAction(caction); }
 
       void setFromCAction(const CAction& caction);
 
-      long id;
-      float fAmount1;
-      float fAmount2;
-      float fRepeat;
-      unsigned long buttonCode;
+      long id = -1;
+      float fAmount1 = 0.0f;
+      float fAmount2 = 0.0f;
+      float fRepeat = 0.0f;
+      unsigned long buttonCode = 0;
       std::string strAction;
 
       // Not sure if this is correct but it's here for now.
@@ -204,7 +202,7 @@
     class Window : public AddonCallback
     {
       friend class WindowDialogMixin;
-      bool isDisposed;
+      bool isDisposed = false;
 
       void doAddControl(Control* pControl, CCriticalSection* gcontext, bool wait);
       void doRemoveControl(Control* pControl, CCriticalSection* gcontext, bool wait);
@@ -212,19 +210,19 @@
     protected:
 #ifndef SWIG
       InterceptorBase* window;
-      int iWindowId;
+      int iWindowId = -1;
 
       std::vector<AddonClass::Ref<Control> > vecControls;
-      int iOldWindowId;
-      int iCurrentControlId;
-      bool bModal;
+      int iOldWindowId = 0;
+      int iCurrentControlId = 3000;
+      bool bModal = false;
       CEvent m_actionEvent;
 
-      bool canPulse;
+      bool canPulse = false;
 
       // I REALLY hate this ... but it's the simplest fix right now.
-      bool existingWindow;
-      bool destroyAfterDeInit;
+      bool existingWindow = true;
+      bool destroyAfterDeInit = false;
 
       /**
        * This only takes a boolean to allow subclasses to explicitly use it. A
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/wsgi/WsgiInputStream.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/wsgi/WsgiInputStream.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/wsgi/WsgiInputStream.cpp	2018-05-01 00:00:28.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/wsgi/WsgiInputStream.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -28,15 +28,12 @@
   {
     WsgiInputStreamIterator::WsgiInputStreamIterator()
       : m_data(),
-        m_offset(0),
-        m_remaining(0),
         m_line()
     { }
 
 #ifndef SWIG
     WsgiInputStreamIterator::WsgiInputStreamIterator(const String& data, bool end /* = false */)
       : m_data(data),
-        m_offset(0),
         m_remaining(end ? 0 : data.size()),
         m_line()
     { }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/wsgi/WsgiInputStream.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/wsgi/WsgiInputStream.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/wsgi/WsgiInputStream.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/wsgi/WsgiInputStream.h	2018-07-04 00:01:50.000000000 +0000
@@ -96,8 +96,8 @@
 
     protected:
       String m_data;
-      mutable unsigned long m_offset;
-      mutable unsigned long m_remaining;
+      mutable unsigned long m_offset = 0;
+      mutable unsigned long m_remaining = 0;
 
     private:
       String m_line;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/wsgi/WsgiResponse.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/wsgi/WsgiResponse.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/wsgi/WsgiResponse.cpp	2018-05-01 00:00:28.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/wsgi/WsgiResponse.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -31,9 +31,7 @@
   namespace xbmcwsgi
   {
     WsgiResponse::WsgiResponse()
-      : m_called(false),
-        m_status(MHD_HTTP_INTERNAL_SERVER_ERROR),
-        m_responseHeaders(),
+      : m_responseHeaders(),
         m_body()
     { }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/wsgi/WsgiResponse.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/wsgi/WsgiResponse.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/legacy/wsgi/WsgiResponse.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/legacy/wsgi/WsgiResponse.h	2018-07-04 00:01:50.000000000 +0000
@@ -79,8 +79,8 @@
       bool Finalize(HTTPPythonRequest* request) const;
 
     private:
-      bool m_called;
-      int m_status;
+      bool m_called = false;
+      int m_status = MHD_HTTP_INTERNAL_SERVER_ERROR;
       std::multimap<std::string, std::string> m_responseHeaders;
 
       WsgiResponseBody m_body;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/python/PyContext.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/python/PyContext.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/interfaces/python/PyContext.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/interfaces/python/PyContext.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -30,11 +30,11 @@
     struct PyContextState
     {
       inline explicit PyContextState(bool pcreatedByGilRelease = false) :
-        value(0), state(NULL), gilReleasedDepth(0), createdByGilRelease(pcreatedByGilRelease) {}
+        state(NULL), createdByGilRelease(pcreatedByGilRelease) {}
 
-      int value;
+      int value = 0;
       PyThreadState* state;
-      int gilReleasedDepth;
+      int gilReleasedDepth = 0;
       bool createdByGilRelease;
     };
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/Album.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/Album.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/Album.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/Album.h	2018-07-04 00:01:50.000000000 +0000
@@ -38,18 +38,7 @@
 {
 public:
   explicit CAlbum(const CFileItem& item);
-  CAlbum()
-    : idAlbum(-1)
-    , fRating(-1)
-    , iUserrating(-1)
-    , iVotes(-1)
-    , iYear(-1)
-    , bCompilation(false)
-    , iTimesPlayed(0)
-    , releaseType(Album)
-    , bScrapedMBID(false)
-    , bArtistSongMerge(false)
-  {};
+  CAlbum() = default;
   bool operator<(const CAlbum &a) const;
   void MergeScrapedAlbum(const CAlbum& album, bool override = true);
 
@@ -155,7 +144,7 @@
   bool Load(const TiXmlElement *element, bool append = false, bool prioritise = false);
   bool Save(TiXmlNode *node, const std::string &tag, const std::string& strPath);
 
-  long idAlbum;
+  long idAlbum = -1;
   std::string strAlbum;
   std::string strMusicBrainzAlbumID;
   std::string strReleaseGroupMBID;
@@ -173,19 +162,19 @@
   std::string strType;
   std::string strPath;
   std::string m_strDateOfRelease;
-  float fRating;
-  int iUserrating;
-  int iVotes;
-  int iYear;
-  bool bCompilation;
-  int iTimesPlayed;
+  float fRating = -1;
+  int iUserrating = -1;
+  int iVotes = -1;
+  int iYear = -1;
+  bool bCompilation = false;
+  int iTimesPlayed = 0;
   CDateTime dateAdded;
   CDateTime lastPlayed;
   VECSONGS songs;     ///< Local songs
-  ReleaseType releaseType;
+  ReleaseType releaseType = Album;
   std::string strLastScraped;
-  bool bScrapedMBID;
-  bool bArtistSongMerge;
+  bool bScrapedMBID = false;
+  bool bArtistSongMerge = false;
 };
 
 typedef std::vector<CAlbum> VECALBUMS;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/Artist.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/Artist.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/Artist.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/Artist.h	2018-07-04 00:01:50.000000000 +0000
@@ -125,7 +125,7 @@
   friend class CMusicDatabase;
 
 public:
-  CArtistCredit() : idArtist(-1), m_bScrapedMBID(false) { }
+  CArtistCredit() = default;
   explicit CArtistCredit(std::string strArtist) : m_strArtist(strArtist) { }
   CArtistCredit(std::string strArtist, std::string strMusicBrainzArtistID)
     : m_strArtist(strArtist), m_strMusicBrainzArtistID(strMusicBrainzArtistID) {  }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/dialogs/GUIDialogInfoProviderSettings.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/dialogs/GUIDialogInfoProviderSettings.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/dialogs/GUIDialogInfoProviderSettings.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/dialogs/GUIDialogInfoProviderSettings.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -59,10 +59,7 @@
 const std::string SETTING_APPLYTOITEMS = "applysettingstoitems";
 
 CGUIDialogInfoProviderSettings::CGUIDialogInfoProviderSettings()
-  : CGUIDialogSettingsManualBase(WINDOW_DIALOG_INFOPROVIDER_SETTINGS, "DialogSettings.xml"),
-    m_showSingleScraper(false),
-    m_singleScraperType(CONTENT_NONE),
-    m_applyToItems(INFOPROVIDER_THISITEM)
+  : CGUIDialogSettingsManualBase(WINDOW_DIALOG_INFOPROVIDER_SETTINGS, "DialogSettings.xml")
 { }
 
 bool CGUIDialogInfoProviderSettings::Show()
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/dialogs/GUIDialogInfoProviderSettings.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/dialogs/GUIDialogInfoProviderSettings.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/dialogs/GUIDialogInfoProviderSettings.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/dialogs/GUIDialogInfoProviderSettings.h	2018-07-04 00:01:50.000000000 +0000
@@ -96,8 +96,8 @@
   ADDON::ScraperPtr m_artistscraper;
 
   std::string m_strArtistInfoPath;
-  bool m_showSingleScraper;
-  CONTENT_TYPE m_singleScraperType;
+  bool m_showSingleScraper = false;
+  CONTENT_TYPE m_singleScraperType = CONTENT_NONE;
   bool m_fetchInfo;
-  unsigned int m_applyToItems;
+  unsigned int m_applyToItems = INFOPROVIDER_THISITEM;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/dialogs/GUIDialogSongInfo.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/dialogs/GUIDialogSongInfo.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/dialogs/GUIDialogSongInfo.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/dialogs/GUIDialogSongInfo.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -123,7 +123,6 @@
 CGUIDialogSongInfo::CGUIDialogSongInfo(void)
     : CGUIDialog(WINDOW_DIALOG_SONG_INFO, "DialogMusicInfo.xml")
     , m_song(new CFileItem)
-    , m_albumId(-1)
 {
   m_cancelled = false;
   m_hasUpdatedUserrating = false;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/dialogs/GUIDialogSongInfo.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/dialogs/GUIDialogSongInfo.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/dialogs/GUIDialogSongInfo.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/dialogs/GUIDialogSongInfo.h	2018-07-04 00:01:50.000000000 +0000
@@ -58,6 +58,6 @@
   int m_startUserrating;
   bool m_cancelled;
   bool m_hasUpdatedUserrating;
-  long m_albumId;
+  long m_albumId = -1;
 
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -31,8 +31,7 @@
 #include "utils/Variant.h"
 
 CGUIDialogVisualisationPresetList::CGUIDialogVisualisationPresetList()
-    : CGUIDialogSelect(WINDOW_DIALOG_VIS_PRESET_LIST),
-      m_viz(nullptr)
+    : CGUIDialogSelect(WINDOW_DIALOG_VIS_PRESET_LIST)
 {
   m_loadType = KEEP_IN_MEMORY;
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/dialogs/GUIDialogVisualisationPresetList.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/dialogs/GUIDialogVisualisationPresetList.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/dialogs/GUIDialogVisualisationPresetList.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/dialogs/GUIDialogVisualisationPresetList.h	2018-07-04 00:01:50.000000000 +0000
@@ -39,5 +39,5 @@
 
 private:
   void SetVisualisation(CGUIVisualisationControl *addon);
-  CGUIVisualisationControl* m_viz;
+  CGUIVisualisationControl* m_viz = nullptr;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/infoscanner/MusicAlbumInfo.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/infoscanner/MusicAlbumInfo.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/infoscanner/MusicAlbumInfo.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/infoscanner/MusicAlbumInfo.h	2018-07-04 00:01:50.000000000 +0000
@@ -34,7 +34,7 @@
 class CMusicAlbumInfo
 {
 public:
-  CMusicAlbumInfo() : m_bLoaded(false), m_relevance(-1) {}
+  CMusicAlbumInfo() = default;
   CMusicAlbumInfo(const std::string& strAlbumInfo, const CScraperUrl& strAlbumURL);
   CMusicAlbumInfo(const std::string& strAlbum, const std::string& strArtist, const std::string& strAlbumInfo, const CScraperUrl& strAlbumURL);
   virtual ~CMusicAlbumInfo() = default;
@@ -53,9 +53,9 @@
   bool Load(XFILE::CCurlFile& http, const ADDON::ScraperPtr& scraper);
 
 protected:
-  bool m_bLoaded;
+  bool m_bLoaded = false;
   CAlbum m_album;
-  float m_relevance;
+  float m_relevance = -1;
   std::string m_strTitle2;
   CScraperUrl m_albumURL;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/infoscanner/MusicArtistInfo.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/infoscanner/MusicArtistInfo.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/infoscanner/MusicArtistInfo.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/infoscanner/MusicArtistInfo.h	2018-07-04 00:01:50.000000000 +0000
@@ -31,7 +31,7 @@
 class CMusicArtistInfo
 {
 public:
-  CMusicArtistInfo() : m_bLoaded(false) {}
+  CMusicArtistInfo() = default;
   CMusicArtistInfo(const std::string& strArtist, const CScraperUrl& strArtistURL);
   virtual ~CMusicArtistInfo() = default;
   bool Loaded() const { return m_bLoaded; }
@@ -46,6 +46,6 @@
 protected:
   CArtist m_artist;
   CScraperUrl m_artistURL;
-  bool m_bLoaded;
+  bool m_bLoaded = false;
 };
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/infoscanner/MusicInfoScanner.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/infoscanner/MusicInfoScanner.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/infoscanner/MusicInfoScanner.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/infoscanner/MusicInfoScanner.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -72,9 +72,7 @@
 using KODI::UTILITY::CDigest;
 
 CMusicInfoScanner::CMusicInfoScanner()
-: m_needsCleanup(false),
-  m_scanType(0),
-  m_fileCountReader(this, "MusicFileCounter")
+: m_fileCountReader(this, "MusicFileCounter")
 {
   m_bStop = false;
   m_currentItem=0;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/infoscanner/MusicInfoScanner.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/infoscanner/MusicInfoScanner.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/infoscanner/MusicInfoScanner.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/infoscanner/MusicInfoScanner.h	2018-07-04 00:01:50.000000000 +0000
@@ -248,8 +248,8 @@
   int m_currentItem;
   int m_itemCount;
   bool m_bStop;
-  bool m_needsCleanup;
-  int m_scanType; // 0 - load from files, 1 - albums, 2 - artists
+  bool m_needsCleanup = false;
+  int m_scanType = 0; // 0 - load from files, 1 - albums, 2 - artists
   int m_idSourcePath;
   CMusicDatabase m_musicDatabase;
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/MusicLibraryQueue.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/MusicLibraryQueue.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/MusicLibraryQueue.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/MusicLibraryQueue.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -37,10 +37,7 @@
 
 CMusicLibraryQueue::CMusicLibraryQueue()
   : CJobQueue(false, 1, CJob::PRIORITY_LOW),
-    m_jobs(),
-    m_modal(false),
-    m_exporting(false),
-    m_cleaning(false)
+    m_jobs()
 { }
 
 CMusicLibraryQueue::~CMusicLibraryQueue()
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/MusicLibraryQueue.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/MusicLibraryQueue.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/MusicLibraryQueue.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/MusicLibraryQueue.h	2018-07-04 00:01:50.000000000 +0000
@@ -142,7 +142,7 @@
   MusicLibraryJobMap m_jobs;
   CCriticalSection m_critical;
 
-  bool m_modal;
-  bool m_exporting;
-  bool m_cleaning;
+  bool m_modal = false;
+  bool m_exporting = false;
+  bool m_cleaning = false;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/tags/ReplayGain.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/tags/ReplayGain.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/tags/ReplayGain.cpp	2018-05-01 00:00:29.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/tags/ReplayGain.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -108,12 +108,6 @@
 // class ReplayGain::Info
 ///////////////////////////////////////////////////////////////
 
-ReplayGain::Info::Info()
-  : m_gain(REPLAY_GAIN_NO_GAIN)
-  , m_peak(REPLAY_GAIN_NO_PEAK)
-{
-}
-
 void ReplayGain::Info::SetGain(float aGain)
 {
   m_gain = aGain;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/tags/ReplayGain.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/tags/ReplayGain.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/music/tags/ReplayGain.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/music/tags/ReplayGain.h	2018-07-04 00:01:50.000000000 +0000
@@ -37,7 +37,6 @@
   class Info
   {
   public:
-    Info();
     void SetGain(float aGain);
     void SetGain(const std::string& aStrGain);
     float Gain() const;
@@ -48,8 +47,8 @@
     bool HasPeak() const;
     bool Valid() const;
   private:
-    float m_gain;   // measured in milliBels
-    float m_peak;   // 1.0 == full digital scale
+    float m_gain = REPLAY_GAIN_NO_GAIN;   // measured in milliBels
+    float m_peak = REPLAY_GAIN_NO_PEAK;   // 1.0 == full digital scale
   };
   const Info& Get(Type aType) const;
   void Set(Type aType, const Info& aInfo);
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/httprequesthandler/HTTPFileHandler.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/httprequesthandler/HTTPFileHandler.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/httprequesthandler/HTTPFileHandler.cpp	2018-05-01 00:00:29.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/httprequesthandler/HTTPFileHandler.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -26,16 +26,12 @@
 CHTTPFileHandler::CHTTPFileHandler()
   : IHTTPRequestHandler(),
     m_url(),
-    m_canHandleRanges(true),
-    m_canBeCached(true),
     m_lastModified()
 { }
 
 CHTTPFileHandler::CHTTPFileHandler(const HTTPRequest &request)
   : IHTTPRequestHandler(request),
     m_url(),
-    m_canHandleRanges(true),
-    m_canBeCached(true),
     m_lastModified()
 { }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/httprequesthandler/HTTPFileHandler.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/httprequesthandler/HTTPFileHandler.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/httprequesthandler/HTTPFileHandler.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/httprequesthandler/HTTPFileHandler.h	2018-07-04 00:01:50.000000000 +0000
@@ -53,8 +53,8 @@
 private:
   std::string m_url;
 
-  bool m_canHandleRanges;
-  bool m_canBeCached;
+  bool m_canHandleRanges = true;
+  bool m_canBeCached = true;
 
   CDateTime m_lastModified;
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/httprequesthandler/IHTTPRequestHandler.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/httprequesthandler/IHTTPRequestHandler.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/httprequesthandler/IHTTPRequestHandler.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/httprequesthandler/IHTTPRequestHandler.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -65,15 +65,13 @@
 IHTTPRequestHandler::IHTTPRequestHandler()
   : m_request(),
     m_response(),
-    m_postFields(),
-    m_ranged(false)
+    m_postFields()
 { }
 
 IHTTPRequestHandler::IHTTPRequestHandler(const HTTPRequest &request)
   : m_request(request),
     m_response(),
-    m_postFields(),
-    m_ranged(false)
+    m_postFields()
 {
   m_response.type = HTTPError;
   m_response.status = MHD_HTTP_INTERNAL_SERVER_ERROR;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/httprequesthandler/IHTTPRequestHandler.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/httprequesthandler/IHTTPRequestHandler.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/httprequesthandler/IHTTPRequestHandler.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/httprequesthandler/IHTTPRequestHandler.h	2018-07-04 00:01:50.000000000 +0000
@@ -249,5 +249,5 @@
   std::map<std::string, std::string> m_postFields;
 
 private:
-  bool m_ranged;
+  bool m_ranged = false;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/WakeOnAccess.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/WakeOnAccess.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/WakeOnAccess.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/WakeOnAccess.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -190,7 +190,6 @@
   , wait_online1_sec(DEFAULT_WAIT_FOR_ONLINE_SEC_1)
   , wait_online2_sec(DEFAULT_WAIT_FOR_ONLINE_SEC_2)
   , wait_services_sec(DEFAULT_WAIT_FOR_SERVICES_SEC)
-  , ping_port(0), ping_mode(0)
 {
   nextWake = CDateTime::GetCurrentDateTime();
 
@@ -447,7 +446,6 @@
 CWakeOnAccess::CWakeOnAccess()
   : m_netinit_sec(DEFAULT_NETWORK_INIT_SEC)    // wait for network to connect
   , m_netsettle_ms(DEFAULT_NETWORK_SETTLE_MS)  // wait for network to settle
-  , m_enabled(false)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/WakeOnAccess.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/WakeOnAccess.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/WakeOnAccess.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/WakeOnAccess.h	2018-07-04 00:01:50.000000000 +0000
@@ -56,8 +56,8 @@
     unsigned int wait_online2_sec; // extended wait
     unsigned int wait_services_sec;
 
-    unsigned short ping_port; // where to ping
-    unsigned short ping_mode; // how to ping
+    unsigned short ping_port = 0; // where to ping
+    unsigned short ping_mode = 0; // how to ping
 
     CDateTime nextWake;
     std::string upnpUuid; // empty unless upnpmode
@@ -84,7 +84,7 @@
 
   unsigned int m_netinit_sec, m_netsettle_ms; //time to wait for network connection
 
-  bool m_enabled;
+  bool m_enabled = false;
 
   bool WakeUpHost(const std::string& hostName, const std::string& customMessage, bool upnpMode);
   bool WakeUpHost(const WakeUpEntry& server);
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/WebServer.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/WebServer.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/WebServer.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/WebServer.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -76,13 +76,7 @@
 } HttpFileDownloadContext;
 
 CWebServer::CWebServer()
-  : m_port(0),
-    m_daemon_ip6(nullptr),
-    m_daemon_ip4(nullptr),
-    m_running(false),
-    m_thread_stacksize(0),
-    m_authenticationRequired(false),
-    m_authenticationUsername("kodi"),
+  : m_authenticationUsername("kodi"),
     m_authenticationPassword(""),
     m_key(),
     m_cert()
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/WebServer.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/WebServer.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/WebServer.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/WebServer.h	2018-07-04 00:01:50.000000000 +0000
@@ -123,12 +123,12 @@
 
   bool LoadCert(std::string &skey, std::string &scert);
 
-  uint16_t m_port;
-  struct MHD_Daemon *m_daemon_ip6;
-  struct MHD_Daemon *m_daemon_ip4;
-  bool m_running;
-  size_t m_thread_stacksize;
-  bool m_authenticationRequired;
+  uint16_t m_port = 0;
+  struct MHD_Daemon *m_daemon_ip6 = nullptr;
+  struct MHD_Daemon *m_daemon_ip4 = nullptr;
+  bool m_running = false;
+  size_t m_thread_stacksize = 0;
+  bool m_authenticationRequired = false;
   std::string m_authenticationUsername;
   std::string m_authenticationPassword;
   std::string m_key;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/ZeroconfBrowser.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/ZeroconfBrowser.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/ZeroconfBrowser.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/ZeroconfBrowser.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -52,7 +52,7 @@
 std::atomic_flag CZeroconfBrowser::sm_singleton_guard = ATOMIC_FLAG_INIT;
 CZeroconfBrowser* CZeroconfBrowser::smp_instance = 0;
 
-CZeroconfBrowser::CZeroconfBrowser():mp_crit_sec(new CCriticalSection),m_started(false)
+CZeroconfBrowser::CZeroconfBrowser():mp_crit_sec(new CCriticalSection)
 {
 #ifdef HAS_FILESYSTEM_SMB
   AddServiceType("_smb._tcp.");
@@ -175,12 +175,9 @@
 }
 
 
-CZeroconfBrowser::ZeroconfService::ZeroconfService():m_port(0){}
-
 CZeroconfBrowser::ZeroconfService::ZeroconfService(const std::string& fcr_name, const std::string& fcr_type, const std::string& fcr_domain):
   m_name(fcr_name),
-  m_domain(fcr_domain),
-  m_port(0)
+  m_domain(fcr_domain)
 {
   SetType(fcr_type);
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/ZeroconfBrowser.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/ZeroconfBrowser.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/ZeroconfBrowser.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/ZeroconfBrowser.h	2018-07-04 00:01:50.000000000 +0000
@@ -42,7 +42,7 @@
     public:
       typedef std::map<std::string, std::string> tTxtRecordMap;
 
-      ZeroconfService();
+      ZeroconfService() = default;
       ZeroconfService(const std::string& fcr_name, const std::string& fcr_type, const std::string& fcr_domain);
 
       /// easy conversion to string and back (used in czeronfdiretory to store this service)
@@ -85,7 +85,7 @@
 
       //2 entries below store 1 ip:port pair for this service
       std::string m_ip;
-      int        m_port;
+      int        m_port = 0;
 
       //used for mdns in case dns resolution fails
       //we store the hostname and resolve with mdns functions again
@@ -163,7 +163,7 @@
   CCriticalSection* mp_crit_sec;
   typedef std::set<std::string> tServices;
   tServices m_services;
-  bool m_started;
+  bool m_started = false;
 
   //protects singleton creation/destruction
   static std::atomic_flag sm_singleton_guard;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/Zeroconf.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/Zeroconf.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/Zeroconf.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/Zeroconf.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -58,7 +58,7 @@
 std::atomic_flag CZeroconf::sm_singleton_guard = ATOMIC_FLAG_INIT;
 CZeroconf* CZeroconf::smp_instance = 0;
 
-CZeroconf::CZeroconf():mp_crit_sec(new CCriticalSection),m_started(false)
+CZeroconf::CZeroconf():mp_crit_sec(new CCriticalSection)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/Zeroconf.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/Zeroconf.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/network/Zeroconf.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/network/Zeroconf.h	2018-07-04 00:01:50.000000000 +0000
@@ -133,7 +133,7 @@
   CCriticalSection* mp_crit_sec;
   typedef std::map<std::string, PublishInfo> tServiceMap;
   tServiceMap m_service_map;
-  bool m_started;
+  bool m_started = false;
 
   //protects singleton creation/destruction
   static std::atomic_flag sm_singleton_guard;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/NfoFile.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/NfoFile.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/NfoFile.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/NfoFile.h	2018-07-04 00:01:50.000000000 +0000
@@ -35,7 +35,6 @@
 class CNfoFile
 {
 public:
-  CNfoFile() : m_headPos(0), m_type(ADDON::ADDON_UNKNOWN) {}
   virtual ~CNfoFile() { Close(); }
 
   CInfoScanner::INFO_TYPE Create(const std::string&,
@@ -68,9 +67,9 @@
 
 private:
   std::string m_doc;
-  size_t m_headPos;
+  size_t m_headPos = 0;
   ADDON::ScraperPtr m_info;
-  ADDON::TYPE m_type;
+  ADDON::TYPE m_type = ADDON::ADDON_UNKNOWN;
   CScraperUrl m_scurl;
 
   int Load(const std::string&);
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -37,8 +37,7 @@
 
 CGUIDialogPeripheralSettings::CGUIDialogPeripheralSettings()
   : CGUIDialogSettingsManualBase(WINDOW_DIALOG_PERIPHERAL_SETTINGS, "DialogSettings.xml"),
-    m_item(NULL),
-    m_initialising(false)
+    m_item(NULL)
 { }
 
 CGUIDialogPeripheralSettings::~CGUIDialogPeripheralSettings()
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.h	2018-07-04 00:01:50.000000000 +0000
@@ -51,7 +51,7 @@
   void InitializeSettings() override;
 
   CFileItem *m_item;
-  bool m_initialising;
+  bool m_initialising = false;
   std::map<std::string, std::shared_ptr<CSetting>> m_settingsMap;
 };
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/peripherals/PeripheralTypes.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/peripherals/PeripheralTypes.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/peripherals/PeripheralTypes.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/peripherals/PeripheralTypes.h	2018-07-04 00:01:50.000000000 +0000
@@ -325,22 +325,11 @@
   {
   public:
     explicit PeripheralScanResult(const PeripheralBusType busType) :
-      m_type(PERIPHERAL_UNKNOWN),
-      m_iVendorId(0),
-      m_iProductId(0),
-      m_mappedType(PERIPHERAL_UNKNOWN),
       m_busType(busType),
-      m_mappedBusType(busType),
-      m_iSequence(0) {}
+      m_mappedBusType(busType)
+      {}
 
-    PeripheralScanResult(void) :
-      m_type(PERIPHERAL_UNKNOWN),
-      m_iVendorId(0),
-      m_iProductId(0),
-      m_mappedType(PERIPHERAL_UNKNOWN),
-      m_busType(PERIPHERAL_BUS_UNKNOWN),
-      m_mappedBusType(PERIPHERAL_BUS_UNKNOWN),
-      m_iSequence(0) {}
+    PeripheralScanResult(void) = default;
 
     bool operator ==(const PeripheralScanResult& right) const
     {
@@ -356,15 +345,15 @@
       return !(*this == right);
     }
 
-    PeripheralType    m_type;
+    PeripheralType    m_type = PERIPHERAL_UNKNOWN;
     std::string        m_strLocation;
-    int               m_iVendorId;
-    int               m_iProductId;
-    PeripheralType    m_mappedType;
+    int               m_iVendorId = 0;
+    int               m_iProductId = 0;
+    PeripheralType    m_mappedType = PERIPHERAL_UNKNOWN;
     std::string        m_strDeviceName;
-    PeripheralBusType m_busType;
-    PeripheralBusType m_mappedBusType;
-    unsigned int      m_iSequence; // when more than one adapter of the same type is found
+    PeripheralBusType m_busType = PERIPHERAL_BUS_UNKNOWN;
+    PeripheralBusType m_mappedBusType = PERIPHERAL_BUS_UNKNOWN;
+    unsigned int      m_iSequence = 0; // when more than one adapter of the same type is found
   };
 
   struct PeripheralScanResults
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pictures/ExifParse.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pictures/ExifParse.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pictures/ExifParse.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pictures/ExifParse.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -201,14 +201,6 @@
 }
 
 //--------------------------------------------------------------------------
-// Constructor.
-//--------------------------------------------------------------------------
-CExifParse::CExifParse () : m_ExifInfo(nullptr),
-        m_FocalPlaneUnits(0.0), m_LargestExifOffset(0),
-        m_ExifImageWidth(0), m_MotorolaOrder(false), m_DateFound(false)
-{}
-
-//--------------------------------------------------------------------------
 // Convert a 16 bit unsigned value from file's native byte order
 //--------------------------------------------------------------------------
 int CExifParse::Get16(const void* const Short, const bool motorolaOrder)
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pictures/ExifParse.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pictures/ExifParse.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pictures/ExifParse.h	2018-05-01 00:00:29.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pictures/ExifParse.h	2018-07-04 00:01:50.000000000 +0000
@@ -5,20 +5,19 @@
 class CExifParse
 {
   public:
-    CExifParse();
    ~CExifParse(void) = default;
     bool Process(const unsigned char* const Data, const unsigned short length, ExifInfo_t *info);
     static int Get16(const void* const Short, const bool motorolaOrder=true);
     static int Get32(const void* const Long,  const bool motorolaOrder=true);
 
   private:
-    ExifInfo_t *m_ExifInfo;
+    ExifInfo_t *m_ExifInfo = nullptr;
     double m_FocalPlaneXRes;
-    double m_FocalPlaneUnits;
-    unsigned m_LargestExifOffset;          // Last exif data referenced (to check if thumbnail is at end)
-    int m_ExifImageWidth;
-    bool m_MotorolaOrder;
-    bool m_DateFound;
+    double m_FocalPlaneUnits = 0.0;
+    unsigned m_LargestExifOffset = 0;          // Last exif data referenced (to check if thumbnail is at end)
+    int m_ExifImageWidth = 0;
+    bool m_MotorolaOrder = false;
+    bool m_DateFound = false;
 
 //    void    LocaliseDate        (void);
 //    void    GetExposureTime     (const float exposureTime);
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pictures/SlideShowPicture.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pictures/SlideShowPicture.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pictures/SlideShowPicture.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pictures/SlideShowPicture.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -56,7 +56,7 @@
 
 static float zoomamount[10] = { 1.0f, 1.2f, 1.5f, 2.0f, 2.8f, 4.0f, 6.0f, 9.0f, 13.5f, 20.0f };
 
-CSlideShowPic::CSlideShowPic() : m_alpha(0)
+CSlideShowPic::CSlideShowPic()
 {
   m_pImage = NULL;
   m_bIsLoaded = false;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pictures/SlideShowPicture.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pictures/SlideShowPicture.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pictures/SlideShowPicture.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pictures/SlideShowPicture.h	2018-07-04 00:01:50.000000000 +0000
@@ -103,7 +103,7 @@
   std::string m_strFileName;
   float m_fWidth;
   float m_fHeight;
-  UTILS::Color m_alpha;
+  UTILS::Color m_alpha = 0;
   // stuff relative to middle position
   float m_fPosX;
   float m_fPosY;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/FDEventMonitor.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/FDEventMonitor.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/FDEventMonitor.cpp	2018-05-01 00:00:30.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/FDEventMonitor.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -27,9 +27,7 @@
 #include "FDEventMonitor.h"
 
 CFDEventMonitor::CFDEventMonitor() :
-  CThread("FDEventMonitor"),
-  m_nextID(0),
-  m_wakeupfd(-1)
+  CThread("FDEventMonitor")
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/FDEventMonitor.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/FDEventMonitor.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/FDEventMonitor.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/FDEventMonitor.h	2018-07-04 00:01:50.000000000 +0000
@@ -39,15 +39,15 @@
 
   struct MonitoredFD
   {
-    int fd; /**< File descriptor to be monitored */
-    short events; /**< Events to be monitored (see poll(2)) */
+    int fd = -1; /**< File descriptor to be monitored */
+    short events = 0; /**< Events to be monitored (see poll(2)) */
 
-    EventCallback callback; /** Callback to be called on events */
-    void *callbackData; /** data parameter for EventCallback */
+    EventCallback callback = nullptr; /** Callback to be called on events */
+    void *callbackData = nullptr; /** data parameter for EventCallback */
 
     MonitoredFD(int fd_, short events_, EventCallback callback_, void *callbackData_) :
       fd(fd_), events(events_), callback(callback_), callbackData(callbackData_) {}
-    MonitoredFD() : fd(-1), events(0), callback(NULL), callbackData(NULL) {}
+    MonitoredFD() = default;
   };
 
   CFDEventMonitor();
@@ -77,8 +77,8 @@
   std::vector<int> m_monitoredFDbyPollDescs;
   std::vector<struct pollfd> m_pollDescs;
 
-  int m_nextID;
-  int m_wakeupfd;
+  int m_nextID = 0;
+  int m_wakeupfd = -1;
 
   CCriticalSection m_mutex;
   CCriticalSection m_pollMutex;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/LinuxTimezone.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/LinuxTimezone.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/LinuxTimezone.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/LinuxTimezone.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -36,7 +36,7 @@
 
 #include <algorithm>
 
-CLinuxTimezone::CLinuxTimezone() : m_IsDST(0)
+CLinuxTimezone::CLinuxTimezone()
 {
    char* line = NULL;
    size_t linelen = 0;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/LinuxTimezone.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/LinuxTimezone.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/LinuxTimezone.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/LinuxTimezone.h	2018-07-04 00:01:50.000000000 +0000
@@ -44,7 +44,7 @@
    std::string GetCountryByTimezone(const std::string& timezone);
 
    void SetTimezone(std::string timezone);
-   int m_IsDST;
+   int m_IsDST = 0;
 
    static void SettingOptionsTimezoneCountriesFiller(std::shared_ptr<const CSetting> setting, std::vector< std::pair<std::string, std::string> > &list, std::string &current, void *data);
    static void SettingOptionsTimezonesFiller(std::shared_ptr<const CSetting> setting, std::vector< std::pair<std::string, std::string> > &list, std::string &current, void *data);
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/network/ZeroconfAvahi.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/network/ZeroconfAvahi.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/network/ZeroconfAvahi.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/network/ZeroconfAvahi.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -67,7 +67,7 @@
   AvahiEntryGroup* mp_group;
 };
 
-CZeroconfAvahi::CZeroconfAvahi(): mp_client(0), mp_poll (0), m_shutdown(false),m_thread_id(0)
+CZeroconfAvahi::CZeroconfAvahi()
 {
     if (! (mp_poll = avahi_threaded_poll_new()))
     {
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/network/ZeroconfAvahi.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/network/ZeroconfAvahi.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/network/ZeroconfAvahi.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/network/ZeroconfAvahi.h	2018-07-04 00:01:50.000000000 +0000
@@ -79,13 +79,13 @@
   //helper that actually does the work of publishing
   void addService(tServiceMap::mapped_type fp_service_info, AvahiClient* fp_client);
 
-  AvahiClient* mp_client;
-  AvahiThreadedPoll* mp_poll;
+  AvahiClient* mp_client = 0;
+  AvahiThreadedPoll* mp_poll = 0;
 
   //this holds all published and unpublished services including info on howto create them
   tServiceMap m_services;
 
   //2 variables below are needed for workaround of avahi bug (see destructor for details)
-  bool m_shutdown;
-  pthread_t m_thread_id;
+  bool m_shutdown = false;
+  pthread_t m_thread_id = 0;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/network/ZeroconfBrowserAvahi.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/network/ZeroconfBrowserAvahi.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/network/ZeroconfBrowserAvahi.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/network/ZeroconfBrowserAvahi.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -47,7 +47,7 @@
 };
 }
 
-CZeroconfBrowserAvahi::CZeroconfBrowserAvahi() : mp_client ( 0 ), mp_poll ( 0 )
+CZeroconfBrowserAvahi::CZeroconfBrowserAvahi()
 {
   if ( ! ( mp_poll = avahi_threaded_poll_new() ) )
   {
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/network/ZeroconfBrowserAvahi.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/network/ZeroconfBrowserAvahi.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/linux/network/ZeroconfBrowserAvahi.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/linux/network/ZeroconfBrowserAvahi.h	2018-07-04 00:01:50.000000000 +0000
@@ -82,8 +82,8 @@
     static AvahiServiceBrowser* createServiceBrowser(const std::string& fcr_service_type, AvahiClient* fp_client, void* fp_userdata);
 
     //shared variables between avahi thread and interface
-    AvahiClient* mp_client;
-    AvahiThreadedPoll* mp_poll;
+    AvahiClient* mp_client =  0 ;
+    AvahiThreadedPoll* mp_poll =  0 ;
     // tBrowserMap maps service types the corresponding browser
     typedef std::map<std::string, AvahiServiceBrowser*> tBrowserMap;
     tBrowserMap m_browsers;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/posix/filesystem/PosixFile.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/posix/filesystem/PosixFile.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/posix/filesystem/PosixFile.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/posix/filesystem/PosixFile.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -37,10 +37,6 @@
 
 using namespace XFILE;
 
-CPosixFile::CPosixFile() :
-  m_fd(-1), m_filePos(-1), m_lastDropPos(-1), m_allowWrite(false)
-{ }
-
 CPosixFile::~CPosixFile()
 {
   if (m_fd >= 0)
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/posix/filesystem/PosixFile.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/posix/filesystem/PosixFile.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/platform/posix/filesystem/PosixFile.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/platform/posix/filesystem/PosixFile.h	2018-07-04 00:01:50.000000000 +0000
@@ -28,7 +28,6 @@
   class CPosixFile : public IFile
   {
   public:
-    CPosixFile();
     ~CPosixFile() override;
 
     bool Open(const CURL& url) override;
@@ -51,10 +50,10 @@
     int Stat(struct __stat64* buffer) override;
 
   protected:
-    int     m_fd;
-    int64_t m_filePos;
-    int64_t m_lastDropPos;
-    bool    m_allowWrite;
+    int     m_fd = -1;
+    int64_t m_filePos = -1;
+    int64_t m_lastDropPos = -1;
+    bool    m_allowWrite = false;
   };
 
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/profiles/dialogs/GUIDialogLockSettings.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/profiles/dialogs/GUIDialogLockSettings.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/profiles/dialogs/GUIDialogLockSettings.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/profiles/dialogs/GUIDialogLockSettings.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -52,12 +52,7 @@
 
 CGUIDialogLockSettings::CGUIDialogLockSettings()
     : CGUIDialogSettingsManualBase(WINDOW_DIALOG_LOCK_SETTINGS, "DialogSettings.xml"),
-      m_changed(false),
-      m_details(true),
-      m_conditionalDetails(false),
-      m_getUser(false),
-      m_saveUserDetails(NULL),
-      m_buttonLabel(20091)
+      m_saveUserDetails(NULL)
 { }
 
 CGUIDialogLockSettings::~CGUIDialogLockSettings() = default;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/profiles/dialogs/GUIDialogLockSettings.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/profiles/dialogs/GUIDialogLockSettings.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/profiles/dialogs/GUIDialogLockSettings.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/profiles/dialogs/GUIDialogLockSettings.h	2018-07-04 00:01:50.000000000 +0000
@@ -53,14 +53,14 @@
   void SetDetailSettingsEnabled(bool enabled);
   void SetSettingLockCodeLabel();
 
-  bool m_changed;
+  bool m_changed = false;
 
   CProfile::CLock m_locks;
   std::string m_user;
   std::string m_url;
-  bool m_details;
-  bool m_conditionalDetails;
-  bool m_getUser;
+  bool m_details = true;
+  bool m_conditionalDetails = false;
+  bool m_getUser = false;
   bool* m_saveUserDetails;
-  int m_buttonLabel;
+  int m_buttonLabel = 20091;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -52,8 +52,7 @@
 #define SETTING_PROFILE_MEDIA_SOURCES "profile.mediasources"
 
 CGUIDialogProfileSettings::CGUIDialogProfileSettings()
-    : CGUIDialogSettingsManualBase(WINDOW_DIALOG_PROFILE_SETTINGS, "DialogSettings.xml"),
-      m_needsSaving(false)
+    : CGUIDialogSettingsManualBase(WINDOW_DIALOG_PROFILE_SETTINGS, "DialogSettings.xml")
 { }
 
 CGUIDialogProfileSettings::~CGUIDialogProfileSettings() = default;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/profiles/dialogs/GUIDialogProfileSettings.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/profiles/dialogs/GUIDialogProfileSettings.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/profiles/dialogs/GUIDialogProfileSettings.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/profiles/dialogs/GUIDialogProfileSettings.h	2018-07-04 00:01:50.000000000 +0000
@@ -60,7 +60,7 @@
   void UpdateProfileImage();
   void updateProfileDirectory();
 
-  bool m_needsSaving;
+  bool m_needsSaving = false;
   std::string m_name;
   std::string m_thumb;
   std::string m_directory;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/channels/PVRChannelGroup.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/channels/PVRChannelGroup.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/channels/PVRChannelGroup.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/channels/PVRChannelGroup.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -45,54 +45,22 @@
 
 using namespace PVR;
 
-CPVRChannelGroup::CPVRChannelGroup(void) :
-    m_bRadio(false),
-    m_iGroupType(PVR_GROUP_TYPE_DEFAULT),
-    m_iGroupId(-1),
-    m_bLoaded(false),
-    m_bChanged(false),
-    m_bUsingBackendChannelOrder(false),
-    m_bUsingBackendChannelNumbers(false),
-    m_bSelectedGroup(false),
-    m_bPreventSortAndRenumber(false),
-    m_iLastWatched(0),
-    m_bHidden(false),
-    m_iPosition(0)
+CPVRChannelGroup::CPVRChannelGroup(void)
 {
   OnInit();
 }
 
 CPVRChannelGroup::CPVRChannelGroup(bool bRadio, unsigned int iGroupId, const std::string &strGroupName) :
     m_bRadio(bRadio),
-    m_iGroupType(PVR_GROUP_TYPE_DEFAULT),
     m_iGroupId(iGroupId),
-    m_strGroupName(strGroupName),
-    m_bLoaded(false),
-    m_bChanged(false),
-    m_bUsingBackendChannelOrder(false),
-    m_bUsingBackendChannelNumbers(false),
-    m_bSelectedGroup(false),
-    m_bPreventSortAndRenumber(false),
-    m_iLastWatched(0),
-    m_bHidden(false),
-    m_iPosition(0)
+    m_strGroupName(strGroupName)
 {
   OnInit();
 }
 
 CPVRChannelGroup::CPVRChannelGroup(const PVR_CHANNEL_GROUP &group) :
     m_bRadio(group.bIsRadio),
-    m_iGroupType(PVR_GROUP_TYPE_DEFAULT),
-    m_iGroupId(-1),
     m_strGroupName(group.strGroupName),
-    m_bLoaded(false),
-    m_bChanged(false),
-    m_bUsingBackendChannelOrder(false),
-    m_bUsingBackendChannelNumbers(false),
-    m_bSelectedGroup(false),
-    m_bPreventSortAndRenumber(false),
-    m_iLastWatched(0),
-    m_bHidden(false),
     m_iPosition(group.iPosition)
 {
   OnInit();
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/channels/PVRChannelGroup.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/channels/PVRChannelGroup.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/channels/PVRChannelGroup.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/channels/PVRChannelGroup.h	2018-07-04 00:01:50.000000000 +0000
@@ -42,15 +42,14 @@
 
   struct PVRChannelGroupMember
   {
-    PVRChannelGroupMember()
-    : iClientPriority(0) {}
+    PVRChannelGroupMember() = default;
 
     PVRChannelGroupMember(const CPVRChannelPtr _channel, const CPVRChannelNumber &_channelNumber, int _iClientPriority)
     : channel(_channel), channelNumber(_channelNumber), iClientPriority(_iClientPriority) {}
 
     CPVRChannelPtr channel;
     CPVRChannelNumber channelNumber; // the number this channel has in the group
-    int iClientPriority;
+    int iClientPriority = 0;
   };
 
   typedef std::vector<PVRChannelGroupMember> PVR_CHANNEL_GROUP_SORTED_MEMBERS;
@@ -523,19 +522,19 @@
      */
     bool UpdateClientPriorities();
 
-    bool             m_bRadio;                      /*!< true if this container holds radio channels, false if it holds TV channels */
-    int              m_iGroupType;                  /*!< The type of this group */
-    int              m_iGroupId;                    /*!< The ID of this group in the database */
+    bool             m_bRadio = false;                      /*!< true if this container holds radio channels, false if it holds TV channels */
+    int              m_iGroupType = PVR_GROUP_TYPE_DEFAULT;                  /*!< The type of this group */
+    int              m_iGroupId = -1;                    /*!< The ID of this group in the database */
     std::string      m_strGroupName;                /*!< The name of this group */
-    bool             m_bLoaded;                     /*!< True if this container is loaded, false otherwise */
-    bool             m_bChanged;                    /*!< true if anything changed in this group that hasn't been persisted, false otherwise */
-    bool             m_bUsingBackendChannelOrder;   /*!< true to use the channel order from backends, false otherwise */
-    bool             m_bUsingBackendChannelNumbers; /*!< true to use the channel numbers from 1 backend, false otherwise */
-    bool             m_bSelectedGroup;              /*!< true when this is the selected group, false otherwise */
-    bool             m_bPreventSortAndRenumber;     /*!< true when sorting and renumbering should not be done after adding/updating channels to the group */
-    time_t           m_iLastWatched;                /*!< last time group has been watched */
-    bool             m_bHidden;                     /*!< true if this group is hidden, false otherwise */
-    int              m_iPosition;                   /*!< the position of this group within the group list */
+    bool             m_bLoaded = false;                     /*!< True if this container is loaded, false otherwise */
+    bool             m_bChanged = false;                    /*!< true if anything changed in this group that hasn't been persisted, false otherwise */
+    bool             m_bUsingBackendChannelOrder = false;   /*!< true to use the channel order from backends, false otherwise */
+    bool             m_bUsingBackendChannelNumbers = false; /*!< true to use the channel numbers from 1 backend, false otherwise */
+    bool             m_bSelectedGroup = false;              /*!< true when this is the selected group, false otherwise */
+    bool             m_bPreventSortAndRenumber = false;     /*!< true when sorting and renumbering should not be done after adding/updating channels to the group */
+    time_t           m_iLastWatched = 0;                /*!< last time group has been watched */
+    bool             m_bHidden = false;                     /*!< true if this group is hidden, false otherwise */
+    int              m_iPosition = 0;                   /*!< the position of this group within the group list */
     PVR_CHANNEL_GROUP_SORTED_MEMBERS m_sortedMembers; /*!< members sorted by channel number */
     PVR_CHANNEL_GROUP_MEMBERS        m_members;       /*!< members with key clientid+uniqueid */
     CCriticalSection m_critSection;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/channels/PVRChannelGroupsContainer.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/channels/PVRChannelGroupsContainer.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/channels/PVRChannelGroupsContainer.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/channels/PVRChannelGroupsContainer.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -32,10 +32,7 @@
 
 CPVRChannelGroupsContainer::CPVRChannelGroupsContainer(void) :
     m_groupsRadio(new CPVRChannelGroups(true)),
-    m_groupsTV(new CPVRChannelGroups(false)),
-    m_bUpdateChannelsOnly(false),
-    m_bIsUpdating(false),
-    m_bLoaded(false)
+    m_groupsTV(new CPVRChannelGroups(false))
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/channels/PVRChannelGroupsContainer.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/channels/PVRChannelGroupsContainer.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/channels/PVRChannelGroupsContainer.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/channels/PVRChannelGroupsContainer.h	2018-07-04 00:01:50.000000000 +0000
@@ -203,8 +203,8 @@
     CPVRChannelGroups *m_groupsRadio; /*!< all radio channel groups */
     CPVRChannelGroups *m_groupsTV;    /*!< all TV channel groups */
     CCriticalSection   m_critSection;
-    bool               m_bUpdateChannelsOnly;
-    bool               m_bIsUpdating;
+    bool               m_bUpdateChannelsOnly = false;
+    bool               m_bIsUpdating = false;
     CPVRChannelGroupPtr m_lastPlayedGroups[2]; /*!< used to store the last played groups */
 
   private :
@@ -213,6 +213,6 @@
 
     bool FilterDirectory(const CURL &url, CFileItemList &results) const;
 
-    bool m_bLoaded;
+    bool m_bLoaded = false;
   };
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -69,11 +69,6 @@
 
 CGUIDialogPVRChannelManager::CGUIDialogPVRChannelManager(void) :
     CGUIDialog(WINDOW_DIALOG_PVR_CHANNEL_MANAGER, "DialogPVRChannelManager.xml"),
-    m_bIsRadio(false),
-    m_bMovingMode(false),
-    m_bContainsChanges(false),
-    m_bAllowNewChannel(false),
-    m_iSelected(0),
     m_channelItems(new CFileItemList)
 {
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h	2018-07-04 00:01:50.000000000 +0000
@@ -76,12 +76,12 @@
     bool PersistChannel(const CFileItemPtr &pItem, const CPVRChannelGroupPtr &group, unsigned int *iChannelNumber);
     void SetItemsUnchanged(void);
 
-    bool m_bIsRadio;
-    bool m_bMovingMode;
-    bool m_bContainsChanges;
-    bool m_bAllowNewChannel;
+    bool m_bIsRadio = false;
+    bool m_bMovingMode = false;
+    bool m_bContainsChanges = false;
+    bool m_bAllowNewChannel = false;
 
-    int m_iSelected;
+    int m_iSelected = 0;
     CFileItemList* m_channelItems;
     CGUIViewControl m_viewControl;
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -58,8 +58,6 @@
 
 CGUIDialogPVRGuideSearch::CGUIDialogPVRGuideSearch(void) :
     CGUIDialog(WINDOW_DIALOG_PVR_GUIDE_SEARCH, "DialogPVRGuideSearch.xml"),
-    m_bConfirmed(false),
-    m_bCanceled(false),
     m_searchFilter(NULL)
 {
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.h	2018-07-04 00:01:50.000000000 +0000
@@ -59,8 +59,8 @@
     int  GetSpinValue(int controlID);
     std::string GetEditValue(int controlID);
 
-    bool m_bConfirmed;
-    bool m_bCanceled;
+    bool m_bConfirmed = false;
+    bool m_bCanceled = false;
     CPVREpgSearchFilter *m_searchFilter;
     std::map<int, CPVRChannelNumber> m_channelNumbersMap;
   };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRRadioRDSInfo.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRRadioRDSInfo.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRRadioRDSInfo.cpp	2018-05-01 00:00:31.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRRadioRDSInfo.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -53,16 +53,6 @@
 CGUIDialogPVRRadioRDSInfo::CGUIDialogPVRRadioRDSInfo(void)
   : CGUIDialog(WINDOW_DIALOG_PVR_RADIO_RDS_INFO, "DialogPVRRadioRDSInfo.xml")
   , m_rdsItem(new CFileItem)
-  , m_InfoPresent(false)
-  , m_LabelInfoNewsPresent(false)
-  , m_LabelInfoNewsLocalPresent(false)
-  , m_LabelInfoWeatherPresent(false)
-  , m_LabelInfoLotteryPresent(false)
-  , m_LabelInfoSportPresent(false)
-  , m_LabelInfoStockPresent(false)
-  , m_LabelInfoOtherPresent(false)
-  , m_LabelInfoCinemaPresent(false)
-  , m_LabelInfoHoroscopePresent(false)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRRadioRDSInfo.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRRadioRDSInfo.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRRadioRDSInfo.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRRadioRDSInfo.h	2018-07-04 00:01:50.000000000 +0000
@@ -40,32 +40,32 @@
   private:
     CFileItemPtr m_rdsItem;
 
-    bool m_InfoPresent;
-    bool m_LabelInfoNewsPresent;
+    bool m_InfoPresent = false;
+    bool m_LabelInfoNewsPresent = false;
     std::string m_LabelInfoNews;
 
-    bool m_LabelInfoNewsLocalPresent;
+    bool m_LabelInfoNewsLocalPresent = false;
     std::string m_LabelInfoNewsLocal;
 
-    bool m_LabelInfoWeatherPresent;
+    bool m_LabelInfoWeatherPresent = false;
     std::string m_LabelInfoWeather;
 
-    bool m_LabelInfoLotteryPresent;
+    bool m_LabelInfoLotteryPresent = false;
     std::string m_LabelInfoLottery;
 
-    bool m_LabelInfoSportPresent;
+    bool m_LabelInfoSportPresent = false;
     std::string m_LabelInfoSport;
 
-    bool m_LabelInfoStockPresent;
+    bool m_LabelInfoStockPresent = false;
     std::string m_LabelInfoStock;
 
-    bool m_LabelInfoOtherPresent;
+    bool m_LabelInfoOtherPresent = false;
     std::string m_LabelInfoOther;
 
-    bool m_LabelInfoCinemaPresent;
+    bool m_LabelInfoCinemaPresent = false;
     std::string m_LabelInfoCinema;
 
-    bool m_LabelInfoHoroscopePresent;
+    bool m_LabelInfoHoroscopePresent = false;
     std::string m_LabelInfoHoroscope;
   };
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRRecordingSettings.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRRecordingSettings.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRRecordingSettings.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRRecordingSettings.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -42,9 +42,7 @@
 #define SETTING_RECORDING_LIFETIME "recording.lifetime"
 
 CGUIDialogPVRRecordingSettings::CGUIDialogPVRRecordingSettings() :
-  CGUIDialogSettingsManualBase(WINDOW_DIALOG_PVR_RECORDING_SETTING, "DialogSettings.xml"),
-  m_iPlayCount(0),
-  m_iLifetime(0)
+  CGUIDialogSettingsManualBase(WINDOW_DIALOG_PVR_RECORDING_SETTING, "DialogSettings.xml")
 {
   m_loadType = LOAD_EVERY_TIME;
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRRecordingSettings.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRRecordingSettings.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRRecordingSettings.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRRecordingSettings.h	2018-07-04 00:01:50.000000000 +0000
@@ -59,7 +59,7 @@
 
     CPVRRecordingPtr m_recording;
     std::string m_strTitle;
-    int m_iPlayCount;
-    int m_iLifetime;
+    int m_iPlayCount = 0;
+    int m_iLifetime = 0;
   };
 } // namespace PVR
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -76,20 +76,7 @@
 
 CGUIDialogPVRTimerSettings::CGUIDialogPVRTimerSettings() :
   CGUIDialogSettingsManualBase(WINDOW_DIALOG_PVR_TIMER_SETTING, "DialogSettings.xml"),
-  m_bIsRadio(false),
-  m_bIsNewTimer(true),
-  m_bTimerActive(false),
-  m_bFullTextEpgSearch(true),
-  m_bStartAnyTime(false),
-  m_bEndAnyTime(false),
-  m_iWeekdays(PVR_WEEKDAY_NONE),
-  m_iPreventDupEpisodes(0),
-  m_iMarginStart(0),
-  m_iMarginEnd(0),
-  m_iPriority(0),
-  m_iLifetime(0),
-  m_iMaxRecordings(0),
-  m_iRecordingGroup(0)
+  m_iWeekdays(PVR_WEEKDAY_NONE)
 {
   m_loadType = LOAD_EVERY_TIME;
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h	2018-07-04 00:01:50.000000000 +0000
@@ -146,26 +146,26 @@
     std::string         m_timerEndTimeStr;
 
     CPVRTimerTypePtr    m_timerType;
-    bool                m_bIsRadio;
-    bool                m_bIsNewTimer;
-    bool                m_bTimerActive;
+    bool                m_bIsRadio = false;
+    bool                m_bIsNewTimer = true;
+    bool                m_bTimerActive = false;
     std::string         m_strTitle;
     std::string         m_strEpgSearchString;
-    bool                m_bFullTextEpgSearch;
+    bool                m_bFullTextEpgSearch = true;
     ChannelDescriptor   m_channel;
     CDateTime           m_startLocalTime;
     CDateTime           m_endLocalTime;
-    bool                m_bStartAnyTime;
-    bool                m_bEndAnyTime;
+    bool                m_bStartAnyTime = false;
+    bool                m_bEndAnyTime = false;
     unsigned int        m_iWeekdays;
     CDateTime           m_firstDayLocalTime;
-    unsigned int        m_iPreventDupEpisodes;
-    unsigned int        m_iMarginStart;
-    unsigned int        m_iMarginEnd;
-    int                 m_iPriority;
-    int                 m_iLifetime;
-    int                 m_iMaxRecordings;
+    unsigned int        m_iPreventDupEpisodes = 0;
+    unsigned int        m_iMarginStart = 0;
+    unsigned int        m_iMarginEnd = 0;
+    int                 m_iPriority = 0;
+    int                 m_iLifetime = 0;
+    int                 m_iMaxRecordings = 0;
     std::string         m_strDirectory;
-    unsigned int        m_iRecordingGroup;
+    unsigned int        m_iRecordingGroup = 0;
   };
 } // namespace PVR
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/epg/EpgContainer.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/epg/EpgContainer.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/epg/EpgContainer.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/epg/EpgContainer.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -79,14 +79,14 @@
 class CEpgTagStateChange
 {
 public:
-  CEpgTagStateChange() : m_state(EPG_EVENT_CREATED) {}
+  CEpgTagStateChange() = default;
   CEpgTagStateChange(const CPVREpgInfoTagPtr tag, EPG_EVENT_STATE eNewState) : m_epgtag(tag), m_state(eNewState) {}
 
   void Deliver();
 
 private:
   CPVREpgInfoTagPtr m_epgtag;
-  EPG_EVENT_STATE m_state;
+  EPG_EVENT_STATE m_state = EPG_EVENT_CREATED;
 };
 
 void CEpgTagStateChange::Deliver()
@@ -116,7 +116,6 @@
 CPVREpgContainer::CPVREpgContainer(void) :
   CThread("EPGUpdater"),
   m_database(new CPVREpgDatabase),
-  m_bUpdateNotificationPending(false),
   m_settings({
     CSettings::SETTING_EPG_IGNOREDBFORCLIENT,
     CSettings::SETTING_EPG_EPGUPDATE,
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/epg/EpgContainer.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/epg/EpgContainer.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/epg/EpgContainer.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/epg/EpgContainer.h	2018-07-04 00:01:50.000000000 +0000
@@ -281,7 +281,7 @@
     std::list<CEpgTagStateChange> m_epgTagChanges; /*!< list of updated epg tags announced by addon */
     CCriticalSection m_epgTagChangesLock;          /*!< protect changed epg tags list */
 
-    bool m_bUpdateNotificationPending; /*!< true while an epg updated notification to observers is pending. */
+    bool m_bUpdateNotificationPending = false; /*!< true while an epg updated notification to observers is pending. */
     CPVRSettings m_settings;
   };
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/epg/Epg.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/epg/Epg.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/epg/Epg.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/epg/Epg.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -41,36 +41,18 @@
 
 CPVREpg::CPVREpg(int iEpgID, const std::string &strName /* = "" */, const std::string &strScraperName /* = "" */, bool bLoadedFromDb /* = false */) :
     m_bChanged(!bLoadedFromDb),
-    m_bTagsChanged(false),
-    m_bLoaded(false),
-    m_bUpdatePending(false),
     m_iEpgID(iEpgID),
     m_strName(strName),
-    m_strScraperName(strScraperName),
-    m_bUpdateLastScanTime(false)
+    m_strScraperName(strScraperName)
 {
 }
 
 CPVREpg::CPVREpg(const CPVRChannelPtr &channel, bool bLoadedFromDb /* = false */) :
     m_bChanged(!bLoadedFromDb),
-    m_bTagsChanged(false),
-    m_bLoaded(false),
-    m_bUpdatePending(false),
     m_iEpgID(channel->EpgID()),
     m_strName(channel->ChannelName()),
     m_strScraperName(channel->EPGScraper()),
-    m_pvrChannel(channel),
-    m_bUpdateLastScanTime(false)
-{
-}
-
-CPVREpg::CPVREpg(void) :
-    m_bChanged(false),
-    m_bTagsChanged(false),
-    m_bLoaded(false),
-    m_bUpdatePending(false),
-    m_iEpgID(0),
-    m_bUpdateLastScanTime(false)
+    m_pvrChannel(channel)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/epg/Epg.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/epg/Epg.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/epg/Epg.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/epg/Epg.h	2018-07-04 00:01:50.000000000 +0000
@@ -285,7 +285,7 @@
     bool IsValid(void) const;
 
   private:
-    CPVREpg(void);
+    CPVREpg(void) = default;
 
     /*!
      * @brief Update the EPG from a scraper set in the channel tag.
@@ -328,11 +328,11 @@
     std::map<CDateTime, CPVREpgInfoTagPtr> m_tags;
     std::map<int, CPVREpgInfoTagPtr>       m_changedTags;
     std::map<int, CPVREpgInfoTagPtr>       m_deletedTags;
-    bool                                m_bChanged;        /*!< true if anything changed that needs to be persisted, false otherwise */
-    bool                                m_bTagsChanged;    /*!< true when any tags are changed and not persisted, false otherwise */
-    bool                                m_bLoaded;         /*!< true when the initial entries have been loaded */
-    bool                                m_bUpdatePending;  /*!< true if manual update is pending */
-    int                                 m_iEpgID;          /*!< the database ID of this table */
+    bool                                m_bChanged = false;        /*!< true if anything changed that needs to be persisted, false otherwise */
+    bool                                m_bTagsChanged = false;    /*!< true when any tags are changed and not persisted, false otherwise */
+    bool                                m_bLoaded = false;         /*!< true when the initial entries have been loaded */
+    bool                                m_bUpdatePending = false;  /*!< true if manual update is pending */
+    int                                 m_iEpgID = 0;          /*!< the database ID of this table */
     std::string                         m_strName;         /*!< the name of this table */
     std::string                         m_strScraperName;  /*!< the name of the scraper to use */
     mutable CDateTime                   m_nowActiveStart;  /*!< the start time of the tag that is currently active */
@@ -342,6 +342,6 @@
     PVR::CPVRChannelPtr                 m_pvrChannel;      /*!< the channel this EPG belongs to */
 
     CCriticalSection                    m_critSection;     /*!< critical section for changes in this table */
-    bool                                m_bUpdateLastScanTime;
+    bool                                m_bUpdateLastScanTime = false;
   };
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/epg/EpgInfoTag.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/epg/EpgInfoTag.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/epg/EpgInfoTag.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/epg/EpgInfoTag.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -45,38 +45,16 @@
 }
 
 CPVREpgInfoTag::CPVREpgInfoTag(void) :
-    m_bNotify(false),
-    m_iClientId(-1),
-    m_iBroadcastId(-1),
-    m_iGenreType(0),
-    m_iGenreSubType(0),
-    m_iParentalRating(0),
-    m_iStarRating(0),
-    m_iSeriesNumber(0),
-    m_iEpisodeNumber(0),
-    m_iEpisodePart(0),
     m_iUniqueBroadcastID(EPG_TAG_INVALID_UID),
     m_iUniqueChannelID(PVR_CHANNEL_INVALID_UID),
-    m_iYear(0),
-    m_epg(nullptr),
     m_iFlags(EPG_TAG_FLAG_UNDEFINED)
 {
 }
 
 CPVREpgInfoTag::CPVREpgInfoTag(CPVREpg *epg, const PVR::CPVRChannelPtr &channel, const std::string &strTableName /* = "" */, const std::string &strIconPath /* = "" */) :
-    m_bNotify(false),
     m_iClientId(channel ? channel->ClientID() : -1),
-    m_iBroadcastId(-1),
-    m_iGenreType(0),
-    m_iGenreSubType(0),
-    m_iParentalRating(0),
-    m_iStarRating(0),
-    m_iSeriesNumber(0),
-    m_iEpisodeNumber(0),
-    m_iEpisodePart(0),
     m_iUniqueBroadcastID(EPG_TAG_INVALID_UID),
     m_iUniqueChannelID(channel ? channel->UniqueID() : PVR_CHANNEL_INVALID_UID),
-    m_iYear(0),
     m_strIconPath(strIconPath),
     m_epg(epg),
     m_iFlags(EPG_TAG_FLAG_UNDEFINED),
@@ -88,9 +66,6 @@
 CPVREpgInfoTag::CPVREpgInfoTag(const EPG_TAG &data, int iClientId) :
     m_bNotify(data.bNotify),
     m_iClientId(iClientId),
-    m_iBroadcastId(-1),
-    m_iGenreType(0),
-    m_iGenreSubType(0),
     m_iParentalRating(data.iParentalRating),
     m_iStarRating(data.iStarRating),
     m_iSeriesNumber(data.iSeriesNumber),
@@ -102,7 +77,6 @@
     m_startTime(data.startTime + g_advancedSettings.m_iPVRTimeCorrection),
     m_endTime(data.endTime + g_advancedSettings.m_iPVRTimeCorrection),
     m_firstAired(data.firstAired + g_advancedSettings.m_iPVRTimeCorrection),
-    m_epg(nullptr),
     m_iFlags(data.iFlags)
 {
   SetGenre(data.iGenreType, data.iGenreSubType, data.strGenreDescription);
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/epg/EpgInfoTag.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/epg/EpgInfoTag.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/epg/EpgInfoTag.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/epg/EpgInfoTag.h	2018-07-04 00:01:50.000000000 +0000
@@ -497,16 +497,16 @@
      */
     CDateTime GetCurrentPlayingTime(void) const;
 
-    bool                     m_bNotify;            /*!< notify on start */
-    int                      m_iClientId;          /*!< client id */
-    int                      m_iBroadcastId;       /*!< database ID */
-    int                      m_iGenreType;         /*!< genre type */
-    int                      m_iGenreSubType;      /*!< genre subtype */
-    int                      m_iParentalRating;    /*!< parental rating */
-    int                      m_iStarRating;        /*!< star rating */
-    int                      m_iSeriesNumber;      /*!< series number */
-    int                      m_iEpisodeNumber;     /*!< episode number */
-    int                      m_iEpisodePart;       /*!< episode part number */
+    bool                     m_bNotify = false;            /*!< notify on start */
+    int                      m_iClientId = -1;          /*!< client id */
+    int                      m_iBroadcastId = -1;       /*!< database ID */
+    int                      m_iGenreType = 0;         /*!< genre type */
+    int                      m_iGenreSubType = 0;      /*!< genre subtype */
+    int                      m_iParentalRating = 0;    /*!< parental rating */
+    int                      m_iStarRating = 0;        /*!< star rating */
+    int                      m_iSeriesNumber = 0;      /*!< series number */
+    int                      m_iEpisodeNumber = 0;     /*!< episode number */
+    int                      m_iEpisodePart = 0;       /*!< episode part number */
     unsigned int             m_iUniqueBroadcastID; /*!< unique broadcast ID */
     unsigned int             m_iUniqueChannelID;   /*!< unique channel ID */
     std::string              m_strTitle;           /*!< title */
@@ -516,7 +516,7 @@
     std::vector<std::string> m_cast;               /*!< cast */
     std::vector<std::string> m_directors;          /*!< director(s) */
     std::vector<std::string> m_writers;            /*!< writer(s) */
-    int                      m_iYear;              /*!< year */
+    int                      m_iYear = 0;              /*!< year */
     std::string              m_strIMDBNumber;      /*!< imdb number */
     std::vector<std::string> m_genre;              /*!< genre */
     std::string              m_strEpisodeName;     /*!< episode name */
@@ -528,7 +528,7 @@
 
     PVR::CPVRTimerInfoTagPtr m_timer;
 
-    CPVREpg *                m_epg;                /*!< the schedule that this event belongs to */
+    CPVREpg *                m_epg = nullptr;                /*!< the schedule that this event belongs to */
 
     unsigned int             m_iFlags;             /*!< the flags applicable to this EPG entry */
     std::string              m_strSeriesLink;      /*!< series link */
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/PVRGUIActions.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/PVRGUIActions.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/PVRGUIActions.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/PVRGUIActions.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -75,7 +75,7 @@
     bool Execute(const CFileItemPtr &item);
 
   protected:
-    AsyncRecordingAction() : m_bSuccess(false) {}
+    AsyncRecordingAction() = default;
 
   private:
     // IRunnable implementation
@@ -85,7 +85,7 @@
     virtual bool DoRun(const CFileItemPtr &item) = 0;
 
     CFileItemPtr m_item;
-    bool m_bSuccess;
+    bool m_bSuccess = false;
   };
 
   bool AsyncRecordingAction::Execute(const CFileItemPtr &item)
@@ -159,8 +159,7 @@
   };
 
   CPVRGUIActions::CPVRGUIActions()
-  : m_bChannelScanRunning(false),
-    m_settings({
+  : m_settings({
       CSettings::SETTING_LOOKANDFEEL_STARTUPACTION,
       CSettings::SETTING_PVRMANAGER_PRESELECTPLAYINGCHANNEL,
       CSettings::SETTING_PVRRECORD_INSTANTRECORDTIME,
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/PVRGUIActions.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/PVRGUIActions.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/PVRGUIActions.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/PVRGUIActions.h	2018-07-04 00:01:50.000000000 +0000
@@ -496,7 +496,7 @@
 
     CCriticalSection m_critSection;
     CPVRChannelSwitchingInputHandler m_channelNumberInputHandler;
-    bool m_bChannelScanRunning;
+    bool m_bChannelScanRunning = false;
     CPVRSettings m_settings;
     CPVRGUIChannelNavigator m_channelNavigator;
     std::string m_selectedItemPathTV;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/PVRManager.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/PVRManager.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/PVRManager.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/PVRManager.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -53,8 +53,7 @@
 using namespace KODI::MESSAGING;
 
 CPVRManagerJobQueue::CPVRManagerJobQueue()
-: m_triggerEvent(false),
-  m_bStopped(true)
+: m_triggerEvent(false)
 {
 }
 
@@ -139,17 +138,13 @@
     m_guiInfo(new CPVRGUIInfo),
     m_guiActions(new CPVRGUIActions),
     m_database(new CPVRDatabase),
-    m_bFirstStart(true),
-    m_bEpgsCreated(false),
-    m_managerState(ManagerStateStopped),
     m_parentalTimer(new CStopWatch),
     m_settings({
       CSettings::SETTING_PVRPOWERMANAGEMENT_ENABLED,
       CSettings::SETTING_PVRPOWERMANAGEMENT_SETWAKEUPCMD,
       CSettings::SETTING_PVRPARENTAL_ENABLED,
       CSettings::SETTING_PVRPARENTAL_DURATION
-    }),
-    m_playingClientId(-1)
+    })
 {
   CAnnouncementManager::GetInstance().AddAnnouncer(this);
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/PVRManager.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/PVRManager.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/PVRManager.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/PVRManager.h	2018-07-04 00:01:50.000000000 +0000
@@ -67,7 +67,7 @@
     CCriticalSection m_critSection;
     CEvent m_triggerEvent;
     std::vector<CJob *> m_pendingUpdates;
-    bool m_bStopped;
+    bool m_bStopped = true;
   };
 
   class CPVRManager : private CThread, public Observable, public ANNOUNCEMENT::IAnnouncer
@@ -533,11 +533,11 @@
 
     CPVRDatabasePtr                 m_database;                    /*!< the database for all PVR related data */
     CCriticalSection                m_critSection;                 /*!< critical section for all changes to this class, except for changes to triggers */
-    bool                            m_bFirstStart;                 /*!< true when the PVR manager was started first, false otherwise */
-    bool                            m_bEpgsCreated;                /*!< true if epg data for channels has been created */
+    bool                            m_bFirstStart = true;                 /*!< true when the PVR manager was started first, false otherwise */
+    bool                            m_bEpgsCreated = false;                /*!< true if epg data for channels has been created */
 
     CCriticalSection                m_managerStateMutex;
-    ManagerState                    m_managerState;
+    ManagerState                    m_managerState = ManagerStateStopped;
     std::unique_ptr<CStopWatch>     m_parentalTimer;
 
     CCriticalSection                m_startStopMutex; // mutex for protecting pvr manager's start/restart/stop sequence */
@@ -551,6 +551,6 @@
     CPVRRecordingPtr m_playingRecording;
     CPVREpgInfoTagPtr m_playingEpgTag;
     std::string m_strPlayingClientName;
-    int m_playingClientId;
+    int m_playingClientId = -1;
   };
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/recordings/PVRRecordings.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/recordings/PVRRecordings.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/recordings/PVRRecordings.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/recordings/PVRRecordings.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -42,16 +42,6 @@
 
 using namespace PVR;
 
-CPVRRecordings::CPVRRecordings(void) :
-    m_bIsUpdating(false),
-    m_iLastId(0),
-    m_bDeletedTVRecordings(false),
-    m_bDeletedRadioRecordings(false),
-    m_iTVRecordings(0),
-    m_iRadioRecordings(0)
-{
-}
-
 CPVRRecordings::~CPVRRecordings()
 {
   if (m_database && m_database->IsOpen())
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/recordings/PVRRecordings.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/recordings/PVRRecordings.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/recordings/PVRRecordings.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/recordings/PVRRecordings.h	2018-07-04 00:01:50.000000000 +0000
@@ -36,7 +36,6 @@
   class CPVRRecordings
   {
   public:
-    CPVRRecordings(void);
     virtual ~CPVRRecordings(void);
 
     /**
@@ -102,14 +101,14 @@
     typedef PVR_RECORDINGMAP::const_iterator PVR_RECORDINGMAP_CITR;
 
     CCriticalSection m_critSection;
-    bool m_bIsUpdating;
+    bool m_bIsUpdating = false;
     PVR_RECORDINGMAP m_recordings;
-    unsigned int m_iLastId;
+    unsigned int m_iLastId = 0;
     std::unique_ptr<CVideoDatabase> m_database;
-    bool m_bDeletedTVRecordings;
-    bool m_bDeletedRadioRecordings;
-    unsigned int m_iTVRecordings;
-    unsigned int m_iRadioRecordings;
+    bool m_bDeletedTVRecordings = false;
+    bool m_bDeletedRadioRecordings = false;
+    unsigned int m_iTVRecordings = 0;
+    unsigned int m_iRadioRecordings = 0;
 
     void UpdateFromClients(void);
     std::string TrimSlashes(const std::string &strOrig) const;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/timers/PVRTimerInfoTag.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/timers/PVRTimerInfoTag.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/timers/PVRTimerInfoTag.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/timers/PVRTimerInfoTag.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -41,21 +41,14 @@
 
 CPVRTimerInfoTag::CPVRTimerInfoTag(bool bRadio /* = false */) :
   m_strTitle(g_localizeStrings.Get(19056)), // New Timer
-  m_bFullTextEpgSearch(false),
-  m_state(PVR_TIMER_STATE_SCHEDULED),
   m_iClientId(CServiceBroker::GetPVRManager().Clients()->GetFirstCreatedClientID()),
   m_iClientIndex(PVR_TIMER_NO_CLIENT_INDEX),
   m_iParentClientIndex(PVR_TIMER_NO_PARENT),
   m_iClientChannelUid(PVR_CHANNEL_INVALID_UID),
-  m_bStartAnyTime(false),
-  m_bEndAnyTime(false),
   m_iPriority(DEFAULT_RECORDING_PRIORITY),
   m_iLifetime(DEFAULT_RECORDING_LIFETIME),
-  m_iMaxRecordings(0),
   m_iPreventDupEpisodes(DEFAULT_RECORDING_DUPLICATEHANDLING),
-  m_iRecordingGroup(0),
   m_bIsRadio(bRadio),
-  m_iTimerId(0),
   m_iMarginStart(CServiceBroker::GetSettings().GetInt(CSettings::SETTING_PVRRECORD_MARGINSTART)),
   m_iMarginEnd(CServiceBroker::GetSettings().GetInt(CSettings::SETTING_PVRRECORD_MARGINEND)),
   m_StartTime(CDateTime::GetUTCDateTime()),
@@ -109,7 +102,6 @@
   m_iRecordingGroup(timer.iRecordingGroup),
   m_strFileNameAndPath(StringUtils::Format("pvr://client%i/timers/%i", m_iClientId, m_iClientIndex)),
   m_bIsRadio(channel && channel->IsRadio()),
-  m_iTimerId(0),
   m_iMarginStart(timer.iMarginStart),
   m_iMarginEnd(timer.iMarginEnd),
   m_StartTime(timer.startTime + g_advancedSettings.m_iPVRTimeCorrection),
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/timers/PVRTimerInfoTag.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/timers/PVRTimerInfoTag.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/timers/PVRTimerInfoTag.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/timers/PVRTimerInfoTag.h	2018-07-04 00:01:50.000000000 +0000
@@ -285,25 +285,25 @@
 
     std::string           m_strTitle;            /*!< @brief name of this timer */
     std::string           m_strEpgSearchString;  /*!< @brief a epg data match string for epg-based timer rules. Format is backend-dependent, for example regexp */
-    bool                  m_bFullTextEpgSearch;  /*!< @brief indicates whether only epg episode title can be matched by the pvr backend or "more" (backend-dependent") data. */
+    bool                  m_bFullTextEpgSearch = false;  /*!< @brief indicates whether only epg episode title can be matched by the pvr backend or "more" (backend-dependent") data. */
     std::string           m_strDirectory;        /*!< @brief directory where the recording must be stored */
     std::string           m_strSummary;          /*!< @brief summary string with the time to show inside a GUI list */
-    PVR_TIMER_STATE       m_state;               /*!< @brief the state of this timer */
+    PVR_TIMER_STATE       m_state = PVR_TIMER_STATE_SCHEDULED;               /*!< @brief the state of this timer */
     int                   m_iClientId;           /*!< @brief ID of the backend */
     unsigned int          m_iClientIndex;        /*!< @brief index number of the tag, given by the backend, PVR_TIMER_NO_CLIENT_INDEX for new */
     unsigned int          m_iParentClientIndex;  /*!< @brief for timers scheduled by a timer rule, the index number of the parent, given by the backend, PVR_TIMER_NO_PARENT for no parent */
     int                   m_iClientChannelUid;   /*!< @brief channel uid */
-    bool                  m_bStartAnyTime;       /*!< @brief Ignore start date and time clock. Record at 'Any Time' */
-    bool                  m_bEndAnyTime;         /*!< @brief Ignore end date and time clock. Record at 'Any Time' */
+    bool                  m_bStartAnyTime = false;       /*!< @brief Ignore start date and time clock. Record at 'Any Time' */
+    bool                  m_bEndAnyTime = false;         /*!< @brief Ignore end date and time clock. Record at 'Any Time' */
     int                   m_iPriority;           /*!< @brief priority of the timer */
     int                   m_iLifetime;           /*!< @brief lifetime of the timer in days */
-    int                   m_iMaxRecordings;      /*!< @brief (optional) backend setting for maximum number of recordings to keep*/
+    int                   m_iMaxRecordings = 0;      /*!< @brief (optional) backend setting for maximum number of recordings to keep*/
     unsigned int          m_iWeekdays;           /*!< @brief bit based store of weekdays for timer rules */
     unsigned int          m_iPreventDupEpisodes; /*!< @brief only record new episodes for epg-based timer rules */
-    unsigned int          m_iRecordingGroup;     /*!< @brief (optional) if set, the addon/backend stores the recording to a group (sub-folder) */
+    unsigned int          m_iRecordingGroup = 0;     /*!< @brief (optional) if set, the addon/backend stores the recording to a group (sub-folder) */
     std::string           m_strFileNameAndPath;  /*!< @brief file name is only for reference */
     bool                  m_bIsRadio;            /*!< @brief is radio channel if set */
-    unsigned int          m_iTimerId;            /*!< @brief id that won't change as long as XBMC is running */
+    unsigned int          m_iTimerId = 0;            /*!< @brief id that won't change as long as XBMC is running */
 
     unsigned int          m_iMarginStart;        /*!< @brief (optional) if set, the backend starts the recording iMarginStart minutes before startTime. */
     unsigned int          m_iMarginEnd;          /*!< @brief (optional) if set, the backend ends the recording iMarginEnd minutes after endTime. */
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/timers/PVRTimers.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/timers/PVRTimers.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/timers/PVRTimers.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/timers/PVRTimers.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -87,8 +87,7 @@
 }
 
 CPVRTimers::CPVRTimers(void)
-: m_bIsUpdating(false),
-  m_settings({
+: m_settings({
     CSettings::SETTING_PVRPOWERMANAGEMENT_DAILYWAKEUP,
     CSettings::SETTING_PVRPOWERMANAGEMENT_PREWAKEUP,
     CSettings::SETTING_PVRPOWERMANAGEMENT_BACKENDIDLETIME,
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/timers/PVRTimers.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/timers/PVRTimers.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/timers/PVRTimers.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/timers/PVRTimers.h	2018-07-04 00:01:50.000000000 +0000
@@ -44,8 +44,6 @@
   class CPVRTimersContainer
   {
   public:
-    CPVRTimersContainer() : m_iLastId(0) {}
-
     /*!
      * @brief Add a timer tag to this container or update the tag if already present in this container.
      * @param The timer tag
@@ -74,7 +72,7 @@
     void InsertTimer(const CPVRTimerInfoTagPtr &newTimer);
 
     CCriticalSection m_critSection;
-    unsigned int m_iLastId;
+    unsigned int m_iLastId = 0;
     MapTags m_tags;
   };
 
@@ -318,7 +316,7 @@
     std::vector<CFileItemPtr> GetActiveRecordings(const TimerKind &eKind) const;
     int AmountActiveRecordings(const TimerKind &eKind) const;
 
-    bool m_bIsUpdating;
+    bool m_bIsUpdating = false;
     CPVRSettings m_settings;
   };
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/timers/PVRTimerType.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/timers/PVRTimerType.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/timers/PVRTimerType.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/timers/PVRTimerType.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -87,14 +87,8 @@
 }
 
 CPVRTimerType::CPVRTimerType() :
-  m_iClientId(-1),
   m_iTypeId(PVR_TIMER_TYPE_NONE),
-  m_iAttributes(PVR_TIMER_TYPE_ATTRIBUTE_NONE),
-  m_iPriorityDefault(50),
-  m_iLifetimeDefault(365),
-  m_iMaxRecordingsDefault(0),
-  m_iPreventDupEpisodesDefault(0),
-  m_iRecordingGroupDefault(0)
+  m_iAttributes(PVR_TIMER_TYPE_ATTRIBUTE_NONE)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/timers/PVRTimerType.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/timers/PVRTimerType.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/timers/PVRTimerType.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/timers/PVRTimerType.h	2018-07-04 00:01:50.000000000 +0000
@@ -360,19 +360,19 @@
     void InitPreventDuplicateEpisodesValues(const PVR_TIMER_TYPE &type);
     void InitRecordingGroupValues(const PVR_TIMER_TYPE &type);
 
-    int           m_iClientId;
+    int           m_iClientId = -1;
     unsigned int  m_iTypeId;
     unsigned int  m_iAttributes;
     std::string   m_strDescription;
     std::vector< std::pair<std::string, int> > m_priorityValues;
-    int           m_iPriorityDefault;
+    int           m_iPriorityDefault = 50;
     std::vector< std::pair<std::string, int> > m_lifetimeValues;
-    int           m_iLifetimeDefault;
+    int           m_iLifetimeDefault = 365;
     std::vector< std::pair<std::string, int> > m_maxRecordingsValues;
-    int           m_iMaxRecordingsDefault;
+    int           m_iMaxRecordingsDefault = 0;
     std::vector< std::pair<std::string, int> > m_preventDupEpisodesValues;
-    unsigned int  m_iPreventDupEpisodesDefault;
+    unsigned int  m_iPreventDupEpisodesDefault = 0;
     std::vector< std::pair<std::string, int> > m_recordingGroupValues;
-    unsigned int  m_iRecordingGroupDefault;
+    unsigned int  m_iRecordingGroupDefault = 0;
   };
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/windows/GUIEPGGridContainerModel.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/windows/GUIEPGGridContainerModel.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/windows/GUIEPGGridContainerModel.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/windows/GUIEPGGridContainerModel.h	2018-07-04 00:01:50.000000000 +0000
@@ -37,11 +37,9 @@
   struct GridItem
   {
     CFileItemPtr item;
-    float originWidth;
-    float width;
-    int progIndex;
-
-    GridItem() : originWidth(0.0f), width(0.0f), progIndex(-1) {}
+    float originWidth = 0.0f;
+    float width = 0.0f;
+    int progIndex = -1;
   };
 
   class CGUIEPGGridContainerModel
@@ -50,7 +48,6 @@
     static const int MINSPERBLOCK = 5; // minutes
     static const int MAXBLOCKS = 33 * 24 * 60 / MINSPERBLOCK; //! 33 days of 5 minute blocks (31 days for upcoming data + 1 day for past data + 1 day for fillers)
 
-    CGUIEPGGridContainerModel() : m_blocks(0) {}
     virtual ~CGUIEPGGridContainerModel() { Reset(); }
 
     void Refresh(const std::unique_ptr<CFileItemList> &items, const CDateTime &gridStart, const CDateTime &gridEnd, int iRulerUnit, int iBlocksPerPage, float fBlockSize);
@@ -115,6 +112,6 @@
     std::vector<ItemsPtr> m_epgItemsPtr;
     std::vector<std::vector<GridItem> > m_gridIndex;
 
-    int m_blocks;
+    int m_blocks = 0;
   };
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/windows/GUIWindowPVRBase.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/windows/GUIWindowPVRBase.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/pvr/windows/GUIWindowPVRBase.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/pvr/windows/GUIWindowPVRBase.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -54,7 +54,6 @@
 class CGUIPVRChannelGroupsSelector
 {
 public:
-  CGUIPVRChannelGroupsSelector() : m_control(nullptr) {};
   virtual ~CGUIPVRChannelGroupsSelector() = default;
 
   bool Initialize(CGUIWindow* parent, bool bRadio);
@@ -64,7 +63,7 @@
   bool SelectChannelGroup(const CPVRChannelGroupPtr &newGroup);
 
 private:
-  CGUIControl *m_control;
+  CGUIControl *m_control = nullptr;
   std::vector<CPVRChannelGroupPtr> m_channelGroups;
 };
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/rendering/RenderSystem.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/rendering/RenderSystem.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/rendering/RenderSystem.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/rendering/RenderSystem.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -26,8 +26,6 @@
 #include "Util.h"
 
 CRenderSystemBase::CRenderSystemBase()
-  : m_stereoView(RENDER_STEREO_VIEW_OFF)
-  , m_stereoMode(RENDER_STEREO_MODE_OFF)
 {
   m_bRenderCreated = false;
   m_bVSync = true;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/rendering/RenderSystem.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/rendering/RenderSystem.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/rendering/RenderSystem.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/rendering/RenderSystem.h	2018-07-04 00:01:50.000000000 +0000
@@ -101,8 +101,8 @@
   std::string   m_RenderVersion;
   int          m_RenderVersionMinor;
   int          m_RenderVersionMajor;
-  RENDER_STEREO_VIEW m_stereoView;
-  RENDER_STEREO_MODE m_stereoMode;
+  RENDER_STEREO_VIEW m_stereoView = RENDER_STEREO_VIEW_OFF;
+  RENDER_STEREO_MODE m_stereoMode = RENDER_STEREO_MODE_OFF;
   bool m_limitedColorRange = false;
 
   std::unique_ptr<CGUIImage> m_splashImage;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/SeekHandler.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/SeekHandler.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/SeekHandler.cpp	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/SeekHandler.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -39,15 +39,6 @@
 #include "utils/StringUtils.h"
 #include "utils/Variant.h"
 
-CSeekHandler::CSeekHandler()
-: m_seekDelay(500),
-  m_requireSeek(false),
-  m_analogSeek(false),
-  m_seekSize(0),
-  m_seekStep(0)
-{
-}
-
 CSeekHandler::~CSeekHandler()
 {
   m_seekDelays.clear();
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/SeekHandler.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/SeekHandler.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/SeekHandler.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/SeekHandler.h	2018-07-04 00:01:50.000000000 +0000
@@ -39,7 +39,7 @@
 class CSeekHandler : public ISettingCallback, public IActionListener
 {
 public:
-  CSeekHandler();
+  CSeekHandler() = default;
   ~CSeekHandler() override;
 
   static void SettingOptionsSeekStepsFiller(std::shared_ptr<const CSetting> setting, std::vector< std::pair<std::string, int> > &list, int &current, void *data);
@@ -71,13 +71,13 @@
   void SetSeekSize(double seekSize);
   int GetSeekStepSize(SeekType type, int step);
 
-  int m_seekDelay;
+  int m_seekDelay = 500;
   std::map<SeekType, int > m_seekDelays;
-  bool m_requireSeek;
+  bool m_requireSeek = false;
   bool m_seekChanged = false;
-  bool m_analogSeek;
-  double m_seekSize;
-  int m_seekStep;
+  bool m_analogSeek = false;
+  double m_seekSize = 0;
+  int m_seekStep = 0;
   std::map<SeekType, std::vector<int> > m_forwardSeekSteps;
   std::map<SeekType, std::vector<int> > m_backwardSeekSteps;
   CStopWatch m_timer;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/dialogs/GUIDialogContentSettings.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/dialogs/GUIDialogContentSettings.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/dialogs/GUIDialogContentSettings.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/dialogs/GUIDialogContentSettings.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -58,15 +58,7 @@
 
 
 CGUIDialogContentSettings::CGUIDialogContentSettings()
-  : CGUIDialogSettingsManualBase(WINDOW_DIALOG_CONTENT_SETTINGS, "DialogSettings.xml"),
-    m_content(CONTENT_NONE),
-    m_originalContent(CONTENT_NONE),
-    m_showScanSettings(false),
-    m_scanRecursive(false),
-    m_useDirectoryNames(false),
-    m_containsSingleItem(false),
-    m_exclude(false),
-    m_noUpdating(false)
+  : CGUIDialogSettingsManualBase(WINDOW_DIALOG_CONTENT_SETTINGS, "DialogSettings.xml")
 { }
 
 void CGUIDialogContentSettings::SetContent(CONTENT_TYPE content)
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/dialogs/GUIDialogContentSettings.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/dialogs/GUIDialogContentSettings.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/dialogs/GUIDialogContentSettings.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/dialogs/GUIDialogContentSettings.h	2018-07-04 00:01:50.000000000 +0000
@@ -82,20 +82,20 @@
   /*!
   * @brief The currently selected content type
   */
-  CONTENT_TYPE m_content;
+  CONTENT_TYPE m_content = CONTENT_NONE;
   /*!
   * @brief The selected content type at dialog creation
   */
-  CONTENT_TYPE m_originalContent;
+  CONTENT_TYPE m_originalContent = CONTENT_NONE;
   /*!
   * @brief The currently selected scraper
   */
   ADDON::ScraperPtr m_scraper;
 
-  bool m_showScanSettings;
-  bool m_scanRecursive;
-  bool m_useDirectoryNames;
-  bool m_containsSingleItem;
-  bool m_exclude;
-  bool m_noUpdating;
+  bool m_showScanSettings = false;
+  bool m_scanRecursive = false;
+  bool m_useDirectoryNames = false;
+  bool m_containsSingleItem = false;
+  bool m_exclude = false;
+  bool m_noUpdating = false;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/dialogs/GUIDialogLibExportSettings.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/dialogs/GUIDialogLibExportSettings.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/dialogs/GUIDialogLibExportSettings.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/dialogs/GUIDialogLibExportSettings.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -50,8 +50,7 @@
 using KODI::MESSAGING::HELPERS::DialogResponse;
 
 CGUIDialogLibExportSettings::CGUIDialogLibExportSettings()
-  : CGUIDialogSettingsManualBase(WINDOW_DIALOG_LIBEXPORT_SETTINGS, "DialogSettings.xml"),
-  m_destinationChecked(false)
+  : CGUIDialogSettingsManualBase(WINDOW_DIALOG_LIBEXPORT_SETTINGS, "DialogSettings.xml")
 { }
 
 bool CGUIDialogLibExportSettings::Show(CLibExportSettings& settings)
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/dialogs/GUIDialogLibExportSettings.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/dialogs/GUIDialogLibExportSettings.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/dialogs/GUIDialogLibExportSettings.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/dialogs/GUIDialogLibExportSettings.h	2018-07-04 00:01:50.000000000 +0000
@@ -63,5 +63,5 @@
   static int GetExportItemsFromSetting(SettingConstPtr setting);
 
   CLibExportSettings m_settings;
-  bool m_destinationChecked;
+  bool m_destinationChecked = false;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/lib/SettingDependency.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/lib/SettingDependency.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/lib/SettingDependency.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/lib/SettingDependency.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -53,7 +53,6 @@
                             CSettingsManager *settingsManager /* = nullptr */)
   : CSettingConditionItem(settingsManager)
   , m_target(SettingDependencyTarget::Property)
-  , m_operator(SettingDependencyOperator::Equals)
 {
   m_name = strProperty;
   m_value = value;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/SettingsBase.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/SettingsBase.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/SettingsBase.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/SettingsBase.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -28,8 +28,7 @@
 #define SETTINGS_XML_ROOT   "settings"
 
 CSettingsBase::CSettingsBase()
-  : m_initialized(false)
-  , m_settingsManager(new CSettingsManager())
+  : m_settingsManager(new CSettingsManager())
 { }
 
 CSettingsBase::~CSettingsBase()
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/SettingsBase.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/SettingsBase.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/SettingsBase.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/SettingsBase.h	2018-07-04 00:01:50.000000000 +0000
@@ -291,7 +291,7 @@
   */
   bool LoadHiddenValuesFromXml(const TiXmlElement* root);
 
-  bool m_initialized;
+  bool m_initialized = false;
   CSettingsManager* m_settingsManager;
   CCriticalSection m_critical;
 private:
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/windows/GUIWindowSettingsCategory.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/windows/GUIWindowSettingsCategory.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/windows/GUIWindowSettingsCategory.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/windows/GUIWindowSettingsCategory.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -59,9 +59,7 @@
 
 CGUIWindowSettingsCategory::CGUIWindowSettingsCategory()
     : CGUIDialogSettingsManagerBase(WINDOW_SETTINGS_SYSTEM, "SettingsCategory.xml"),
-      m_settings(CServiceBroker::GetSettings()),
-      m_iSection(0),
-      m_returningFromSkinLoad(false)
+      m_settings(CServiceBroker::GetSettings())
 {
   // set the correct ID range...
   m_idRange.clear();
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/windows/GUIWindowSettingsCategory.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/windows/GUIWindowSettingsCategory.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/windows/GUIWindowSettingsCategory.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/windows/GUIWindowSettingsCategory.h	2018-07-04 00:01:50.000000000 +0000
@@ -58,6 +58,6 @@
   void FocusElement(const std::string& elementId);
 
   CSettings& m_settings;
-  int m_iSection;
-  bool m_returningFromSkinLoad; // true if we are returning from loading the skin
+  int m_iSection = 0;
+  bool m_returningFromSkinLoad = false; // true if we are returning from loading the skin
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/windows/GUIWindowTestPattern.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/windows/GUIWindowTestPattern.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/windows/GUIWindowTestPattern.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/windows/GUIWindowTestPattern.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -28,8 +28,6 @@
 
 CGUIWindowTestPattern::CGUIWindowTestPattern(void)
     : CGUIWindow(WINDOW_TEST_PATTERN, "")
-    , m_white(1.0)
-    , m_black(0.0)
 {
   m_pattern = 0;
   m_bounceX = 0;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/windows/GUIWindowTestPattern.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/windows/GUIWindowTestPattern.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/settings/windows/GUIWindowTestPattern.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/settings/windows/GUIWindowTestPattern.h	2018-07-04 00:01:50.000000000 +0000
@@ -53,8 +53,8 @@
   int m_bounceDirectionY;
   int m_blinkFrame;
 
-  float m_white;
-  float m_black;
+  float m_white = 1.0;
+  float m_black = 0.0;
 };
 
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/storage/cdioSupport.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/storage/cdioSupport.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/storage/cdioSupport.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/storage/cdioSupport.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -230,11 +230,7 @@
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 CCdIoSupport::CCdIoSupport()
-: i(0),
-  j(0),
-  cdio(nullptr),
-  m_nNumTracks(CDIO_INVALID_TRACK),
-  m_nFirstTrackNum(CDIO_INVALID_TRACK)
+: cdio(nullptr)
 {
   m_cdio = CLibcdio::GetInstance();
   m_nFirstData = -1;        /* # of first data track */
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/storage/cdioSupport.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/storage/cdioSupport.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/storage/cdioSupport.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/storage/cdioSupport.h	2018-07-04 00:01:50.000000000 +0000
@@ -310,7 +310,7 @@
 private:
   char buffer[7][CDIO_CD_FRAMESIZE_RAW];  /* for CD-Data */
   static signature_t sigs[17];
-  int i, j;                               /* index */
+  int i = 0, j = 0;                               /* index */
   int m_nStartTrack;                      /* first sector of track */
   int m_nIsofsSize;                       /* size of session */
   int m_nJolietLevel;
@@ -321,8 +321,8 @@
   int m_nUDFVerMajor;
 
   CdIo* cdio;
-  track_t m_nNumTracks;
-  track_t m_nFirstTrackNum;
+  track_t m_nNumTracks = CDIO_INVALID_TRACK;
+  track_t m_nFirstTrackNum = CDIO_INVALID_TRACK;
 
   std::string m_strDiscLabel;
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/storage/DetectDVDType.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/storage/DetectDVDType.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/storage/DetectDVDType.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/storage/DetectDVDType.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -59,9 +59,6 @@
 std::string CDetectDVDMedia::m_diskPath = "";
 
 CDetectDVDMedia::CDetectDVDMedia() : CThread("DetectDVDMedia"),
-  m_bStartup(true),  // Do not autorun on startup
-  m_bAutorun(false),
-  m_dwLastTrayState(0),
   m_cdio(CLibcdio::GetInstance())
 {
   m_bStop = false;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/storage/DetectDVDType.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/storage/DetectDVDType.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/storage/DetectDVDType.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/storage/DetectDVDType.h	2018-07-04 00:01:50.000000000 +0000
@@ -77,10 +77,10 @@
 
   static CCdInfo* m_pCdInfo;
 
-  bool m_bStartup;
-  bool m_bAutorun;
+  bool m_bStartup = true; // Do not autorun on startup
+  bool m_bAutorun = false;
   DWORD m_dwTrayState;
-  DWORD m_dwLastTrayState;
+  DWORD m_dwLastTrayState = 0;
 
   static std::string m_diskLabel;
   static std::string m_diskPath;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/threads/Event.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/threads/Event.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/threads/Event.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/threads/Event.h	2018-07-04 00:01:50.000000000 +0000
@@ -47,7 +47,7 @@
 {
   bool manualReset;
   volatile bool signaled;
-  unsigned int numWaits;
+  unsigned int numWaits = 0;
 
   CCriticalSection groupListMutex; // lock for the groups list
   std::unique_ptr<std::vector<XbmcThreads::CEventGroup*>> groups;
@@ -74,7 +74,7 @@
 
 public:
   inline CEvent(bool manual = false, bool signaled_ = false) :
-    manualReset(manual), signaled(signaled_), numWaits(0), condVar(actualCv,signaled) {}
+    manualReset(manual), signaled(signaled_), condVar(actualCv,signaled) {}
 
   inline void Reset() { CSingleLock lock(mutex); signaled = false; }
   void Set();
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/threads/Lockables.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/threads/Lockables.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/threads/Lockables.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/threads/Lockables.h	2018-07-04 00:01:50.000000000 +0000
@@ -54,10 +54,10 @@
     CountingLockable& operator=(const CountingLockable&) = delete;
   protected:
     L mutex;
-    unsigned int count;
+    unsigned int count = 0;
 
   public:
-    inline CountingLockable() : count(0) {}
+    inline CountingLockable() = default;
 
     // boost::thread Lockable concept
     inline void lock() { mutex.lock(); count++; }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/threads/SharedSection.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/threads/SharedSection.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/threads/SharedSection.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/threads/SharedSection.h	2018-07-04 00:01:50.000000000 +0000
@@ -33,10 +33,10 @@
   XbmcThreads::ConditionVariable actualCv;
   XbmcThreads::TightConditionVariable<XbmcThreads::InversePredicate<unsigned int&> > cond;
 
-  unsigned int sharedCount;
+  unsigned int sharedCount = 0;
 
 public:
-  inline CSharedSection() : cond(actualCv,XbmcThreads::InversePredicate<unsigned int&>(sharedCount)), sharedCount(0)  {}
+  inline CSharedSection() : cond(actualCv,XbmcThreads::InversePredicate<unsigned int&>(sharedCount)) {}
 
   inline void lock() { CSingleLock l(sec); while (sharedCount) cond.wait(l); sec.lock(); }
   inline bool try_lock() { return (sec.try_lock() ? ((sharedCount == 0) ? true : (sec.unlock(), false)) : false); }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/threads/SystemClock.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/threads/SystemClock.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/threads/SystemClock.h	2018-05-01 00:00:32.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/threads/SystemClock.h	2018-07-04 00:01:50.000000000 +0000
@@ -42,11 +42,11 @@
    */
   class EndTime
   {
-    unsigned int startTime;
-    unsigned int totalWaitTime;
+    unsigned int startTime = 0;
+    unsigned int totalWaitTime = 0;
   public:
     static const unsigned int InfiniteValue;
-    inline EndTime() : startTime(0), totalWaitTime(0) {}
+    inline EndTime() = default;
     inline explicit EndTime(unsigned int millisecondsIntoTheFuture) : startTime(SystemClockMillis()), totalWaitTime(millisecondsIntoTheFuture) {}
 
     inline void Set(unsigned int millisecondsIntoTheFuture) { startTime = SystemClockMillis(); totalWaitTime = millisecondsIntoTheFuture; }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/threads/test/TestEvent.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/threads/test/TestEvent.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/threads/test/TestEvent.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/threads/test/TestEvent.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -539,9 +539,9 @@
   CEvent& event;
   bool result;
 
-  volatile bool waiting;
+  volatile bool waiting = false;
 
-  mass_waiter() : event(*g_event), waiting(false) {}
+  mass_waiter() : event(*g_event) {}
 
   void Run() override
   {
@@ -558,9 +558,9 @@
   CEvent& event;
   bool result;
 
-  volatile bool waiting;
+  volatile bool waiting = false;
 
-  poll_mass_waiter() : event(*g_event), waiting(false) {}
+  poll_mass_waiter() : event(*g_event) {}
 
   void Run() override
   {
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/URL.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/URL.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/URL.h	2018-06-21 18:59:47.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/URL.h	2018-07-04 00:01:50.000000000 +0000
@@ -36,7 +36,7 @@
     Parse(strURL);
   }
 
-  CURL():m_iPort(0) {}
+  CURL() = default;
   virtual ~CURL(void);
 
   // explicit equals operator for std::string comparison
@@ -197,7 +197,7 @@
   void RemoveProtocolOption(const std::string &key);
 
 protected:
-  int m_iPort;
+  int m_iPort = 0;
   std::string m_strHostName;
   std::string m_strShareName;
   std::string m_strDomain;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/AlarmClock.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/AlarmClock.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/AlarmClock.cpp	2018-05-01 00:00:32.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/AlarmClock.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -34,7 +34,7 @@
 
 using namespace KODI::MESSAGING;
 
-CAlarmClock::CAlarmClock() : CThread("AlarmClock"), m_bIsRunning(false)
+CAlarmClock::CAlarmClock() : CThread("AlarmClock")
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/AlarmClock.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/AlarmClock.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/AlarmClock.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/AlarmClock.h	2018-07-04 00:01:50.000000000 +0000
@@ -72,7 +72,7 @@
   std::map<std::string,SAlarmClockEvent> m_event;
   CCriticalSection m_events;
 
-  bool m_bIsRunning;
+  bool m_bIsRunning = false;
 };
 
 extern CAlarmClock g_alarmClock;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/auto_buffer.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/auto_buffer.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/auto_buffer.cpp	2018-05-01 00:00:32.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/auto_buffer.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -24,7 +24,7 @@
 
 using namespace XUTILS;
 
-auto_buffer::auto_buffer(size_t size) : p(0), s(0)
+auto_buffer::auto_buffer(size_t size)
 {
   if (!size)
     return;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/auto_buffer.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/auto_buffer.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/auto_buffer.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/auto_buffer.h	2018-07-04 00:01:50.000000000 +0000
@@ -31,8 +31,7 @@
     /**
      * Create buffer with zero size
      */
-    auto_buffer(void) : p(0), s(0)
-    {}
+    auto_buffer(void) = default;
     /**
      * Create buffer with specified size
      * @param size of created buffer
@@ -100,7 +99,7 @@
     auto_buffer(const auto_buffer& other) = delete; // disallow copy constructor
     auto_buffer& operator=(const auto_buffer& other) = delete; // disallow assignment
 
-    void* p;
-    size_t s;
+    void* p = 0;
+    size_t s = 0;
   };
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/CPUInfo.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/CPUInfo.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/CPUInfo.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/CPUInfo.h	2018-07-04 00:01:50.000000000 +0000
@@ -50,30 +50,25 @@
 
 struct CoreInfo
 {
-  int    m_id;
-  double m_fSpeed;
-  double m_fPct;
+  int    m_id = 0;
+  double m_fSpeed = .0;
+  double m_fPct = .0;
 #ifdef TARGET_POSIX
-  unsigned long long m_user;
-  unsigned long long m_nice;
-  unsigned long long m_system;
-  unsigned long long m_io;
+  unsigned long long m_user = 0LL;
+  unsigned long long m_nice = 0LL;
+  unsigned long long m_system = 0LL;
+  unsigned long long m_io = 0LL;
 #elif defined(TARGET_WINDOWS)
-  PDH_HCOUNTER m_coreCounter;
-  unsigned long long m_total;
+  PDH_HCOUNTER m_coreCounter = NULL;
+  unsigned long long m_total = 0;
 #endif
-  unsigned long long m_idle;
+  unsigned long long m_idle = 0LL;
   std::string m_strVendor;
   std::string m_strModel;
   std::string m_strBogoMips;
   std::string m_strHardware;
   std::string m_strRevision;
   std::string m_strSerial;
-#ifdef TARGET_POSIX
-  CoreInfo() : m_id(0), m_fSpeed(.0), m_fPct(.0), m_user(0LL), m_nice(0LL), m_system(0LL), m_io(0LL), m_idle(0LL) {}
-#elif defined(TARGET_WINDOWS)
-  CoreInfo() : m_id(0), m_fSpeed(.0), m_fPct(.0), m_coreCounter(NULL), m_total(0LL), m_idle(0LL) {}
-#endif
   bool operator<(const CoreInfo& other) const { return m_id < other.m_id; }
 };
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/EGLUtils.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/EGLUtils.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/EGLUtils.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/EGLUtils.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -65,8 +65,7 @@
 CEGLContextUtils::CEGLContextUtils() :
   m_eglDisplay(EGL_NO_DISPLAY),
   m_eglSurface(EGL_NO_SURFACE),
-  m_eglContext(EGL_NO_CONTEXT),
-  m_eglConfig(0)
+  m_eglContext(EGL_NO_CONTEXT)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/EGLUtils.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/EGLUtils.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/EGLUtils.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/EGLUtils.h	2018-07-04 00:01:50.000000000 +0000
@@ -143,5 +143,5 @@
   EGLDisplay m_eglDisplay;
   EGLSurface m_eglSurface;
   EGLContext m_eglContext;
-  EGLConfig m_eglConfig;
+  EGLConfig m_eglConfig = 0;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/EmbeddedArt.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/EmbeddedArt.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/EmbeddedArt.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/EmbeddedArt.h	2018-07-04 00:01:50.000000000 +0000
@@ -29,7 +29,7 @@
 class EmbeddedArtInfo : public IArchivable
 {
 public:
-  EmbeddedArtInfo() : m_size(0) { }
+  EmbeddedArtInfo() = default;
   EmbeddedArtInfo(size_t size, const std::string &mime, const std::string& type = "");
 
   // implementation of IArchivable
@@ -41,7 +41,7 @@
   bool Matches(const EmbeddedArtInfo &right) const;
   void SetType(const std::string& type) { m_type = type; }
 
-  size_t m_size;
+  size_t m_size = 0;
   std::string m_mime;
   std::string m_type;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/FileOperationJob.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/FileOperationJob.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/FileOperationJob.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/FileOperationJob.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -36,15 +36,11 @@
 using namespace XFILE;
 
 CFileOperationJob::CFileOperationJob()
-  : m_action(ActionCopy),
-    m_items(),
+  : m_items(),
     m_strDestFile(),
     m_avgSpeed(),
     m_currentOperation(),
-    m_currentFile(),
-    m_displayProgress(false),
-    m_heading(0),
-    m_line(0)
+    m_currentFile()
 { }
 
 CFileOperationJob::CFileOperationJob(FileAction action, CFileItemList & items,
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/FileOperationJob.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/FileOperationJob.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/FileOperationJob.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/FileOperationJob.h	2018-07-04 00:01:50.000000000 +0000
@@ -87,11 +87,11 @@
 
   static inline bool CanBeRenamed(const std::string &strFileA, const std::string &strFileB);
 
-  FileAction m_action;
+  FileAction m_action = ActionCopy;
   CFileItemList m_items;
   std::string m_strDestFile;
   std::string m_avgSpeed, m_currentOperation, m_currentFile;
-  bool m_displayProgress;
-  int m_heading;
-  int m_line;
+  bool m_displayProgress = false;
+  int m_heading = 0;
+  int m_line = 0;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/HttpParser.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/HttpParser.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/HttpParser.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/HttpParser.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -25,20 +25,6 @@
 
 #include "HttpParser.h"
 
-HttpParser::HttpParser() :
-    _headerStart(0),
-    _parsedTo( 0 ),
-    _state( 0 ),
-    _keyIndex(0),
-    _valueIndex(0),
-    _contentLength(0),
-    _contentStart(0),
-    _uriIndex(0),
-    _status( Incomplete )
-{
-
-}
-
 HttpParser::~HttpParser() = default;
 
 void
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/HttpParser.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/HttpParser.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/HttpParser.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/HttpParser.h	2018-07-04 00:01:50.000000000 +0000
@@ -54,7 +54,6 @@
 class HttpParser
 {
 public:
-    HttpParser();
     ~HttpParser();
 
     enum status_t {
@@ -78,14 +77,14 @@
     bool parseRequestLine();
 
     std::string _data;
-    unsigned _headerStart;
-    unsigned _parsedTo;
-    int _state;
-    unsigned _keyIndex;
-    unsigned _valueIndex;
-    unsigned _contentLength;
-    unsigned _contentStart;
-    unsigned _uriIndex;
+    unsigned _headerStart = 0;
+    unsigned _parsedTo =  0 ;
+    int _state =  0 ;
+    unsigned _keyIndex = 0;
+    unsigned _valueIndex = 0;
+    unsigned _contentLength = 0;
+    unsigned _contentStart = 0;
+    unsigned _uriIndex = 0;
 
     typedef std::vector<unsigned> IntArray;
     IntArray _keys;
@@ -106,6 +105,6 @@
         p_error=12 // here an error has occurred and the parse failed.
     };
 
-    status_t _status;
+    status_t _status =  Incomplete ;
 };
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/HttpRangeUtils.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/HttpRangeUtils.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/HttpRangeUtils.cpp	2018-05-01 00:00:32.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/HttpRangeUtils.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -38,11 +38,6 @@
 #define CONTENT_RANGE_FORMAT_TOTAL          HEADER_CONTENT_RANGE_FORMAT_BYTES HEADER_CONTENT_RANGE_VALUE
 #define CONTENT_RANGE_FORMAT_TOTAL_UNKNOWN  HEADER_CONTENT_RANGE_FORMAT_BYTES HEADER_CONTENT_RANGE_VALUE_UNKNOWN
 
-CHttpRange::CHttpRange()
-  : m_first(1),
-    m_last(0)
-{ }
-
 CHttpRange::CHttpRange(uint64_t firstPosition, uint64_t lastPosition)
   : m_first(firstPosition),
     m_last(lastPosition)
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/HttpRangeUtils.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/HttpRangeUtils.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/HttpRangeUtils.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/HttpRangeUtils.h	2018-07-04 00:01:50.000000000 +0000
@@ -28,7 +28,7 @@
 class CHttpRange
 {
 public:
-  CHttpRange();
+  CHttpRange() = default;
   CHttpRange(uint64_t firstPosition, uint64_t lastPosition);
   virtual ~CHttpRange() = default;
 
@@ -47,8 +47,8 @@
   virtual bool IsValid() const;
 
 protected:
-  uint64_t m_first;
-  uint64_t m_last;
+  uint64_t m_first = 1;
+  uint64_t m_last = 0;
 };
 
 typedef std::vector<CHttpRange> HttpRanges;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/Locale.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/Locale.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/Locale.cpp	2018-05-01 00:00:32.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/Locale.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -24,16 +24,14 @@
 const CLocale CLocale::Empty;
 
 CLocale::CLocale()
-  : m_valid(false),
-    m_language(),
+  : m_language(),
     m_territory(),
     m_codeset(),
     m_modifier()
 { }
 
 CLocale::CLocale(const std::string& language)
-  : m_valid(false),
-    m_language(),
+  : m_language(),
     m_territory(),
     m_codeset(),
     m_modifier()
@@ -42,8 +40,7 @@
 }
 
 CLocale::CLocale(const std::string& language, const std::string& territory)
-  : m_valid(false),
-    m_language(language),
+  : m_language(language),
     m_territory(territory),
     m_codeset(),
     m_modifier()
@@ -52,8 +49,7 @@
 }
 
 CLocale::CLocale(const std::string& language, const std::string& territory, const std::string& codeset)
-  : m_valid(false),
-    m_language(language),
+  : m_language(language),
     m_territory(territory),
     m_codeset(codeset),
     m_modifier()
@@ -62,8 +58,7 @@
 }
 
 CLocale::CLocale(const std::string& language, const std::string& territory, const std::string& codeset, const std::string& modifier)
-  : m_valid(false),
-    m_language(language),
+  : m_language(language),
     m_territory(territory),
     m_codeset(codeset),
     m_modifier(modifier)
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/Locale.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/Locale.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/Locale.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/Locale.h	2018-07-04 00:01:50.000000000 +0000
@@ -150,7 +150,7 @@
 
   int GetMatchRank(const std::string& locale) const;
 
-  bool m_valid;
+  bool m_valid = false;
   std::string m_language;
   std::string m_territory;
   std::string m_codeset;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/log.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/log.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/log.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/log.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -47,14 +47,13 @@
 class CLogGlobals
 {
 public:
-  CLogGlobals(void) : m_repeatCount(0), m_repeatLogLevel(-1), m_logLevel(LOG_LEVEL_DEBUG), m_extraLogLevels(0) {}
   ~CLogGlobals() = default;
   PlatformInterfaceForCLog m_platform;
-  int         m_repeatCount;
-  int         m_repeatLogLevel;
+  int         m_repeatCount = 0;
+  int         m_repeatLogLevel = -1;
   std::string m_repeatLine;
-  int         m_logLevel;
-  int         m_extraLogLevels;
+  int         m_logLevel = LOG_LEVEL_DEBUG;
+  int         m_extraLogLevels = 0;
   CCriticalSection critSec;
 };
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/ProgressJob.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/ProgressJob.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/ProgressJob.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/ProgressJob.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -29,20 +29,12 @@
 #include "utils/Variant.h"
 
 CProgressJob::CProgressJob()
-  : m_modal(false),
-    m_autoClose(true),
-    m_updateProgress(true),
-    m_updateInformation(true),
-    m_progress(NULL),
+  : m_progress(NULL),
     m_progressDialog(NULL)
 { }
 
 CProgressJob::CProgressJob(CGUIDialogProgressBarHandle* progressBar)
-  : m_modal(false),
-    m_autoClose(true),
-    m_updateProgress(true),
-    m_updateInformation(true),
-    m_progress(progressBar),
+  : m_progress(progressBar),
     m_progressDialog(NULL)
 { }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/ProgressJob.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/ProgressJob.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/ProgressJob.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/ProgressJob.h	2018-07-04 00:01:50.000000000 +0000
@@ -166,10 +166,10 @@
   bool IsCancelled() const;
 
 private:
-  bool m_modal;
-  bool m_autoClose;
-  bool m_updateProgress;
-  bool m_updateInformation;
+  bool m_modal = false;
+  bool m_autoClose = true;
+  bool m_updateProgress = true;
+  bool m_updateInformation = true;
   mutable CGUIDialogProgressBarHandle* m_progress;
   mutable CGUIDialogProgress* m_progressDialog;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/SortUtils.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/SortUtils.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/SortUtils.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/SortUtils.h	2018-07-04 00:01:50.000000000 +0000
@@ -168,16 +168,11 @@
 ///@}
 
 typedef struct SortDescription {
-  SortBy sortBy;
-  SortOrder sortOrder;
-  SortAttribute sortAttributes;
-  int limitStart;
-  int limitEnd;
-
-  SortDescription()
-    : sortBy(SortByNone), sortOrder(SortOrderAscending), sortAttributes(SortAttributeNone),
-      limitStart(0), limitEnd(-1)
-  { }
+  SortBy sortBy = SortByNone;
+  SortOrder sortOrder = SortOrderAscending;
+  SortAttribute sortAttributes = SortAttributeNone;
+  int limitStart = 0;
+  int limitEnd = -1;
 } SortDescription;
 
 typedef struct GUIViewSortDetails
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/StreamDetails.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/StreamDetails.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/StreamDetails.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/StreamDetails.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -30,7 +30,7 @@
 const float VIDEOASPECT_EPSILON = 0.025f;
 
 CStreamDetailVideo::CStreamDetailVideo() :
-  CStreamDetail(CStreamDetail::VIDEO), m_iWidth(0), m_iHeight(0), m_fAspect(0.0), m_iDuration(0)
+  CStreamDetail(CStreamDetail::VIDEO)
 {
 }
 
@@ -91,7 +91,7 @@
 }
 
 CStreamDetailAudio::CStreamDetailAudio() :
-  CStreamDetail(CStreamDetail::AUDIO), m_iChannels(-1)
+  CStreamDetail(CStreamDetail::AUDIO)
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/StreamDetails.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/StreamDetails.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/StreamDetails.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/StreamDetails.h	2018-07-04 00:01:50.000000000 +0000
@@ -61,10 +61,10 @@
   void Serialize(CVariant& value) const override;
   bool IsWorseThan(const CStreamDetail &that) const override;
 
-  int m_iWidth;
-  int m_iHeight;
-  float m_fAspect;
-  int m_iDuration;
+  int m_iWidth = 0;
+  int m_iHeight = 0;
+  float m_fAspect = 0.0;
+  int m_iDuration = 0;
   std::string m_strCodec;
   std::string m_strStereoMode;
   std::string m_strLanguage;
@@ -79,7 +79,7 @@
   void Serialize(CVariant& value) const override;
   bool IsWorseThan(const CStreamDetail &that) const override;
 
-  int m_iChannels;
+  int m_iChannels = -1;
   std::string m_strCodec;
   std::string m_strLanguage;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/test/TestGlobalsHandlingPattern1.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/test/TestGlobalsHandlingPattern1.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/test/TestGlobalsHandlingPattern1.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/test/TestGlobalsHandlingPattern1.h	2018-07-04 00:01:50.000000000 +0000
@@ -34,9 +34,9 @@
       static bool ctorCalled;
       static bool dtorCalled;
 
-      int somethingToAccess;
+      int somethingToAccess = 0;
 
-      TestGlobalPattern1() : somethingToAccess(0) { ctorCalled = true; }
+      TestGlobalPattern1() { ctorCalled = true; }
       ~TestGlobalPattern1()
       {
         std::cout << "Clean shutdown of TestGlobalPattern1" << std::endl << std::flush;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/test/TestJobManager.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/test/TestJobManager.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/test/TestJobManager.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/test/TestJobManager.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -79,8 +79,7 @@
 {
 struct JobControlPackage
 {
-  JobControlPackage() :
-    ready (false)
+  JobControlPackage()
   {
     // We're not ready to wait yet
     jobCreatedMutex.lock();
@@ -91,7 +90,7 @@
     jobCreatedMutex.unlock();
   }
 
-  bool ready;
+  bool ready = false;
   XbmcThreads::ConditionVariable jobCreatedCond;
   CCriticalSection jobCreatedMutex;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/XSLTUtils.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/XSLTUtils.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/XSLTUtils.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/XSLTUtils.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -38,8 +38,7 @@
   return;
 }
 
-XSLTUtils::XSLTUtils() :
-m_xmlInput(nullptr), m_xmlOutput(nullptr), m_xmlStylesheet(nullptr), m_xsltStylesheet(nullptr)
+XSLTUtils::XSLTUtils()
 {
   // initialize libxslt
   xmlSubstituteEntitiesDefault(1);
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/XSLTUtils.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/XSLTUtils.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/utils/XSLTUtils.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/utils/XSLTUtils.h	2018-07-04 00:01:50.000000000 +0000
@@ -55,8 +55,8 @@
 
 
 private:
-  xmlDocPtr m_xmlInput;
-  xmlDocPtr m_xmlOutput;
-  xmlDocPtr m_xmlStylesheet;
-  xsltStylesheetPtr m_xsltStylesheet;
+  xmlDocPtr m_xmlInput = nullptr;
+  xmlDocPtr m_xmlOutput = nullptr;
+  xmlDocPtr m_xmlStylesheet = nullptr;
+  xsltStylesheetPtr m_xsltStylesheet = nullptr;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogAudioSettings.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogAudioSettings.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogAudioSettings.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogAudioSettings.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -59,8 +59,7 @@
 #define SETTING_AUDIO_MAKE_DEFAULT             "audio.makedefault"
 
 CGUIDialogAudioSettings::CGUIDialogAudioSettings()
-  : CGUIDialogSettingsManualBase(WINDOW_DIALOG_AUDIO_OSD_SETTINGS, "DialogSettings.xml"),
-    m_passthrough(false)
+  : CGUIDialogSettingsManualBase(WINDOW_DIALOG_AUDIO_OSD_SETTINGS, "DialogSettings.xml")
 { }
 
 CGUIDialogAudioSettings::~CGUIDialogAudioSettings() = default;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogAudioSettings.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogAudioSettings.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogAudioSettings.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogAudioSettings.h	2018-07-04 00:01:50.000000000 +0000
@@ -68,7 +68,7 @@
 
   float m_volume;
   int m_audioStream;
-  bool m_passthrough;
+  bool m_passthrough = false;
 
   typedef std::vector<int> Features;
   Features m_audioCaps;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogSubtitles.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogSubtitles.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogSubtitles.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogSubtitles.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -103,8 +103,6 @@
     : CGUIDialog(WINDOW_DIALOG_SUBTITLES, "DialogSubtitles.xml")
     , m_subtitles(new CFileItemList)
     , m_serviceItems(new CFileItemList)
-    , m_pausedOnRun(false)
-    , m_updateSubsList(false)
 {
   m_loadType = KEEP_IN_MEMORY;
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogSubtitles.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogSubtitles.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogSubtitles.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogSubtitles.h	2018-07-04 00:01:50.000000000 +0000
@@ -69,7 +69,7 @@
   std::string    m_currentService;
   std::string    m_status;
   std::string     m_strManualSearch;
-  bool           m_pausedOnRun;
-  bool           m_updateSubsList; ///< true if we need to update our subs list
+  bool           m_pausedOnRun = false;
+  bool           m_updateSubsList = false; ///< true if we need to update our subs list
   std::string     m_LastAutoDownloaded; ///< Last video file path which automatically downloaded subtitle
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogVideoInfo.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogVideoInfo.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -90,13 +90,7 @@
 CGUIDialogVideoInfo::CGUIDialogVideoInfo(void)
   : CGUIDialog(WINDOW_DIALOG_VIDEO_INFO, "DialogVideoInfo.xml"),
   m_movieItem(new CFileItem),
-  m_castList(new CFileItemList),
-  m_bViewReview(false),
-  m_bRefresh(false),
-  m_bRefreshAll(true),
-  m_hasUpdatedThumb(false),
-  m_hasUpdatedUserrating(false),
-  m_startUserrating(-1)
+  m_castList(new CFileItemList)
 {
   m_loadType = KEEP_IN_MEMORY;
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogVideoInfo.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogVideoInfo.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogVideoInfo.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogVideoInfo.h	2018-07-04 00:01:50.000000000 +0000
@@ -109,10 +109,10 @@
 
   CFileItemPtr m_movieItem;
   CFileItemList *m_castList;
-  bool m_bViewReview;
-  bool m_bRefresh;
-  bool m_bRefreshAll;
-  bool m_hasUpdatedThumb;
-  bool m_hasUpdatedUserrating;
-  int m_startUserrating;
+  bool m_bViewReview = false;
+  bool m_bRefresh = false;
+  bool m_bRefreshAll = true;
+  bool m_hasUpdatedThumb = false;
+  bool m_hasUpdatedUserrating = false;
+  int m_startUserrating = -1;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogVideoSettings.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogVideoSettings.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogVideoSettings.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogVideoSettings.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -68,8 +68,7 @@
 #define SETTING_VIDEO_STREAM              "video.stream"
 
 CGUIDialogVideoSettings::CGUIDialogVideoSettings()
-    : CGUIDialogSettingsManualBase(WINDOW_DIALOG_VIDEO_OSD_SETTINGS, "DialogSettings.xml"),
-      m_viewModeChanged(false)
+    : CGUIDialogSettingsManualBase(WINDOW_DIALOG_VIDEO_OSD_SETTINGS, "DialogSettings.xml")
 { }
 
 CGUIDialogVideoSettings::~CGUIDialogVideoSettings() = default;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogVideoSettings.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogVideoSettings.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/dialogs/GUIDialogVideoSettings.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/dialogs/GUIDialogVideoSettings.h	2018-07-04 00:01:50.000000000 +0000
@@ -53,5 +53,5 @@
 
 private:
   int m_videoStream;
-  bool m_viewModeChanged;
+  bool m_viewModeChanged = false;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/PlayerController.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/PlayerController.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/PlayerController.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/PlayerController.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -40,11 +40,6 @@
 #include "utils/StringUtils.h"
 #include "utils/Variant.h"
 
-CPlayerController::CPlayerController()
-  : m_sliderAction(0)
-{
-}
-
 CPlayerController::~CPlayerController() = default;
 
 CPlayerController& CPlayerController::GetInstance()
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/PlayerController.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/PlayerController.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/PlayerController.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/PlayerController.h	2018-07-04 00:01:50.000000000 +0000
@@ -47,7 +47,7 @@
   void OnSliderChange(void *data, CGUISliderControl *slider) override;
 
 protected:
-  CPlayerController();
+  CPlayerController() = default;
   CPlayerController(const CPlayerController&) = delete;
   CPlayerController& operator=(CPlayerController const&) = delete;
   ~CPlayerController() override;
@@ -64,5 +64,5 @@
    */
   void ShowSlider(int action, int label, float value, float min, float delta, float max, bool modal = false);
 
-  int m_sliderAction; ///< \brief set to the action id for a slider being displayed \sa ShowSlider
+  int m_sliderAction = 0; ///< \brief set to the action id for a slider being displayed \sa ShowSlider
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/VideoInfoTag.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/VideoInfoTag.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/VideoInfoTag.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/VideoInfoTag.h	2018-07-04 00:01:50.000000000 +0000
@@ -37,7 +37,6 @@
 
 struct SActorInfo
 {
-  SActorInfo() : order(-1) {};
   bool operator<(const SActorInfo &right) const
   {
     return order < right.order;
@@ -46,17 +45,17 @@
   std::string strRole;
   CScraperUrl thumbUrl;
   std::string thumb;
-  int        order;
+  int        order = -1;
 };
 
 class CRating
 {
 public:
-  CRating(): rating(0.0f), votes(0) {}
-  explicit CRating(float r): rating(r), votes(0) {}
+  CRating() = default;
+  explicit CRating(float r): rating(r) {}
   CRating(float r, int v): rating(r), votes(v) {}
-  float rating;
-  int votes;
+  float rating = 0.0f;
+  int votes = 0;
 };
 typedef std::map<std::string, CRating> RatingMap;
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/VideoLibraryQueue.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/VideoLibraryQueue.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/VideoLibraryQueue.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/VideoLibraryQueue.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -37,9 +37,7 @@
 
 CVideoLibraryQueue::CVideoLibraryQueue()
   : CJobQueue(false, 1, CJob::PRIORITY_LOW),
-    m_jobs(),
-    m_modal(false),
-    m_cleaning(false)
+    m_jobs()
 { }
 
 CVideoLibraryQueue::~CVideoLibraryQueue()
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/VideoLibraryQueue.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/VideoLibraryQueue.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/video/VideoLibraryQueue.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/video/VideoLibraryQueue.h	2018-07-04 00:01:50.000000000 +0000
@@ -162,6 +162,6 @@
   VideoLibraryJobMap m_jobs;
   CCriticalSection m_critical;
 
-  bool m_modal;
-  bool m_cleaning;
+  bool m_modal = false;
+  bool m_cleaning = false;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/view/ViewStateSettings.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/view/ViewStateSettings.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/view/ViewStateSettings.cpp	2018-05-01 00:00:33.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/view/ViewStateSettings.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -41,9 +41,6 @@
 #define XML_EVENTLOG_LEVEL_HIGHER   "showhigherlevels"
 
 CViewStateSettings::CViewStateSettings()
-  : m_settingLevel(SettingLevel::Standard),
-    m_eventLevel(EventLevel::Basic),
-    m_eventShowHigherLevels(true)
 {
   AddViewState("musicnavartists");
   AddViewState("musicnavalbums");
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/view/ViewStateSettings.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/view/ViewStateSettings.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/view/ViewStateSettings.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/view/ViewStateSettings.h	2018-07-04 00:01:50.000000000 +0000
@@ -65,9 +65,9 @@
 
 private:
   std::map<std::string, CViewState*> m_viewStates;
-  SettingLevel m_settingLevel;
-  EventLevel m_eventLevel;
-  bool m_eventShowHigherLevels;
+  SettingLevel m_settingLevel = SettingLevel::Standard;
+  EventLevel m_eventLevel = EventLevel::Basic;
+  bool m_eventShowHigherLevels = true;
   CCriticalSection m_critical;
 
   void AddViewState(const std::string& strTagName, int defaultView = DEFAULT_VIEW_LIST, SortBy defaultSort = SortByLabel);
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/weather/GUIWindowWeather.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/weather/GUIWindowWeather.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/weather/GUIWindowWeather.cpp	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/weather/GUIWindowWeather.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -59,7 +59,7 @@
 */
 
 CGUIWindowWeather::CGUIWindowWeather(void)
-    : CGUIWindow(WINDOW_WEATHER, "MyWeather.xml"), m_maxLocation(0)
+    : CGUIWindow(WINDOW_WEATHER, "MyWeather.xml")
 {
   m_loadType = KEEP_IN_MEMORY;
 }
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/weather/GUIWindowWeather.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/weather/GUIWindowWeather.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/weather/GUIWindowWeather.h	2018-06-21 18:59:49.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/weather/GUIWindowWeather.h	2018-07-04 00:01:50.000000000 +0000
@@ -39,5 +39,5 @@
   void ClearProperties();
   void SetLocation(int loc);
 
-  unsigned int m_maxLocation;
+  unsigned int m_maxLocation = 0;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/windowing/gbm/WinSystemGbm.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/windowing/gbm/WinSystemGbm.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/windowing/gbm/WinSystemGbm.cpp	2018-06-27 00:01:38.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/windowing/gbm/WinSystemGbm.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -40,7 +40,6 @@
 CWinSystemGbm::CWinSystemGbm() :
   m_DRM(nullptr),
   m_GBM(new CGBMUtils),
-  m_delayDispReset(false),
   m_libinput(new CLibInputHandler)
 {
   std::string envSink;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/windowing/gbm/WinSystemGbm.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/windowing/gbm/WinSystemGbm.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/windowing/gbm/WinSystemGbm.h	2018-06-24 00:01:06.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/windowing/gbm/WinSystemGbm.h	2018-07-04 00:01:50.000000000 +0000
@@ -76,7 +76,7 @@
   CCriticalSection m_resourceSection;
   std::vector<IDispResource*>  m_resources;
 
-  bool m_delayDispReset;
+  bool m_delayDispReset = false;
   XbmcThreads::EndTime m_dispResetTimer;
   std::unique_ptr<OPTIONALS::CLircContainer, OPTIONALS::delete_CLircContainer> m_lirc;
   std::unique_ptr<CLibInputHandler> m_libinput;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/windowing/GraphicContext.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/windowing/GraphicContext.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/windowing/GraphicContext.h	2018-06-21 18:59:50.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/windowing/GraphicContext.h	2018-07-04 00:01:50.000000000 +0000
@@ -217,13 +217,13 @@
   class UITransform
   {
   public:
-    UITransform() : matrix(), scaleX(1.0f), scaleY(1.0f) {};
+    UITransform() : matrix() {};
     UITransform(const TransformMatrix &m, const float sX = 1.0f, const float sY = 1.0f) : matrix(m), scaleX(sX), scaleY(sY) { };
     void Reset() { matrix.Reset(); scaleX = scaleY = 1.0f; };
 
     TransformMatrix matrix;
-    float scaleX;
-    float scaleY;
+    float scaleX = 1.0f;
+    float scaleY = 1.0f;
   };
 
   UITransform m_guiTransform;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/windows/GUIWindowHome.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/windows/GUIWindowHome.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/windows/GUIWindowHome.cpp	2018-06-21 18:59:50.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/windows/GUIWindowHome.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -35,9 +35,7 @@
 
 using namespace ANNOUNCEMENT;
 
-CGUIWindowHome::CGUIWindowHome(void) : CGUIWindow(WINDOW_HOME, "Home.xml"),
-                                       m_recentlyAddedRunning(false),
-                                       m_cumulativeUpdateFlag(0)
+CGUIWindowHome::CGUIWindowHome(void) : CGUIWindow(WINDOW_HOME, "Home.xml")
 {
   m_updateRA = (Audio | Video | Totals);
   m_loadType = KEEP_IN_MEMORY;
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/windows/GUIWindowHome.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/windows/GUIWindowHome.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/windows/GUIWindowHome.h	2018-06-21 18:59:50.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/windows/GUIWindowHome.h	2018-07-04 00:01:50.000000000 +0000
@@ -45,6 +45,6 @@
   int m_updateRA; // flag for which recently added items needs to be queried
   void AddRecentlyAddedJobs(int flag);
 
-  bool m_recentlyAddedRunning;
-  int m_cumulativeUpdateFlag;
+  bool m_recentlyAddedRunning = false;
+  int m_cumulativeUpdateFlag = 0;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/windows/GUIWindowScreensaver.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/windows/GUIWindowScreensaver.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/windows/GUIWindowScreensaver.cpp	2018-06-21 18:59:50.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/windows/GUIWindowScreensaver.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -29,8 +29,7 @@
 #include "settings/Settings.h"
 
 CGUIWindowScreensaver::CGUIWindowScreensaver(void)
-  : CGUIWindow(WINDOW_SCREENSAVER, ""),
-    m_addon(nullptr)
+  : CGUIWindow(WINDOW_SCREENSAVER, "")
 {
 }
 
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/windows/GUIWindowScreensaverDim.cpp kodi-18.0+git20180704.0202-f0dda3a/xbmc/windows/GUIWindowScreensaverDim.cpp
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/windows/GUIWindowScreensaverDim.cpp	2018-06-21 18:59:50.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/windows/GUIWindowScreensaverDim.cpp	2018-07-04 00:01:50.000000000 +0000
@@ -28,10 +28,7 @@
 #include "guilib/GUITexture.h"
 
 CGUIWindowScreensaverDim::CGUIWindowScreensaverDim(void)
-  : CGUIDialog(WINDOW_SCREENSAVER_DIM, "", DialogModalityType::MODELESS),
-    m_dimLevel(100.0f),
-    m_newDimLevel(100.0f),
-    m_visible(false)
+  : CGUIDialog(WINDOW_SCREENSAVER_DIM, "", DialogModalityType::MODELESS)
 {
   m_needsScaling = false;
   m_animations.push_back(CAnimation::CreateFader(0, 100, 0, 1000, ANIM_TYPE_WINDOW_OPEN));
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/windows/GUIWindowScreensaverDim.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/windows/GUIWindowScreensaverDim.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/windows/GUIWindowScreensaverDim.h	2018-06-21 18:59:50.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/windows/GUIWindowScreensaverDim.h	2018-07-04 00:01:50.000000000 +0000
@@ -34,7 +34,7 @@
   void UpdateVisibility() override;
 
 private:
-  float m_dimLevel;
-  float m_newDimLevel;
-  bool m_visible;
+  float m_dimLevel = 100.0f;
+  float m_newDimLevel = 100.0f;
+  bool m_visible = false;
 };
diff -Nru kodi-18.0+git20180703.0201-a44e6e2/xbmc/windows/GUIWindowScreensaver.h kodi-18.0+git20180704.0202-f0dda3a/xbmc/windows/GUIWindowScreensaver.h
--- kodi-18.0+git20180703.0201-a44e6e2/xbmc/windows/GUIWindowScreensaver.h	2018-06-21 18:59:50.000000000 +0000
+++ kodi-18.0+git20180704.0202-f0dda3a/xbmc/windows/GUIWindowScreensaver.h	2018-07-04 00:01:50.000000000 +0000
@@ -38,6 +38,6 @@
   EVENT_RESULT OnMouseEvent(const CPoint &point, const CMouseEvent &event) override;
 
 private:
-  ADDON::CScreenSaver* m_addon;
+  ADDON::CScreenSaver* m_addon = nullptr;
 };