openhd-git: remove redundant patches
This commit is contained in:
parent
033d2dcaf9
commit
83d2944bb9
@ -1,6 +1,6 @@
|
|||||||
pkgbase = openhd-git
|
pkgbase = openhd-git
|
||||||
pkgdesc = Open-source digital FPV system
|
pkgdesc = Open-source digital FPV system
|
||||||
pkgver = 2.5.3.r23.gb9ed014
|
pkgver = 2.6.0.r1.gd19b2c9
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
url = https://openhdfpv.org
|
url = https://openhdfpv.org
|
||||||
arch = any
|
arch = any
|
||||||
@ -21,10 +21,6 @@ pkgbase = openhd-git
|
|||||||
provides = openhd
|
provides = openhd
|
||||||
conflicts = openhd
|
conflicts = openhd
|
||||||
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 = 0002-fix-compile-on-gcc-13.patch
|
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
sha256sums = 7637ec59e85b4616d05d1f0c81a10fca921473b4b124c04e6506213718bb205a
|
|
||||||
sha256sums = 118befc82ae46153b407ea66fdf7ee4bc0043cb0d36308e124703da1d01f8a79
|
|
||||||
|
|
||||||
pkgname = openhd-git
|
pkgname = openhd-git
|
||||||
|
@ -1,26 +0,0 @@
|
|||||||
From f1111ce46894d3b51434e33a6f3461318dade5fd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rihards Skuja <rihards@skuja.eu>
|
|
||||||
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.
|
|
||||||
---
|
|
||||||
wifibroadcast/src/HelperSources/StringHelper.hpp | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
#include <array>
|
|
||||||
+#include <cstdint>
|
|
||||||
#include <sstream>
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
--
|
|
||||||
2.44.0
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
pkgname=openhd-git
|
pkgname=openhd-git
|
||||||
_reponame=OpenHD
|
_reponame=OpenHD
|
||||||
pkgver=2.5.3.r23.gb9ed014
|
pkgver=2.6.0.r1.gd19b2c9
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc='Open-source digital FPV system'
|
pkgdesc='Open-source digital FPV system'
|
||||||
arch=(any)
|
arch=(any)
|
||||||
@ -16,23 +16,14 @@ optdepends=(
|
|||||||
)
|
)
|
||||||
provides=("${pkgname%-git}")
|
provides=("${pkgname%-git}")
|
||||||
conflicts=("${pkgname%-git}")
|
conflicts=("${pkgname%-git}")
|
||||||
source=("git+https://github.com/OpenHD/$_reponame.git" "0001-fix-compile-on-gcc-13.patch" "0002-fix-compile-on-gcc-13.patch")
|
source=("git+https://github.com/OpenHD/$_reponame.git")
|
||||||
sha256sums=('SKIP'
|
sha256sums=('SKIP')
|
||||||
'7637ec59e85b4616d05d1f0c81a10fca921473b4b124c04e6506213718bb205a'
|
|
||||||
'118befc82ae46153b407ea66fdf7ee4bc0043cb0d36308e124703da1d01f8a79')
|
|
||||||
|
|
||||||
pkgver() {
|
pkgver() {
|
||||||
cd "$_reponame"
|
cd "$_reponame"
|
||||||
git describe --long --tags --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
|
git describe --long --tags --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
|
||||||
}
|
}
|
||||||
|
|
||||||
prepare() {
|
|
||||||
cd "$_reponame"
|
|
||||||
git submodule update --init --recursive
|
|
||||||
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() {
|
build() {
|
||||||
cmake -B build -S "$_reponame/OpenHD" -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev
|
cmake -B build -S "$_reponame/OpenHD" -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev
|
||||||
cmake --build build
|
cmake --build build
|
||||||
|
Loading…
Reference in New Issue
Block a user