kodi: added xkeyboard-config dependency and patch for fmt 10

kodi/.signature

@@ -1,6 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF30Tpr5z9BIaVSQfMeo/F0DvFm2aMl88oS5orZBGvxZWDiGNfGTXWm0D2DMzosg0Me9qvCYndxxwHVW2o3Jr9UAU=
-SHA256 (Pkgfile) = 30b57a6628c9f95410a79272621e16217e4fb18eccc40334b866e65057a580ae
+RWSagIOpLGJF3+vJwCkvRibMs1QCrGYMVe1q5mTatcjPP2gsQcPMj1ptb8VpG6BGMP8pP8H+GBkoTtVAckRblv0YVgWkoq4zJwI=
+SHA256 (Pkgfile) = f5ffdf06acc20a06c78525224e7d1ec2281ea6b54938196b2ebef8e68411d869
 SHA256 (.footprint) = 0a92bc1aa49557700a76f8e88a91666e11d107b6c35134a4939f3f1fae16afbf
 SHA256 (kodi-20.2.tar.gz) = 4e81abf81172812bc8891f69a7a80a2b846298cecaae7b5009725e28a3040c23
 SHA256 (gl-headers.patch) = 6fa089625184b2b47bea7a3dcb349931e9b39681df9d84fd690a1ba848460168
+SHA256 (23453.patch) = 0c7ce50029029a937b970a79cfd468d0c336a6be80dcf048b33380d1ed39a66b

kodi/23453.patch

@@ -0,0 +1,108 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ xbmc/windows/GUIWindowHome.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/xbmc/windows/GUIWindowHome.cpp b/xbmc/windows/GUIWindowHome.cpp
+index c42e073c48ced..abc6cfc94d5a0 100644
+--- a/xbmc/windows/GUIWindowHome.cpp
++++ b/xbmc/windows/GUIWindowHome.cpp
+@@ -78,7 +78,8 @@ void CGUIWindowHome::Announce(ANNOUNCEMENT::AnnouncementFlag flag,
+ {
+   int ra_flag = 0;
+ 
+-  CLog::Log(LOGDEBUG, LOGANNOUNCE, "GOT ANNOUNCEMENT, type: {}, from {}, message {}", flag, sender, message);
++  CLog::Log(LOGDEBUG, LOGANNOUNCE, "GOT ANNOUNCEMENT, type: {}, from {}, message {}",
++            AnnouncementFlagToString(flag), sender, message);
+ 
+   // we are only interested in library changes
+   if ((flag & (ANNOUNCEMENT::VideoLibrary | ANNOUNCEMENT::AudioLibrary)) == 0)
+
+From c82006b575b78efbb3f5aff40a159b90f245ea9d Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:22:32 -0700
+Subject: [PATCH 2/4] CGUIColorButtonControl: use explicit cast to
+ UTILS::COLOR::Color when formatting
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ xbmc/guilib/GUIColorButtonControl.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/xbmc/guilib/GUIColorButtonControl.cpp b/xbmc/guilib/GUIColorButtonControl.cpp
+index 940834cb68852..67597d7ab504b 100644
+--- a/xbmc/guilib/GUIColorButtonControl.cpp
++++ b/xbmc/guilib/GUIColorButtonControl.cpp
+@@ -188,7 +188,8 @@ void CGUIColorButtonControl::RenderInfoText()
+ void CGUIColorButtonControl::ProcessInfoText(unsigned int currentTime)
+ {
+   CRect labelRenderRect = m_labelInfo.GetRenderRect();
+-  bool changed = m_labelInfo.SetText(StringUtils::Format("#{:08X}", m_imgBoxColor));
++  bool changed = m_labelInfo.SetText(
++      StringUtils::Format("#{:08X}", static_cast<UTILS::COLOR::Color>(m_imgBoxColor)));
+   // Set Label X position based on image mask control position
+   float textWidth = m_labelInfo.GetTextWidth() + 2 * m_labelInfo.GetLabelInfo().offsetX;
+   float textPosX = m_imgColorMask->GetXPosition() - textWidth;
+
+From e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:24:02 -0700
+Subject: [PATCH 3/4] CLog: allow using fmt::enums::format_as for explicit enum
+ conversion when using libfmt>=10
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ xbmc/utils/log.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h
+index 9fc4aae36813e..adf46905a86c6 100644
+--- a/xbmc/utils/log.h
++++ b/xbmc/utils/log.h
+@@ -46,6 +46,10 @@ class dist_sink;
+ } // namespace sinks
+ } // namespace spdlog
+ 
++#if FMT_VERSION >= 100000
++using fmt::enums::format_as;
++#endif
++
+ class CLog : public ISettingsHandler, public ISettingCallback
+ {
+ public:
+
+From 26c164a28cfd18ceef7a1f2bbba5bf8a4a5a750c Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:24:34 -0700
+Subject: [PATCH 4/4] CLog: add formatter for std::atomic for explicit atomic
+ conversion when using libfmt>=10
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ xbmc/utils/log.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h
+index adf46905a86c6..1c42c888cb655 100644
+--- a/xbmc/utils/log.h
++++ b/xbmc/utils/log.h
+@@ -48,6 +48,14 @@ class dist_sink;
+ 
+ #if FMT_VERSION >= 100000
+ using fmt::enums::format_as;
++
++namespace fmt
++{
++template<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback

kodi/Pkgfile

@@ -1,12 +1,12 @@
 # Description: A free and open source software media player and entertainment hub
 # URL: https://kodi.tv/
 # Maintainer: Matt Housh, jaeger at crux dot ninja
-# Depends on: cmake fmt ghostscript giflib glu openjdk17-jdk libass libcdio libmicrohttpd mariadb samba swig taglib tinyxml spdlog libva libvdpau libdvdnav
+# Depends on: cmake fmt ghostscript giflib glu openjdk17-jdk libass libcdio libmicrohttpd mariadb samba swig taglib tinyxml spdlog libva libvdpau libdvdnav xkeyboard-config
 
 name=kodi
 version=20.2
-release=1
-source=(https://github.com/xbmc/xbmc/archive/$version-Nexus/$name-$version.tar.gz gl-headers.patch)
+release=2
+source=(https://github.com/xbmc/xbmc/archive/$version-Nexus/$name-$version.tar.gz gl-headers.patch 23453.patch)
 
 build() {
 	export PATH="/usr/lib/java/openjdk17-jdk/bin:$PATH"
@@ -14,6 +14,7 @@ build() {
 	[[ -e /usr/lib/ccache ]] && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
 
 	patch -d xbmc-$version-Nexus -p1 -i $SRC/gl-headers.patch
+	patch -d xbmc-$version-Nexus -p1 -i $SRC/23453.patch
 
 	cmake -Bbuild \
 		-DVERBOSE=ON \