Merge pull request #8084 from HiassofT/le12-kodi5

kodi: update to current master version

packages/mediacenter/JsonSchemaBuilder/package.mk

@@ -10,7 +10,7 @@ PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_UNPACK="${MEDIACENTER}"
 PKG_LONGDESC="kodi-platform:"
 
-PKG_CMAKE_SCRIPT="$(get_build_dir ${MEDIACENTER})/tools/depends/native/JsonSchemaBuilder/CMakeLists.txt"
+PKG_CMAKE_SCRIPT="$(get_build_dir ${MEDIACENTER})/tools/depends/native/JsonSchemaBuilder/src/CMakeLists.txt"
 
 PKG_CMAKE_OPTS_HOST="-Wno-dev"
 

packages/mediacenter/TexturePacker/package.mk

@@ -10,12 +10,12 @@ PKG_DEPENDS_HOST="lzo:host libpng:host libjpeg-turbo:host giflib:host"
 PKG_DEPENDS_UNPACK="${MEDIACENTER}"
 PKG_LONGDESC="kodi-platform:"
 
-PKG_CMAKE_SCRIPT="$(get_build_dir ${MEDIACENTER})/tools/depends/native/TexturePacker/CMakeLists.txt"
+PKG_CMAKE_SCRIPT="$(get_build_dir ${MEDIACENTER})/tools/depends/native/TexturePacker/src/CMakeLists.txt"
 
-PKG_CMAKE_OPTS_HOST="-Wno-dev"
+PKG_CMAKE_OPTS_HOST="-Wno-dev -DKODI_SOURCE_DIR=$(get_build_dir ${MEDIACENTER})"
 
 pre_configure_host() {
-  export CXXFLAGS="${CXXFLAGS} -std=c++17 -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -I$(get_build_dir ${MEDIACENTER})/xbmc/platform/linux"
+  export CXXFLAGS="${CXXFLAGS} -std=c++17 -DTARGET_POSIX -DTARGET_LINUX -D_LINUX"
 }
 
 makeinstall_host() {

packages/mediacenter/kodi/package.mk

@@ -3,12 +3,12 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="kodi"
-PKG_VERSION="21.0a2-Omega"
-PKG_SHA256="b4433b6d0c165b3de82d3594224c7297a89cc9fb2c12c5cc56b899f60912fda6"
+PKG_VERSION="aaef1a0d1e37ff87361011fd48c89d9e69ec9a9d"
+PKG_SHA256="2ee1ac405cf451cacf5c5e63ccd170cd3e044cb2d4cfe350ab0673289c350e8c"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
 PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python3 zlib systemd lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid libdvdnav libfmt lirc libfstrcmp flatbuffers:host flatbuffers libudfread spdlog"
+PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python3 zlib systemd lzo pcre swig:host libass curl fontconfig fribidi tinyxml tinyxml2 libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid libdvdnav libfmt lirc libfstrcmp flatbuffers:host flatbuffers libudfread spdlog"
 PKG_DEPENDS_HOST="toolchain"
 PKG_LONGDESC="A free and open source cross-platform media player."
 PKG_BUILD_FLAGS="+speed"

packages/mediacenter/kodi/patches/kodi-100.25-hack-fix-texture-packer-cmake-source-dir.patch

@@ -1,8 +0,0 @@
---- a/tools/depends/native/TexturePacker/CMakeLists.txt
-+++ b/tools/depends/native/TexturePacker/CMakeLists.txt
-@@ -1,3 +1,5 @@
-+set(CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/../../../..)
-+
- list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
- 
- if(APPLE)

projects/RPi/patches/kodi/0009-VideoPlayer-ffmpeg-change-default-software-deinterla.patch

@@ -1,74 +0,0 @@
-From c9a70db5879a6ac37b5840621aa102812104087f Mon Sep 17 00:00:00 2001
-From: Alan Swanson <reiver@improbability.net>
-Date: Thu, 18 May 2023 16:12:43 +0100
-Subject: [PATCH 09/12] VideoPlayer: ffmpeg change default software
- deinterlacer from yadif to bwdif
-
----
- .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp            | 10 +++++-----
- xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp       |  4 ++--
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-index 032ee16454..5d1b7162f9 100644
---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-@@ -55,7 +55,7 @@ enum DecoderState
- 
- enum EFilterFlags {
-   FILTER_NONE                =  0x0,
--  FILTER_DEINTERLACE_YADIF   =  0x1,  //< use first deinterlace mode
-+  FILTER_DEINTERLACE_BWDIF   =  0x1,  //< use first deinterlace mode
-   FILTER_DEINTERLACE_ANY     =  0xf,  //< use any deinterlace mode
-   FILTER_DEINTERLACE_FLAGGED = 0x10,  //< only deinterlace flagged frames
-   FILTER_DEINTERLACE_HALFED  = 0x20,  //< do half rate deinterlacing
-@@ -526,12 +526,12 @@ void CDVDVideoCodecFFmpeg::SetFilters()
-       }
-   }
- 
--  if (filters & FILTER_DEINTERLACE_YADIF)
-+  if (filters & FILTER_DEINTERLACE_BWDIF)
-   {
-     if (filters & FILTER_DEINTERLACE_HALFED)
--      m_filters_next = "yadif=0:-1";
-+      m_filters_next = "bwdif=0:-1";
-     else
--      m_filters_next = "yadif=1:-1";
-+      m_filters_next = "bwdif=1:-1";
- 
-     if (filters & FILTER_DEINTERLACE_FLAGGED)
-       m_filters_next += ":1";
-@@ -1226,7 +1226,7 @@ int CDVDVideoCodecFFmpeg::FilterOpen(const std::string& filters, bool scale)
-       return result;
-     }
- 
--    if (filters.compare(0,5,"yadif") == 0)
-+    if (filters.compare(0,5,"bwdif") == 0)
-     {
-       m_processInfo.SetVideoDeintMethod(filters);
-     }
-diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
-index 24edd058e9..f9b6f17824 100644
---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
-+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
-@@ -3007,7 +3007,7 @@ bool CFFmpegPostproc::Init(EINTERLACEMETHOD method)
-   {
-     std::string filter;
- 
--    filter = "yadif=1:-1";
-+    filter = "bwdif=1:-1";
- 
-     if (avfilter_graph_parse_ptr(m_pFilterGraph, filter.c_str(), &inputs, &outputs, NULL) < 0)
-     {
-@@ -3026,7 +3026,7 @@ bool CFFmpegPostproc::Init(EINTERLACEMETHOD method)
-       return false;
-     }
- 
--    m_config.processInfo->SetVideoDeintMethod("yadif");
-+    m_config.processInfo->SetVideoDeintMethod("bwdif");
-   }
-   else if (method == VS_INTERLACEMETHOD_RENDER_BOB ||
-            method == VS_INTERLACEMETHOD_NONE)
--- 
-2.39.2
-