From 6760f365f4e3d2a71d9c853c23bca0221731301d Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 5 Aug 2023 09:49:57 +0000
Subject: [PATCH] protobuf: update to 21.12

---
 .../addons/addon-depends/protobuf/package.mk  |  6 ++---
 .../addon-depends/protobuf/patches/9936.patch | 24 -------------------
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 packages/addons/addon-depends/protobuf/patches/9936.patch

diff --git a/packages/addons/addon-depends/protobuf/package.mk b/packages/addons/addon-depends/protobuf/package.mk
index ef4852cc68..caba990d4b 100644
--- a/packages/addons/addon-depends/protobuf/package.mk
+++ b/packages/addons/addon-depends/protobuf/package.mk
@@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="protobuf"
-PKG_VERSION="3.20.3"
-PKG_SHA256="e51cc8fc496f893e2a48beb417730ab6cbcb251142ad8b2cd1951faa5c76fe3d"
+PKG_VERSION="21.12"
+PKG_SHA256="4eab9b524aa5913c6fffb20b2a8abf5ef7f95a80bc0701f3a6dbb4c607f73460"
 PKG_LICENSE="OSS"
 PKG_SITE="https://developers.google.com/protocol-buffers/"
-PKG_URL="https://github.com/google/${PKG_NAME}/releases/download/v${PKG_VERSION}/${PKG_NAME}-cpp-${PKG_VERSION}.tar.gz"
+PKG_URL="https://github.com/google/${PKG_NAME}/releases/download/v${PKG_VERSION}/${PKG_NAME}-cpp-3.${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="toolchain:host zlib:host"
 PKG_DEPENDS_TARGET="toolchain zlib protobuf:host"
 PKG_LONGDESC="Protocol Buffers for Google's data interchange format."
diff --git a/packages/addons/addon-depends/protobuf/patches/9936.patch b/packages/addons/addon-depends/protobuf/patches/9936.patch
deleted file mode 100644
index c85ee8884a..0000000000
--- a/packages/addons/addon-depends/protobuf/patches/9936.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From fc7dc129f19fec7fe3211a39f13f6fe74c35cce6 Mon Sep 17 00:00:00 2001
-From: Adam Cozzette <acozzette@google.com>
-Date: Mon, 9 May 2022 19:03:39 +0000
-Subject: [PATCH] Use __constinit only in GCC 12.2 and up
-
-Fixes #9916. GCC appears to have a bug preventing our use of __constinit
-from working correctly, but this bug will be fixed in GCC 12.2.
----
- src/google/protobuf/port_def.inc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
-index dcb0ff758f1..289a42674cf 100644
---- a/src/google/protobuf/port_def.inc
-+++ b/src/google/protobuf/port_def.inc
-@@ -650,7 +650,7 @@
-      (!defined(__APPLE__) && __clang_major__ >= 12))
- #define PROTOBUF_CONSTINIT [[clang::require_constant_initialization]]
- #define PROTOBUF_CONSTEXPR constexpr
--#elif PROTOBUF_GNUC_MIN(12, 0)
-+#elif PROTOBUF_GNUC_MIN(12, 2)
- #define PROTOBUF_CONSTINIT __constinit
- #define PROTOBUF_CONSTEXPR constexpr
- #else