[packages/kodi] - relup, added fix-curl-8.16.patch and fix-libnfs-6-compatibility.patch
mrozowik
mrozowik at pld-linux.org
Wed Oct 22 16:48:32 CEST 2025
commit 502e8c7978f2e6ca588a93c3ce9a97d55a8a1259
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date: Wed Oct 22 14:48:18 2025 +0000
- relup, added fix-curl-8.16.patch and fix-libnfs-6-compatibility.patch
kodi-21.2-fix-curl-8.16.patch | 15 +++++
kodi-21.2-fix-libnfs-6-compatibility.patch | 101 +++++++++++++++++++++++++++++
kodi.spec | 6 +-
3 files changed, 121 insertions(+), 1 deletion(-)
---
diff --git a/kodi.spec b/kodi.spec
index 0634f74..7515749 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -63,7 +63,7 @@ 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: 8
+Release: 9
License: GPL v2+ and GPL v3+
Group: Applications/Multimedia
#Source0Download: https://github.com/xbmc/xbmc/releases
@@ -82,6 +82,8 @@ Source5: http://mirrors.kodi.tv/build-deps/sources/commons-lang3-%{commons_lang_
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
URL: https://kodi.tv/
BuildRequires: EGL-devel
%{?with_gbm:BuildRequires: Mesa-libgbm-devel}
@@ -258,6 +260,8 @@ 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
new file mode 100644
index 0000000..1234e6e
--- /dev/null
+++ b/kodi-21.2-fix-curl-8.16.patch
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 0000000..06e45eb
--- /dev/null
+++ b/kodi-21.2-fix-libnfs-6-compatibility.patch
@@ -0,0 +1,101 @@
+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
+
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kodi.git/commitdiff/502e8c7978f2e6ca588a93c3ce9a97d55a8a1259
More information about the pld-cvs-commit
mailing list