[packages/kodi] up to 21.3
atler
atler at pld-linux.org
Fri Oct 31 19:39:44 CET 2025
commit c0a2fd7f82bc5fdfffef2e4442de2e4f1af726c1
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Oct 31 19:39:01 2025 +0100
up to 21.3
kodi-21.2-fix-curl-8.16.patch | 15 -----
kodi-21.2-fix-libnfs-6-compatibility.patch | 101 -----------------------------
kodi.spec | 26 +++-----
pipewire-1.4.patch | 27 --------
4 files changed, 10 insertions(+), 159 deletions(-)
---
diff --git a/kodi.spec b/kodi.spec
index 7515749..a0e777d 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -54,21 +54,21 @@
%define dvdread_ver 6.1.3-Next-Nexus-Alpha2-2
%define dvdcss_ver 1.4.3-Next-Nexus-Alpha2-2
%define dvdnav_ver 6.1.1-Next-Nexus-Alpha2-2
-%define groovy_ver 4.0.16
-%define commons_lang_ver 3.14.0
-%define commons_text_ver 1.11.0
+%define groovy_ver 4.0.26
+%define commons_lang_ver 3.17.0
+%define commons_text_ver 1.13.0
%define codename Omega
Summary: Kodi - a free and open source media-player and entertainment hub
Summary(pl.UTF-8): Kodi - wolnodostępny, mający otwarte źródła odtwarzacz multimediów i hub rozrywkowy
Name: kodi
-Version: 21.2
-Release: 9
+Version: 21.3
+Release: 1
License: GPL v2+ and GPL v3+
Group: Applications/Multimedia
#Source0Download: https://github.com/xbmc/xbmc/releases
-Source0: https://github.com/xbmc/xbmc/archive/v%{version}-%{codename}/%{version}-%{codename}.tar.gz
-# Source0-md5: ba191fcbd49e19af50e5c56786bc9bf4
+Source0: https://github.com/xbmc/xbmc/archive/%{version}-%{codename}/%{version}-%{codename}.tar.gz
+# Source0-md5: bb76936b9fcf395697e2aeeed80cb14e
Source1: https://github.com/xbmc/libdvdread/archive/%{dvdread_ver}/libdvdread-%{dvdread_ver}.tar.gz
# Source1-md5: 0d24c950abfef9dc02e231dda56912ac
Source2: https://github.com/xbmc/libdvdcss/archive/%{dvdcss_ver}/libdvdcss-%{dvdcss_ver}.tar.gz
@@ -76,14 +76,11 @@ Source2: https://github.com/xbmc/libdvdcss/archive/%{dvdcss_ver}/libdvdcss-%{dvd
Source3: https://github.com/xbmc/libdvdnav/archive/%{dvdnav_ver}/libdvdnav-%{dvdnav_ver}.tar.gz
# Source3-md5: 2349cde54d950af21fa4936371ad3349
Source4: http://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-%{groovy_ver}.zip
-# Source4-md5: bd9eb761a11372dd659da8c2cf1ae692
+# Source4-md5: eff85b60190bbd1fddf286f3fe2273ac
Source5: http://mirrors.kodi.tv/build-deps/sources/commons-lang3-%{commons_lang_ver}-bin.tar.gz
-# Source5-md5: 88c83b3fa007ae35d4f82a2466cad423
+# Source5-md5: ec63dbb802ed3e188388213f2657966b
Source6: http://mirrors.kodi.tv/build-deps/sources/commons-text-%{commons_text_ver}-bin.tar.gz
-# Source6-md5: ae1f7607159b192e12f9c8eaaaf3d927
-Patch0: pipewire-1.4.patch
-Patch1: kodi-21.2-fix-curl-8.16.patch
-Patch2: kodi-21.2-fix-libnfs-6-compatibility.patch
+# Source6-md5: 941495aeab3bc15ab7ef60db789b51d3
URL: https://kodi.tv/
BuildRequires: EGL-devel
%{?with_gbm:BuildRequires: Mesa-libgbm-devel}
@@ -259,9 +256,6 @@ Pliki nagłówkowe Kodi.
%prep
%setup -q -n xbmc-%{version}-%{codename} -a1 -a2 -a3
-%patch -P0 -p1
-%patch -P1 -p1
-%patch -P2 -p1
%{__rm} -r lib/win32
diff --git a/kodi-21.2-fix-curl-8.16.patch b/kodi-21.2-fix-curl-8.16.patch
deleted file mode 100644
index 1234e6e..0000000
--- a/kodi-21.2-fix-curl-8.16.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/962751
-https://gitlab.alpinelinux.org/alpine/aports/-/blob/106a02411488e3f71b9f2085a4a857e4be27b9ea/community/kodi/curl-8.16.0.patch
-
---- a/xbmc/filesystem/CurlFile.cpp
-+++ b/xbmc/filesystem/CurlFile.cpp
-@@ -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/kodi-21.2-fix-libnfs-6-compatibility.patch b/kodi-21.2-fix-libnfs-6-compatibility.patch
deleted file mode 100644
index 06e45eb..0000000
--- a/kodi-21.2-fix-libnfs-6-compatibility.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 313d78c92cb3344baa416aeeba8d4403017e82ea Mon Sep 17 00:00:00 2001
-From: Stephan Sundermann <stephansundermann at gmail.com>
-Date: Sun, 15 Dec 2024 17:08:34 +0100
-Subject: [PATCH 1/4] [nfs] Fix API breakage in libnfs 6.0
-
----
- xbmc/filesystem/NFSFile.cpp | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/xbmc/filesystem/NFSFile.cpp b/xbmc/filesystem/NFSFile.cpp
-index b96b2bc4fad4b..a64fc860635b6 100644
---- a/xbmc/filesystem/NFSFile.cpp
-+++ b/xbmc/filesystem/NFSFile.cpp
-@@ -477,7 +477,11 @@ void CNfsConnection::keepAlive(const std::string& _exportPath, struct nfsfh* _pF
-
- nfs_lseek(pContext, _pFileHandle, 0, SEEK_CUR, &offset);
-
-+#ifdef LIBNFS_API_V2
-+ int bytes = nfs_read(pContext, _pFileHandle, buffer, sizeof(buffer));
-+#else
- int bytes = nfs_read(pContext, _pFileHandle, 32, buffer);
-+#endif
- if (bytes < 0)
- {
- CLog::LogF(LOGERROR, "nfs_read - Error ({}, {})", bytes, nfs_get_error(pContext));
-@@ -741,8 +745,11 @@ ssize_t CNFSFile::Read(void *lpBuf, size_t uiBufSize)
-
- if (m_pFileHandle == NULL || m_pNfsContext == NULL )
- return -1;
--
-+#ifdef LIBNFS_API_V2
-+ numberOfBytesRead = nfs_read(m_pNfsContext, m_pFileHandle, lpBuf, uiBufSize);
-+#else
- numberOfBytesRead = nfs_read(m_pNfsContext, m_pFileHandle, uiBufSize, (char *)lpBuf);
-+#endif
-
- lock.unlock(); //no need to keep the connection lock after that
-
-@@ -841,12 +848,17 @@ ssize_t CNFSFile::Write(const void* lpBuf, size_t uiBufSize)
- {
- chunkSize = leftBytes;//write last chunk with correct size
- }
-+#ifdef LIBNFS_API_V2
-+ writtenBytes = nfs_write(m_pNfsContext, m_pFileHandle,
-+ static_cast<const char*>(lpBuf) + numberOfBytesWritten, chunkSize);
-+#else
- //write chunk
- //! @bug libnfs < 2.0.0 isn't const correct
- writtenBytes = nfs_write(m_pNfsContext,
- m_pFileHandle,
- chunkSize,
- const_cast<char*>((const char *)lpBuf) + numberOfBytesWritten);
-+#endif
- //decrease left bytes
- leftBytes-= writtenBytes;
- //increase overall written bytes
-
-From b78237b97ec2d5837cafb8921ec18c8f66df2536 Mon Sep 17 00:00:00 2001
-From: Stephan Sundermann <stephansundermann at gmail.com>
-Date: Sun, 15 Dec 2024 17:07:05 +0100
-Subject: [PATCH 2/4] [depends] Update to libnfs 6.0.2
-
----
- tools/depends/target/libnfs/LIBNFS-VERSION | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/depends/target/libnfs/LIBNFS-VERSION b/tools/depends/target/libnfs/LIBNFS-VERSION
-index 892aa7afcfd48..699a31c70fcae 100644
---- a/tools/depends/target/libnfs/LIBNFS-VERSION
-+++ b/tools/depends/target/libnfs/LIBNFS-VERSION
-@@ -1,6 +1,6 @@
- LIBNAME=libnfs
--VERSION=5.0.2
-+VERSION=6.0.2
- ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
--SHA512=6dcf4ea8a01b35beb53694625d20fbebd858a88725c2742671878ad6fe7877999f93d262fb58a435b00c283c3e6fb6fa7222d04bb4540bf674b7ce196e9424f5
-+SHA512=539790ab98aac7b2f25755b745d1f5e016518f1adb3748b8c58df187048bc31e091915d59e6359bb95c49dd986361cbbf2536edcda02598b0fac236762b61a46
- BYPRODUCT=libnfs.a
- BYPRODUCT_WIN=nfs.lib
-
-From 28857698a05aba4b7168ed775b4ffce381421fc1 Mon Sep 17 00:00:00 2001
-From: Stephan Sundermann <stephansundermann at gmail.com>
-Date: Sun, 15 Dec 2024 17:28:21 +0100
-Subject: [PATCH 3/4] [depends] TEMP: BASE_URL change
-
----
- tools/depends/target/libnfs/LIBNFS-VERSION | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tools/depends/target/libnfs/LIBNFS-VERSION b/tools/depends/target/libnfs/LIBNFS-VERSION
-index 699a31c70fcae..a6cc0bc8da16a 100644
---- a/tools/depends/target/libnfs/LIBNFS-VERSION
-+++ b/tools/depends/target/libnfs/LIBNFS-VERSION
-@@ -4,3 +4,5 @@ ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
- SHA512=539790ab98aac7b2f25755b745d1f5e016518f1adb3748b8c58df187048bc31e091915d59e6359bb95c49dd986361cbbf2536edcda02598b0fac236762b61a46
- BYPRODUCT=libnfs.a
- BYPRODUCT_WIN=nfs.lib
-+
-+BASE_URL=https://github.com/sahlberg/libnfs/archive/refs/tags
-
-
diff --git a/pipewire-1.4.patch b/pipewire-1.4.patch
deleted file mode 100644
index 2f7bfb1..0000000
--- a/pipewire-1.4.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 269053ebbfd3cc4a3156a511f54ab7f08a09a730 Mon Sep 17 00:00:00 2001
-From: Timo Gurr <timo.gurr at gmail.com>
-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<struct pw_node*>(m_proxy.get()), 0,
-+ m_info->params[param].id, 0, 0, NULL);
- }
- }
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kodi.git/commitdiff/c0a2fd7f82bc5fdfffef2e4442de2e4f1af726c1
More information about the pld-cvs-commit
mailing list