From d0ad5d2db51a38fe268e62356f3c45a900be210b Mon Sep 17 00:00:00 2001 From: Mateusz Sylwestrzak Date: Wed, 19 Mar 2025 14:47:49 +0100 Subject: [PATCH] kodi: update to 21.2 --- ...fix_pipewire_1.4.0_compilation_error.patch | 27 +++++++++++++++++++ srcpkgs/kodi/template | 13 +++------ 2 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/kodi/patches/fix_pipewire_1.4.0_compilation_error.patch diff --git a/srcpkgs/kodi/patches/fix_pipewire_1.4.0_compilation_error.patch b/srcpkgs/kodi/patches/fix_pipewire_1.4.0_compilation_error.patch new file mode 100644 index 00000000000..2f7bfb187b7 --- /dev/null +++ b/srcpkgs/kodi/patches/fix_pipewire_1.4.0_compilation_error.patch @@ -0,0 +1,27 @@ +From 269053ebbfd3cc4a3156a511f54ab7f08a09a730 Mon Sep 17 00:00:00 2001 +From: Timo Gurr +Date: Fri, 7 Mar 2025 13:30:47 +0100 +Subject: [PATCH] [AudioEngine] PipeWire: Fix build with PipeWire 1.4.0 + +PipeWire >= 1.4.0 requires the correct struct type to be used, otherwise +it will fail to compile. + +Reference: https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/188d920733f0791413d3386e5536ee7377f71b2f +--- + xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp +index 88fe89ee1399a..50eaf0c945886 100644 +--- a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp ++++ b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp +@@ -40,7 +40,8 @@ void CPipewireNode::EnumerateFormats() + for (uint32_t param = 0; param < m_info->n_params; param++) + { + if (m_info->params[param].id == SPA_PARAM_EnumFormat) +- pw_node_enum_params(m_proxy.get(), 0, m_info->params[param].id, 0, 0, NULL); ++ pw_node_enum_params(reinterpret_cast(m_proxy.get()), 0, ++ m_info->params[param].id, 0, 0, NULL); + } + } + diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index 5985cafb6f3..56c167e3e9d 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi -version=21.1 -revision=3 +version=21.2 +revision=1 _codename="Omega" _crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681" _dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2" @@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D -Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz -DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz" make_build_target="all" -hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel +hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc" makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel @@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz" -checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef +checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383 6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 @@ -138,11 +138,6 @@ pre_configure() { fi } -post_install() { - mkdir -p "${DESTDIR}/${py3_sitelib}" - mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}" -} - do_check() { ./build/kodi-test --gtest_filter="${_gtest_filter}" }