diff --git a/.SRCINFO b/.SRCINFO index 5ab2d74..1d1898b 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,15 +13,10 @@ pkgbase = edgetx-companion makedepends = bc makedepends = clang makedepends = cmake - makedepends = dfu-util - makedepends = doxygen makedepends = fox makedepends = gcc makedepends = git - makedepends = graphviz makedepends = icu - makedepends = ninja - makedepends = openssl-1.1 makedepends = python makedepends = python-jinja makedepends = python-lz4 @@ -39,10 +34,11 @@ pkgbase = edgetx-companion depends = qt5-multimedia depends = qt5-serialport depends = sdl2 + optdepends = dfu-util: tool for flashing stm32 based radios 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 +48,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 = 024826402eaf156b36d300d162a0e90a70f82902901e3a78a669d0c6f63dc12b7cbebec089110d38b2965cfeb59759ccb5761fbcf4c1712483d03be50d5416c9 b2sums = SKIP b2sums = SKIP b2sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 6495c73..9e67dea 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,20 +2,21 @@ 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' +optdepends=('dfu-util: tool for flashing stm32 based radios') +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' + '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 +26,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=('024826402eaf156b36d300d162a0e90a70f82902901e3a78a669d0c6f63dc12b7cbebec089110d38b2965cfeb59759ccb5761fbcf4c1712483d03be50d5416c9' 'SKIP' 'SKIP' 'SKIP' @@ -39,13 +40,9 @@ b2sums=('653da451f47977169d1bed523d349f302ca08264bbfd504df51483f19c963e5ab43db42 prepare() { # Deactivate these statements; they bundle the libs for AppImage. for pattern in "LIBSSL1" "LIBUSB1" "DFU_UTIL"; do - sed -i "s/if(${pattern}_FOUND)/if(false)/g" edgetx/companion/src/CMakeLists.txt + 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 git config submodule.AccessDenied.url "$srcdir/AccessDenied" @@ -71,6 +68,7 @@ prepare() { build() { cd edgetx export EDGETX_VERSION_TAG=$pkgver + COMMON_OPTIONS="-DCMAKE_INSTALL_PREFIX=/usr -DGVARS=YES -DHELI=YES -DLUA=YES -Wno-dev -DCMAKE_BUILD_TYPE=Release" source tools/build-common.sh # Provides get_target_build_options() for retrieving individual build options per simulated radio. rm -rf build @@ -90,8 +88,9 @@ build() { for plugin in "${simulator_plugins[@]}" do + BUILD_OPTIONS="${COMMON_OPTIONS} " + echo "Building ${plugin}" - BUILD_OPTIONS="" if ! get_target_build_options "$plugin"; then echo "Error: Failed to find a match for target '$plugin'" @@ -99,27 +98,17 @@ build() { fi rm -f CMakeCache.txt native/CMakeCache.txt - cmake \ - -S .. \ - -G Ninja \ - -DCMAKE_MAKE_PROGRAM=/usr/bin/ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ - -DGVARS=YES \ - -DHELI=YES \ - -DLUA=YES \ - -Wno-dev \ - ${BUILD_OPTIONS} + cmake ${BUILD_OPTIONS} "$srcdir/edgetx" cmake --build . --target native-configure cmake --build native --target libsimulator done + cmake --build . --target native-configure cmake --build native --target companion } package() { - DESTDIR="$pkgdir" ninja -C edgetx/build/native install - install -Dm644 edgetx/LICENSE "$pkgdir/usr/share/licenses/edgetx-companion/LICENSE" + cd edgetx/build/native + make DESTDIR="$pkgdir/" install + install -Dm644 "$srcdir/edgetx/LICENSE" "$pkgdir/usr/share/licenses/edgetx-companion/LICENSE" }