[kodi] Patch for new fmt version

commit 5e011cbf49b82eda014998bf52fa8f4012de2848 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Sun Jul 11 22:13:53 2021 +0100 Patch for new fmt version kodi-19-fmt.patch | 26 ++++++++++++++++++++++++++ kodi.spec | 4 ++++ 2 files changed, 30 insertions(+) --- diff --git a/kodi-19-fmt.patch b/kodi-19-fmt.patch new file mode 100644 index 0000000..458666c --- /dev/null +++ b/kodi-19-fmt.patch @@ -0,0 +1,26 @@ +From 18ff80a9c169fb969b75e2143d9f1f234b71a730 Mon Sep 17 00:00:00 2001 +From: Craig Andrews <candrews(a)integralblue.com&gt; +Date: Thu, 24 Jun 2021 20:41:11 -0400 +Subject: [PATCH] [utils] include fmt/xchar.h + +fmt 8 moved wchar/custom char overloads to xchar.h, so for fmt 8 compatibility, xchar.h must be included + +See https://github.com/fmtlib/fmt/commit/76ee490468212f8705a1421b4c88f8f814b2... +--- + xbmc/utils/StringUtils.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/xbmc/utils/StringUtils.h b/xbmc/utils/StringUtils.h +index ca6f82953d90a..2dc5c3f03af2f 100644 +--- a/xbmc/utils/StringUtils.h ++++ b/xbmc/utils/StringUtils.h +@@ -36,6 +36,9 @@ + #if FMT_VERSION >= 40000 + #include <fmt/printf.h> + #endif ++#if FMT_VERSION >= 80000 ++#include <fmt/xchar.h> ++#endif + + #include "XBDateTime.h" + #include "utils/params_check_macros.h" diff --git a/kodi.spec b/kodi.spec index 5726ae8..c28406d 100644 --- a/kodi.spec +++ b/kodi.spec @@ -89,6 +89,9 @@ Patch4: kodi-18-brp-mangle-shebangs.patch # FFmpeg 4.4 support (RFBZ#6000) Patch5: kodi-19-ffmpeg-4-4.patch +# Fix for new fmt version +Patch6: kodi-19-fmt.patch + %ifarch x86_64 i686 %global _with_crystalhd 1 %endif @@ -329,6 +332,7 @@ This package contains FirewallD files for Kodi. %patch3 -p1 -b.innobinfix %patch4 -p1 -b.brp-mangle-shebangs %patch5 -p1 -b.ffmpeg-4-4 +%patch6 -p1 -b.new-fmt # Fix up Python shebangs pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \