From 3847541cb93b126464a35d02d0b9022e157f300a Mon Sep 17 00:00:00 2001 From: Rihards Skuja Date: Fri, 10 Nov 2023 20:07:07 +0200 Subject: [PATCH] qopenhd-git: add QOpenHD package --- qopenhd-git/.SRCINFO | 26 ++++++++++ qopenhd-git/.gitignore | 4 ++ ...-using-the-latest-GCC-and-FFmpeg-ver.patch | 50 +++++++++++++++++++ qopenhd-git/PKGBUILD | 40 +++++++++++++++ 4 files changed, 120 insertions(+) create mode 100644 qopenhd-git/.SRCINFO create mode 100644 qopenhd-git/.gitignore create mode 100644 qopenhd-git/0001-fix-compile-when-using-the-latest-GCC-and-FFmpeg-ver.patch create mode 100644 qopenhd-git/PKGBUILD diff --git a/qopenhd-git/.SRCINFO b/qopenhd-git/.SRCINFO new file mode 100644 index 0000000..69d2435 --- /dev/null +++ b/qopenhd-git/.SRCINFO @@ -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 diff --git a/qopenhd-git/.gitignore b/qopenhd-git/.gitignore new file mode 100644 index 0000000..ccc3f2a --- /dev/null +++ b/qopenhd-git/.gitignore @@ -0,0 +1,4 @@ +* +!/PKGBUILD +!/.SRCINFO +!/*.patch diff --git a/qopenhd-git/0001-fix-compile-when-using-the-latest-GCC-and-FFmpeg-ver.patch b/qopenhd-git/0001-fix-compile-when-using-the-latest-GCC-and-FFmpeg-ver.patch new file mode 100644 index 0000000..b70d712 --- /dev/null +++ b/qopenhd-git/0001-fix-compile-when-using-the-latest-GCC-and-FFmpeg-ver.patch @@ -0,0 +1,50 @@ +From e950a5f3735bbb26622348d16a896c7eb6b229c1 Mon Sep 17 00:00:00 2001 +From: Rihards Skuja +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 + #include + #include ++#include + + #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 + #include + #include ++#include + // + #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 + diff --git a/qopenhd-git/PKGBUILD b/qopenhd-git/PKGBUILD new file mode 100644 index 0000000..db25ef8 --- /dev/null +++ b/qopenhd-git/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Rihards Skuja + +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" +}