diff --git a/packages/addons/addon-depends/cxxtools/package.mk b/packages/addons/addon-depends/cxxtools/package.mk
index 7fe56f9ebc..0cabf6c174 100644
--- a/packages/addons/addon-depends/cxxtools/package.mk
+++ b/packages/addons/addon-depends/cxxtools/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="cxxtools"
-PKG_VERSION="2.2.1"
-PKG_SHA256="8cebb6d6cda7c93cc4f7c0d552a68d50dd5530b699cf87916bb3b708fdc4e342"
+PKG_VERSION="3.0"
+PKG_SHA256="07b18037fb0983f6292f5c8d53e2369e9e7a9711df2c9ad50838aacbc8c62f7c"
 PKG_LICENSE="GPL-2"
 PKG_SITE="http://www.tntnet.org/cxxtools.html"
 PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
diff --git a/packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2.1-make-explicit-cast-in-cxxtools-char-when-moving-or-copying-data.patch b/packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2.1-make-explicit-cast-in-cxxtools-char-when-moving-or-copying-data.patch
deleted file mode 100644
index 638c32cd3e..0000000000
--- a/packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2.1-make-explicit-cast-in-cxxtools-char-when-moving-or-copying-data.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 607073936f5ce1b1c348d432c19234863a072cc7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tommi=20M=C3=A4kitalo?= <tommi@tntnet.org>
-Date: Sat, 2 Jun 2018 15:23:14 +0200
-Subject: [PATCH] Make explicit cast in cxxtools::Char when moving or copying
- data This removes a warning message from the compiler.
-
----
- include/cxxtools/char.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/cxxtools/char.h b/include/cxxtools/char.h
-index 00b91fd3..4ad72883 100644
---- a/include/cxxtools/char.h
-+++ b/include/cxxtools/char.h
-@@ -324,14 +324,14 @@ namespace std {
-     inline char_traits<cxxtools::Char>::char_type*
-     char_traits<cxxtools::Char>::move(char_type* s1, const char_type* s2, int_type n)
-     {
--        return (cxxtools::Char*)std::memmove(s1, s2, n * sizeof(cxxtools::Char));
-+        return static_cast<cxxtools::Char*>(std::memmove(static_cast<void*>(s1), static_cast<const void*>(s2), n * sizeof(cxxtools::Char)));
-     }
- 
- 
-     inline char_traits<cxxtools::Char>::char_type*
-     char_traits<cxxtools::Char>::copy(char_type* s1, const char_type* s2, size_t n)
-     {
--        return (cxxtools::Char*)std::memcpy(s1, s2, n * sizeof(cxxtools::Char));
-+        return static_cast<cxxtools::Char*>(std::memcpy(static_cast<void*>(s1), static_cast<const void*>(s2), n * sizeof(cxxtools::Char)));
-     }
- 
- 
diff --git a/packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2.1-superflous-copy-constuctor.patch b/packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2.1-superflous-copy-constuctor.patch
deleted file mode 100644
index e8116fd90b..0000000000
--- a/packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2.1-superflous-copy-constuctor.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tommi=20M=C3=A4kitalo?= <tommi@tntnet.org>
-Date: Fri, 31 Jan 2021 17:20:24 +0100
-Subject: [PATCH] superflous copy constuctor
-
----
- include/cxxtools/char.h | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/include/cxxtools/char.h b/include/cxxtools/char.h
-index 1e637317..3a4ed62a 100644
---- a/include/cxxtools/char.h
-+++ b/include/cxxtools/char.h
-@@ -114,9 +112,6 @@
-                 return Char(0);
-             }
- 
--            Char& operator=(const Char& ch)
--            { _value = ch._value; return *this; }
--
-             /**
-              * @brief Returns the internal value (unsigned 32 bits) of this character.
-              * @return The 32-bit-value of this character.
diff --git a/packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch b/packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch
index ff3446c12f..85fedbdf02 100644
--- a/packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch
+++ b/packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch
@@ -12,9 +12,9 @@ diff -Naur cxxtools-2.2/configure cxxtools-2.2.patch/configure
  
  
  
-diff -Naur cxxtools-2.2/configure.in cxxtools-2.2.patch/configure.in
---- cxxtools-2.2/configure.in	2013-04-20 23:31:50.000000000 +0200
-+++ cxxtools-2.2.patch/configure.in	2014-01-03 20:26:32.064005192 +0100
+diff -Naur cxxtools-2.2/configure.ac cxxtools-2.2.patch/configure.ac
+--- cxxtools-2.2/configure.ac	2013-04-20 23:31:50.000000000 +0200
++++ cxxtools-2.2.patch/configure.ac	2014-01-03 20:26:32.064005192 +0100
 @@ -106,8 +106,8 @@
  
  AC_PROG_LIBTOOL