1
0
forked from ports/contrib

kodi: fixed build against fmt8

This commit is contained in:
Tim Biermann 2021-08-15 00:07:14 +02:00
parent f1fc433b29
commit 915bf64aaf
2 changed files with 19 additions and 2 deletions

View File

@ -5,12 +5,13 @@
name=kodi
version=19.1
release=1
source=(https://github.com/xbmc/xbmc/archive/$version-Matrix/$name-$version.tar.gz gl-headers.patch)
release=2
source=(https://github.com/xbmc/xbmc/archive/$version-Matrix/$name-$version.tar.gz gl-headers.patch fmt8.patch)
build() {
[[ -e /usr/lib/ccache ]] && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
patch -d xbmc-$version-Matrix -p1 -i $SRC/gl-headers.patch
patch -d xbmc-$version-Matrix -p1 -i $SRC/fmt8.patch
cmake -Bbuild \
-DVERBOSE=ON \
-DAPP_RENDER_SYSTEM=gl \

16
kodi/fmt8.patch Normal file
View File

@ -0,0 +1,16 @@
--- xbmc-19.1-Matrix.orig/xbmc/utils/StringUtils.h 2021-07-13 13:53:06.623129336 +0200
+++ xbmc-19.1-Matrix/xbmc/utils/StringUtils.h 2021-07-13 13:53:17.929007096 +0200
@@ -31,8 +31,13 @@
#undef FMT_DEPRECATED
#define FMT_DEPRECATED
#endif
+
#include <fmt/format.h>
+#if FMT_VERSION >= 80000
+#include <fmt/xchar.h>
+#endif
+
#if FMT_VERSION >= 40000
#include <fmt/printf.h>
#endif