From baa520082e1723277ae1c5a570a45bfc24a65a17 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Tue, 11 Sep 2018 20:36:59 +0200
Subject: [PATCH] kodi: update Kodi18 Beta2

---
 packages/mediacenter/kodi/config/appliance.xml  |  3 ---
 packages/mediacenter/kodi/package.mk            |  8 ++++----
 ...di-995.01-pr14354_wrapper_toolchain_nm.patch | 17 -----------------
 3 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 packages/mediacenter/kodi/patches/kodi-995.01-pr14354_wrapper_toolchain_nm.patch

diff --git a/packages/mediacenter/kodi/config/appliance.xml b/packages/mediacenter/kodi/config/appliance.xml
index 8889ff1410..7831707eeb 100644
--- a/packages/mediacenter/kodi/config/appliance.xml
+++ b/packages/mediacenter/kodi/config/appliance.xml
@@ -4,9 +4,6 @@
   <section id="games">
     <category id="gamesgeneral">
       <group id="1">
-        <setting id="gamesgeneral.enable">
-          <default>true</default>
-        </setting>
         <setting id="gamesgeneral.enablerewind">
           <default>false</default>
         </setting>
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 0428ef9f18..e1c6aa6efa 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -15,14 +15,14 @@ PKG_PATCH_DIRS="$KODI_VENDOR"
 
 case $KODI_VENDOR in
   raspberrypi)
-    PKG_VERSION="newclock5_18.0b1v2-Leia"
-    PKG_SHA256="7434263c55aa528f3e3d8f455cffe3148e3707a1c1068f80bd08829094e16576"
+    PKG_VERSION="newclock5_18.0b2-Leia"
+    PKG_SHA256="28ba41ea6a942f4399b98e300596ea4a85ac043c8358c9eae9f2d0e0bee9aa99"
     PKG_URL="https://github.com/popcornmix/xbmc/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz"
     ;;
   *)
-    PKG_VERSION="18.0b1v2-Leia"
-    PKG_SHA256="3808aa97723b710a0774261116e3387f091bc3d8150b9ba49ef36cb30b3d7ba2"
+    PKG_VERSION="18.0b2-Leia"
+    PKG_SHA256="25fc0aabfb523d4db19e08b1990d4851592ee2adec0424f5fb729bd3672eae69"
     PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_NAME="kodi-$PKG_VERSION.tar.gz"
     ;;
diff --git a/packages/mediacenter/kodi/patches/kodi-995.01-pr14354_wrapper_toolchain_nm.patch b/packages/mediacenter/kodi/patches/kodi-995.01-pr14354_wrapper_toolchain_nm.patch
deleted file mode 100644
index 92b634da19..0000000000
--- a/packages/mediacenter/kodi/patches/kodi-995.01-pr14354_wrapper_toolchain_nm.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-wrapper.def:
-  - make nm binary configurable (-DCMAKE_NM=..)
-  - fail if an empty file is generated
-
-diff --git a/xbmc/cores/DllLoader/exports/CMakeLists.txt b/xbmc/cores/DllLoader/exports/CMakeLists.txt
-index 580a779fdc..efcd872cad 100644
---- a/xbmc/cores/DllLoader/exports/CMakeLists.txt
-+++ b/xbmc/cores/DllLoader/exports/CMakeLists.txt
-@@ -16,7 +16,7 @@ elseif(NOT CORE_SYSTEM_NAME STREQUAL windows AND NOT CORE_SYSTEM_NAME STREQUAL w
-   add_options(C ALL_BUILDS "-fPIC")
-   add_library(wrapper OBJECT wrapper.c)
- 
--  add_custom_target(wrapper.def ALL nm ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/wrapper.dir/wrapper.c.o | grep __wrap | awk '{ printf(\"%s \", \$\$3) }' | sed \"s/___wrap_/__wrap_/g\" | sed \"s/__wrap_/-Wl,-wrap,/g\" > wrapper.def)
-+  add_custom_target(wrapper.def ALL ${CMAKE_NM} ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/wrapper.dir/wrapper.c.o | grep __wrap | awk '{ printf(\"%s \", \$\$3) }' | sed \"s/___wrap_/__wrap_/g\" | sed \"s/__wrap_/-Wl,-wrap,/g\" > wrapper.def && test -s wrapper.def)
- 
-   if(CORE_SYSTEM_NAME STREQUAL android)
-     add_custom_command(TARGET wrapper.def COMMAND echo \"-L${DEPENDS_PATH}/lib/dummy-lib${APP_NAME_LC} -l${APP_NAME_LC}\" >> wrapper.def)