Compare commits
5 Commits
f48bfc3d22
...
3847541cb9
Author | SHA1 | Date | |
---|---|---|---|
3847541cb9 | |||
1012662f79 | |||
8bf38de2ef | |||
e001e11d6b | |||
4c967faaa6 |
@ -1,18 +1,17 @@
|
||||
pkgbase = kpeoplevcard-git
|
||||
pkgdesc = KPeople VCard Support
|
||||
pkgver = r38.32d50a9
|
||||
pkgdesc = Expose VCard contacts to KPeople
|
||||
pkgver = 0.1.r124.gb84f309
|
||||
pkgrel = 1
|
||||
url = https://phabricator.kde.org/source/kpeoplevcard/
|
||||
url = https://kde.org
|
||||
arch = x86_64
|
||||
license = GPL
|
||||
makedepends = git
|
||||
makedepends = extra-cmake-modules
|
||||
depends = kpeople
|
||||
depends = kcontacts
|
||||
depends = kpeople5
|
||||
depends = kcontacts5
|
||||
provides = kpeoplevcard
|
||||
conflicts = kpeoplevcard
|
||||
source = git+git://anongit.kde.org/kpeoplevcard
|
||||
source = git+https://invent.kde.org/pim/kpeoplevcard.git
|
||||
md5sums = SKIP
|
||||
|
||||
pkgname = kpeoplevcard-git
|
||||
|
||||
|
@ -1,35 +1,30 @@
|
||||
# Maintainer: Rihards Skuja <rhssk at posteo eu>
|
||||
|
||||
_pkgname=kpeoplevcard
|
||||
pkgname=$_pkgname-git
|
||||
pkgver=r38.32d50a9
|
||||
pkgver=0.1.r124.gb84f309
|
||||
pkgrel=1
|
||||
pkgdesc="KPeople VCard Support"
|
||||
pkgdesc='Expose VCard contacts to KPeople'
|
||||
arch=(x86_64)
|
||||
url="https://phabricator.kde.org/source/$_pkgname/"
|
||||
license=("GPL")
|
||||
depends=(kpeople kcontacts)
|
||||
url='https://kde.org'
|
||||
license=(GPL)
|
||||
depends=(kpeople5 kcontacts5)
|
||||
makedepends=(git extra-cmake-modules)
|
||||
provides=($_pkgname)
|
||||
conflicts=($_pkgname)
|
||||
source=("git+git://anongit.kde.org/$_pkgname")
|
||||
md5sums=("SKIP")
|
||||
source=("git+https://invent.kde.org/pim/$_pkgname.git")
|
||||
md5sums=('SKIP')
|
||||
|
||||
pkgver() {
|
||||
cd $_pkgname
|
||||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
||||
}
|
||||
|
||||
prepare() {
|
||||
mkdir -p build
|
||||
cd $_pkgname
|
||||
git describe --long --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
|
||||
}
|
||||
|
||||
build() {
|
||||
cd build
|
||||
cmake ../$_pkgname
|
||||
make
|
||||
cmake -B build -S $_pkgname -Wno-dev
|
||||
cmake --build build
|
||||
}
|
||||
|
||||
package() {
|
||||
cd build
|
||||
make DESTDIR="$pkgdir/" install
|
||||
DESTDIR="$pkgdir" cmake --install build
|
||||
}
|
||||
|
28
openhd-git/.SRCINFO
Normal file
28
openhd-git/.SRCINFO
Normal 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
|
4
openhd-git/.gitignore
vendored
Normal file
4
openhd-git/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
*
|
||||
!/PKGBUILD
|
||||
!/.SRCINFO
|
||||
!/*.patch
|
26
openhd-git/0001-fix-compile-on-gcc-13.patch
Normal file
26
openhd-git/0001-fix-compile-on-gcc-13.patch
Normal 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
41
openhd-git/PKGBUILD
Normal 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
26
qopenhd-git/.SRCINFO
Normal 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
|
4
qopenhd-git/.gitignore
vendored
Normal file
4
qopenhd-git/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
*
|
||||
!/PKGBUILD
|
||||
!/.SRCINFO
|
||||
!/*.patch
|
@ -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
40
qopenhd-git/PKGBUILD
Normal 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"
|
||||
}
|
@ -1,13 +1,13 @@
|
||||
pkgbase = simplicity-commander
|
||||
pkgdesc = GUI and command line access to the debug features of Silicon Labs devices
|
||||
pkgver = 1.14.5
|
||||
pkgver = 1.16.0
|
||||
pkgrel = 1
|
||||
url = https://www.silabs.com/mcu/programming-options
|
||||
arch = x86_64
|
||||
license = LGPL
|
||||
depends = jlink-software-and-documentation
|
||||
options = !strip
|
||||
source = simplicity-commander-1.14.5.zip::https://www.silabs.com/documents/public/software/SimplicityCommander-Linux.zip
|
||||
sha256sums = 30a0cd9534246cb2e96e1331a426f0c8e80ec41be31cdb411df980239732185a
|
||||
source = simplicity-commander-1.16.0.zip::https://www.silabs.com/documents/public/software/SimplicityCommander-Linux.zip
|
||||
sha256sums = 6737d88915443113d544727dafba54b27cf85e9e72a53f200a591e5c30913d7d
|
||||
|
||||
pkgname = simplicity-commander
|
||||
|
@ -1,7 +1,7 @@
|
||||
# Maintainer: Rihards Skuja <rhssk at posteo dot eu>
|
||||
|
||||
pkgname=simplicity-commander
|
||||
pkgver=1.14.5
|
||||
pkgver=1.16.0
|
||||
pkgrel=1
|
||||
pkgdesc='GUI and command line access to the debug features of Silicon Labs devices'
|
||||
arch=('x86_64')
|
||||
@ -10,7 +10,7 @@ license=('LGPL')
|
||||
options=('!strip')
|
||||
depends=('jlink-software-and-documentation')
|
||||
source=("$pkgname-$pkgver.zip::https://www.silabs.com/documents/public/software/SimplicityCommander-Linux.zip")
|
||||
sha256sums=('30a0cd9534246cb2e96e1331a426f0c8e80ec41be31cdb411df980239732185a')
|
||||
sha256sums=('6737d88915443113d544727dafba54b27cf85e9e72a53f200a591e5c30913d7d')
|
||||
|
||||
package() {
|
||||
cd "SimplicityCommander-Linux"
|
||||
|
@ -1,7 +1,7 @@
|
||||
pkgbase = slc-cli
|
||||
pkgdesc = Command line tool to generate projects with Silicon Labs SDK
|
||||
pkgver = 5.4.2
|
||||
pkgrel = 2
|
||||
pkgver = 5.7.3.0
|
||||
pkgrel = 1
|
||||
url = https://siliconlabs.github.io/slc-specification
|
||||
arch = x86_64
|
||||
license = unknown
|
||||
@ -9,9 +9,9 @@ pkgbase = slc-cli
|
||||
depends = python-requests
|
||||
depends = python-websockets
|
||||
depends = python-colorama
|
||||
noextract = slc-cli-5.4.2.zip
|
||||
noextract = slc-cli-5.7.3.0.zip
|
||||
options = !strip
|
||||
source = slc-cli-5.4.2.zip::https://www.silabs.com/documents/login/software/slc_cli_linux.zip
|
||||
sha256sums = 0befd4e3c919739b1ba366f6d0aac6767e9e552eb023ec2c0cacb880ad301b40
|
||||
source = slc-cli-5.7.3.0.zip::https://www.silabs.com/documents/login/software/slc_cli_linux.zip
|
||||
sha256sums = e33775fef52032b97f31b8cae48936e02e299b2df79c40ce5caf47d08ce02396
|
||||
|
||||
pkgname = slc-cli
|
||||
|
@ -1,8 +1,8 @@
|
||||
# Maintainer: Rihards Skuja <rhssk at posteo dot eu>
|
||||
|
||||
pkgname=slc-cli
|
||||
pkgver=5.4.2
|
||||
pkgrel=2
|
||||
pkgver=5.7.3.0
|
||||
pkgrel=1
|
||||
pkgdesc='Command line tool to generate projects with Silicon Labs SDK'
|
||||
arch=('x86_64')
|
||||
url='https://siliconlabs.github.io/slc-specification'
|
||||
@ -11,7 +11,7 @@ options=('!strip')
|
||||
depends=('java-runtime' 'python-requests' 'python-websockets' 'python-colorama')
|
||||
source=("$pkgname-$pkgver.zip::https://www.silabs.com/documents/login/software/slc_cli_linux.zip")
|
||||
noextract=("$pkgname-$pkgver.zip")
|
||||
sha256sums=('0befd4e3c919739b1ba366f6d0aac6767e9e552eb023ec2c0cacb880ad301b40')
|
||||
sha256sums=('e33775fef52032b97f31b8cae48936e02e299b2df79c40ce5caf47d08ce02396')
|
||||
|
||||
prepare() {
|
||||
bsdtar -xpf "$pkgname-$pkgver.zip"
|
||||
|
Loading…
Reference in New Issue
Block a user