48 files changed, 345 insertions, 68 deletions
diff --git a/project/cmake/addons/CMakeLists.txt b/project/cmake/addons/CMakeLists.txt
index 0773713..8fc1a23 100644
--- a/project/cmake/addons/CMakeLists.txt
+++ b/project/cmake/addons/CMakeLists.txt
@@ -1,15 +1,31 @@
 project(kodi-addons)
-cmake_minimum_required(VERSION 2.8)
+if(WIN32)
+  # there seems to be a bug in the CMake generator implementation in CMake 2.8.x releases for WIN32
+  cmake_minimum_required(VERSION 3.0)
+else()
+  cmake_minimum_required(VERSION 2.8)
+endif()
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
+option(ADDON_TARBALL_CACHING "Cache downloaded addon source tarballs?" ON)
+if(ADDON_TARBALL_CACHING)
+  message(STATUS "Addon source tarball caching is enabled")
+else()
+  message(STATUS "Addon source tarball caching is disabled")
+endif()
 if(NOT CMAKE_BUILD_TYPE)
  set(CMAKE_BUILD_TYPE Release)
 endif()
 if(NOT CORE_SYSTEM_NAME)
-  string(TOLOWER ${CMAKE_SYSTEM_NAME} CORE_SYSTEM_NAME)
+  if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(CORE_SYSTEM_NAME "osx")
+  else()
+    string(TOLOWER ${CMAKE_SYSTEM_NAME} CORE_SYSTEM_NAME)
+  endif()
 endif()
 include(ExternalProject)
@@ -65,6 +81,7 @@ list(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX})
 set(BUILD_ARGS -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
               -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
               -DPACKAGE_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig
+               -DDEPENDS_PATH=${DEPENDS_PATH}
               -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
               -DCMAKE_USER_MAKE_RULES_OVERRIDE=${CMAKE_USER_MAKE_RULES_OVERRIDE}
               -DCMAKE_USER_MAKE_RULES_OVERRIDE_CXX=${CMAKE_USER_MAKE_RULES_OVERRIDE_CXX}
@@ -78,16 +95,26 @@ if(MSVC)
  set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 endif()
+option(PACKAGE_ZIP "Prepare built addons for packaging" OFF)
 if(PACKAGE_ZIP)
  # needed for project installing
-  list(APPEND BUILD_ARGS -DPACKAGE_ZIP=1)
+  list(APPEND BUILD_ARGS -DPACKAGE_ZIP=ON)
-  MESSAGE("package zip specified")
+  # figure out where to store the packaged ZIP archives
+  if(NOT PACKAGE_DIR)
+    set(PACKAGE_DIR "${BUILD_DIR}/zips")
+  else()
+    file(TO_CMAKE_PATH "${PACKAGE_DIR}" PACKAGE_DIR)
+  endif()
+  list(APPEND BUILD_ARGS -DPACKAGE_DIR=${PACKAGE_DIR})
+  MESSAGE(STATUS "ZIP packaging enabled (destination: ${PACKAGE_DIR})")
 endif()
 if(CMAKE_TOOLCHAIN_FILE)
  list(APPEND BUILD_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
-  MESSAGE("toolchain specified")
+  MESSAGE(STATUS "Toolchain specified")
-  MESSAGE(${BUILD_ARGS})
+  MESSAGE(STATUS ${BUILD_ARGS})
 endif()
 if(NOT ADDONS_TO_BUILD)
@@ -97,16 +124,25 @@ else()
  separate_arguments(ADDONS_TO_BUILD)
 endif()
+if(NOT ADDONS_DEFINITION_DIR)
+  set(ADDONS_DEFINITION_DIR ${PROJECT_SOURCE_DIR}/addons)
+else()
+  file(TO_CMAKE_PATH "${ADDONS_DEFINITION_DIR}" ADDONS_DEFINITION_DIR)
+endif()
+get_filename_component(ADDONS_DEFINITION_DIR "${ADDONS_DEFINITION_DIR}" ABSOLUTE)
 if(ADDON_SRC_PREFIX)
  message(STATUS "Overriding addon source directory prefix: ${ADDON_SRC_PREFIX}")
 endif()
-if(NOT KODI_LIB_DIR)
+if(NOT APP_LIB_DIR)
-  set(KODI_LIB_DIR "${DEPENDS_PATH}/lib/kodi")
+  set(APP_LIB_DIR "${DEPENDS_PATH}/lib/kodi")
 else()
-  file(TO_CMAKE_PATH "${KODI_LIB_DIR}" KODI_LIB_DIR)
+  file(TO_CMAKE_PATH "${APP_LIB_DIR}" APP_LIB_DIR)
 endif()
+set(APP_PREFIX "${CMAKE_INSTALL_PREFIX}")
 # check for platform specific stuff
 if(EXISTS ${PLATFORM_DIR}/defines.txt)
  file(STRINGS ${PLATFORM_DIR}/defines.txt platformdefines)
@@ -119,21 +155,23 @@ endif()
 # include check_target_platform() function
 include(${APP_ROOT}/project/cmake/scripts/common/check_target_platform.cmake)
-# check install permissions
 set(ADDON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
-check_install_permissions(${CMAKE_INSTALL_PREFIX} can_write)
+if(NOT WIN32)
-if(NOT ${can_write} AND NOT WIN32)
+  # check install permissions
-  set(NEED_SUDO TRUE)
+  check_install_permissions(${CMAKE_INSTALL_PREFIX} can_write)
-  set(ADDON_INSTALL_DIR ${CMAKE_BINARY_DIR}/.install)
+  if(NOT ${can_write} AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  message(STATUS "NEED_SUDO: ${NEED_SUDO}")
+    set(NEED_SUDO TRUE)
+    set(ADDON_INSTALL_DIR ${CMAKE_BINARY_DIR}/.install)
+    message(STATUS "NEED_SUDO: ${NEED_SUDO}")
+  endif()
 endif()
 ### prepare the build environment for the binary addons
 # copy the prepare-env.cmake script to the depends path so that we can include it
-file(COPY ${APP_ROOT}/project/cmake/scripts/common/prepare-env.cmake DESTINATION ${KODI_LIB_DIR})
+file(COPY ${APP_ROOT}/project/cmake/scripts/common/prepare-env.cmake DESTINATION ${APP_LIB_DIR})
 # add the location of prepare-env.cmake to CMAKE_MODULE_PATH so that it is found
-list(APPEND CMAKE_MODULE_PATH ${KODI_LIB_DIR})
+list(APPEND CMAKE_MODULE_PATH ${APP_LIB_DIR})
 # include prepare-env.cmake which contains the logic to install the addon header bindings etc
 include(prepare-env)
@@ -141,17 +179,61 @@ include(prepare-env)
 ### add the depends subdirectory for any general dependencies
 add_subdirectory(depends)
+# add a custom target "package-addons" which will package and install all addons
+add_custom_target(package-addons)
 ### get and build all the binary addons
 # look for all the addons to be built
-file(GLOB_RECURSE addons ${PROJECT_SOURCE_DIR}/addons/*.txt)
+file(GLOB_RECURSE addons ${ADDONS_DEFINITION_DIR}/*.txt)
+#if there are no addons assume that bootstrapping hasn't happened yet
+if(NOT addons)
+  message(STATUS "Bootstrapping all default repositories as no addons were found...")
+  set(BOOTSTRAP_BUILD_DIR "${BUILD_DIR}/bootstrap")
+  # make sure that the bootstraps build addon exists
+  if(NOT EXISTS ${BOOTSTRAP_BUILD_DIR})
+    file(MAKE_DIRECTORY ${BOOTSTRAP_BUILD_DIR})
+  endif()
+  # generate the bootstrap buildsystem
+  execute_process(COMMAND ${CMAKE_COMMAND} ${PROJECT_SOURCE_DIR}/bootstrap
+                                           -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                                           -DCMAKE_INSTALL_PREFIX:PATH=${ADDONS_DEFINITION_DIR}
+                                           -DBUILD_DIR:PATH=${BOOTSTRAP_BUILD_DIR}
+                                           -DADDONS_TO_BUILD=${ADDONS_TO_BUILD}
+                  WORKING_DIRECTORY ${BOOTSTRAP_BUILD_DIR})
+  # execute the generated bootstrap buildsystem
+  execute_process(COMMAND ${CMAKE_COMMAND} --build ${BOOTSTRAP_BUILD_DIR}
+                  WORKING_DIRECTORY ${BOOTSTRAP_BUILD_DIR})
+  # now look for all the addons to be built again
+  file(GLOB_RECURSE addons ${ADDONS_DEFINITION_DIR}/*.txt)
+  if(NOT addons)
+    message(FATAL_ERROR "No addons available to be built")
+  endif()
+endif()
 foreach(addon ${addons})
  if(NOT (addon MATCHES platforms.txt))
    file(STRINGS ${addon} def)
    separate_arguments(def)
    list(GET def 0 id)
+    set(ADDON_FOUND FALSE)
+    # try to find a perfect match
    list(FIND ADDONS_TO_BUILD ${id} idx)
-    if(idx GREATER -1 OR ADDONS_TO_BUILD STREQUAL "all")
+    if(idx GREATER -1 OR "${ADDONS_TO_BUILD}" STREQUAL "all")
+      set(ADDON_FOUND TRUE)
+    # Maybe we have a regex
+    elseif(id MATCHES "${ADDONS_TO_BUILD}")
+      message(STATUS "Pattern ${ADDONS_TO_BUILD} matches ${id}, building addon")
+      set(ADDON_FOUND TRUE)
+    endif()
+    if(ADDON_FOUND)
      get_filename_component(dir ${addon} PATH)
      # check if the addon has a platforms.txt
@@ -180,6 +262,19 @@ foreach(addon ${addons})
        if(deflength GREATER 2 AND "${SOURCE_DIR}" STREQUAL "")
          list(GET def 2 revision)
+          # we need access to a git executable
+          find_package(Git REQUIRED)
+          # resolve revision to git hash
+          execute_process(COMMAND ${GIT_EXECUTABLE} ls-remote ${url} ${revision} OUTPUT_VARIABLE revision_hash)
+          # git ls-remote only works on branches and tag names but not on revisions
+          if(NOT "${revision_hash}" STREQUAL "")
+            string(REPLACE "\t" ";" revision_list ${revision_hash})
+            list(GET revision_list 0 revision_hash)
+            message(STATUS "${id}: git branch/tag ${revision} resolved to hash: ${revision_hash}")
+            set(revision ${revision_hash})
+          endif()
          # Note: downloading specific revisions via http in the format below is probably github specific
          # if we ever use other repositories, this might need adapting
          set(url ${url}/archive/${revision}.tar.gz)
@@ -210,7 +305,7 @@ foreach(addon ${addons})
        # download the addon if necessary
        if(NOT "${archive_name}" STREQUAL "")
          # download and extract the addon
-          if(NOT EXISTS ${BUILD_DIR}/download/${archive_name}.tar.gz)
+          if(NOT ADDON_TARBALL_CACHING OR NOT EXISTS ${BUILD_DIR}/download/${archive_name}.tar.gz)
            # cleanup any of the previously downloaded archives of this addon
            file(GLOB archives "${BUILD_DIR}/download/${id}*.tar.gz")
            if(archives)
@@ -275,6 +370,25 @@ foreach(addon ${addons})
              add_dependencies(${id} ${${id}_DEPS})
            endif()
          endif()
+          if(CROSS_AUTOCONF AND AUTOCONF_FILES)
+            if(EXISTS ${SOURCE_DIR}/bootstrap/autoreconf.txt)
+              file(STRINGS ${SOURCE_DIR}/bootstrap/autoreconf.txt conf_dirs)
+              foreach(conf_dir ${conf_dirs})
+                foreach(afile ${AUTOCONF_FILES})
+                  message(STATUS "copying ${afile} to ${SOURCE_DIR}/${conf_dir}")
+                  file(COPY ${afile} DESTINATION ${SOURCE_DIR}/${conf_dir})
+                endforeach()
+              endforeach()
+            endif()
+          endif()
+          # create a forwarding target to the addon-package target
+          add_custom_target(package-${id}
+                    COMMAND ${CMAKE_COMMAND} --build ${id}-prefix/src/${id}-build --target addon-package
+                    DEPENDS ${id})
+          add_dependencies(package-addons package-${id})
        else()
          message(FATAL_ERROR "${id}: invalid or missing addon source directory at ${SOURCE_DIR}")
        endif()
@@ -297,4 +411,4 @@ endif()
 # add custom target "supported_addons" that returns all addons that are supported on this platform
 string(REPLACE ";" " " ALL_ADDONS_BUILDING "${ALL_ADDONS_BUILDING}")
-add_custom_target(supported_addons COMMAND ${CMAKE_COMMAND} -E echo "ALL_ADDONS_BUILDING: ${ALL_ADDONS_BUILDING}" VERBATIM)
+add_custom_target(supported_addons COMMAND ${CMAKE_COMMAND} -E echo "ALL_ADDONS_BUILDING: ${ALL_ADDONS_BUILDING}" VERBATIM)
+\ No newline at end of file
diff --git a/project/cmake/addons/README b/project/cmake/addons/README
index b901bb7..a0f2c32 100644
--- a/project/cmake/addons/README
+++ b/project/cmake/addons/README
@@ -1,7 +1,8 @@
 KODI ADDONS
 ===========
 This directory contains the cmake-based buildsystem for addons. It looks into
-the "addons" sub-directory and parses all *.txt files recursively. Each addon
+the directory pointed to by the ADDONS_DEFINITION_DIR option (which defaults to
+the "addons" sub-directory) and parses all *.txt files recursively. Each addon
 must have its own <addon-id>.txt file in a separate sub-directory which must
 follow one of the defined format:
  <addon-id> <git-url> <git-revision>
@@ -22,13 +23,26 @@ are:
  * platforms.txt: List of platforms to build an addon for (or "all"). It is
    also supported to specify negated platforms with a leading exclamation mark
    (i), e.g. "!windows".
-    Available platforms are: linux, windows, darwin, ios, android, rbpi
+    Available platforms are: linux, windows, osx, ios, android, rbpi, freebsd
+ATTENTION: If no addon definitions could be found the buildsystem assumes that
+           the bootstrapping of the addon definition repositories hasn't been
+           performed yet and automatically executes the addon bootstrapping
+           buildsystem located in the "bootstrap" sub-directory with the default
+           settings (i.e. all addons from all pre-defined addon definition
+           repositories are bootstrapped into the directory pointed to by the
+           ADDONS_DEFINITION_DIR option).
 The buildsystem uses the following variables (which can be passed into it when
 executing cmake with the -D<variable-name>=<value> option) to e.g. access
 specific paths:
-  * ADDONS_TO_BUILD is a quoted, space delimited list of <addon-id>s that
+  * ADDONS_TO_BUILD has two variations, which are tested in order:
-    you want to build (default is "all").
+     - a quoted, space delimited list of <addon-id>s that
+       you want to build (default is "all").
+     - a regular expression that every <addon-id> is matched against
+       e.g.: ADDONS_TO_BUILD=pvr.* to build all pvr addons
+  * ADDONS_DEFINITION_DIR points to the directory containing the definitions
+    for the addons to be built.
  * ADDON_SRC_PREFIX can be used to override the addon repository location.
    It must point to the locally available parent directory of the addon(s) to build
    <addon-id> will be appended to this path automatically
@@ -45,11 +59,15 @@ specific paths:
    absolute representation of ../../.. starting from this directory).
  * BUILD_DIR points to the directory where the addons and their dependencies
    will be downloaded and built.
-  * PACKAGE_ZIP=1 will mean the add-ons will be 'packaged' into a common folder,
+  * PACKAGE_ZIP=ON means that the add-ons will be 'packaged' into a common folder,
    rather than being placed in <CMAKE_INSTALL_PREFIX>/lib/kodi/addons and
    <CMAKE_INSTALL_PREFIX>/share/kodi/addons.
+  * PACKAGE_DIR points to the directory where the ZIP archived addons will be
+    stored after they have been packaged (defaults to <BUILD_DIR>/zips)
  * ARCH_DEFINES specifies the platform-specific C/C++ preprocessor defines
    (defaults to empty).
+  * ADDON_TARBALL_CACHING specifies whether downloaded addon source tarballs
+    should be cached or not (defaults to ON).
 The buildsystem makes some assumptions about the environment which must be met
 by whoever uses it:
diff --git a/project/cmake/addons/addons/audioencoder.flac/audioencoder.flac.txt b/project/cmake/addons/addons/audioencoder.flac/audioencoder.flac.txt
deleted file mode 100644
index 5886cfa..0000000
--- a/project/cmake/addons/addons/audioencoder.flac/audioencoder.flac.txt
+++ /dev/null
@@ -1 +0,0 @@
-audioencoder.flac https://github.com/xbmc/audioencoder.flac 84acb14
diff --git a/project/cmake/addons/addons/audioencoder.flac/platforms.txt b/project/cmake/addons/addons/audioencoder.flac/platforms.txt
deleted file mode 100644
index 174a52e..0000000
--- a/project/cmake/addons/addons/audioencoder.flac/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-!ios
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/audioencoder.lame/audioencoder.lame.txt b/project/cmake/addons/addons/audioencoder.lame/audioencoder.lame.txt
deleted file mode 100644
index a55dc44..0000000
--- a/project/cmake/addons/addons/audioencoder.lame/audioencoder.lame.txt
+++ /dev/null
@@ -1 +0,0 @@
-audioencoder.lame https://github.com/xbmc/audioencoder.lame 3eb59de
diff --git a/project/cmake/addons/addons/audioencoder.lame/platforms.txt b/project/cmake/addons/addons/audioencoder.lame/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/audioencoder.lame/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/audioencoder.vorbis/audioencoder.vorbis.txt b/project/cmake/addons/addons/audioencoder.vorbis/audioencoder.vorbis.txt
deleted file mode 100644
index 8decf52..0000000
--- a/project/cmake/addons/addons/audioencoder.vorbis/audioencoder.vorbis.txt
+++ /dev/null
@@ -1 +0,0 @@
-audioencoder.vorbis https://github.com/xbmc/audioencoder.vorbis d556a68
diff --git a/project/cmake/addons/addons/audioencoder.vorbis/platforms.txt b/project/cmake/addons/addons/audioencoder.vorbis/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/audioencoder.vorbis/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/audioencoder.wav/audioencoder.wav.txt b/project/cmake/addons/addons/audioencoder.wav/audioencoder.wav.txt
deleted file mode 100644
index b3209f6..0000000
--- a/project/cmake/addons/addons/audioencoder.wav/audioencoder.wav.txt
+++ /dev/null
@@ -1 +0,0 @@
-audioencoder.wav https://github.com/xbmc/audioencoder.wav 40aaedf
diff --git a/project/cmake/addons/addons/audioencoder.wav/platforms.txt b/project/cmake/addons/addons/audioencoder.wav/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/audioencoder.wav/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.argustv/platforms.txt b/project/cmake/addons/addons/pvr.argustv/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/pvr.argustv/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.argustv/pvr.argustv.txt b/project/cmake/addons/addons/pvr.argustv/pvr.argustv.txt
deleted file mode 100644
index 88ccde4..0000000
--- a/project/cmake/addons/addons/pvr.argustv/pvr.argustv.txt
+++ /dev/null
@@ -1 +0,0 @@
-pvr.argustv https://github.com/kodi-pvr/pvr.argustv 96ee875
diff --git a/project/cmake/addons/addons/pvr.demo/platforms.txt b/project/cmake/addons/addons/pvr.demo/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/pvr.demo/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.demo/pvr.demo.txt b/project/cmake/addons/addons/pvr.demo/pvr.demo.txt
deleted file mode 100644
index 1307381..0000000
--- a/project/cmake/addons/addons/pvr.demo/pvr.demo.txt
+++ /dev/null
@@ -1 +0,0 @@
-pvr.demo https://github.com/kodi-pvr/pvr.demo b4b7de1
diff --git a/project/cmake/addons/addons/pvr.dvblink/platforms.txt b/project/cmake/addons/addons/pvr.dvblink/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/pvr.dvblink/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.dvblink/pvr.dvblink.txt b/project/cmake/addons/addons/pvr.dvblink/pvr.dvblink.txt
deleted file mode 100644
index 1aa96d8..0000000
--- a/project/cmake/addons/addons/pvr.dvblink/pvr.dvblink.txt
+++ /dev/null
@@ -1 +0,0 @@
-pvr.dvblink https://github.com/kodi-pvr/pvr.dvblink 5d505b8
diff --git a/project/cmake/addons/addons/pvr.dvbviewer/platforms.txt b/project/cmake/addons/addons/pvr.dvbviewer/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/pvr.dvbviewer/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.dvbviewer/pvr.dvbviewer.txt b/project/cmake/addons/addons/pvr.dvbviewer/pvr.dvbviewer.txt
deleted file mode 100644
index db25aa2..0000000
--- a/project/cmake/addons/addons/pvr.dvbviewer/pvr.dvbviewer.txt
+++ /dev/null
@@ -1 +0,0 @@
-pvr.dvbviewer https://github.com/manuelm/pvr.dvbviewer master
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.filmon/platforms.txt b/project/cmake/addons/addons/pvr.filmon/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/pvr.filmon/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.filmon/pvr.filmon.txt b/project/cmake/addons/addons/pvr.filmon/pvr.filmon.txt
deleted file mode 100644
index 2e7142c..0000000
--- a/project/cmake/addons/addons/pvr.filmon/pvr.filmon.txt
+++ /dev/null
@@ -1 +0,0 @@
-pvr.filmon https://github.com/kodi-pvr/pvr.filmon 413fe9e
diff --git a/project/cmake/addons/addons/pvr.hts/platforms.txt b/project/cmake/addons/addons/pvr.hts/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/pvr.hts/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.hts/pvr.hts.txt b/project/cmake/addons/addons/pvr.hts/pvr.hts.txt
deleted file mode 100644
index 5f913f8..0000000
--- a/project/cmake/addons/addons/pvr.hts/pvr.hts.txt
+++ /dev/null
@@ -1 +0,0 @@
-pvr.hts https://github.com/kodi-pvr/pvr.hts 4bf1a97
diff --git a/project/cmake/addons/addons/pvr.iptvsimple/platforms.txt b/project/cmake/addons/addons/pvr.iptvsimple/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/pvr.iptvsimple/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.iptvsimple/pvr.iptvsimple.txt b/project/cmake/addons/addons/pvr.iptvsimple/pvr.iptvsimple.txt
deleted file mode 100644
index d1d4d3c..0000000
--- a/project/cmake/addons/addons/pvr.iptvsimple/pvr.iptvsimple.txt
+++ /dev/null
@@ -1 +0,0 @@
-pvr.iptvsimple https://github.com/kodi-pvr/pvr.iptvsimple a2e6c6f
diff --git a/project/cmake/addons/addons/pvr.mediaportal.tvserver/platforms.txt b/project/cmake/addons/addons/pvr.mediaportal.tvserver/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/pvr.mediaportal.tvserver/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.mediaportal.tvserver/pvr.mediaportal.tvserver.txt b/project/cmake/addons/addons/pvr.mediaportal.tvserver/pvr.mediaportal.tvserver.txt
deleted file mode 100644
index 665dfff..0000000
--- a/project/cmake/addons/addons/pvr.mediaportal.tvserver/pvr.mediaportal.tvserver.txt
+++ /dev/null
@@ -1 +0,0 @@
-pvr.mediaportal.tvserver https://github.com/kodi-pvr/pvr.mediaportal.tvserver 6f8ca82
diff --git a/project/cmake/addons/addons/pvr.mythtv/platforms.txt b/project/cmake/addons/addons/pvr.mythtv/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/pvr.mythtv/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.mythtv/pvr.mythtv.txt b/project/cmake/addons/addons/pvr.mythtv/pvr.mythtv.txt
deleted file mode 100644
index de930ab..0000000
--- a/project/cmake/addons/addons/pvr.mythtv/pvr.mythtv.txt
+++ /dev/null
@@ -1 +0,0 @@
-pvr.mythtv https://github.com/kodi-pvr/pvr.mythtv ef9cf41
diff --git a/project/cmake/addons/addons/pvr.nextpvr/platforms.txt b/project/cmake/addons/addons/pvr.nextpvr/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/pvr.nextpvr/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.nextpvr/pvr.nextpvr.txt b/project/cmake/addons/addons/pvr.nextpvr/pvr.nextpvr.txt
deleted file mode 100644
index ecb73d2..0000000
--- a/project/cmake/addons/addons/pvr.nextpvr/pvr.nextpvr.txt
+++ /dev/null
@@ -1 +0,0 @@
-pvr.nextpvr https://github.com/kodi-pvr/pvr.nextpvr 1ecbf87
diff --git a/project/cmake/addons/addons/pvr.njoy/platforms.txt b/project/cmake/addons/addons/pvr.njoy/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/pvr.njoy/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.njoy/pvr.njoy.txt b/project/cmake/addons/addons/pvr.njoy/pvr.njoy.txt
deleted file mode 100644
index fec1b59..0000000
--- a/project/cmake/addons/addons/pvr.njoy/pvr.njoy.txt
+++ /dev/null
@@ -1 +0,0 @@
-pvr.njoy https://github.com/kodi-pvr/pvr.njoy fcd6294
diff --git a/project/cmake/addons/addons/pvr.pctv/platforms.txt b/project/cmake/addons/addons/pvr.pctv/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/pvr.pctv/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.pctv/pvr.pctv.txt b/project/cmake/addons/addons/pvr.pctv/pvr.pctv.txt
deleted file mode 100644
index b17bdc7..0000000
--- a/project/cmake/addons/addons/pvr.pctv/pvr.pctv.txt
+++ /dev/null
@@ -1 +0,0 @@
-pvr.pctv https://github.com/kodi-pvr/pvr.pctv 0a0924e
diff --git a/project/cmake/addons/addons/pvr.vdr.vnsi/platforms.txt b/project/cmake/addons/addons/pvr.vdr.vnsi/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/pvr.vdr.vnsi/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.vdr.vnsi/pvr.vdr.vnsi.txt b/project/cmake/addons/addons/pvr.vdr.vnsi/pvr.vdr.vnsi.txt
deleted file mode 100644
index 72b4954..0000000
--- a/project/cmake/addons/addons/pvr.vdr.vnsi/pvr.vdr.vnsi.txt
+++ /dev/null
@@ -1 +0,0 @@
-pvr.vdr.vnsi https://github.com/kodi-pvr/pvr.vdr.vnsi 3a28e39
diff --git a/project/cmake/addons/addons/pvr.vuplus/platforms.txt b/project/cmake/addons/addons/pvr.vuplus/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/pvr.vuplus/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.vuplus/pvr.vuplus.txt b/project/cmake/addons/addons/pvr.vuplus/pvr.vuplus.txt
deleted file mode 100644
index 36d60af..0000000
--- a/project/cmake/addons/addons/pvr.vuplus/pvr.vuplus.txt
+++ /dev/null
@@ -1 +0,0 @@
-pvr.vuplus https://github.com/kodi-pvr/pvr.vuplus d6abad3
diff --git a/project/cmake/addons/addons/pvr.wmc/platforms.txt b/project/cmake/addons/addons/pvr.wmc/platforms.txt
deleted file mode 100644
index baa6044..0000000
--- a/project/cmake/addons/addons/pvr.wmc/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-all
-\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.wmc/pvr.wmc.txt b/project/cmake/addons/addons/pvr.wmc/pvr.wmc.txt
deleted file mode 100644
index 1455925..0000000
--- a/project/cmake/addons/addons/pvr.wmc/pvr.wmc.txt
+++ /dev/null
@@ -1 +0,0 @@
-pvr.wmc https://github.com/kodi-pvr/pvr.wmc cf28e4c
diff --git a/project/cmake/addons/bootstrap/CMakeLists.txt b/project/cmake/addons/bootstrap/CMakeLists.txt
new file mode 100644
index 0000000..86950b8
--- /dev/null
+++ b/project/cmake/addons/bootstrap/CMakeLists.txt
@@ -0,0 +1,95 @@
+project(kodi-addons-bootstrap)
+cmake_minimum_required(VERSION 2.8)
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
+# make sure CMAKE_INSTALL_PREFIX is properly set
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR NOT CMAKE_INSTALL_PREFIX)
+  set(CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}/../addons")
+endif()
+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX})
+# figure out where the build directory is located
+if(NOT BUILD_DIR)
+  set(BUILD_DIR "${CMAKE_BINARY_DIR}/build")
+else()
+  file(TO_CMAKE_PATH "${BUILD_DIR}" BUILD_DIR)
+endif()
+get_filename_component(BUILD_DIR "${BUILD_DIR}" ABSOLUTE)
+# make sure that the repositories to build have been specified
+if(NOT REPOSITORY_TO_BUILD)
+  set(REPOSITORY_TO_BUILD_DEFAULT ON)
+  set(REPOSITORY_TO_BUILD "all")
+  set(REPOSITORY_REVISION "")
+  message(STATUS "Bootstrapping all repositories")
+else()
+  set(REPOSITORY_TO_BUILD_DEFAULT OFF)
+  message(STATUS "Bootstrapping following repository: ${REPOSITORY_TO_BUILD}")
+endif()
+# figure out which addons to bootstrap (defaults to all)
+if(NOT ADDONS_TO_BUILD)
+  set(ADDONS_TO_BUILD "all")
+  message(STATUS "Bootstrapping all addons")
+else()
+  message(STATUS "Bootstrapping following addons: ${ADDONS_TO_BUILD}")
+endif()
+include(ExternalProject)
+function(bootstrap_repo repo_id repo_url repo_revision)
+  message(STATUS "Bootstrapping addons from ${repo_id} (${repo_url} ${repo_revision})...")
+  externalproject_add(${repo_id}
+                      GIT_REPOSITORY ${repo_url}
+                      GIT_TAG ${repo_revision}
+                      PREFIX ${BUILD_DIR}/${repo_id}
+                      CONFIGURE_COMMAND ""
+                      BUILD_COMMAND ""
+                      INSTALL_COMMAND ${CMAKE_COMMAND}
+                                      -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+                                      -DPROJECT_SOURCE_DIR=<SOURCE_DIR>
+                                      -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+                                      -DADDONS_TO_BUILD=${ADDONS_TO_BUILD}
+                                      -P ${PROJECT_SOURCE_DIR}/bootstrap.cmake
+                      )
+endfunction()
+# look for all addons repository definitions
+set(REPOSITORY_TO_BUILD_FOUND OFF)
+file(GLOB repos repositories/*.txt)
+foreach(repo ${repos})
+  file(STRINGS ${repo} repo_definition)
+  separate_arguments(repo_definition)
+  list(GET repo_definition 0 repo_id)
+  list(FIND REPOSITORY_TO_BUILD ${repo_id} idx)
+  if(idx GREATER -1 OR REPOSITORY_TO_BUILD STREQUAL "all")
+    set(REPOSITORY_TO_BUILD_FOUND ON)
+    # get the URL of the repository
+    list(GET repo_definition 1 repo_url)
+    # get the revision of the repository if not provided as an argument
+    if(NOT REPOSITORY_REVISION)
+      list(GET repo_definition 2 repo_revision)
+    else()
+      set(repo_revision "${REPOSITORY_REVISION}")
+    endif()
+    bootstrap_repo(${repo_id} ${repo_url} ${repo_revision})
+  endif()
+endforeach()
+# if we have been asked to bootstrap a specific repository (not the default one) and
+# it couldn't be found in the predefined repository definitions we assume that it's a
+# URL to a specific repository
+if(NOT REPOSITORY_TO_BUILD_DEFAULT AND NOT REPOSITORY_TO_BUILD_FOUND)
+  # default to the master branch if no revision has been provided
+  if(NOT REPOSITORY_REVISION)
+    set(REPOSITORY_REVISION "master")
+  endif()
+  bootstrap_repo(binary-addons-custom ${REPOSITORY_TO_BUILD} ${REPOSITORY_REVISION})
+endif()
diff --git a/project/cmake/addons/bootstrap/README.md b/project/cmake/addons/bootstrap/README.md
new file mode 100644
index 0000000..b886b5b
--- /dev/null
+++ b/project/cmake/addons/bootstrap/README.md
@@ -0,0 +1,48 @@
+# KODI ADDON DEFINITIONS BOOTSTRAPPING
+This directory contains the cmake-based buildsystem for addon definitions
+bootstrapping which downloads the addon definitions from one or more addon
+definitions repositories. These addon definitions are then used by the addon
+buildsystem to figure out which addons and which versions to build. It looks
+into the "repositories" sub-directory and parses all *.txt files recursively.
+Each addon definitions repository must have its own <repository>.txt file which
+must follow the following defined format:
+```
+<repository> <git-url> <git-revision>
+```
+where
+* `<repository>` is the identification of the repository.
+* `<git-url>` must be the URL of the git repository containing the addon
+    definitions
+* `<git-revision>` must be a valid git tag/branch/commit in the addon
+    definitions repository's git repository which will be used for the build
+The buildsystem uses the following variables (which can be passed into it when
+executing cmake with the `-D<variable-name>=<value>` option):
+* `CMAKE_INSTALL_PREFIX` points to the directory where the downloaded addon
+definitions will be installed to (defaults to `../addons`).
+* `BUILD_DIR` points to the directory where the addon definitions repositories
+will be downloaded to.
+* `REPOSITORY_TO_BUILD` specifies a single addon definitions repository to be
+downloaded and processed (defaults to `"all"`).
+* `REPOSITORY_REVISION` specifies the git revision in the addon definitions
+repository which will be used for the build. This option is only valid in
+combination with the `REPOSITORY_TO_BUILD` option (defaults to the git
+revision specified in the repository's definition file).
+* `ADDONS_TO_BUILD` is a quoted, space delimited list of `<addon-id>`s that
+should be bootstrapped (default is `"all"`).
+To trigger the cmake-based buildsystem the following command must be executed
+with <path> being the path to this directory (absolute or relative, allowing for
+in-source and out-of-source builds).
+```
+cmake <path> -G <generator>
+```
+cmake supports multiple generators, see
+http://www.cmake.org/cmake/help/v2.8.8/cmake.html#section_Generators for a list.
+In case of additional options the call might look like this
+```
+cmake <path> [-G <generator>] \
+      -DCMAKE_INSTALL_PREFIX="<path-to-install-directory>"
+```
+\ No newline at end of file
diff --git a/project/cmake/addons/bootstrap/bootstrap.cmake b/project/cmake/addons/bootstrap/bootstrap.cmake
new file mode 100644
index 0000000..c78910c
--- /dev/null
+++ b/project/cmake/addons/bootstrap/bootstrap.cmake
@@ -0,0 +1,38 @@
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
+# make sure that the installation location has been specified
+if(NOT CMAKE_INSTALL_PREFIX)
+  message(FATAL_ERROR "CMAKE_INSTALL_PREFIX has not been specified")
+endif()
+# figure out which addons to bootstrap (defaults to all)
+if(NOT ADDONS_TO_BUILD)
+  set(ADDONS_TO_BUILD "all")
+else()
+  separate_arguments(ADDONS_TO_BUILD)
+endif()
+# find all addon definitions and go through them
+file(GLOB_RECURSE ADDON_DEFINITIONS ${PROJECT_SOURCE_DIR}/*.txt)
+foreach(ADDON_DEFINITION_FILE ${ADDON_DEFINITIONS})
+  # ignore platforms.txt
+  if(NOT (ADDON_DEFINITION_FILE MATCHES platforms.txt))
+    # read the addon definition file
+    file(STRINGS ${ADDON_DEFINITION_FILE} ADDON_DEFINITION)
+    separate_arguments(ADDON_DEFINITION)
+    # extract the addon definition's identifier
+    list(GET ADDON_DEFINITION 0 ADDON_ID)
+    # check if the addon definition should be built
+    list(FIND ADDONS_TO_BUILD ${ADDON_ID} ADDONS_TO_BUILD_IDX)
+    if(ADDONS_TO_BUILD_IDX GREATER -1 OR "${ADDONS_TO_BUILD}" STREQUAL "all")
+      # get the path to the addon definition directory
+      get_filename_component(ADDON_DEFINITION_DIR ${ADDON_DEFINITION_FILE} PATH)
+      # install the addon definition
+      message(STATUS "Bootstrapping ${ADDON_ID} addon...")
+      file(INSTALL ${ADDON_DEFINITION_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX})
+    endif()
+  endif()
+endforeach()
diff --git a/project/cmake/addons/bootstrap/repositories/binary-addons.txt b/project/cmake/addons/bootstrap/repositories/binary-addons.txt
new file mode 100644
index 0000000..8674f06
--- /dev/null
+++ b/project/cmake/addons/bootstrap/repositories/binary-addons.txt
@@ -0,0 +1 @@
+binary-addons https://github.com/xbmc/repo-binary-addons.git master
+\ No newline at end of file
diff --git a/project/cmake/addons/depends/common/kodi-platform/deps.txt b/project/cmake/addons/depends/common/kodi-platform/deps.txt
index f0e8246..b953815 100644
--- a/project/cmake/addons/depends/common/kodi-platform/deps.txt
+++ b/project/cmake/addons/depends/common/kodi-platform/deps.txt
@@ -1,2 +1,2 @@
-kodi
+tinyxml
-tinyxml
-\ No newline at end of file
+p8-platform
diff --git a/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt b/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt
index 009c72b..de42267 100644
--- a/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt
+++ b/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt
@@ -1 +1 @@
-kodi-platform https://github.com/xbmc/kodi-platform 48bdd985
+kodi-platform https://github.com/xbmc/kodi-platform fed924e764b4c9c722f7f5d825ce70d4b61ae54f
diff --git a/project/cmake/addons/depends/common/p8-platform/p8-platform.txt b/project/cmake/addons/depends/common/p8-platform/p8-platform.txt
new file mode 100644
index 0000000..7db4e36
--- /dev/null
+++ b/project/cmake/addons/depends/common/p8-platform/p8-platform.txt
@@ -0,0 +1 @@
+p8-platform https://github.com/Pulse-Eight/platform.git 38343e0acd6a636ac46139aa666aee4a8d1f13db
diff --git a/project/cmake/addons/depends/common/tinyxml/tinyxml.txt b/project/cmake/addons/depends/common/tinyxml/tinyxml.txt
index 456b0c5..f8e05e8 100644
--- a/project/cmake/addons/depends/common/tinyxml/tinyxml.txt
+++ b/project/cmake/addons/depends/common/tinyxml/tinyxml.txt
@@ -1 +1 @@
-tinyxml http://mirrors.xbmc.org/build-deps/sources/tinyxml-2.6.2_2.tar.gz
+tinyxml http://mirrors.kodi.tv/build-deps/sources/tinyxml-2.6.2_2.tar.gz