From ca4d6e10429223b61d514d949e297510c773f41b Mon Sep 17 00:00:00 2001
From: Rihards Skuja <rihards.s@origin-robotics.com>
Date: Wed, 28 Feb 2024 17:45:27 +0200
Subject: [PATCH] openhd-git: fix failing wifibroadcast patch

---
 openhd-git/.SRCINFO                         |  8 +++---
 openhd-git/0001-fix-compile-on-gcc-13.patch | 30 ++++++++++-----------
 openhd-git/0002-fix-compile-on-gcc-13.patch | 24 +++++++++++++++++
 openhd-git/PKGBUILD                         | 12 +++++----
 4 files changed, 51 insertions(+), 23 deletions(-)
 create mode 100644 openhd-git/0002-fix-compile-on-gcc-13.patch

diff --git a/openhd-git/.SRCINFO b/openhd-git/.SRCINFO
index 631e515..8dfb931 100644
--- a/openhd-git/.SRCINFO
+++ b/openhd-git/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openhd-git
 	pkgdesc = Open-source digital FPV system
-	pkgver = 2.5.0.beta3.r381.gf559237
-	pkgrel = 2
+	pkgver = 2.5.3.r23.gb9ed014
+	pkgrel = 1
 	url = https://openhdfpv.org
 	arch = any
 	license = GPL3
@@ -22,7 +22,9 @@ pkgbase = openhd-git
 	conflicts = openhd
 	source = git+https://github.com/OpenHD/OpenHD.git
 	source = 0001-fix-compile-on-gcc-13.patch
+	source = 0002-fix-compile-on-gcc-13.patch
 	sha256sums = SKIP
-	sha256sums = f5353f5411a41833a050cee54d9b461261c8a68eb9051547830960d06c0c0733
+	sha256sums = 7637ec59e85b4616d05d1f0c81a10fca921473b4b124c04e6506213718bb205a
+	sha256sums = 118befc82ae46153b407ea66fdf7ee4bc0043cb0d36308e124703da1d01f8a79
 
 pkgname = openhd-git
diff --git a/openhd-git/0001-fix-compile-on-gcc-13.patch b/openhd-git/0001-fix-compile-on-gcc-13.patch
index cd2cff1..71926ef 100644
--- a/openhd-git/0001-fix-compile-on-gcc-13.patch
+++ b/openhd-git/0001-fix-compile-on-gcc-13.patch
@@ -1,26 +1,26 @@
-From f15c889cf40d7c96a01af1e12f443b14c27872ba Mon Sep 17 00:00:00 2001
+From f1111ce46894d3b51434e33a6f3461318dade5fd Mon Sep 17 00:00:00 2001
 From: Rihards Skuja <rihards@skuja.eu>
-Date: Fri, 3 Nov 2023 15:41:01 +0200
+Date: Thu, 29 Feb 2024 11:40:31 +0200
 Subject: [PATCH] fix compile on gcc 13
 
 Without the header compilation fails with a bunch of
 "'uint8_t' does not name a type" errors.
 ---
- src/HelperSources/StringHelper.hpp | 1 +
+ wifibroadcast/src/HelperSources/StringHelper.hpp | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/src/HelperSources/StringHelper.hpp b/src/HelperSources/StringHelper.hpp
-index f00bf9c..1e8e774 100644
---- a/src/HelperSources/StringHelper.hpp
-+++ b/src/HelperSources/StringHelper.hpp
-@@ -9,6 +9,7 @@
- #include <sstream>
- #include <array>
- #include <vector>
-+#include <cstdint>
+diff --git a/wifibroadcast/src/HelperSources/StringHelper.hpp b/wifibroadcast/src/HelperSources/StringHelper.hpp
+index 056b12d..9d16c94 100644
+--- a/wifibroadcast/src/HelperSources/StringHelper.hpp
++++ b/wifibroadcast/src/HelperSources/StringHelper.hpp
+@@ -6,6 +6,7 @@
+ #define OSDTESTER_STRINGHELPER_H
  
- class StringHelper {
-  public:
+ #include <array>
++#include <cstdint>
+ #include <sstream>
+ #include <string>
+ #include <vector>
 -- 
-2.42.1
+2.44.0
 
diff --git a/openhd-git/0002-fix-compile-on-gcc-13.patch b/openhd-git/0002-fix-compile-on-gcc-13.patch
new file mode 100644
index 0000000..e704428
--- /dev/null
+++ b/openhd-git/0002-fix-compile-on-gcc-13.patch
@@ -0,0 +1,24 @@
+From 79b881d9007d44023ab1c6c4d91c0933a1bc934f Mon Sep 17 00:00:00 2001
+From: Rihards Skuja <rihards@skuja.eu>
+Date: Thu, 29 Feb 2024 11:52:22 +0200
+Subject: [PATCH] fix compile on gcc 13
+
+---
+ OpenHD/ohd_common/inc/openhd_util.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/OpenHD/ohd_common/inc/openhd_util.h b/OpenHD/ohd_common/inc/openhd_util.h
+index 9890eaa3..6c4b1ba5 100644
+--- a/OpenHD/ohd_common/inc/openhd_util.h
++++ b/OpenHD/ohd_common/inc/openhd_util.h
+@@ -1,6 +1,7 @@
+ #ifndef OPENHD_UTIL_H
+ #define OPENHD_UTIL_H
+ 
++#include <cstdint>
+ #include <optional>
+ #include <string>
+ #include <vector>
+-- 
+2.44.0
+
diff --git a/openhd-git/PKGBUILD b/openhd-git/PKGBUILD
index 246e2a5..0713e5d 100644
--- a/openhd-git/PKGBUILD
+++ b/openhd-git/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=openhd-git
 _reponame=OpenHD
-pkgver=2.5.0.beta3.r381.gf559237
-pkgrel=2
+pkgver=2.5.3.r23.gb9ed014
+pkgrel=1
 pkgdesc='Open-source digital FPV system'
 arch=(any)
 url='https://openhdfpv.org'
@@ -16,9 +16,10 @@ optdepends=(
 )
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=("git+https://github.com/OpenHD/$_reponame.git" "0001-fix-compile-on-gcc-13.patch")
+source=("git+https://github.com/OpenHD/$_reponame.git" "0001-fix-compile-on-gcc-13.patch" "0002-fix-compile-on-gcc-13.patch")
 sha256sums=('SKIP'
-            'f5353f5411a41833a050cee54d9b461261c8a68eb9051547830960d06c0c0733')
+            '7637ec59e85b4616d05d1f0c81a10fca921473b4b124c04e6506213718bb205a'
+            '118befc82ae46153b407ea66fdf7ee4bc0043cb0d36308e124703da1d01f8a79')
 
 pkgver() {
 	cd "$_reponame"
@@ -28,7 +29,8 @@ pkgver() {
 prepare() {
 	cd "$_reponame"
 	git submodule update --init --recursive
-	patch -d 'OpenHD/lib/wifibroadcast' -p1 -i "$srcdir/0001-fix-compile-on-gcc-13.patch"
+	patch -d 'OpenHD/ohd_interface/lib/wifibroadcast' -p1 -i "$srcdir/0001-fix-compile-on-gcc-13.patch"
+	patch -p1 -i "$srcdir/0002-fix-compile-on-gcc-13.patch"
 }
 
 build() {