commit 915bf64aafd64999cc3eef02921a2294590ac475 Author: Tim Biermann <tbier@posteo.de> Date: Sun Aug 15 00:07:14 2021 +0200 kodi: fixed build against fmt8 diff --git a/kodi/Pkgfile b/kodi/Pkgfile index ced77bc3a..56754baec 100644 --- a/kodi/Pkgfile +++ b/kodi/Pkgfile @@ -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 \ diff --git a/kodi/fmt8.patch b/kodi/fmt8.patch new file mode 100644 index 000000000..8f27019f6 --- /dev/null +++ b/kodi/fmt8.patch @@ -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