gentoo resync : 29.06.2021

4 files changed, 34 insertions, 1 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 9ece41eb49e5..c39de4e77064 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index bed27a1a8f2d..e2e214584f8d 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,3 +1,4 @@
+AUX kodi-19.1-fmt-8.patch 875 BLAKE2B 12899b05bc5c79bd6dd9871d45065142848507bdf928dca12a1fff483611df1d924f1a386881232fbdd67eb303e627f41b331b8ce769325731dbbd4b63a0d4ab SHA512 bb54aa79a497d6d13f88ae9d1e530628eecc1b57deba9c4a404c2b5595f5ccc0c0069ce728a34df08ffbcac984713442091bb63bcdb06adacf7dc05965001e58
 DIST ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz 13477440 BLAKE2B 49415f76fd2a888b0efadb19597bd89db65c3d9e1224ab529ff0d73ab5734a23982b4d4905ddeb105ce59a816c4642cdb9f5568b0c39c29f5fb9431f9623d4ec SHA512 ce43390e816dabeed4ca231f5f7adade6c721c38e17996a57810fb6025ea49b812133c2a6e29aac7c674d4e4af3a21dbd7e605d85fb966935a01bda983b884ac
 DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
 DIST ffmpeg-kodi-4.4-N-Alpha1.tar.gz 13717391 BLAKE2B 2c45778e36167a8740f8f724dc8a66ea2491d8343b1f2546027c4dd1a711aa7a8b830defc439006402e141f264532cbc623758dd066b45fc8a09f67ffdc0f9b8 SHA512 53edceae357747763dd20cdaae0a546970506e5f488477426821ecb87aff613dadb9c4c46a63594db9e230ba54db6da8e5f34699afc0221fd10adfb8f08cf840
@@ -7,7 +8,7 @@ DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280
 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
 EBUILD kodi-19.0.ebuild 10842 BLAKE2B cc6463edea0f1e9f473a9edf4f756ae22010ac8cf39a7c58ee45de52287cf02240276dd6f7da8413760bd9c4bb56548937f8c60c61f28744ed7073f8220246aa SHA512 464262da1d8f081eb172ad1c670e6283728fe482144ea65b020df2b15943ea7926d3ab7a5a9e68e0f64a99b0ea070fb6a945f407acfb32e604b44453dfce1a41
-EBUILD kodi-19.1.ebuild 10820 BLAKE2B 1383c72c46e268cfcb0e6e140ee5625824155ce7656eae7d702346798f3594da546f3c0e0fc52a79ac3f97c07fd7fd28775993ba66d648bd6d00ac7ab927967a SHA512 625b501a8a817c02a454b3ead006d5ca1d5dc170124b44d4763682cebe4ff8863c1535a57169fabd9169522285fc0052f0da851fdc11a46f71d1144fb70567a8
+EBUILD kodi-19.1.ebuild 10865 BLAKE2B 49394ce9302779adb33304374bd8bdb8fc7329ba6b1b3c180b0b44551a83f3c7743e85a9e52fa5eca386f55eaa13f5c267423840f1c8a77b0038397eac376e4e SHA512 edcc6a6768b9fcc5f53ef73ebd8f68b6c1bda70ca3a1f441aec036240398eac4bb81ac658cff1a84e2eab8f9178609f8a955471b231fa27cc2dd0597429af603
 EBUILD kodi-19.9999.ebuild 10820 BLAKE2B 1383c72c46e268cfcb0e6e140ee5625824155ce7656eae7d702346798f3594da546f3c0e0fc52a79ac3f97c07fd7fd28775993ba66d648bd6d00ac7ab927967a SHA512 625b501a8a817c02a454b3ead006d5ca1d5dc170124b44d4763682cebe4ff8863c1535a57169fabd9169522285fc0052f0da851fdc11a46f71d1144fb70567a8
 EBUILD kodi-9999.ebuild 10897 BLAKE2B c24337d42e960fb2e485b72c6ef4461730fafa8170c819ffb00ae277894564c49945cea1823c69a93e4555c19244acca98a13fc8ac48ec264b27a68a7af7bf6f SHA512 3ff06ced5e2575d4b8492875544b6561e2c01f20dd7aabdf7126bbde778cab933566dee8d03d184eba4f5cd5a8478ce77d82d34380ad2b79637e33ae3a39b3d7
 MISC metadata.xml 2762 BLAKE2B bfb7136dd5d2314362f94da7d51340b57aa8176e4e081027c89e08db03e32fa14213a3301c44a89a5d172c71331b9d9da53665e077398dac9a84948fec08d707 SHA512 916c7c7696f704b24d534414f0d79bbd66268d88cee3b2365e95cdf8d2cd0a90f01db8ffb855b49badfab3dd0b1c8efee78aac3e4b4b1208d1a8b21d8ad336c8
diff --git a/media-tv/kodi/files/kodi-19.1-fmt-8.patch b/media-tv/kodi/files/kodi-19.1-fmt-8.patch
new file mode 100644
index 000000000000..ea82d007910d
--- /dev/null
+++ b/media-tv/kodi/files/kodi-19.1-fmt-8.patch
@@ -0,0 +1,28 @@
+https://github.com/xbmc/xbmc/pull/19904
+
+From 18ff80a9c169fb969b75e2143d9f1f234b71a730 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@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"
diff --git a/media-tv/kodi/kodi-19.1.ebuild b/media-tv/kodi/kodi-19.1.ebuild
index 11329e6f4706..d8e43ce073b2 100644
--- a/media-tv/kodi/kodi-19.1.ebuild
+++ b/media-tv/kodi/kodi-19.1.ebuild
@@ -30,6 +30,10 @@ else
 	S=${WORKDIR}/xbmc-${MY_PV}
 fi
 
+PATCHES=(
+	"${FILESDIR}/${P}-fmt-8.patch"
+)
+
 inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
 
 DESCRIPTION="A free and open source media-player and entertainment hub"