From d2ffd6fbbe3f6e751d1d4cc9dc03bbc65078712a Mon Sep 17 00:00:00 2001 From: lod Date: Mon, 28 Apr 2025 13:18:43 +0200 Subject: [PATCH] upstream release 2.11.0 --- .SRCINFO | 8 ++++---- PKGBUILD | 22 +++++++++------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5ab2d74..e02d7f3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = edgetx-companion pkgdesc = EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares pkgver = 2.11.0 - pkgrel = 0.3 + pkgrel = 1 url = https://edgetx.org/ arch = x86_64 license = GPL-2.0-only @@ -13,7 +13,6 @@ pkgbase = edgetx-companion makedepends = bc makedepends = clang makedepends = cmake - makedepends = dfu-util makedepends = doxygen makedepends = fox makedepends = gcc @@ -32,6 +31,7 @@ pkgbase = edgetx-companion makedepends = qt5-translations makedepends = sed makedepends = xsd + depends = dfu-util depends = gcc-libs depends = glibc depends = hicolor-icon-theme @@ -42,7 +42,7 @@ pkgbase = edgetx-companion provides = companion conflicts = companion options = !debug - source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.11.0-rc3 + source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.11.0 source = git+https://github.com/raphaelcoeffic/AccessDenied.git source = git+https://github.com/FreeRTOS/FreeRTOS-Kernel.git source = git+https://github.com/adfernandes/segger-rtt.git @@ -52,7 +52,7 @@ pkgbase = edgetx-companion source = git+https://github.com/nothings/stb.git source = git+https://github.com/microsoft/uf2 source = git+https://github.com/signal11/hidapi - b2sums = 653da451f47977169d1bed523d349f302ca08264bbfd504df51483f19c963e5ab43db42dabeabec05e6713de1084c8722b2262de505a666a9e19dc50dd199066 + b2sums = 403635484bef31d0cc39d7fb9375b5fac911c828540cce3320949a1287239a9c81283e44243e903fd19d6550719c05060a2a28d78c51a88b6a8d05606bca2a20 b2sums = SKIP b2sums = SKIP b2sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 6495c73..d4b6947 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,20 +2,19 @@ pkgname=edgetx-companion pkgver=2.11.0 -pkgrel=0.3 +pkgrel=1 pkgdesc="EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares" arch=('x86_64') url='https://edgetx.org/' license=('GPL-2.0-only') -depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'qt5-base' 'qt5-multimedia' 'qt5-serialport' 'sdl2') -makedepends=('arm-none-eabi-binutils' 'arm-none-eabi-gcc' 'arm-none-eabi-newlib' 'avr-gcc' 'avr-libc' - 'bc' 'clang' 'cmake' 'dfu-util' 'doxygen' 'fox' 'gcc' 'git' 'graphviz' 'icu' 'ninja' - 'openssl-1.1' 'python' 'python-jinja' 'python-lz4' 'python-pillow' 'python-pyqt5' 'qt5-svg' - 'qt5-tools' 'qt5-translations' 'sed' 'xsd') +depends=('dfu-util' 'gcc-libs' 'glibc' 'hicolor-icon-theme' 'qt5-base' 'qt5-multimedia' 'qt5-serialport' 'sdl2') +makedepends=('arm-none-eabi-binutils' 'arm-none-eabi-gcc' 'arm-none-eabi-newlib' 'avr-gcc' 'avr-libc' 'bc' 'clang' + 'cmake' 'doxygen' 'fox' 'gcc' 'git' 'graphviz' 'icu' 'ninja' 'openssl-1.1' 'python' 'python-jinja' + 'python-lz4' 'python-pillow' 'python-pyqt5' 'qt5-svg' 'qt5-tools' 'qt5-translations' 'sed' 'xsd') options=('!debug') provides=('companion') conflicts=('companion') -source=("git+https://github.com/EdgeTX/edgetx.git#tag=v$pkgver-rc3" +source=("git+https://github.com/EdgeTX/edgetx.git#tag=v$pkgver" "git+https://github.com/raphaelcoeffic/AccessDenied.git" "git+https://github.com/FreeRTOS/FreeRTOS-Kernel.git" "git+https://github.com/adfernandes/segger-rtt.git" @@ -25,7 +24,7 @@ source=("git+https://github.com/EdgeTX/edgetx.git#tag=v$pkgver-rc3" "git+https://github.com/nothings/stb.git" "git+https://github.com/microsoft/uf2" "git+https://github.com/signal11/hidapi") -b2sums=('653da451f47977169d1bed523d349f302ca08264bbfd504df51483f19c963e5ab43db42dabeabec05e6713de1084c8722b2262de505a666a9e19dc50dd199066' +b2sums=('403635484bef31d0cc39d7fb9375b5fac911c828540cce3320949a1287239a9c81283e44243e903fd19d6550719c05060a2a28d78c51a88b6a8d05606bca2a20' 'SKIP' 'SKIP' 'SKIP' @@ -38,13 +37,11 @@ b2sums=('653da451f47977169d1bed523d349f302ca08264bbfd504df51483f19c963e5ab43db42 prepare() { # Deactivate these statements; they bundle the libs for AppImage. - for pattern in "LIBSSL1" "LIBUSB1" "DFU_UTIL"; do + for pattern in "LIBSSL1" "LIBUSB1"; do sed -i "s/if(${pattern}_FOUND)/if(false)/g" edgetx/companion/src/CMakeLists.txt done sed -i 's/$(MAKE)/ninja/g' edgetx/CMakeLists.txt - sed -i 's/cmake_policy(SET CMP0026 OLD)/cmake_policy(SET CMP0026 NEW)/' edgetx/companion/src/CMakeLists.txt - sed -i 's/cmake_policy(SET CMP0023 OLD)/cmake_policy(SET CMP0023 NEW)/' edgetx/cmake/GenericDefinitions.cmake cd "$srcdir/edgetx/radio/src/thirdparty/" git submodule init @@ -84,7 +81,7 @@ build() { tlite tpro tprov2 tpros bumblebee lr3pro t14 x9d x9dp x9dp2019 x9e xlite xlites - nv14 el18 pl18 pl18ev + nv14 el18 pl18 pl18ev st16 x10 x10express x12s t15 t16 t18 t20 t20v2 tx16s f16 v16) @@ -106,7 +103,6 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DGVARS=YES \ -DHELI=YES \ -DLUA=YES \