| 1 |
commit: 0e9e4120aff7a0bc400e9823f0ca24c08c97abd4 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 25 13:34:34 2021 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 25 13:35:00 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e9e4120 |
| 7 |
|
| 8 |
media-tv/kodi: support fmt 8 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/797619 |
| 11 |
See: https://github.com/xbmc/xbmc/pull/19904 |
| 12 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 13 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 14 |
|
| 15 |
media-tv/kodi/files/kodi-19.1-fmt-8.patch | 28 ++++++++++++++++++++++++++++ |
| 16 |
media-tv/kodi/kodi-19.1.ebuild | 4 ++++ |
| 17 |
2 files changed, 32 insertions(+) |
| 18 |
|
| 19 |
diff --git a/media-tv/kodi/files/kodi-19.1-fmt-8.patch b/media-tv/kodi/files/kodi-19.1-fmt-8.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..ea82d007910 |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-tv/kodi/files/kodi-19.1-fmt-8.patch |
| 24 |
@@ -0,0 +1,28 @@ |
| 25 |
+https://github.com/xbmc/xbmc/pull/19904 |
| 26 |
+ |
| 27 |
+From 18ff80a9c169fb969b75e2143d9f1f234b71a730 Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Craig Andrews <candrews@××××××××××××.com> |
| 29 |
+Date: Thu, 24 Jun 2021 20:41:11 -0400 |
| 30 |
+Subject: [PATCH] [utils] include fmt/xchar.h |
| 31 |
+ |
| 32 |
+fmt 8 moved wchar/custom char overloads to xchar.h, so for fmt 8 compatibility, xchar.h must be included |
| 33 |
+ |
| 34 |
+See https://github.com/fmtlib/fmt/commit/76ee490468212f8705a1421b4c88f8f814b2d351 |
| 35 |
+--- |
| 36 |
+ xbmc/utils/StringUtils.h | 3 +++ |
| 37 |
+ 1 file changed, 3 insertions(+) |
| 38 |
+ |
| 39 |
+diff --git a/xbmc/utils/StringUtils.h b/xbmc/utils/StringUtils.h |
| 40 |
+index ca6f82953d90a..2dc5c3f03af2f 100644 |
| 41 |
+--- a/xbmc/utils/StringUtils.h |
| 42 |
++++ b/xbmc/utils/StringUtils.h |
| 43 |
+@@ -36,6 +36,9 @@ |
| 44 |
+ #if FMT_VERSION >= 40000 |
| 45 |
+ #include <fmt/printf.h> |
| 46 |
+ #endif |
| 47 |
++#if FMT_VERSION >= 80000 |
| 48 |
++#include <fmt/xchar.h> |
| 49 |
++#endif |
| 50 |
+ |
| 51 |
+ #include "XBDateTime.h" |
| 52 |
+ #include "utils/params_check_macros.h" |
| 53 |
|
| 54 |
diff --git a/media-tv/kodi/kodi-19.1.ebuild b/media-tv/kodi/kodi-19.1.ebuild |
| 55 |
index 11329e6f470..d8e43ce073b 100644 |
| 56 |
--- a/media-tv/kodi/kodi-19.1.ebuild |
| 57 |
+++ b/media-tv/kodi/kodi-19.1.ebuild |
| 58 |
@@ -30,6 +30,10 @@ else |
| 59 |
S=${WORKDIR}/xbmc-${MY_PV} |
| 60 |
fi |
| 61 |
|
| 62 |
+PATCHES=( |
| 63 |
+ "${FILESDIR}/${P}-fmt-8.patch" |
| 64 |
+) |
| 65 |
+ |
| 66 |
inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg |
| 67 |
|
| 68 |
DESCRIPTION="A free and open source media-player and entertainment hub" |
Archives