From 13135355d8fb93d8ba444d309cbdeba72a1be0b2 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 29 Aug 2023 17:39:11 +0200 Subject: [PATCH 1/6] kodi: update to aaef1a0 Signed-off-by: Matthias Reichl --- packages/mediacenter/kodi/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 468296e69e..42995632ab 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -3,8 +3,8 @@ # 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" From 2ba4b7bc175ea40ea699418dc68835c15d514148 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 7 Aug 2023 14:42:42 +0200 Subject: [PATCH 2/6] kodi: drop texturepacker hack patch Signed-off-by: Matthias Reichl --- ...-100.25-hack-fix-texture-packer-cmake-source-dir.patch | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 packages/mediacenter/kodi/patches/kodi-100.25-hack-fix-texture-packer-cmake-source-dir.patch diff --git a/packages/mediacenter/kodi/patches/kodi-100.25-hack-fix-texture-packer-cmake-source-dir.patch b/packages/mediacenter/kodi/patches/kodi-100.25-hack-fix-texture-packer-cmake-source-dir.patch deleted file mode 100644 index f73ad7cf33..0000000000 --- a/packages/mediacenter/kodi/patches/kodi-100.25-hack-fix-texture-packer-cmake-source-dir.patch +++ /dev/null @@ -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) From c41f074ca2f6ff9d5ef08b4b9f70be38194dedc3 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 7 Aug 2023 14:41:09 +0200 Subject: [PATCH 3/6] RPi: drop bwdif kodi patch which is now upstream Signed-off-by: Matthias Reichl --- ...eg-change-default-software-deinterla.patch | 74 ------------------- 1 file changed, 74 deletions(-) delete mode 100644 projects/RPi/patches/kodi/0009-VideoPlayer-ffmpeg-change-default-software-deinterla.patch diff --git a/projects/RPi/patches/kodi/0009-VideoPlayer-ffmpeg-change-default-software-deinterla.patch b/projects/RPi/patches/kodi/0009-VideoPlayer-ffmpeg-change-default-software-deinterla.patch deleted file mode 100644 index 141aa2c5cd..0000000000 --- a/projects/RPi/patches/kodi/0009-VideoPlayer-ffmpeg-change-default-software-deinterla.patch +++ /dev/null @@ -1,74 +0,0 @@ -From c9a70db5879a6ac37b5840621aa102812104087f Mon Sep 17 00:00:00 2001 -From: Alan Swanson -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 - From 70abdd27a22b22547060fcb00a2c70ea61721465 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 7 Aug 2023 14:43:18 +0200 Subject: [PATCH 4/6] TexturePacker: fix build after kodi update Signed-off-by: Matthias Reichl --- packages/mediacenter/TexturePacker/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/mediacenter/TexturePacker/package.mk b/packages/mediacenter/TexturePacker/package.mk index d1e6373fe2..a58353b7a5 100644 --- a/packages/mediacenter/TexturePacker/package.mk +++ b/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() { From 73af2095ff0db1bbf6bd3cd7663ef318b077e367 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 7 Aug 2023 14:43:55 +0200 Subject: [PATCH 5/6] JsonSchemaBuilder: fix build after kodi update Signed-off-by: Matthias Reichl --- packages/mediacenter/JsonSchemaBuilder/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/JsonSchemaBuilder/package.mk b/packages/mediacenter/JsonSchemaBuilder/package.mk index d5782836b6..18887af680 100644 --- a/packages/mediacenter/JsonSchemaBuilder/package.mk +++ b/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" From aa094ce2da0d8e3e6d52c77f8cb940b6737d298c Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 20 Aug 2023 17:03:39 +0200 Subject: [PATCH 6/6] kodi: add dependency on tinyxml2 Signed-off-by: Matthias Reichl --- packages/mediacenter/kodi/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 42995632ab..0e3804f7ea 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -8,7 +8,7 @@ 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"