Compare commits

...

2 Commits

Author SHA1 Message Date
1012eaea3a
qopenhd-git: add QOpenHD package 2023-11-10 20:07:07 +02:00
bd94fd55aa
openhd-git: add OpenHD package 2023-11-10 20:07:07 +02:00
6 changed files with 211 additions and 0 deletions

28
openhd-git/.SRCINFO Normal file
View File

@ -0,0 +1,28 @@
pkgbase = openhd-git
pkgdesc = Open-source digital FPV system
pkgver = 2.5.0.beta3.r381.gf559237
pkgrel = 1
url = https://openhdfpv.org
arch = any
license = GPL3
makedepends = cmake
makedepends = git
depends = gstreamer
depends = gst-plugins-bad
depends = gst-plugins-ugly
depends = libcamera
depends = libpcap
depends = libsodium
depends = sdl2
depends = sudo
depends = v4l-utils
optdepends = rtl88x2bu-openhd-dkms-git: driver for RTL88x2BU Wi-Fi cards
optdepends = rtl8812au-openhd-dkms-git: driver for RTL88xxAU Wi-Fi cards
provides = openhd
conflicts = openhd
source = git+https://github.com/OpenHD/OpenHD.git
source = 0001-fix-compile-on-gcc-13.patch
sha256sums = SKIP
sha256sums = f5353f5411a41833a050cee54d9b461261c8a68eb9051547830960d06c0c0733
pkgname = openhd-git

View File

@ -0,0 +1,26 @@
From f15c889cf40d7c96a01af1e12f443b14c27872ba Mon Sep 17 00:00:00 2001
From: Rihards Skuja <rihards@skuja.eu>
Date: Fri, 3 Nov 2023 15:41:01 +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 +
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>
class StringHelper {
public:
--
2.42.1

41
openhd-git/PKGBUILD Normal file
View File

@ -0,0 +1,41 @@
# Maintainer: Rihards Skuja <rihards at skuja dot eu>
pkgname=openhd-git
_reponame=OpenHD
pkgver=2.5.0.beta3.r381.gf559237
pkgrel=1
pkgdesc='Open-source digital FPV system'
arch=(any)
url='https://openhdfpv.org'
license=(GPL3)
depends=(gstreamer gst-plugins-bad gst-plugins-ugly libcamera libpcap libsodium sdl2 sudo v4l-utils)
makedepends=(cmake git)
optdepends=(
'rtl88x2bu-openhd-dkms-git: driver for RTL88x2BU Wi-Fi cards'
'rtl8812au-openhd-dkms-git: driver for RTL88xxAU Wi-Fi cards'
)
provides=("${pkgname%-git}")
conflicts=("${pkgname%-git}")
source=("git+https://github.com/OpenHD/$_reponame.git" "0001-fix-compile-on-gcc-13.patch")
sha256sums=('SKIP'
'f5353f5411a41833a050cee54d9b461261c8a68eb9051547830960d06c0c0733')
pkgver() {
cd "$_reponame"
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/lib/wifibroadcast' -p1 -i "$srcdir/0001-fix-compile-on-gcc-13.patch"
}
build() {
cmake -B build -S "$_reponame/OpenHD" -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev
cmake --build build
}
package() {
DESTDIR="$pkgdir" cmake --install build
}

26
qopenhd-git/.SRCINFO Normal file
View File

@ -0,0 +1,26 @@
pkgbase = qopenhd-git
pkgdesc = The default OpenHD companion app
pkgver = 2.5.0.beta3.r218.g7d71a21
pkgrel = 1
url = https://github.com/OpenHD/QOpenHD
arch = any
license = GPL3
makedepends = git
depends = qt5-base
depends = gstreamer
depends = gst-plugins-bad
depends = gst-plugins-ugly
depends = libcamera
depends = libpcap
depends = libsodium
depends = sdl2
depends = sudo
depends = v4l-utils
provides = qopenhd
conflicts = qopenhd
source = git+https://github.com/OpenHD/QOpenHD.git
source = 0001-fix-compile-when-using-the-latest-GCC-and-FFmpeg-ver.patch
sha256sums = SKIP
sha256sums = f8371953163197e7255797991285e9fda84733958274b0609cfc1023c5b6d25c
pkgname = qopenhd-git

View File

@ -0,0 +1,50 @@
From e950a5f3735bbb26622348d16a896c7eb6b229c1 Mon Sep 17 00:00:00 2001
From: Rihards Skuja <rihards@skuja.eu>
Date: Fri, 3 Nov 2023 15:23:14 +0200
Subject: [PATCH] fix compile when using the latest GCC and FFmpeg versions
That FFmpeg API function was deprecated more than 2 years ago.
---
app/telemetry/action/impl/xparam.h | 1 +
app/videostreaming/avcodec/avcodec_helper.hpp | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/app/telemetry/action/impl/xparam.h b/app/telemetry/action/impl/xparam.h
index b80b7da44..27ecf44ec 100644
--- a/app/telemetry/action/impl/xparam.h
+++ b/app/telemetry/action/impl/xparam.h
@@ -8,6 +8,7 @@
#include <thread>
#include <functional>
#include <vector>
+#include <string>
#include "../../util/mavlink_include.h"
diff --git a/app/videostreaming/avcodec/avcodec_helper.hpp b/app/videostreaming/avcodec/avcodec_helper.hpp
index 3123ccfbf..c90cccda3 100644
--- a/app/videostreaming/avcodec/avcodec_helper.hpp
+++ b/app/videostreaming/avcodec/avcodec_helper.hpp
@@ -16,6 +16,7 @@ extern "C" {
#include <libavutil/imgutils.h>
#include <libavutil/buffer.h>
#include <libavutil/frame.h>
+#include <libavutil/version.h>
//
#include "libavutil/frame.h"
#include "libavutil/hwcontext.h"
@@ -60,7 +61,11 @@ static std::string safe_av_get_pix_fmt_name(enum AVPixelFormat pix_fmt){
return {tmp};
}
static std::string safe_av_get_colorspace_name(enum AVColorSpace val){
+#if defined(FF_API_COLORSPACE_NAME)
auto tmp= av_get_colorspace_name(val);
+#else
+ auto tmp= av_color_space_name(val);
+#endif
if(tmp== nullptr){
return "null";
}
--
2.42.0

40
qopenhd-git/PKGBUILD Normal file
View File

@ -0,0 +1,40 @@
# Maintainer: Rihards Skuja <rihards at skuja dot eu>
pkgname=qopenhd-git
_reponame=QOpenHD
pkgver=2.5.0.beta3.r218.g7d71a21
pkgrel=1
pkgdesc='The default OpenHD companion app'
arch=(any)
url='https://github.com/OpenHD/QOpenHD'
license=(GPL3)
# TODO: add proper dependencies
depends=(qt5-base gstreamer gst-plugins-bad gst-plugins-ugly libcamera libpcap libsodium sdl2 sudo v4l-utils)
makedepends=(git)
provides=("${pkgname%-git}")
conflicts=("${pkgname%-git}")
source=("git+https://github.com/OpenHD/$_reponame.git" "0001-fix-compile-when-using-the-latest-GCC-and-FFmpeg-ver.patch")
sha256sums=('SKIP'
'f8371953163197e7255797991285e9fda84733958274b0609cfc1023c5b6d25c')
pkgver() {
cd "$_reponame"
git describe --long --tags --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {
cd "$_reponame"
git submodule update --init --recursive
patch -p1 -i "$srcdir/0001-fix-compile-when-using-the-latest-GCC-and-FFmpeg-ver.patch"
}
build() {
mkdir -p "$_reponame/build"
cd "$_reponame/build"
qmake ..
make
}
package() {
install -Dm755 "$_reponame/build/release/QOpenHD" "$pkgdir/usr/bin/QOpenHD"
}