diff --git a/openhd-git/.SRCINFO b/openhd-git/.SRCINFO index 631e515..851664e 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.r4.g1e7139f + pkgrel = 1 url = https://openhdfpv.org arch = any license = GPL3 @@ -23,6 +23,6 @@ pkgbase = openhd-git source = git+https://github.com/OpenHD/OpenHD.git source = 0001-fix-compile-on-gcc-13.patch sha256sums = SKIP - sha256sums = f5353f5411a41833a050cee54d9b461261c8a68eb9051547830960d06c0c0733 + sha256sums = d7a917cba6b6e9f510c42f543636024efd970baa2c255ca1eacae0601d0ef148 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 -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 - #include - #include -+#include +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 ++#include + #include + #include + #include -- -2.42.1 +2.44.0 diff --git a/openhd-git/PKGBUILD b/openhd-git/PKGBUILD index 246e2a5..86bee7a 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.r4.g1e7139f +pkgrel=1 pkgdesc='Open-source digital FPV system' arch=(any) url='https://openhdfpv.org' @@ -18,7 +18,7 @@ provides=("${pkgname%-git}") conflicts=("${pkgname%-git}") source=("git+https://github.com/OpenHD/$_reponame.git" "0001-fix-compile-on-gcc-13.patch") sha256sums=('SKIP' - 'f5353f5411a41833a050cee54d9b461261c8a68eb9051547830960d06c0c0733') + 'd7a917cba6b6e9f510c42f543636024efd970baa2c255ca1eacae0601d0ef148') pkgver() { cd "$_reponame" @@ -28,7 +28,7 @@ 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" } build() {