diff --git a/kodi/.signature b/kodi/.signature
index 9b92e686f..16acea4ea 100644
--- a/kodi/.signature
+++ b/kodi/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/lD+NvpGcUSvF3B3NH+aZCqP37Xprm68ivv2FAAZn1xxWruICxK5chzUjuOntyw27VGoJ3uA1nn/NopvvZERwo=
-SHA256 (Pkgfile) = a89b5ffa7ee68f0d6cee0e390a2c94e9052e9c3d4a1a409c7cd38ea53fe1ede5
+RWSagIOpLGJF3xTbBlU73jjsDcpXPfzaITrAbrndPlngcgU0G85zBKwNMWr9XbCSJX7Y19BGNpCM4mWlQGn61vttonXlb8dy3ww=
+SHA256 (Pkgfile) = 078dafb91d4aeb5cc5584470dfc76125753a11dd46cd118d39aab3261f27fc08
 SHA256 (.footprint) = c45007af4a2e946af6cda1e1ae3a34c26ddfcfa823acfc5bb794b38b51c49001
 SHA256 (kodi-19.4.tar.gz) = cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da
 SHA256 (gl-headers.patch) = 6fa089625184b2b47bea7a3dcb349931e9b39681df9d84fd690a1ba848460168
-SHA256 (fmt8.patch) = acbbd74a7e568a788bbe9e48173a4c23203cba5efafadcaaed5505d8eb17d661
+SHA256 (kodi-19.4-fmt-9.patch) = 236d40c7c201212a3f76d0b6362391e6b459bacc9ec5d35b9e34fa4b2fee7c25
diff --git a/kodi/Pkgfile b/kodi/Pkgfile
index 25ff23426..cec1933b1 100644
--- a/kodi/Pkgfile
+++ b/kodi/Pkgfile
@@ -6,12 +6,12 @@
 name=kodi
 version=19.4
 release=1
-source=(https://github.com/xbmc/xbmc/archive/$version-Matrix/$name-$version.tar.gz gl-headers.patch fmt8.patch)
+source=(https://github.com/xbmc/xbmc/archive/$version-Matrix/$name-$version.tar.gz gl-headers.patch $name-19.4-fmt-9.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
+	patch -d xbmc-$version-Matrix -p1 -i $SRC/$name-19.4-fmt-9.patch
 	cmake -Bbuild \
 		-DVERBOSE=ON \
 		-DAPP_RENDER_SYSTEM=gl \
diff --git a/kodi/fmt8.patch b/kodi/fmt8.patch
deleted file mode 100644
index 8f27019f6..000000000
--- a/kodi/fmt8.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
diff --git a/kodi/kodi-19.4-fmt-9.patch b/kodi/kodi-19.4-fmt-9.patch
new file mode 100644
index 000000000..b60d9ccc9
--- /dev/null
+++ b/kodi/kodi-19.4-fmt-9.patch
@@ -0,0 +1,74 @@
+From 6e081841981af8fc0d88d4f549456fd93b7ae2ac Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Wed, 6 Jul 2022 22:48:35 +1000
+Subject: [PATCH 1/2] GLUtils: cast as char as formatting of non-void pointers
+ is disallowed
+
+---
+ xbmc/utils/GLUtils.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp
+index 1ef804709ff56..c36dcf6a20fec 100644
+--- a/xbmc/utils/GLUtils.cpp
++++ b/xbmc/utils/GLUtils.cpp
+@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno)
+ void LogGraphicsInfo()
+ {
+ #if defined(HAS_GL) || defined(HAS_GLES)
+-  const GLubyte *s;
++  const char* s;
+ 
+-  s = glGetString(GL_VENDOR);
++  s = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
+   if (s)
+     CLog::Log(LOGINFO, "GL_VENDOR = %s", s);
+   else
+     CLog::Log(LOGINFO, "GL_VENDOR = NULL");
+ 
+-  s = glGetString(GL_RENDERER);
++  s = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
+   if (s)
+     CLog::Log(LOGINFO, "GL_RENDERER = %s", s);
+   else
+     CLog::Log(LOGINFO, "GL_RENDERER = NULL");
+ 
+-  s = glGetString(GL_VERSION);
++  s = reinterpret_cast<const char*>(glGetString(GL_VERSION));
+   if (s)
+     CLog::Log(LOGINFO, "GL_VERSION = %s", s);
+   else
+     CLog::Log(LOGINFO, "GL_VERSION = NULL");
+ 
+-  s = glGetString(GL_SHADING_LANGUAGE_VERSION);
++  s = reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION));
+   if (s)
+     CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s);
+   else
+
+From 6a504c306b743b73225bd81e490ef7dc9fae2c25 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Mon, 11 Jul 2022 09:39:02 +0000
+Subject: [PATCH 2/2] WinSystemX11: cast as char as formatting of non-void
+ pointers is disallowed
+
+---
+ xbmc/windowing/X11/WinSystemX11.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
+index 8a18288fd8af0..033c0f77bf454 100644
+--- a/xbmc/windowing/X11/WinSystemX11.cpp
++++ b/xbmc/windowing/X11/WinSystemX11.cpp
+@@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager()
+ 
+   if(status == Success && items_read)
+   {
+-    CLog::Log(LOGDEBUG,"Window Manager Name: %s", data);
++    const char* s;
++
++    s = reinterpret_cast<const char*>(data);
++    CLog::Log(LOGDEBUG, "Window Manager Name: {}", s);
+   }
+   else
+     CLog::Log(LOGDEBUG,"Window Manager Name: ");