diff options
24 files changed, 28 insertions, 718 deletions
diff --git a/package/kodi/Makefile b/package/kodi/Makefile index ce9869ea4..cd1aaa91e 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi -PKG_VERSION:= 21.2 +PKG_VERSION:= 22.0a1 PKG_RELEASE:= 1 -PKG_HASH:= da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383 +PKG_HASH:= da88f6aee01995caadfc6e194b8e3b51dfd193164a6c8d559d2443dd7f58f9f8 PKG_DESCR:= software media player PKG_SECTION:= mm/video PKG_DEPENDS:= python3 libsquish libopenssl libfmt rapidjson libpcre @@ -15,10 +15,10 @@ PKG_DEPENDS+= libflac libbz2 libtiff libnettle librtmp liblzo libXext PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libncurses libpng PKG_DEPENDS+= libpcre2 libcdio libfreetype libsamplerate libuuid PKG_DEPENDS+= taglib libjasper libmp3lame libgpg-error giflib nghttp2 -PKG_DEPENDS+= glib libdcadec libffmpeg libxvidcore harfbuzz +PKG_DEPENDS+= glib libdcadec libffmpeg libxvidcore harfbuzz exiv2 PKG_DEPENDS+= flatbuffers fstrcmp spdlog mesa libinput libxkbcommon -PKG_DEPENDS+= xkeyboard-config tinyxml2 libdisplay-info libudfread -PKG_BUILDDEP:= python3 libass ffmpeg rtmpdump libudfread +PKG_DEPENDS+= xkeyboard-config tinyxml2 libdisplay-info libudfread json +PKG_BUILDDEP:= python3 libass ffmpeg rtmpdump libudfread exiv2 PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo fmt rapidjson PKG_BUILDDEP+= curl flac bzip2 libtiff yajl cmake-host libdisplay-info PKG_BUILDDEP+= tinyxml tinyxml2 sqlite pcre2 libcdio freetype libpng @@ -26,14 +26,14 @@ PKG_BUILDDEP+= libsamplerate taglib libjasper giflib xkeyboard-config PKG_BUILDDEP+= glib libmodplug libgpg-error xvidcore libxshmfence PKG_BUILDDEP+= swig-host liblzo-host libpng-host libjpeg-turbo-host PKG_BUILDDEP+= zip-host unzip-host giflib-host libsquish libdcadec -PKG_BUILDDEP+= libcrossguid openssl bzip2 liblzo harfbuzz pcre +PKG_BUILDDEP+= openssl bzip2 liblzo harfbuzz pcre json PKG_BUILDDEP+= flatbuffers fstrcmp spdlog mesa libinput libxkbcommon PKG_NEEDS:= threads c++ data iconv PKG_URL:= http://kodi.tv/ PKG_SITES:= https://github.com/xbmc/xbmc/archive/ -DISTFILES:= $(PKG_VERSION)-Omega.tar.gz -WRKDIST= ${WRKDIR}/xbmc-$(PKG_VERSION)-Omega +DISTFILES:= $(PKG_VERSION)-Piers.tar.gz +WRKDIST= ${WRKDIR}/xbmc-$(PKG_VERSION)-Piers WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj PKG_SYSTEM_DEPENDS:= qemu-x86_64 raspberry-pi raspberry-pi2 raspberry-pi3 raspberry-pi4 raspberry-pi4-64 rockpi4-plus raspberry-pi5 @@ -74,7 +74,6 @@ CMAKE_FLAGS+= -DENABLE_CCACHE=OFF \ -DVERBOSE=ON \ -DENABLE_DVDCSS=ON \ -DENABLE_INTERNAL_FFMPEG=OFF \ - -DENABLE_INTERNAL_CROSSGUID=OFF \ -DENABLE_INTERNAL_RapidJSON=OFF \ -DWITH_FFMPEG=$(STAGING_TARGET_DIR)/usr \ -DPYTHON_EXECUTABLE=$(STAGING_HOST_DIR)/usr/bin/python3 \ @@ -101,6 +100,7 @@ CMAKE_FLAGS+= -DENABLE_CCACHE=OFF \ -DNATIVEPREFIX=$(STAGING_HOST_DIR)/usr \ -DDEPENDS_PATH=$(STAGING_TARGET_DIR)/usr \ -DWITH_JSONSCHEMABUILDER=$(STAGING_HOST_DIR)/usr/bin/JsonSchemaBuilder \ + -DWITH_TEXTUREPACKER=$(STAGING_HOST_DIR)/usr/bin/TexturePacker \ -DCMAKE_EXE_LINKER_FLAGS="-latomic" \ -DLIBDVDCSS_URL=$(DL_DIR)/libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz \ -DLIBDVDNAV_URL=$(DL_DIR)/libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz \ @@ -179,13 +179,13 @@ pre-configure: PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src cp $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src/JsonSchemaBuilder \ $(STAGING_HOST_DIR)/usr/bin/JsonSchemaBuilder - #(cd $(WRKSRC)/tools/depends/native/TexturePacker/src && PATH='$(HOST_PATH)' cmake \ - # -DKODI_SOURCE_DIR=$(WRKSRC) \ - # -DCMAKE_MODULE_PATH=$(WRKSRC)/cmake/modules \ - # -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" .) - #PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/TexturePacker/src - #cp $(WRKSRC)/tools/depends/native/TexturePacker/src/TexturePacker \ - # $(STAGING_HOST_DIR)/usr/bin + (cd $(WRKSRC)/tools/depends/native/TexturePacker/src && PATH='$(HOST_PATH)' cmake \ + -DKODI_SOURCE_DIR=$(WRKSRC) \ + -DCMAKE_MODULE_PATH=$(WRKSRC)/cmake/modules \ + -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" .) + PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/TexturePacker/src + cp $(WRKSRC)/tools/depends/native/TexturePacker/src/TexturePacker \ + $(STAGING_HOST_DIR)/usr/bin (cd $(DL_DIR) && wget -O libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz https://github.com/xbmc/libdvdcss/archive/refs/tags/$(KODI_LIBDVDCSS_VERSION).tar.gz) (cd $(DL_DIR) && wget -O libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz https://github.com/xbmc/libdvdnav/archive/refs/tags/$(KODI_LIBDVDNAV_VERSION).tar.gz) (cd $(DL_DIR) && wget -O libdvdread-$(KODI_LIBDVDREAD_VERSION).tar.gz https://github.com/xbmc/libdvdread/archive/refs/tags/$(KODI_LIBDVDREAD_VERSION).tar.gz) diff --git a/package/kodi/patches/patch-CMakeLists_txt b/package/kodi/patches/patch-CMakeLists_txt deleted file mode 100644 index 492db43fa..000000000 --- a/package/kodi/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,27 +0,0 @@ ---- xbmc-21.2-Omega.orig/CMakeLists.txt 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/CMakeLists.txt 2025-10-06 04:40:59.015473347 +0200 -@@ -184,7 +184,6 @@ endforeach() - # Required tools. Keep in alphabetical order please - set(required_buildtools FlatC - JsonSchemaBuilder -- TexturePacker - ) - - # Optional build tools -@@ -473,7 +472,6 @@ endif() - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${CONFIG_VAR}/gen_skin.timestamp - COMMAND ${CMAKE_COMMAND} -DBUNDLEDIR=${_bundle_dir} -- -DTEXTUREPACKER_EXECUTABLE=$<TARGET_FILE:TexturePacker::TexturePacker::Executable> - -P ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/GeneratedPackSkins.cmake - COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${CONFIG_VAR} - COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${CONFIG_VAR}/gen_skin.timestamp -@@ -486,7 +484,7 @@ add_custom_target(gen_skin_pack DEPENDS - - # Packaging target. This generates system addon, xbt creation, copy files to build tree - add_custom_target(generate-packaging ALL -- DEPENDS TexturePacker::TexturePacker::Executable export-files gen_skin_pack gen_system_addons) -+ DEPENDS export-files gen_skin_pack gen_system_addons) - # Make sure we build any libs before we look to export-files. - # We may need to export some shared libs/data (eg Python) - add_dependencies(export-files ${GLOBAL_TARGET_DEPS}) diff --git a/package/kodi/patches/patch-CMakeLists_txt.orig b/package/kodi/patches/patch-CMakeLists_txt.orig deleted file mode 100644 index 7fa65595b..000000000 --- a/package/kodi/patches/patch-CMakeLists_txt.orig +++ /dev/null @@ -1,27 +0,0 @@ ---- xbmc-21.0b2-Omega.orig/CMakeLists.txt 2023-12-09 22:24:46.000000000 +0100 -+++ xbmc-21.0b2-Omega/CMakeLists.txt 2024-01-31 10:45:45.831435209 +0100 -@@ -178,7 +178,6 @@ endforeach() - # Required tools. Keep in alphabetical order please - set(required_buildtools FlatC - JsonSchemaBuilder -- TexturePacker - ) - - # Optional build tools -@@ -468,7 +467,6 @@ endif() - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${CONFIG_VAR}/gen_skin.timestamp - COMMAND ${CMAKE_COMMAND} -DBUNDLEDIR=${_bundle_dir} -- -DTEXTUREPACKER_EXECUTABLE=$<TARGET_FILE:TexturePacker::TexturePacker::Executable> - -P ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/GeneratedPackSkins.cmake - COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${CONFIG_VAR} - COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${CONFIG_VAR}/gen_skin.timestamp -@@ -481,7 +479,7 @@ add_custom_target(gen_skin_pack DEPENDS - - # Packaging target. This generates system addon, xbt creation, copy files to build tree - add_custom_target(generate-packaging ALL -- DEPENDS TexturePacker::TexturePacker::Executable export-files gen_skin_pack gen_system_addons) -+ DEPENDS export-files gen_skin_pack gen_system_addons) - # Make sure we build any libs before we look to export-files. - # We may need to export some shared libs/data (eg Python) - add_dependencies(export-files ${GLOBAL_TARGET_DEPS}) diff --git a/package/kodi/patches/patch-addons_resource_language_en_gb_resources_strings_po b/package/kodi/patches/patch-addons_resource_language_en_gb_resources_strings_po deleted file mode 100644 index 0bd666de5..000000000 --- a/package/kodi/patches/patch-addons_resource_language_en_gb_resources_strings_po +++ /dev/null @@ -1,27 +0,0 @@ ---- xbmc-21.2-Omega.orig/addons/resource.language.en_gb/resources/strings.po 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/addons/resource.language.en_gb/resources/strings.po 2025-10-06 04:40:59.031472961 +0200 -@@ -7360,10 +7360,7 @@ msgctxt "#13427" - msgid "Allow hardware acceleration - DXVA2" - msgstr "" - --#: system/settings/settings.xml --msgctxt "#13428" --msgid "Allow hardware acceleration - CrystalHD" --msgstr "" -+#empty string with id 13428 - - #: system/settings/settings.xml - msgctxt "#13429" -@@ -19519,11 +19516,7 @@ msgctxt "#36158" - msgid "Enable DXVA2 hardware decoding of video files." - msgstr "" - --#. Description of setting with label #13428 "Allow hardware acceleration (CrystalHD)" --#: system/settings/settings.xml --msgctxt "#36159" --msgid "Enable CrystalHD decoding of video files." --msgstr "" -+#empty string with id 36159 - - #. Description of setting with label #13429 "Allow hardware acceleration (VDADecoder)" - #: system/settings/settings.xml diff --git a/package/kodi/patches/patch-cmake_modules_FindFFMPEG_cmake b/package/kodi/patches/patch-cmake_modules_FindFFMPEG_cmake deleted file mode 100644 index 7fec44671..000000000 --- a/package/kodi/patches/patch-cmake_modules_FindFFMPEG_cmake +++ /dev/null @@ -1,25 +0,0 @@ ---- xbmc-21.2-Omega.orig/cmake/modules/FindFFMPEG.cmake 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/cmake/modules/FindFFMPEG.cmake 2025-10-06 04:40:59.031472961 +0200 -@@ -163,14 +163,14 @@ if(WITH_FFMPEG) - set(REQUIRED_FFMPEG_VERSION undef) - else() - # required ffmpeg library versions -- set(REQUIRED_FFMPEG_VERSION 6.0.0) -- set(_avcodec_ver ">=60.2.100") -- set(_avfilter_ver ">=9.3.100") -- set(_avformat_ver ">=60.3.100") -- set(_avutil_ver ">=58.2.100") -- set(_postproc_ver ">=57.1.100") -- set(_swresample_ver ">=4.10.100") -- set(_swscale_ver ">=7.1.100") -+ set(REQUIRED_FFMPEG_VERSION 7.0.0) -+ set(_avcodec_ver ">=61.3.100") -+ set(_avfilter_ver ">=10.1.100") -+ set(_avformat_ver ">=61.1.100") -+ set(_avutil_ver ">=59.8.100") -+ set(_postproc_ver ">=58.1.100") -+ set(_swresample_ver ">=5.1.100") -+ set(_swscale_ver ">=8.1.100") - endif() - - # Allows building with external ffmpeg not found in system paths, diff --git a/package/kodi/patches/patch-tools_buildsteps_windows_ffmpeg_options_txt b/package/kodi/patches/patch-tools_buildsteps_windows_ffmpeg_options_txt deleted file mode 100644 index 45689bb24..000000000 --- a/package/kodi/patches/patch-tools_buildsteps_windows_ffmpeg_options_txt +++ /dev/null @@ -1,8 +0,0 @@ ---- xbmc-21.2-Omega.orig/tools/buildsteps/windows/ffmpeg_options.txt 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/tools/buildsteps/windows/ffmpeg_options.txt 2025-10-06 04:40:59.031472961 +0200 -@@ -1,5 +1,4 @@ - --disable-avdevice ----disable-crystalhd - --disable-cuda - --disable-cuvid - --disable-devices diff --git a/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp b/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp index 67e51c6e9..193f5987b 100644 --- a/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp +++ b/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp @@ -1,5 +1,5 @@ ---- xbmc-19.3-Matrix.orig/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2021-10-24 12:09:58.000000000 +0200 -+++ xbmc-19.3-Matrix/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2022-02-26 00:09:15.499548854 +0100 +--- xbmc-22.0a1-Piers.orig/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2025-08-18 23:49:12.000000000 +0200 ++++ xbmc-22.0a1-Piers/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2025-10-06 14:07:24.604055678 +0200 @@ -18,11 +18,11 @@ * */ diff --git a/package/kodi/patches/patch-tools_depends_target_ffmpeg_FFMPEG-VERSION b/package/kodi/patches/patch-tools_depends_target_ffmpeg_FFMPEG-VERSION deleted file mode 100644 index 4c4dab53d..000000000 --- a/package/kodi/patches/patch-tools_depends_target_ffmpeg_FFMPEG-VERSION +++ /dev/null @@ -1,10 +0,0 @@ ---- xbmc-21.2-Omega.orig/tools/depends/target/ffmpeg/FFMPEG-VERSION 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/tools/depends/target/ffmpeg/FFMPEG-VERSION 2025-10-06 04:40:59.031472961 +0200 -@@ -1,5 +1,5 @@ - LIBNAME=ffmpeg --VERSION=6.0.1 -+VERSION=7.0.1 - ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz --SHA512=945e34840092dc0fd3824eb1af2be79868af2afb4fe13159b19a9bcfc464cc4d53243c13ff065199290e9393ddbf4b1c5c8abccf83a31a31d6c7490e499fd1fc -+SHA512=43b639b0bc0597e95dea2dce3e925f4b71ca8c4d9eadaef614941053e287f2d5c2e78d95413f0f7142da0f6ea1dbf443457e4fa1c2296cd8cf4081c185ed9c04 - diff --git a/package/kodi/patches/patch-xbmc_cdrip_EncoderFFmpeg_cpp b/package/kodi/patches/patch-xbmc_cdrip_EncoderFFmpeg_cpp deleted file mode 100644 index c77a69631..000000000 --- a/package/kodi/patches/patch-xbmc_cdrip_EncoderFFmpeg_cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-21.2-Omega.orig/xbmc/cdrip/EncoderFFmpeg.cpp 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/xbmc/cdrip/EncoderFFmpeg.cpp 2025-10-06 04:40:59.031472961 +0200 -@@ -235,7 +235,7 @@ void CEncoderFFmpeg::SetTag(const std::s - av_dict_set(&m_formatCtx->metadata, tag.c_str(), value.c_str(), 0); - } - --int CEncoderFFmpeg::avio_write_callback(void* opaque, uint8_t* buf, int buf_size) -+int CEncoderFFmpeg::avio_write_callback(void* opaque, const uint8_t* buf, int buf_size) - { - CEncoderFFmpeg* enc = static_cast<CEncoderFFmpeg*>(opaque); - if (enc->Write(buf, buf_size) != buf_size) diff --git a/package/kodi/patches/patch-xbmc_cdrip_EncoderFFmpeg_h b/package/kodi/patches/patch-xbmc_cdrip_EncoderFFmpeg_h deleted file mode 100644 index 2c58fe3a2..000000000 --- a/package/kodi/patches/patch-xbmc_cdrip_EncoderFFmpeg_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-21.2-Omega.orig/xbmc/cdrip/EncoderFFmpeg.h 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/xbmc/cdrip/EncoderFFmpeg.h 2025-10-06 04:40:59.031472961 +0200 -@@ -33,7 +33,7 @@ public: - bool Close() override; - - private: -- static int avio_write_callback(void* opaque, uint8_t* buf, int buf_size); -+ static int avio_write_callback(void* opaque, const uint8_t* buf, int buf_size); - static int64_t avio_seek_callback(void* opaque, int64_t offset, int whence); - - void SetTag(const std::string& tag, const std::string& value); diff --git a/package/kodi/patches/patch-xbmc_cores_AudioEngine_Engines_ActiveAE_ActiveAEResampleFFMPEG_cpp b/package/kodi/patches/patch-xbmc_cores_AudioEngine_Engines_ActiveAE_ActiveAEResampleFFMPEG_cpp deleted file mode 100644 index b1ac0c853..000000000 --- a/package/kodi/patches/patch-xbmc_cores_AudioEngine_Engines_ActiveAE_ActiveAEResampleFFMPEG_cpp +++ /dev/null @@ -1,152 +0,0 @@ ---- xbmc-21.2-Omega.orig/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp 2025-10-06 04:40:59.031472961 +0200 -@@ -66,51 +66,7 @@ bool CActiveAEResampleFFMPEG::Init(Sampl - AVChannelLayout dstChLayout = {}; - AVChannelLayout srcChLayout = {}; - -- av_channel_layout_from_mask(&dstChLayout, m_dst_chan_layout); -- av_channel_layout_from_mask(&srcChLayout, m_src_chan_layout); -- -- int ret = swr_alloc_set_opts2(&m_pContext, &dstChLayout, m_dst_fmt, m_dst_rate, &srcChLayout, -- m_src_fmt, m_src_rate, 0, NULL); -- -- if (ret) -- { -- CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Init - create context failed"); -- return false; -- } -- -- if(quality == AE_QUALITY_HIGH) -- { -- av_opt_set_double(m_pContext, "cutoff", 1.0, 0); -- av_opt_set_int(m_pContext,"filter_size", 256, 0); -- } -- else if(quality == AE_QUALITY_MID) -- { -- // 0.97 is default cutoff so use (1.0 - 0.97) / 2.0 + 0.97 -- av_opt_set_double(m_pContext, "cutoff", 0.985, 0); -- av_opt_set_int(m_pContext,"filter_size", 64, 0); -- } -- else if(quality == AE_QUALITY_LOW) -- { -- av_opt_set_double(m_pContext, "cutoff", 0.97, 0); -- av_opt_set_int(m_pContext,"filter_size", 32, 0); -- } -- -- if (m_dst_fmt == AV_SAMPLE_FMT_S32 || m_dst_fmt == AV_SAMPLE_FMT_S32P) -- { -- av_opt_set_int(m_pContext, "output_sample_bits", m_dst_bits, 0); -- } -- -- // tell resampler to clamp float values -- // not required for sink stage (remapLayout == true) -- if ((m_dst_fmt == AV_SAMPLE_FMT_FLT || m_dst_fmt == AV_SAMPLE_FMT_FLTP) && -- (m_src_fmt == AV_SAMPLE_FMT_FLT || m_src_fmt == AV_SAMPLE_FMT_FLTP) && -- !remapLayout && normalize) -- { -- av_opt_set_double(m_pContext, "rematrix_maxval", 1.0, 0); -- } -- -- av_opt_set_double(m_pContext, "center_mix_level", centerMix, 0); -- -+ bool hasMatrix = false; - if (remapLayout) - { - // one-to-one mapping of channels -@@ -120,28 +76,19 @@ bool CActiveAEResampleFFMPEG::Init(Sampl - m_dst_chan_layout = 0; - for (unsigned int out=0; out<remapLayout->Count(); out++) - { -- m_dst_chan_layout += ((uint64_t)1) << out; -+ m_dst_chan_layout += static_cast<uint64_t>(1) << out; - int idx = CAEUtil::GetAVChannelIndex((*remapLayout)[out], m_src_chan_layout); - if (idx >= 0) - { - m_rematrix[out][idx] = 1.0; - } - } -- -- av_opt_set_int(m_pContext, "out_channel_count", m_dst_channels, 0); -- av_opt_set_int(m_pContext, "out_channel_layout", m_dst_chan_layout, 0); -- -- if (swr_set_matrix(m_pContext, (const double*)m_rematrix, AE_CH_MAX) < 0) -- { -- CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Init - setting channel matrix failed"); -- return false; -- } -+ hasMatrix = true; - } - // stereo upmix - else if (upmix && m_src_channels == 2 && m_dst_channels > 2) - { - memset(m_rematrix, 0, sizeof(m_rematrix)); -- av_channel_layout_uninit(&dstChLayout); - av_channel_layout_from_mask(&dstChLayout, m_dst_chan_layout); - for (int out=0; out<m_dst_channels; out++) - { -@@ -171,15 +118,64 @@ bool CActiveAEResampleFFMPEG::Init(Sampl - } - } - -+ hasMatrix = true; - av_channel_layout_uninit(&dstChLayout); -+ } - -- if (swr_set_matrix(m_pContext, (const double*)m_rematrix, AE_CH_MAX) < 0) -+ av_channel_layout_from_mask(&dstChLayout, m_dst_chan_layout); -+ av_channel_layout_from_mask(&srcChLayout, m_src_chan_layout); -+ -+ int ret = swr_alloc_set_opts2(&m_pContext, &dstChLayout, m_dst_fmt, m_dst_rate, &srcChLayout, -+ m_src_fmt, m_src_rate, 0, NULL); -+ -+ if (ret) -+ { -+ CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Init - create context failed"); -+ return false; -+ } -+ -+ if (hasMatrix) -+ { -+ if (swr_set_matrix(m_pContext, reinterpret_cast<const double*>(m_rematrix), AE_CH_MAX) < 0) - { - CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Init - setting channel matrix failed"); - return false; - } - } - -+ if (quality == AE_QUALITY_HIGH) -+ { -+ av_opt_set_double(m_pContext, "cutoff", 1.0, 0); -+ av_opt_set_int(m_pContext, "filter_size", 256, 0); -+ } -+ else if (quality == AE_QUALITY_MID) -+ { -+ // 0.97 is default cutoff so use (1.0 - 0.97) / 2.0 + 0.97 -+ av_opt_set_double(m_pContext, "cutoff", 0.985, 0); -+ av_opt_set_int(m_pContext, "filter_size", 64, 0); -+ } -+ else if (quality == AE_QUALITY_LOW) -+ { -+ av_opt_set_double(m_pContext, "cutoff", 0.97, 0); -+ av_opt_set_int(m_pContext, "filter_size", 32, 0); -+ } -+ -+ if (m_dst_fmt == AV_SAMPLE_FMT_S32 || m_dst_fmt == AV_SAMPLE_FMT_S32P) -+ { -+ av_opt_set_int(m_pContext, "output_sample_bits", m_dst_bits, 0); -+ } -+ -+ // tell resampler to clamp float values -+ // not required for sink stage (remapLayout == true) -+ if ((m_dst_fmt == AV_SAMPLE_FMT_FLT || m_dst_fmt == AV_SAMPLE_FMT_FLTP) && -+ (m_src_fmt == AV_SAMPLE_FMT_FLT || m_src_fmt == AV_SAMPLE_FMT_FLTP) && !remapLayout && -+ normalize) -+ { -+ av_opt_set_double(m_pContext, "rematrix_maxval", 1.0, 0); -+ } -+ -+ av_opt_set_double(m_pContext, "center_mix_level", centerMix, 0); -+ - if(swr_init(m_pContext) < 0) - { - CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Init - init resampler failed"); diff --git a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDCodecs_Video_DVDVideoCodecDRMPRIME_cpp b/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDCodecs_Video_DVDVideoCodecDRMPRIME_cpp deleted file mode 100644 index be8c94499..000000000 --- a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDCodecs_Video_DVDVideoCodecDRMPRIME_cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- xbmc-21.2-Omega.orig/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp 2025-10-06 04:40:59.031472961 +0200 -@@ -582,8 +582,9 @@ void CDVDVideoCodecDRMPRIME::SetPictureP - - pVideoPicture->iRepeatPicture = 0; - pVideoPicture->iFlags = 0; -- pVideoPicture->iFlags |= m_pFrame->interlaced_frame ? DVP_FLAG_INTERLACED : 0; -- pVideoPicture->iFlags |= m_pFrame->top_field_first ? DVP_FLAG_TOP_FIELD_FIRST : 0; -+ pVideoPicture->iFlags |= m_pFrame->flags & AV_FRAME_FLAG_INTERLACED ? DVP_FLAG_INTERLACED : 0; -+ pVideoPicture->iFlags |= -+ m_pFrame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST ? DVP_FLAG_TOP_FIELD_FIRST : 0; - pVideoPicture->iFlags |= m_pFrame->data[0] ? 0 : DVP_FLAG_DROPPED; - - if (m_codecControlFlags & DVD_CODEC_CTRL_DROP) diff --git a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_cpp b/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_cpp deleted file mode 100644 index 55c295130..000000000 --- a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- xbmc-21.2-Omega.orig/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp 2025-10-06 04:40:59.031472961 +0200 -@@ -792,12 +792,12 @@ CDVDVideoCodec::VCReturn CDVDVideoCodecF - } - m_dropCtrl.Process(framePTS, m_pCodecContext->skip_frame > AVDISCARD_DEFAULT); - -- if (m_pDecodedFrame->key_frame) -+ if (m_pDecodedFrame->flags & AV_FRAME_FLAG_KEY) - { - m_started = true; - m_iLastKeyframe = m_pCodecContext->has_b_frames + 2; - } -- if (m_pDecodedFrame->interlaced_frame) -+ if (m_pDecodedFrame->flags & AV_FRAME_FLAG_INTERLACED) - m_interlaced = true; - else - m_interlaced = false; -@@ -1013,8 +1013,9 @@ bool CDVDVideoCodecFFmpeg::GetPictureCom - - pVideoPicture->iRepeatPicture = 0.5 * m_pFrame->repeat_pict; - pVideoPicture->iFlags = 0; -- pVideoPicture->iFlags |= m_pFrame->interlaced_frame ? DVP_FLAG_INTERLACED : 0; -- pVideoPicture->iFlags |= m_pFrame->top_field_first ? DVP_FLAG_TOP_FIELD_FIRST: 0; -+ pVideoPicture->iFlags |= m_pFrame->flags & AV_FRAME_FLAG_INTERLACED ? DVP_FLAG_INTERLACED : 0; -+ pVideoPicture->iFlags |= -+ m_pFrame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST ? DVP_FLAG_TOP_FIELD_FIRST : 0; - - if (m_codecControlFlags & DVD_CODEC_CTRL_DROP) - { diff --git a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDCodecs_Video_VAAPI_cpp b/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDCodecs_Video_VAAPI_cpp deleted file mode 100644 index 645d15bd4..000000000 --- a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDCodecs_Video_VAAPI_cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- xbmc-21.2-Omega.orig/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp 2025-10-06 04:40:59.031472961 +0200 -@@ -3068,8 +3068,10 @@ bool CFFmpegPostproc::AddPicture(CVaapiD - m_pFilterFrameIn->height = m_config.vidHeight; - m_pFilterFrameIn->linesize[0] = image.pitches[0]; - m_pFilterFrameIn->linesize[1] = image.pitches[1]; -- m_pFilterFrameIn->interlaced_frame = (inPic.DVDPic.iFlags & DVP_FLAG_INTERLACED) ? 1 : 0; -- m_pFilterFrameIn->top_field_first = (inPic.DVDPic.iFlags & DVP_FLAG_TOP_FIELD_FIRST) ? 1 : 0; -+ if (inPic.DVDPic.iFlags & DVP_FLAG_INTERLACED) -+ m_pFilterFrameIn->flags |= AV_FRAME_FLAG_INTERLACED; -+ if (inPic.DVDPic.iFlags & DVP_FLAG_TOP_FIELD_FIRST) -+ m_pFilterFrameIn->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; - - if (inPic.DVDPic.pts == DVD_NOPTS_VALUE) - m_pFilterFrameIn->pts = AV_NOPTS_VALUE; diff --git a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDCodecs_Video_VTB_cpp b/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDCodecs_Video_VTB_cpp deleted file mode 100644 index 4b9814b4e..000000000 --- a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDCodecs_Video_VTB_cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-21.2-Omega.orig/xbmc/cores/VideoPlayer/DVDCodecs/Video/VTB.cpp 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/xbmc/cores/VideoPlayer/DVDCodecs/Video/VTB.cpp 2025-10-06 04:40:59.031472961 +0200 -@@ -196,7 +196,7 @@ CDVDVideoCodec::VCReturn CDecoder::Decod - - if(frame) - { -- if (frame->interlaced_frame) -+ if (frame->flags & AV_FRAME_FLAG_INTERLACED) - return CDVDVideoCodec::VC_FATAL; - - if (m_renderBuffer) diff --git a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDDemuxers_DVDDemuxClient_cpp b/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDDemuxers_DVDDemuxClient_cpp deleted file mode 100644 index ee898242e..000000000 --- a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDDemuxers_DVDDemuxClient_cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- xbmc-21.2-Omega.orig/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp 2025-10-06 04:40:59.031472961 +0200 -@@ -188,7 +188,6 @@ bool CDVDDemuxClient::ParsePacket(DemuxP - if (!avcodec_open2(stream->m_context, stream->m_context->codec, nullptr)) - { - avcodec_send_packet(stream->m_context, avpkt); -- avcodec_close(stream->m_context); - } - } - av_packet_free(&avpkt); diff --git a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDDemuxers_DVDDemuxFFmpeg_cpp b/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDDemuxers_DVDDemuxFFmpeg_cpp deleted file mode 100644 index a0777d0f4..000000000 --- a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDDemuxers_DVDDemuxFFmpeg_cpp +++ /dev/null @@ -1,178 +0,0 @@ ---- xbmc-21.2-Omega.orig/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2025-10-06 04:40:59.031472961 +0200 -@@ -376,74 +376,7 @@ bool CDVDDemuxFFmpeg::Open(const std::sh - if (iformat == nullptr) - { - // let ffmpeg decide which demuxer we have to open -- bool trySPDIFonly = (m_pInput->GetContent() == "audio/x-spdif-compressed"); -- -- if (!trySPDIFonly) -- av_probe_input_buffer(m_ioContext, &iformat, strFile.c_str(), NULL, 0, 0); -- -- // Use the more low-level code in case we have been built against an old -- // FFmpeg without the above av_probe_input_buffer(), or in case we only -- // want to probe for spdif (DTS or IEC 61937) compressed audio -- // specifically, or in case the file is a wav which may contain DTS or -- // IEC 61937 (e.g. ac3-in-wav) and we want to check for those formats. -- if (trySPDIFonly || (iformat && strcmp(iformat->name, "wav") == 0)) -- { -- AVProbeData pd; -- int probeBufferSize = 32768; -- std::unique_ptr<uint8_t[]> probe_buffer (new uint8_t[probeBufferSize + AVPROBE_PADDING_SIZE]); -- -- // init probe data -- pd.buf = probe_buffer.get(); -- pd.filename = strFile.c_str(); -- -- // read data using avformat's buffers -- pd.buf_size = avio_read(m_ioContext, pd.buf, probeBufferSize); -- if (pd.buf_size <= 0) -- { -- CLog::Log(LOGERROR, "{} - error reading from input stream, {}", __FUNCTION__, -- CURL::GetRedacted(strFile)); -- return false; -- } -- memset(pd.buf + pd.buf_size, 0, AVPROBE_PADDING_SIZE); -- -- // restore position again -- avio_seek(m_ioContext , 0, SEEK_SET); -- -- // the advancedsetting is for allowing the user to force outputting the -- // 44.1 kHz DTS wav file as PCM, so that an A/V receiver can decode -- // it (this is temporary until we handle 44.1 kHz passthrough properly) -- if (trySPDIFonly || (iformat && strcmp(iformat->name, "wav") == 0 && !CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_VideoPlayerIgnoreDTSinWAV)) -- { -- // check for spdif and dts -- // This is used with wav files and audio CDs that may contain -- // a DTS or AC3 track padded for S/PDIF playback. If neither of those -- // is present, we assume it is PCM audio. -- // AC3 is always wrapped in iec61937 (ffmpeg "spdif"), while DTS -- // may be just padded. -- const AVInputFormat* iformat2 = av_find_input_format("spdif"); -- if (iformat2 && iformat2->read_probe(&pd) > AVPROBE_SCORE_MAX / 4) -- { -- iformat = iformat2; -- } -- else -- { -- // not spdif or no spdif demuxer, try dts -- iformat2 = av_find_input_format("dts"); -- -- if (iformat2 && iformat2->read_probe(&pd) > AVPROBE_SCORE_MAX / 4) -- { -- iformat = iformat2; -- } -- else if (trySPDIFonly) -- { -- // not dts either, return false in case we were explicitly -- // requested to only check for S/PDIF padded compressed audio -- CLog::Log(LOGDEBUG, "{} - not spdif or dts file, falling back", __FUNCTION__); -- return false; -- } -- } -- } -- } -+ av_probe_input_buffer(m_ioContext, &iformat, strFile.c_str(), NULL, 0, 0); - - if (!iformat) - { -@@ -1353,7 +1286,7 @@ bool CDVDDemuxFFmpeg::SeekTime(double ti - - if (ret >= 0) - { -- if (m_pFormatContext->iformat->read_seek) -+ if (!(m_pFormatContext->iformat->flags & AVFMT_NOTIMESTAMPS)) - m_seekToKeyFrame = true; - m_currentPts = DVD_NOPTS_VALUE; - } -@@ -1697,42 +1630,49 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream - st->colorRange = pStream->codecpar->color_range; - st->hdr_type = DetermineHdrType(pStream); - -- // https://github.com/FFmpeg/FFmpeg/blob/release/5.0/doc/APIchanges -- size_t size = 0; -- uint8_t* side_data = nullptr; -+ // https://github.com/FFmpeg/FFmpeg/blob/release/7.0/doc/APIchanges -+ const AVPacketSideData* sideData = nullptr; - - if (st->hdr_type == StreamHdrType::HDR_TYPE_DOLBYVISION) - { -- side_data = av_stream_get_side_data(pStream, AV_PKT_DATA_DOVI_CONF, &size); -- if (side_data && size) -+ -+ sideData = -+ av_packet_side_data_get(pStream->codecpar->coded_side_data, -+ pStream->codecpar->nb_coded_side_data, AV_PKT_DATA_DOVI_CONF); -+ if (sideData && sideData->size) - { -- st->dovi = *reinterpret_cast<AVDOVIDecoderConfigurationRecord*>(side_data); -+ st->dovi = *reinterpret_cast<const AVDOVIDecoderConfigurationRecord*>(sideData->data); - } - } - -- side_data = av_stream_get_side_data(pStream, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, &size); -- if (side_data && size) -+ sideData = av_packet_side_data_get(pStream->codecpar->coded_side_data, -+ pStream->codecpar->nb_coded_side_data, -+ AV_PKT_DATA_MASTERING_DISPLAY_METADATA); -+ if (sideData && sideData->size) - { - st->masteringMetaData = std::make_shared<AVMasteringDisplayMetadata>( -- *reinterpret_cast<AVMasteringDisplayMetadata*>(side_data)); -+ *reinterpret_cast<const AVMasteringDisplayMetadata*>(sideData->data)); - } - -- side_data = av_stream_get_side_data(pStream, AV_PKT_DATA_CONTENT_LIGHT_LEVEL, &size); -- if (side_data && size) -+ sideData = av_packet_side_data_get(pStream->codecpar->coded_side_data, -+ pStream->codecpar->nb_coded_side_data, -+ AV_PKT_DATA_CONTENT_LIGHT_LEVEL); -+ if (sideData && sideData->size) - { - st->contentLightMetaData = std::make_shared<AVContentLightMetadata>( -- *reinterpret_cast<AVContentLightMetadata*>(side_data)); -+ *reinterpret_cast<const AVContentLightMetadata*>(sideData->data)); - } - -- uint8_t* displayMatrixSideData = -- av_stream_get_side_data(pStream, AV_PKT_DATA_DISPLAYMATRIX, nullptr); -- if (displayMatrixSideData) -+ sideData = av_packet_side_data_get(pStream->codecpar->coded_side_data, -+ pStream->codecpar->nb_coded_side_data, -+ AV_PKT_DATA_DISPLAYMATRIX); -+ if (sideData) - { -- const double tetha = -- av_display_rotation_get(reinterpret_cast<int32_t*>(displayMatrixSideData)); -- if (!std::isnan(tetha)) -+ const double theta = -+ av_display_rotation_get(reinterpret_cast<const int32_t*>(sideData->data)); -+ if (!std::isnan(theta)) - { -- st->iOrientation = ((static_cast<int>(-tetha) % 360) + 360) % 360; -+ st->iOrientation = ((static_cast<int>(-theta) % 360) + 360) % 360; - } - } - -@@ -2555,7 +2495,9 @@ StreamHdrType CDVDDemuxFFmpeg::Determine - { - StreamHdrType hdrType = StreamHdrType::HDR_TYPE_NONE; - -- if (av_stream_get_side_data(pStream, AV_PKT_DATA_DOVI_CONF, nullptr)) // DoVi -+ if (av_packet_side_data_get(pStream->codecpar->coded_side_data, -+ pStream->codecpar->nb_coded_side_data, -+ AV_PKT_DATA_DOVI_CONF)) // DoVi - hdrType = StreamHdrType::HDR_TYPE_DOLBYVISION; - else if (pStream->codecpar->color_trc == AVCOL_TRC_SMPTE2084) // HDR10 - hdrType = StreamHdrType::HDR_TYPE_HDR10; -@@ -2563,7 +2505,9 @@ StreamHdrType CDVDDemuxFFmpeg::Determine - hdrType = StreamHdrType::HDR_TYPE_HLG; - // file could be SMPTE2086 which FFmpeg currently returns as unknown - // so use the presence of static metadata to detect it -- else if (av_stream_get_side_data(pStream, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, nullptr)) -+ else if (av_packet_side_data_get(pStream->codecpar->coded_side_data, -+ pStream->codecpar->nb_coded_side_data, -+ AV_PKT_DATA_MASTERING_DISPLAY_METADATA)) - hdrType = StreamHdrType::HDR_TYPE_HDR10; - - return hdrType; diff --git a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDDemuxers_DVDDemux_cpp b/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDDemuxers_DVDDemux_cpp deleted file mode 100644 index 35ec99aac..000000000 --- a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDDemuxers_DVDDemux_cpp +++ /dev/null @@ -1,55 +0,0 @@ ---- xbmc-21.2-Omega.orig/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.cpp 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.cpp 2025-10-06 04:40:59.031472961 +0200 -@@ -15,15 +15,15 @@ std::string CDemuxStreamAudio::GetStream - std::string strInfo; - switch (codec) - { -- //! @todo: With ffmpeg >= 6.1 add new AC4 codec - case AV_CODEC_ID_AC3: - strInfo = "AC3 "; - break; -+ case AV_CODEC_ID_AC4: -+ strInfo = "AC4 "; -+ break; - case AV_CODEC_ID_EAC3: - { -- //! @todo: With ffmpeg >= 6.1 add new atmos profile case -- // "JOC" its EAC3 Atmos underlying profile, there is no standard codec name string -- if (StringUtils::Contains(codecName, "JOC")) -+ if (profile == FF_PROFILE_EAC3_DDP_ATMOS) - strInfo = "DD+ ATMOS "; - else - strInfo = "DD+ "; -@@ -31,7 +31,6 @@ std::string CDemuxStreamAudio::GetStream - } - case AV_CODEC_ID_DTS: - { -- //! @todo: With ffmpeg >= 6.1 add new DTSX profile cases - switch (profile) - { - case FF_PROFILE_DTS_96_24: -@@ -49,6 +48,12 @@ std::string CDemuxStreamAudio::GetStream - case FF_PROFILE_DTS_HD_HRA: - strInfo = "DTS-HD HRA "; - break; -+ case FF_PROFILE_DTS_HD_MA_X: -+ strInfo = "DTS-HD MA X "; -+ break; -+ case FF_PROFILE_DTS_HD_MA_X_IMAX: -+ strInfo = "DTS-HD MA X (IMAX) "; -+ break; - default: - strInfo = "DTS "; - break; -@@ -62,7 +67,10 @@ std::string CDemuxStreamAudio::GetStream - strInfo = "MP3 "; - break; - case AV_CODEC_ID_TRUEHD: -- strInfo = "TrueHD "; -+ if (profile == FF_PROFILE_TRUEHD_ATMOS) -+ strInfo = "TrueHD ATMOS "; -+ else -+ strInfo = "TrueHD "; - break; - case AV_CODEC_ID_AAC: - { diff --git a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDInputStreams_InputStreamAddon_cpp b/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDInputStreams_InputStreamAddon_cpp deleted file mode 100644 index cc89afba7..000000000 --- a/package/kodi/patches/patch-xbmc_cores_VideoPlayer_DVDInputStreams_InputStreamAddon_cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- xbmc-21.2-Omega.orig/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp 2025-10-06 04:40:59.031472961 +0200 -@@ -762,14 +762,11 @@ int CInputStreamAddon::ConvertAudioCodec - case DTSCodecProfileHDExpress: - return FF_PROFILE_DTS_EXPRESS; - case DTSCodecProfileHDMAX: -- //! @todo: with ffmpeg >= 6.1 set the appropriate profile -- return FF_PROFILE_UNKNOWN; // FF_PROFILE_DTS_HD_MA_X -+ return FF_PROFILE_DTS_HD_MA_X; - case DTSCodecProfileHDMAIMAX: -- //! @todo: with ffmpeg >= 6.1 set the appropriate profile -- return FF_PROFILE_UNKNOWN; // FF_PROFILE_DTS_HD_MA_X_IMAX -+ return FF_PROFILE_DTS_HD_MA_X_IMAX; - case DDPlusCodecProfileAtmos: -- //! @todo: with ffmpeg >= 6.1 set the appropriate profile -- return FF_PROFILE_UNKNOWN; // FF_PROFILE_EAC3_DDP_ATMOS -+ return FF_PROFILE_EAC3_DDP_ATMOS; - default: - return FF_PROFILE_UNKNOWN; - } diff --git a/package/kodi/patches/patch-xbmc_dbwrappers_dataset_h b/package/kodi/patches/patch-xbmc_dbwrappers_dataset_h new file mode 100644 index 000000000..f27f92975 --- /dev/null +++ b/package/kodi/patches/patch-xbmc_dbwrappers_dataset_h @@ -0,0 +1,10 @@ +--- xbmc-22.0a1-Piers.orig/xbmc/dbwrappers/dataset.h 2025-08-18 23:49:12.000000000 +0200 ++++ xbmc-22.0a1-Piers/xbmc/dbwrappers/dataset.h 2025-10-07 06:25:46.959580300 +0200 +@@ -14,6 +14,7 @@ + + #include "qry_dat.h" + ++#include <cstdarg> + #include <list> + #include <map> + #include <memory> diff --git a/package/kodi/patches/patch-xbmc_filesystem_CurlFile_cpp b/package/kodi/patches/patch-xbmc_filesystem_CurlFile_cpp deleted file mode 100644 index 42b47bad5..000000000 --- a/package/kodi/patches/patch-xbmc_filesystem_CurlFile_cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-21.2-Omega.orig/xbmc/filesystem/CurlFile.cpp 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/xbmc/filesystem/CurlFile.cpp 2025-10-06 04:56:01.878205684 +0200 -@@ -44,7 +44,7 @@ using namespace std::chrono_literals; - - #define FITS_INT(a) (((a) <= INT_MAX) && ((a) >= INT_MIN)) - --curl_proxytype proxyType2CUrlProxyType[] = { -+long proxyType2CUrlProxyType[] = { - CURLPROXY_HTTP, CURLPROXY_SOCKS4, CURLPROXY_SOCKS4A, - CURLPROXY_SOCKS5, CURLPROXY_SOCKS5_HOSTNAME, CURLPROXY_HTTPS, - }; diff --git a/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp b/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp deleted file mode 100644 index 27c420df8..000000000 --- a/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp +++ /dev/null @@ -1,31 +0,0 @@ ---- xbmc-21.0b2-Omega.orig/xbmc/platform/linux/CPUInfoLinux.cpp 2023-12-09 22:24:46.000000000 +0100 -+++ xbmc-21.0b2-Omega/xbmc/platform/linux/CPUInfoLinux.cpp 2024-01-30 15:52:43.704683194 +0100 -@@ -19,10 +19,7 @@ - #include <sstream> - #include <vector> - --#if (defined(__arm__) && defined(HAS_NEON)) || defined(__aarch64__) --#include <asm/hwcap.h> --#include <sys/auxv.h> --#elif defined(__i386__) || defined(__x86_64__) -+#if defined(__i386__) || defined(__x86_64__) - #include <cpuid.h> - #endif - -@@ -279,16 +276,6 @@ CCPUInfoLinux::CCPUInfoLinux() - - m_cpuModel = m_cpuModel.substr(0, m_cpuModel.find(char(0))); // remove extra null terminations - --#if defined(HAS_NEON) && defined(__arm__) -- if (getauxval(AT_HWCAP) & HWCAP_NEON) -- m_cpuFeatures |= CPU_FEATURE_NEON; --#endif -- --#if defined(HAS_NEON) && defined(__aarch64__) -- if (getauxval(AT_HWCAP) & HWCAP_ASIMD) -- m_cpuFeatures |= CPU_FEATURE_NEON; --#endif -- - // Set MMX2 when SSE is present as SSE is a superset of MMX2 and Intel doesn't set the MMX2 cap - if (m_cpuFeatures & CPU_FEATURE_SSE) - m_cpuFeatures |= CPU_FEATURE_MMX2; diff --git a/package/kodi/patches/patch-xbmc_settings_AdvancedSettings_cpp b/package/kodi/patches/patch-xbmc_settings_AdvancedSettings_cpp deleted file mode 100644 index b476d6b12..000000000 --- a/package/kodi/patches/patch-xbmc_settings_AdvancedSettings_cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- xbmc-21.2-Omega.orig/xbmc/settings/AdvancedSettings.cpp 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/xbmc/settings/AdvancedSettings.cpp 2025-10-06 04:40:59.031472961 +0200 -@@ -129,7 +129,6 @@ void CAdvancedSettings::Initialize() - return; - - m_audioApplyDrc = -1.0f; -- m_VideoPlayerIgnoreDTSinWAV = false; - - //default hold time of 25 ms, this allows a 20 hertz sine to pass undistorted - m_limiterHold = 0.025f; -@@ -579,7 +578,6 @@ void CAdvancedSettings::ParseSettingsFil - GetCustomRegexps(pAudioExcludes, m_audioExcludeFromScanRegExps); - - XMLUtils::GetFloat(pElement, "applydrc", m_audioApplyDrc); -- XMLUtils::GetBoolean(pElement, "VideoPlayerignoredtsinwav", m_VideoPlayerIgnoreDTSinWAV); - - XMLUtils::GetFloat(pElement, "limiterhold", m_limiterHold, 0.0f, 100.0f); - XMLUtils::GetFloat(pElement, "limiterrelease", m_limiterRelease, 0.001f, 100.0f); diff --git a/package/kodi/patches/patch-xbmc_settings_AdvancedSettings_h b/package/kodi/patches/patch-xbmc_settings_AdvancedSettings_h deleted file mode 100644 index 7d732d373..000000000 --- a/package/kodi/patches/patch-xbmc_settings_AdvancedSettings_h +++ /dev/null @@ -1,10 +0,0 @@ ---- xbmc-21.2-Omega.orig/xbmc/settings/AdvancedSettings.h 2025-01-15 23:14:15.000000000 +0100 -+++ xbmc-21.2-Omega/xbmc/settings/AdvancedSettings.h 2025-10-06 04:40:59.031472961 +0200 -@@ -121,7 +121,6 @@ class CAdvancedSettings : public ISettin - - std::string m_audioDefaultPlayer; - float m_audioPlayCountMinimumPercent; -- bool m_VideoPlayerIgnoreDTSinWAV; - float m_limiterHold; - float m_limiterRelease; - |