package/kodi: bump to version 18.0-Leia

Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>

package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch

@@ -17,8 +17,8 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 
 diff --git a/project/cmake/KodiConfig.cmake.in b/project/cmake/KodiConfig.cmake.in
 index 76626ec..ffb8e1d 100644
---- a/project/cmake/KodiConfig.cmake.in
-+++ b/project/cmake/KodiConfig.cmake.in
+--- a/cmake/KodiConfig.cmake.in
++++ b/cmake/KodiConfig.cmake.in
 @@ -7,7 +7,7 @@ if(NOT @APP_NAME_UC@_PREFIX)
    set(@APP_NAME_UC@_PREFIX @APP_PREFIX@)
  endif()

package/kodi/0002-cmake-add-FindIconv.cmake.patch

@@ -25,8 +25,8 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 
 diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt
 index 504e4c046b..90ffa35ea7 100644
---- a/project/cmake/CMakeLists.txt
-+++ b/project/cmake/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -106,7 +106,7 @@ set(required_deps Sqlite3 FreeType PCRE Cpluff LibDvd
                    TinyXML Python Yajl Cdio
                    Lzo2 Fribidi TagLib FFMPEG CrossGUID)
@@ -40,7 +40,7 @@ diff --git a/project/cmake/modules/FindIconv.cmake b/project/cmake/modules/FindI
 new file mode 100644
 index 0000000000..51e4f14c1a
 --- /dev/null
-+++ b/project/cmake/modules/FindIconv.cmake
++++ b/cmake/modules/FindIconv.cmake
 @@ -0,0 +1,124 @@
 +# based on
 +# https://github.com/doxygen/doxygen/blob/master/cmake/FindIconv.cmake

package/kodi/0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch

@@ -11,8 +11,8 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 
 diff --git a/project/cmake/modules/FindPython.cmake b/project/cmake/modules/FindPython.cmake
 index 75dcd6cfbb..e0ce7d1f3f 100644
---- a/project/cmake/modules/FindPython.cmake
-+++ b/project/cmake/modules/FindPython.cmake
+--- a/cmake/modules/FindPython.cmake
++++ b/cmake/modules/FindPython.cmake
 @@ -16,14 +16,12 @@ find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} ${DE
  if(KODI_DEPENDSBUILD)
    find_library(FFI_LIBRARY ffi REQUIRED)

package/kodi/Config.in

@@ -59,6 +59,7 @@ menuconfig BR2_PACKAGE_KODI
 	select BR2_PACKAGE_FFMPEG_GPL
 	select BR2_PACKAGE_FFMPEG_POSTPROC # postproc depends on GPL
 	select BR2_PACKAGE_FFMPEG_SWSCALE
+	select BR2_PACKAGE_FMT
 	select BR2_PACKAGE_FONTCONFIG
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_GMP
@@ -86,13 +87,13 @@ menuconfig BR2_PACKAGE_KODI
 	select BR2_PACKAGE_PYTHON_SSL
 	select BR2_PACKAGE_PYTHON_UNICODEDATA
 	select BR2_PACKAGE_PYTHON_ZLIB
+	select BR2_PACKAGE_RAPIDJSON
 	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_TAGLIB
 	select BR2_PACKAGE_TINYXML
 	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_KODI_GL_EGL
 	select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_KODI_GL_EGL
-	select BR2_PACKAGE_YAJL
 	select BR2_PACKAGE_ZLIB
 	select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support
 	help

package/kodi/kodi.hash

@@ -1,5 +1,5 @@
 # Locally computed
-sha256 5fd5acbd8fb2e6946de42636fa37bdfbaa81064adf24af9b368ac28c4aec3639  kodi-7f7f7e83226ff4e42cfa12174984586815ccfa02.tar.gz
+sha256 7656dab3cddbac7538a41c3fc31c70b27c8aa15fab02fc301d8936439a667113  kodi-7281cbf0eba4b5f13e2b3211af0a94b1a87bc836.tar.gz
 sha256 303f3903cbb57ccc2961f09cf3746505542bcb129a464f0687d7ca8601cebbee  kodi-jsonschemabuilder-17.1-Krypton.tar.gz
 sha256 303f3903cbb57ccc2961f09cf3746505542bcb129a464f0687d7ca8601cebbee  kodi-texturepacker-17.1-Krypton.tar.gz
 # Locally computed - libdvdcss

package/kodi/kodi.mk

@@ -6,7 +6,7 @@
 
 # When updating the version, please also update kodi-jsonschemabuilder
 # and kodi-texturepacker
-KODI_VERSION = 7f7f7e83226ff4e42cfa12174984586815ccfa02
+KODI_VERSION = 7281cbf0eba4b5f13e2b3211af0a94b1a87bc836
 KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION))
 KODI_LICENSE = GPL-2.0
 KODI_LICENSE_FILES = LICENSE.GPL
@@ -16,6 +16,7 @@ KODI_DEPENDENCIES = \
 	bzip2 \
 	expat \
 	ffmpeg \
+	fmt \
 	fontconfig \
 	freetype \
 	gmp \
@@ -41,15 +42,13 @@ KODI_DEPENDENCIES = \
 	openssl \
 	pcre \
 	python \
+	rapidjson \
 	readline \
 	sqlite \
 	taglib \
 	tinyxml \
-	yajl \
 	zlib
 
-KODI_SUBDIR = project/cmake
-
 KODI_LIBDVDCSS_VERSION = 2f12236
 KODI_LIBDVDNAV_VERSION = 981488f
 KODI_LIBDVDREAD_VERSION = 17d99db