rhssk/pkgbuilds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openhd-git: fix failing wifibroadcast patch

Browse Source
This commit is contained in:
Rihards Skuja 2024-02-28 17:45:27 +02:00
parent c30cdcfada
commit 31f257c7b3
Signed by: rhssk
GPG Key ID: E3BF73E10BFF4DF3
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openhd-git/.SRCINFO
View File

@ -1,7 +1,7 @@
pkgbase = openhd-git pkgbase = openhd-git
pkgdesc = Open-source digital FPV system pkgdesc = Open-source digital FPV system
pkgver = 2.5.0.beta3.r381.gf559237 pkgver = 2.5.3.r4.g1e7139f
pkgrel = 2 pkgrel = 1
url = https://openhdfpv.org url = https://openhdfpv.org
arch = any arch = any
license = GPL3 license = GPL3
@ -23,6 +23,6 @@ pkgbase = openhd-git
source = git+https://github.com/OpenHD/OpenHD.git source = git+https://github.com/OpenHD/OpenHD.git
source = 0001-fix-compile-on-gcc-13.patch source = 0001-fix-compile-on-gcc-13.patch
sha256sums = SKIP sha256sums = SKIP
sha256sums = f5353f5411a41833a050cee54d9b461261c8a68eb9051547830960d06c0c0733 sha256sums = 7637ec59e85b4616d05d1f0c81a10fca921473b4b124c04e6506213718bb205a
pkgname = openhd-git pkgname = openhd-git

28
openhd-git/0001-fix-compile-on-gcc-13.patch
View File

@ -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> 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 Subject: [PATCH] fix compile on gcc 13
Without the header compilation fails with a bunch of Without the header compilation fails with a bunch of
"'uint8_t' does not name a type" errors. "'uint8_t' does not name a type" errors.
--- ---
src/HelperSources/StringHelper.hpp | 1 + wifibroadcast/src/HelperSources/StringHelper.hpp | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/src/HelperSources/StringHelper.hpp b/src/HelperSources/StringHelper.hpp diff --git a/wifibroadcast/src/HelperSources/StringHelper.hpp b/wifibroadcast/src/HelperSources/StringHelper.hpp
index f00bf9c..1e8e774 100644 index 056b12d..9d16c94 100644
--- a/src/HelperSources/StringHelper.hpp --- a/wifibroadcast/src/HelperSources/StringHelper.hpp
+++ b/src/HelperSources/StringHelper.hpp +++ b/wifibroadcast/src/HelperSources/StringHelper.hpp
@@ -9,6 +9,7 @@ @@ -6,6 +6,7 @@
#include <sstream> #define OSDTESTER_STRINGHELPER_H
#include <array> #include <array>
#include <vector>
+#include <cstdint> +#include <cstdint>
#include <sstream>
class StringHelper { #include <string>
public: #include <vector>
-- --
2.42.1 2.44.0

8
openhd-git/PKGBUILD
View File

@ -2,8 +2,8 @@
pkgname=openhd-git pkgname=openhd-git
_reponame=OpenHD _reponame=OpenHD
pkgver=2.5.0.beta3.r381.gf559237 pkgver=2.5.3.r4.g1e7139f
pkgrel=2 pkgrel=1
pkgdesc='Open-source digital FPV system' pkgdesc='Open-source digital FPV system'
arch=(any) arch=(any)
url='https://openhdfpv.org' url='https://openhdfpv.org'
@ -18,7 +18,7 @@ provides=("${pkgname%-git}")
conflicts=("${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")
sha256sums=('SKIP' sha256sums=('SKIP'
'f5353f5411a41833a050cee54d9b461261c8a68eb9051547830960d06c0c0733') '7637ec59e85b4616d05d1f0c81a10fca921473b4b124c04e6506213718bb205a')
pkgver() { pkgver() {
cd "$_reponame" cd "$_reponame"
@ -28,7 +28,7 @@ pkgver() {
prepare() { prepare() {
cd "$_reponame" cd "$_reponame"
git submodule update --init --recursive 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() { build() {