[kodi] Kodi 20.4 Final

commit 62f16fbde301966c17047a0c8673863e4932eefa Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Wed Feb 14 13:28:14 2024 +0000 Kodi 20.4 Final kodi-20-add-missing-includes.patch | 90 ++++++++++++++++++++++++++++++++++++++ kodi-generate-tarball-xz.sh | 2 +- kodi.spec | 8 +++- sources | 2 +- 4 files changed, 99 insertions(+), 3 deletions(-) --- diff --git a/kodi-20-add-missing-includes.patch b/kodi-20-add-missing-includes.patch new file mode 100644 index 0000000..2444adf --- /dev/null +++ b/kodi-20-add-missing-includes.patch @@ -0,0 +1,90 @@ +From 3dcea03c915f2062d4f8740d66abdf033fba9d6c Mon Sep 17 00:00:00 2001 +From: Manuel Lauss <manuel.lauss(a)gmail.com&gt; +Date: Fri, 13 Oct 2023 12:27:15 +0200 +Subject: [PATCH] add missing c++ headers + +Add a few missing headers which are no longer indirectly included by +other headers, fixes build with gcc-14 +--- + xbmc/addons/AddonUpdateRules.cpp | 1 + + xbmc/addons/binary-addons/AddonDll.cpp | 1 + + xbmc/interfaces/json-rpc/TextureOperations.cpp | 2 ++ + xbmc/utils/EGLImage.cpp | 1 + + xbmc/windowing/gbm/drm/DRMConnector.cpp | 1 + + xbmc/windowing/gbm/drm/DRMPlane.cpp | 2 ++ + 6 files changed, 8 insertions(+) + +diff --git a/xbmc/addons/AddonUpdateRules.cpp b/xbmc/addons/AddonUpdateRules.cpp +index 7d9d43a7c6fdd..6c620f01d71b9 100644 +--- a/xbmc/addons/AddonUpdateRules.cpp ++++ b/xbmc/addons/AddonUpdateRules.cpp +@@ -12,6 +12,7 @@ + #include "addons/addoninfo/AddonInfo.h" + #include "utils/log.h" + ++#include <algorithm> + #include <mutex> + + using namespace ADDON; +diff --git a/xbmc/addons/binary-addons/AddonDll.cpp b/xbmc/addons/binary-addons/AddonDll.cpp +index 7f867dbf83a43..2c03541110734 100644 +--- a/xbmc/addons/binary-addons/AddonDll.cpp ++++ b/xbmc/addons/binary-addons/AddonDll.cpp +@@ -27,6 +27,7 @@ + #include "utils/Variant.h" + #include "utils/log.h" + ++#include <algorithm> + #include <utility> + + using namespace KODI::MESSAGING; +diff --git a/xbmc/interfaces/json-rpc/TextureOperations.cpp b/xbmc/interfaces/json-rpc/TextureOperations.cpp +index 326093b53edd2..d6ffcc8761028 100644 +--- a/xbmc/interfaces/json-rpc/TextureOperations.cpp ++++ b/xbmc/interfaces/json-rpc/TextureOperations.cpp +@@ -14,6 +14,8 @@ + #include "TextureDatabase.h" + #include "utils/Variant.h" + ++#include <algorithm> ++ + using namespace JSONRPC; + + JSONRPC_STATUS CTextureOperations::GetTextures(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result) +diff --git a/xbmc/utils/EGLImage.cpp b/xbmc/utils/EGLImage.cpp +index 36757995f4e2a..623721fd57744 100644 +--- a/xbmc/utils/EGLImage.cpp ++++ b/xbmc/utils/EGLImage.cpp +@@ -14,6 +14,7 @@ + #include "utils/StringUtils.h" + #include "utils/log.h" + ++#include <algorithm> + #include <map> + + namespace +diff --git a/xbmc/windowing/gbm/drm/DRMConnector.cpp b/xbmc/windowing/gbm/drm/DRMConnector.cpp +index 94f8e909ff82b..1b2fac4d068ba 100644 +--- a/xbmc/windowing/gbm/drm/DRMConnector.cpp ++++ b/xbmc/windowing/gbm/drm/DRMConnector.cpp +@@ -11,6 +11,7 @@ + #include "utils/XTimeUtils.h" + #include "utils/log.h" + ++#include <algorithm> + #include <map> + + using namespace KODI::WINDOWING::GBM; +diff --git a/xbmc/windowing/gbm/drm/DRMPlane.cpp b/xbmc/windowing/gbm/drm/DRMPlane.cpp +index 90b5660ed576f..865beccacb415 100644 +--- a/xbmc/windowing/gbm/drm/DRMPlane.cpp ++++ b/xbmc/windowing/gbm/drm/DRMPlane.cpp +@@ -13,6 +13,8 @@ + #include "utils/StringUtils.h" + #include "utils/log.h" + ++#include <algorithm> ++ + using namespace KODI::WINDOWING::GBM; + + CDRMPlane::CDRMPlane(int fd, uint32_t plane) : CDRMObject(fd), m_plane(drmModeGetPlane(m_fd, plane)) diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh index 698689c..bb6d023 100755 --- a/kodi-generate-tarball-xz.sh +++ b/kodi-generate-tarball-xz.sh @@ -1,7 +1,7 @@ #!/bin/sh MAJORVERSION=20 -MINORVERSION=3 +MINORVERSION=4 #GITCOMMIT=b6daed5dc4f8ab6d0b50cc8bcb80bfb9e6a3e583 #GITSHORT=b6daed5 CODENAME=Nexus diff --git a/kodi.spec b/kodi.spec index c869940..bc04e24 100644 --- a/kodi.spec +++ b/kodi.spec @@ -38,7 +38,7 @@ %endif Name: kodi -Version: 20.3 +Version: 20.4 Release: 1%{?dist} Summary: Media center @@ -78,6 +78,8 @@ Patch2: kodi-20-annobin-workaround.patch # Python 3.12 support Patch3: https://github.com/xbmc/xbmc/commit/4bf9de87e700f0de56ef698a8d8d6eb7d4ff9... +# Add missing includes +Patch4: https://github.com/xbmc/xbmc/commit/3dcea03c915f2062d4f8740d66abdf033fba9... %ifarch x86_64 %global _with_crystalhd 1 @@ -304,6 +306,7 @@ This package contains FirewallD files for Kodi. %if 0%{?fedora} && 0%{?fedora} > 38 %patch -P 3 -p1 -b.python-312 %endif +%patch -P 4 -p1 -b.missing-includes # Fix up Python shebangs %py3_shebang_fix \ @@ -433,6 +436,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1 %changelog +* Wed Feb 14 2024 Leigh Scott <leigh123linux(a)gmail.com&gt; - 20.4-1 +- Kodi 20.4 Final + * Wed Jan 10 2024 Michael Cronenworth <mike(a)cchtml.com&gt; - 20.3-1 - Kodi 20.3 Final diff --git a/sources b/sources index 4534de2..259e46f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (kodi-20.3-patched.tar.xz) = 6e24d25f8b754ec2675f3c935aa8c0be530ee033b7d424e01275cb4b2c76a83a6aad6b8db3a78d235906758ed28ec085393e2ad138f44b61278f502ae5d8ea1c +SHA512 (kodi-20.4-patched.tar.xz) = 55dd6c5727d4d01c46b92fa3bb7e90274cb70d1b528ef719dd9a7013eadb778684c47390fd612dcdfcc60e1cfe316323cfd9951620faf608cca505e594965d81 SHA512 (kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz) = 51e6fc033121241354a5f0b3fc9a430577ae3ff6bb7f31445aa548ef4893037fb80eea3b2c6774c81e9ebaf9c45e9b490c98c2c65eb38f9f7daba84b236f7e1d SHA512 (kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz) = 629a41157d07b8ec0ea1fe89ae5ec48f63047472a862782b805c531ae31a0376fc4dc15175f8280c3ef91d7fa977bacebb1b51232640034a34bab2293210fc5e