[packages/kodi] - adding libfmt patch

mrozowik mrozowik at pld-linux.org
Sat Aug 21 00:23:34 CEST 2021


commit faa2ad2cf173ad9b6a56687ae08a651639ba28fd
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Fri Aug 20 22:23:16 2021 +0000

    - adding libfmt patch

 fmt.patch | 26 ++++++++++++++++++++++++++
 kodi.spec |  2 ++
 2 files changed, 28 insertions(+)
---
diff --git a/kodi.spec b/kodi.spec
index 4232dff..cdcf5d8 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -71,6 +71,7 @@ Patch4:		gcc5.patch
 Patch5:		libdvd.patch
 Patch6:		microhttpd.patch
 Patch7:		assert.patch
+Patch8:		fmt.patch
 URL:		https://kodi.tv/
 BuildRequires:	EGL-devel
 BuildRequires:	OpenGL-GLU-devel
@@ -205,6 +206,7 @@ all common digital media files from local and network storage media.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %{__rm} -r lib/win32
 
diff --git a/fmt.patch b/fmt.patch
new file mode 100644
index 0000000..458666c
--- /dev/null
+++ b/fmt.patch
@@ -0,0 +1,26 @@
+From 18ff80a9c169fb969b75e2143d9f1f234b71a730 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews at integralblue.com>
+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/76ee490468212f8705a1421b4c88f8f814b2d351
+---
+ 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"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kodi.git/commitdiff/faa2ad2cf173ad9b6a56687ae08a651639ba28fd



More information about the pld-cvs-commit mailing list