update to 2.8.5

This commit is contained in:
horstderheld 2023-08-07 20:05:51 +02:00
parent 441eab7591
commit 9ff2b96332
2 changed files with 30 additions and 24 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.8.4 pkgver = 2.8.5
pkgrel = 1 pkgrel = 1
url = https://edgetx.org/ url = https://edgetx.org/
arch = x86_64 arch = x86_64
@ -34,7 +34,8 @@ pkgbase = edgetx-companion
optdepends = dfu-util: tool for flashing stm32 based radios optdepends = dfu-util: tool for flashing stm32 based radios
provides = companion provides = companion
conflicts = companion conflicts = companion
source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.8.4 options = !debug
source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.8.5
source = git+https://github.com/jbeder/yaml-cpp.git 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
@ -44,15 +45,15 @@ pkgbase = edgetx-companion
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
sha256sums = SKIP b2sums = SKIP
sha256sums = SKIP b2sums = SKIP
sha256sums = SKIP b2sums = SKIP
sha256sums = SKIP b2sums = SKIP
sha256sums = SKIP b2sums = SKIP
sha256sums = SKIP b2sums = SKIP
sha256sums = SKIP b2sums = SKIP
sha256sums = SKIP b2sums = SKIP
sha256sums = SKIP b2sums = SKIP
sha256sums = efa51cbbff6cb466a6a9bd681b04b158fce6e48d2db4c5cc235c1a871037f6c8 b2sums = 2f2d110ba03c3d852bec93a0705570df93e72f5e3757bd64494083c5a1ae59c5228024fca563043c05014b1962ccde88e029a6bac2fe36be6e852a53b35a43fb
pkgname = edgetx-companion pkgname = edgetx-companion

View file

@ -4,7 +4,7 @@
# Contributer: Arnaud # Contributer: Arnaud
pkgname=edgetx-companion pkgname=edgetx-companion
pkgver=2.8.4 pkgver=2.8.5
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')
@ -16,6 +16,7 @@ makedepends=('arm-none-eabi-binutils' 'arm-none-eabi-gcc' 'arm-none-eabi-newlib'
'avr-gcc' 'avr-libc' 'bc' 'cmake' 'fox' 'gcc' 'git' 'icu' 'python' 'python-lz4' 'avr-gcc' 'avr-libc' 'bc' 'cmake' 'fox' 'gcc' 'git' 'icu' 'python' 'python-lz4'
'python-pillow' 'python-pyqt5' 'qt5-svg' 'qt5-tools' 'qt5-translations' 'python-pillow' 'python-pyqt5' 'qt5-svg' 'qt5-tools' 'qt5-translations'
'sed' 'xsd') 'sed' 'xsd')
options=('!debug')
provides=('companion') provides=('companion')
conflicts=('companion') conflicts=('companion')
_pkgbase=${pkgname%%-*} _pkgbase=${pkgname%%-*}
@ -30,21 +31,25 @@ source=("git+https://github.com/EdgeTX/edgetx.git#tag=v$pkgver"
"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)
sha256sums=('SKIP' b2sums=('SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'efa51cbbff6cb466a6a9bd681b04b158fce6e48d2db4c5cc235c1a871037f6c8') '2f2d110ba03c3d852bec93a0705570df93e72f5e3757bd64494083c5a1ae59c5228024fca563043c05014b1962ccde88e029a6bac2fe36be6e852a53b35a43fb')
prepare() { prepare() {
export EDGETX_VERSION_TAG=$pkgver export EDGETX_VERSION_TAG=$pkgver
cd $_pkgbase cd $_pkgbase
# Revert this commit, as it installs all files from /usr/lib into this package.
git revert e78da0e4d56a15e5fb9625852613ff0f0f3db25a --no-commit
patch ./tools/build-companion.sh < $srcdir/install.patch patch ./tools/build-companion.sh < $srcdir/install.patch
cd $srcdir/$_pkgbase/companion/src/thirdparty/ cd $srcdir/$_pkgbase/companion/src/thirdparty/