Compare commits

..

No commits in common. "d42a8c8f198747c379963989e4d3deaec3994a6f" and "f5de50d0f27d879c0b693058501ff922ef63507b" have entirely different histories.

3 changed files with 31 additions and 19 deletions

View file

@ -1,6 +1,6 @@
pkgbase = edgetx-companion pkgbase = edgetx-companion
pkgdesc = EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares pkgdesc = EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares
pkgver = 2.10.0 pkgver = 2.9.3
pkgrel = 1 pkgrel = 1
url = https://edgetx.org/ url = https://edgetx.org/
arch = x86_64 arch = x86_64
@ -18,7 +18,6 @@ pkgbase = edgetx-companion
makedepends = git makedepends = git
makedepends = icu makedepends = icu
makedepends = python makedepends = python
makedepends = python-jinja
makedepends = python-lz4 makedepends = python-lz4
makedepends = python-pillow makedepends = python-pillow
makedepends = python-pyqt5 makedepends = python-pyqt5
@ -37,16 +36,16 @@ pkgbase = edgetx-companion
provides = companion provides = companion
conflicts = companion conflicts = companion
options = !debug options = !debug
source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.10.0-rc3 source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.9.3
source = git+https://github.com/jbeder/yaml-cpp.git
source = git+https://github.com/raphaelcoeffic/AccessDenied.git source = git+https://github.com/raphaelcoeffic/AccessDenied.git
source = git+https://github.com/FreeRTOS/FreeRTOS-Kernel.git source = git+https://github.com/FreeRTOS/FreeRTOS-Kernel.git
source = git+https://github.com/adfernandes/segger-rtt.git source = git+https://github.com/edgetx/libopenui.git
source = git+https://github.com/FreeRTOS/FreeRTOS-Kernel-Community-Supported-Ports.git source = git+https://github.com/FreeRTOS/FreeRTOS-Kernel-Community-Supported-Ports.git
source = git+https://github.com/FreeRTOS/FreeRTOS-Kernel-Partner-Supported-Ports.git source = git+https://github.com/FreeRTOS/FreeRTOS-Kernel-Partner-Supported-Ports.git
source = git+https://github.com/EdgeTX/lvgl.git source = git+https://github.com/EdgeTX/lvgl.git
source = git+https://github.com/nothings/stb.git source = git+https://github.com/nothings/stb.git
source = install.patch source = install.patch
b2sums = 3330392c092e883ccca0cc45132c95b10a89b9b3d8bf62c761ffcf75eaa1a837fe23c51a787cb0f4a936f1447b134e9dab75818ab11e1c86a530d9e27bf6e051
b2sums = SKIP b2sums = SKIP
b2sums = SKIP b2sums = SKIP
b2sums = SKIP b2sums = SKIP
@ -54,6 +53,8 @@ pkgbase = edgetx-companion
b2sums = SKIP b2sums = SKIP
b2sums = SKIP b2sums = SKIP
b2sums = SKIP b2sums = SKIP
b2sums = 97badff74d64db444a780f48a3003e4a7232e7c0ab1ef43f9adbf20044c988f41dd455dc5aad548e5d3501ccc7a1ad9967a69bf43cbd2bb133eb6d00d50f210c b2sums = SKIP
b2sums = SKIP
b2sums = 2f2d110ba03c3d852bec93a0705570df93e72f5e3757bd64494083c5a1ae59c5228024fca563043c05014b1962ccde88e029a6bac2fe36be6e852a53b35a43fb
pkgname = edgetx-companion pkgname = edgetx-companion

View file

@ -4,8 +4,7 @@
# Contributer: Arnaud # Contributer: Arnaud
pkgname=edgetx-companion pkgname=edgetx-companion
pkgver=2.10.0 pkgver=2.9.3
_rc=-rc3
pkgrel=1 pkgrel=1
pkgdesc="EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares" pkgdesc="EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares"
arch=('x86_64') arch=('x86_64')
@ -15,21 +14,22 @@ depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'qt5-base' 'qt5-multimedia' 'sd
optdepends=('dfu-util: tool for flashing stm32 based radios') optdepends=('dfu-util: tool for flashing stm32 based radios')
makedepends=('arm-none-eabi-binutils' 'arm-none-eabi-gcc' 'arm-none-eabi-newlib' makedepends=('arm-none-eabi-binutils' 'arm-none-eabi-gcc' 'arm-none-eabi-newlib'
'avr-gcc' 'avr-libc' 'bc' 'clang' 'cmake' 'fox' 'gcc' 'git' 'icu' 'python' 'avr-gcc' 'avr-libc' 'bc' 'clang' 'cmake' 'fox' 'gcc' 'git' 'icu' 'python'
'python-jinja' 'python-lz4' 'python-pillow' 'python-pyqt5' 'qt5-svg' 'python-lz4' 'python-pillow' 'python-pyqt5' 'qt5-svg' 'qt5-tools'
'qt5-tools' 'qt5-translations' 'sed' 'xsd') 'qt5-translations' 'sed' 'xsd')
options=('!debug') options=('!debug')
provides=('companion') provides=('companion')
conflicts=('companion') conflicts=('companion')
source=("git+https://github.com/EdgeTX/edgetx.git#tag=v$pkgver$_rc" source=("git+https://github.com/EdgeTX/edgetx.git#tag=v$pkgver"
"git+https://github.com/jbeder/yaml-cpp.git"
"git+https://github.com/raphaelcoeffic/AccessDenied.git" "git+https://github.com/raphaelcoeffic/AccessDenied.git"
"git+https://github.com/FreeRTOS/FreeRTOS-Kernel.git" "git+https://github.com/FreeRTOS/FreeRTOS-Kernel.git"
"git+https://github.com/adfernandes/segger-rtt.git" "git+https://github.com/edgetx/libopenui.git"
"git+https://github.com/FreeRTOS/FreeRTOS-Kernel-Community-Supported-Ports.git" "git+https://github.com/FreeRTOS/FreeRTOS-Kernel-Community-Supported-Ports.git"
"git+https://github.com/FreeRTOS/FreeRTOS-Kernel-Partner-Supported-Ports.git" "git+https://github.com/FreeRTOS/FreeRTOS-Kernel-Partner-Supported-Ports.git"
"git+https://github.com/EdgeTX/lvgl.git" "git+https://github.com/EdgeTX/lvgl.git"
"git+https://github.com/nothings/stb.git" "git+https://github.com/nothings/stb.git"
install.patch) install.patch)
b2sums=('3330392c092e883ccca0cc45132c95b10a89b9b3d8bf62c761ffcf75eaa1a837fe23c51a787cb0f4a936f1447b134e9dab75818ab11e1c86a530d9e27bf6e051' b2sums=('SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
@ -37,7 +37,8 @@ b2sums=('3330392c092e883ccca0cc45132c95b10a89b9b3d8bf62c761ffcf75eaa1a837fe23c51
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'97badff74d64db444a780f48a3003e4a7232e7c0ab1ef43f9adbf20044c988f41dd455dc5aad548e5d3501ccc7a1ad9967a69bf43cbd2bb133eb6d00d50f210c') 'SKIP'
'2f2d110ba03c3d852bec93a0705570df93e72f5e3757bd64494083c5a1ae59c5228024fca563043c05014b1962ccde88e029a6bac2fe36be6e852a53b35a43fb')
prepare() { prepare() {
export EDGETX_VERSION_TAG=$pkgver export EDGETX_VERSION_TAG=$pkgver
@ -52,7 +53,8 @@ prepare() {
done done
declare -A submodules=( declare -A submodules=(
["$_pkgbase/radio/src/thirdparty/"]="AccessDenied FreeRTOS-Kernel Segger_RTT" ["$_pkgbase/companion/src/thirdparty/"]="yaml-cpp"
["$_pkgbase/radio/src/thirdparty/"]="AccessDenied FreeRTOS-Kernel libopenui"
["$_pkgbase/radio/src/thirdparty/FreeRTOS/portable/ThirdParty/"]="FreeRTOS-Kernel-Community-Supported-Ports FreeRTOS-Kernel-Partner-Supported-Ports" ["$_pkgbase/radio/src/thirdparty/FreeRTOS/portable/ThirdParty/"]="FreeRTOS-Kernel-Community-Supported-Ports FreeRTOS-Kernel-Partner-Supported-Ports"
["$_pkgbase/radio/src/thirdparty/libopenui/thirdparty/"]="lvgl stb" ["$_pkgbase/radio/src/thirdparty/libopenui/thirdparty/"]="lvgl stb"
) )
@ -68,8 +70,8 @@ prepare() {
} }
build() { build() {
cd $srcdir/edgetx cd $_pkgbase
./tools/build-companion.sh $MAKEFLAGS $srcdir/edgetx $srcdir/build ./tools/build-companion.sh $MAKEFLAGS $_pkgbase $srcdir/build
} }
package() { package() {

View file

@ -1,3 +1,5 @@
--- build-companion-org.sh 2022-11-29 15:37:49.493916416 +0100
+++ build-companion.sh 2022-11-29 20:11:06.425385270 +0100
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
SRCDIR=$1 SRCDIR=$1
OUTDIR=$2 OUTDIR=$2
@ -20,9 +22,16 @@
declare -a simulator_plugins=(x9lite x9lites declare -a simulator_plugins=(x9lite x9lites
x7 x7-access x7 x7-access
@@ -176,14 +176,4 @@ @@ -161,19 +161,10 @@
esac
rm -f CMakeCache.txt native/CMakeCache.txt
+
cmake ${BUILD_OPTIONS} "${SRCDIR}"
cmake --build . --target native-configure
cmake --build native -j"${JOBS}" --target libsimulator cmake --build native -j"${JOBS}" --target libsimulator
done -done
+done
-cmake --build . --target native-configure -cmake --build . --target native-configure
-if [ "$(uname)" = "Darwin" ]; then -if [ "$(uname)" = "Darwin" ]; then