From aa0d869431b7e8de2acadd5883eff3cab2f20afb Mon Sep 17 00:00:00 2001 From: horstderheld Date: Tue, 29 Nov 2022 21:28:32 +0100 Subject: [PATCH 01/10] upgrade to 2.8 --- .SRCINFO | 8 ++++---- PKGBUILD | 14 +++++++------- install.patch | 39 +++++++++++++++++++++++++-------------- 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 043e505..935920b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = edgetx-companion pkgdesc = EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares - pkgver = 2.7.1 + pkgver = 2.8.0 pkgrel = 1 url = https://edgetx.org/ arch = x86_64 @@ -17,6 +17,7 @@ pkgbase = edgetx-companion makedepends = git makedepends = icu makedepends = python + makedepends = python-lz4 makedepends = python-pillow makedepends = python-pyqt5 makedepends = qt5-svg @@ -25,15 +26,14 @@ pkgbase = edgetx-companion makedepends = sed makedepends = xsd depends = hicolor-icon-theme - depends = qt5-base depends = qt5-multimedia depends = sdl optdepends = dfu-util: tool for flashing stm32 based radios provides = companion conflicts = companion - source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.7.1 + source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.8.0 source = install.patch sha256sums = SKIP - sha256sums = f9b62f82f402ea96153a7e45ec22aeaa4780039d57b28cc8ca8456e05c34ffe7 + sha256sums = efa51cbbff6cb466a6a9bd681b04b158fce6e48d2db4c5cc235c1a871037f6c8 pkgname = edgetx-companion diff --git a/PKGBUILD b/PKGBUILD index c5a4296..190f0bd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,16 +4,16 @@ # Contributer: Arnaud pkgname=edgetx-companion -pkgver=2.7.1 +pkgver=2.8.0 pkgrel=1 pkgdesc="EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares" arch=('x86_64') url='https://edgetx.org/' license=('GPL2') -depends=('hicolor-icon-theme' 'qt5-base' 'qt5-multimedia' 'sdl') +depends=('hicolor-icon-theme' 'qt5-multimedia' 'sdl') 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' 'cmake' 'fox' 'gcc' 'git' 'icu' 'python' + 'avr-gcc' 'avr-libc' 'bc' 'cmake' 'fox' 'gcc' 'git' 'icu' 'python' 'python-lz4' 'python-pillow' 'python-pyqt5' 'qt5-svg' 'qt5-tools' 'qt5-translations' 'sed' 'xsd') provides=('companion') @@ -23,21 +23,21 @@ _versuff=${pkgver/./} && _versuff=${_versuff%%.*} source=("git+https://github.com/EdgeTX/edgetx.git#tag=v${pkgver}" install.patch) sha256sums=('SKIP' - 'f9b62f82f402ea96153a7e45ec22aeaa4780039d57b28cc8ca8456e05c34ffe7') + 'efa51cbbff6cb466a6a9bd681b04b158fce6e48d2db4c5cc235c1a871037f6c8') prepare() { cd ${_pkgbase} - patch ./tools/build-companion-nightly.sh < ${srcdir}/install.patch + patch ./tools/build-companion.sh < ${srcdir}/install.patch git submodule update --init --recursive } build() { cd ${_pkgbase} - ./tools/build-companion-nightly.sh ${MAKEFLAGS} ${srcdir}/${_pkgbase} ${srcdir}/build ${_versuff} + ./tools/build-companion.sh ${MAKEFLAGS} ${srcdir}/${_pkgbase} ${srcdir}/build ${_versuff} } package() { - cd ${srcdir}/build + cd ${srcdir}/build/native make DESTDIR=${pkgdir}/ install cd ${pkgdir}/usr/share/applications sed -i -e 's/Categories=Application/Categories=Utility/' companion${_versuff}.desktop diff --git a/install.patch b/install.patch index 467ba28..4d947c8 100644 --- a/install.patch +++ b/install.patch @@ -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 @@ SRCDIR=$1 OUTDIR=$2 @@ -6,9 +8,9 @@ +COMMON_OPTIONS="-DCMAKE_INSTALL_PREFIX=/usr -DGVARS=YES -DHELI=YES -DLUA=YES -Wno-dev -DCMAKE_BUILD_TYPE=Release" if [ "$(uname)" = "Darwin" ]; then COMMON_OPTIONS="${COMMON_OPTIONS} -DCMAKE_OSX_DEPLOYMENT_TARGET='10.9'" - elif [ "$(uname)" != "Linux" ]; then -@@ -41,9 +41,9 @@ - COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=$3" + elif [ "$(uname)" != "Linux" ]; then # Assume Windows and MSYS2 +@@ -59,9 +59,9 @@ + fi fi -rm -rf build @@ -18,19 +20,28 @@ +mkdir ${OUTDIR} +cd ${OUTDIR} - cmake ${COMMON_OPTIONS} -DPCB=X9LITE ${SRCDIR} - make -j${JOBS} libsimulator -@@ -128,13 +128,3 @@ - cmake ${COMMON_OPTIONS} -DPCB=X12S ${SRCDIR} - make -j${JOBS} libsimulator + declare -a simulator_plugins=(x9lite x9lites + x7 x7-access +@@ -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 +-done ++done + +-cmake --build . --target native-configure -if [ "$(uname)" = "Darwin" ]; then -- make -j${JOBS} package -- cp *.dmg ${OUTDIR} +- cmake --build native -j"${JOBS}" --target package +- cp native/*.dmg "${OUTDIR}" -elif [ "$(uname)" = "Linux" ]; then -- make -j${JOBS} package -- cp *.AppImage ${OUTDIR} +- cmake --build native -j"${JOBS}" --target package +- cp native/*.AppImage "${OUTDIR}" -else -- make installer -- cp companion/*.exe ${OUTDIR} +- cmake --build native --target installer +- cp native/companion/*.exe "${OUTDIR}" -fi ++cmake ${BUILD_OPTIONS} "${OUTDIR}/native" From 3a34d44bb5b0426bed3f34fd9bf7132333050998 Mon Sep 17 00:00:00 2001 From: horstderheld Date: Fri, 6 Jan 2023 16:23:48 +0100 Subject: [PATCH 02/10] add all thrid party repos to the source array --- PKGBUILD | 61 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 11 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 190f0bd..0701794 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -20,26 +20,65 @@ provides=('companion') conflicts=('companion') _pkgbase=${pkgname%%-*} _versuff=${pkgver/./} && _versuff=${_versuff%%.*} -source=("git+https://github.com/EdgeTX/edgetx.git#tag=v${pkgver}" +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/FreeRTOS/FreeRTOS-Kernel.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-Partner-Supported-Ports.git" + "git+https://github.com/EdgeTX/lvgl.git" + "git+https://github.com/nothings/stb.git" install.patch) sha256sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' 'efa51cbbff6cb466a6a9bd681b04b158fce6e48d2db4c5cc235c1a871037f6c8') prepare() { - cd ${_pkgbase} - patch ./tools/build-companion.sh < ${srcdir}/install.patch - git submodule update --init --recursive + cd $_pkgbase + patch ./tools/build-companion.sh < $srcdir/install.patch + + cd $srcdir/$_pkgbase/companion/src/thirdparty/ + git submodule init + git config submodule.yaml-cpp.url $srcdir/yaml-cpp + git submodule update --init + + cd $srcdir/$_pkgbase/radio/src/thirdparty/ + git submodule init + git config submodule.AccessDenied.url $srcdir/AccessDenied + git config submodule.FreeRTOS-Kernel.url $srcdir/FreeRTOS + git config submodule.libopenui.url $srcdir/libopenui + git submodule update --init + + cd $srcdir/$_pkgbase/radio/src/thirdparty/FreeRTOS/portable/ThirdParty/ + git submodule init + git config submodule.FreeRTOS-Kernel-Community-Supported-Ports.url $srcdir/Community-Supported-Ports + git config submodule.FreeRTOS-Kernel-Partner-Supported-Ports.url $srcdir/FreeRTOS-Kernel-Partner-Supported-Ports + git submodule update --init + + cd $srcdir/$_pkgbase/radio/src/thirdparty/libopenui/thirdparty/ + git submodule init + git config submodule.lvgl.url $srcdir/lvgl + git config submodule.stb.url $srcdir/stb + git submodule update --init } build() { - cd ${_pkgbase} - ./tools/build-companion.sh ${MAKEFLAGS} ${srcdir}/${_pkgbase} ${srcdir}/build ${_versuff} + cd $_pkgbase + ./tools/build-companion.sh $MAKEFLAGS $srcdir/$_pkgbase $srcdir/build $_versuff } package() { - cd ${srcdir}/build/native - make DESTDIR=${pkgdir}/ install - cd ${pkgdir}/usr/share/applications - sed -i -e 's/Categories=Application/Categories=Utility/' companion${_versuff}.desktop - sed -i -e 's/Categories=Application/Categories=Utility/' simulator${_versuff}.desktop + cd $srcdir/build/native + make DESTDIR=$pkgdir/ install + cd $pkgdir/usr/share/applications + sed -i -e 's/Categories=Application/Categories=Utility/' companion$_versuff.desktop + sed -i -e 's/Categories=Application/Categories=Utility/' simulator$_versuff.desktop } From 2680fdc14734a3d1a7c3c614032dba9d269356f3 Mon Sep 17 00:00:00 2001 From: horstderheld Date: Sat, 18 Feb 2023 12:03:45 +0100 Subject: [PATCH 03/10] upgrad to 2.8.1 --- .SRCINFO | 20 ++++++++++++++++++-- PKGBUILD | 4 +++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 935920b..7a91c7c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = edgetx-companion pkgdesc = EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares - pkgver = 2.8.0 + pkgver = 2.8.1 pkgrel = 1 url = https://edgetx.org/ arch = x86_64 @@ -31,9 +31,25 @@ pkgbase = edgetx-companion optdepends = dfu-util: tool for flashing stm32 based radios provides = companion conflicts = companion - source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.8.0 + source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.8.1 + source = git+https://github.com/jbeder/yaml-cpp.git + source = git+https://github.com/raphaelcoeffic/AccessDenied.git + source = git+https://github.com/FreeRTOS/FreeRTOS-Kernel.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-Partner-Supported-Ports.git + source = git+https://github.com/EdgeTX/lvgl.git + source = git+https://github.com/nothings/stb.git source = install.patch sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP sha256sums = efa51cbbff6cb466a6a9bd681b04b158fce6e48d2db4c5cc235c1a871037f6c8 pkgname = edgetx-companion diff --git a/PKGBUILD b/PKGBUILD index 0701794..eedee08 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributer: Arnaud pkgname=edgetx-companion -pkgver=2.8.0 +pkgver=2.8.1 pkgrel=1 pkgdesc="EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares" arch=('x86_64') @@ -42,6 +42,8 @@ sha256sums=('SKIP' 'efa51cbbff6cb466a6a9bd681b04b158fce6e48d2db4c5cc235c1a871037f6c8') prepare() { + export EDGETX_VERSION_TAG=$pkgver + cd $_pkgbase patch ./tools/build-companion.sh < $srcdir/install.patch From 6e0955b56dbcaafca6d2a270e8c3e89250356c62 Mon Sep 17 00:00:00 2001 From: horstderheld Date: Sat, 1 Apr 2023 12:02:38 +0200 Subject: [PATCH 04/10] update to 2.8.2 --- .SRCINFO | 4 ++-- PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7a91c7c..4a850df 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = edgetx-companion pkgdesc = EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares - pkgver = 2.8.1 + pkgver = 2.8.2 pkgrel = 1 url = https://edgetx.org/ arch = x86_64 @@ -31,7 +31,7 @@ pkgbase = edgetx-companion optdepends = dfu-util: tool for flashing stm32 based radios provides = companion conflicts = companion - source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.8.1 + source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.8.2 source = git+https://github.com/jbeder/yaml-cpp.git source = git+https://github.com/raphaelcoeffic/AccessDenied.git source = git+https://github.com/FreeRTOS/FreeRTOS-Kernel.git diff --git a/PKGBUILD b/PKGBUILD index eedee08..132826e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributer: Arnaud pkgname=edgetx-companion -pkgver=2.8.1 +pkgver=2.8.2 pkgrel=1 pkgdesc="EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares" arch=('x86_64') From ed20fb7797faeee801c93b50a167135bbb4dba90 Mon Sep 17 00:00:00 2001 From: horstderheld Date: Wed, 19 Apr 2023 14:48:27 +0200 Subject: [PATCH 05/10] update to 2.8.3 --- .SRCINFO | 7 +++++-- PKGBUILD | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4a850df..ab2f4cb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = edgetx-companion pkgdesc = EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares - pkgver = 2.8.2 + pkgver = 2.8.3 pkgrel = 1 url = https://edgetx.org/ arch = x86_64 @@ -25,13 +25,16 @@ pkgbase = edgetx-companion makedepends = qt5-translations makedepends = sed makedepends = xsd + depends = gcc-libs + depends = glibc depends = hicolor-icon-theme + depends = qt5-base depends = qt5-multimedia depends = sdl optdepends = dfu-util: tool for flashing stm32 based radios provides = companion conflicts = companion - source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.8.2 + source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.8.3 source = git+https://github.com/jbeder/yaml-cpp.git source = git+https://github.com/raphaelcoeffic/AccessDenied.git source = git+https://github.com/FreeRTOS/FreeRTOS-Kernel.git diff --git a/PKGBUILD b/PKGBUILD index 132826e..770e69e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,13 +4,13 @@ # Contributer: Arnaud pkgname=edgetx-companion -pkgver=2.8.2 +pkgver=2.8.3 pkgrel=1 pkgdesc="EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares" arch=('x86_64') url='https://edgetx.org/' license=('GPL2') -depends=('hicolor-icon-theme' 'qt5-multimedia' 'sdl') +depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'qt5-base' 'qt5-multimedia' 'sdl') 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' 'cmake' 'fox' 'gcc' 'git' 'icu' 'python' 'python-lz4' From 441eab759124416e7d3ed1c8eb109487b3a46c29 Mon Sep 17 00:00:00 2001 From: horstderheld Date: Sun, 14 May 2023 10:24:15 +0200 Subject: [PATCH 06/10] update to 2.8.4 --- .SRCINFO | 4 ++-- PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ab2f4cb..f63bce1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = edgetx-companion pkgdesc = EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares - pkgver = 2.8.3 + pkgver = 2.8.4 pkgrel = 1 url = https://edgetx.org/ arch = x86_64 @@ -34,7 +34,7 @@ pkgbase = edgetx-companion optdepends = dfu-util: tool for flashing stm32 based radios provides = companion conflicts = companion - source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.8.3 + source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.8.4 source = git+https://github.com/jbeder/yaml-cpp.git source = git+https://github.com/raphaelcoeffic/AccessDenied.git source = git+https://github.com/FreeRTOS/FreeRTOS-Kernel.git diff --git a/PKGBUILD b/PKGBUILD index 770e69e..bb20701 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributer: Arnaud pkgname=edgetx-companion -pkgver=2.8.3 +pkgver=2.8.4 pkgrel=1 pkgdesc="EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares" arch=('x86_64') From 9ff2b9633235bea634d221971659a154ea02ea5d Mon Sep 17 00:00:00 2001 From: horstderheld Date: Mon, 7 Aug 2023 20:05:51 +0200 Subject: [PATCH 07/10] update to 2.8.5 --- .SRCINFO | 25 +++++++++++++------------ PKGBUILD | 29 +++++++++++++++++------------ 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f63bce1..d9ba7cb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = edgetx-companion pkgdesc = EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares - pkgver = 2.8.4 + pkgver = 2.8.5 pkgrel = 1 url = https://edgetx.org/ arch = x86_64 @@ -34,7 +34,8 @@ pkgbase = edgetx-companion optdepends = dfu-util: tool for flashing stm32 based radios provides = 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/raphaelcoeffic/AccessDenied.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/nothings/stb.git source = install.patch - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = efa51cbbff6cb466a6a9bd681b04b158fce6e48d2db4c5cc235c1a871037f6c8 + b2sums = SKIP + b2sums = SKIP + b2sums = SKIP + b2sums = SKIP + b2sums = SKIP + b2sums = SKIP + b2sums = SKIP + b2sums = SKIP + b2sums = SKIP + b2sums = 2f2d110ba03c3d852bec93a0705570df93e72f5e3757bd64494083c5a1ae59c5228024fca563043c05014b1962ccde88e029a6bac2fe36be6e852a53b35a43fb pkgname = edgetx-companion diff --git a/PKGBUILD b/PKGBUILD index bb20701..9158eaa 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributer: Arnaud pkgname=edgetx-companion -pkgver=2.8.4 +pkgver=2.8.5 pkgrel=1 pkgdesc="EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares" 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' 'python-pillow' 'python-pyqt5' 'qt5-svg' 'qt5-tools' 'qt5-translations' 'sed' 'xsd') +options=('!debug') provides=('companion') conflicts=('companion') _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/nothings/stb.git" install.patch) -sha256sums=('SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'efa51cbbff6cb466a6a9bd681b04b158fce6e48d2db4c5cc235c1a871037f6c8') +b2sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + '2f2d110ba03c3d852bec93a0705570df93e72f5e3757bd64494083c5a1ae59c5228024fca563043c05014b1962ccde88e029a6bac2fe36be6e852a53b35a43fb') prepare() { export EDGETX_VERSION_TAG=$pkgver - + 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 cd $srcdir/$_pkgbase/companion/src/thirdparty/ From 00d17d95dd30b55ab296784bfe48227620a2125f Mon Sep 17 00:00:00 2001 From: horstderheld Date: Sat, 2 Sep 2023 18:37:41 +0200 Subject: [PATCH 08/10] update to 2.9.0 --- .SRCINFO | 7 ++++--- PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d9ba7cb..8c0d9a9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = edgetx-companion pkgdesc = EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares - pkgver = 2.8.5 + pkgver = 2.9.0 pkgrel = 1 url = https://edgetx.org/ arch = x86_64 @@ -11,6 +11,7 @@ pkgbase = edgetx-companion makedepends = avr-gcc makedepends = avr-libc makedepends = bc + makedepends = clang makedepends = cmake makedepends = fox makedepends = gcc @@ -30,12 +31,12 @@ pkgbase = edgetx-companion depends = hicolor-icon-theme depends = qt5-base depends = qt5-multimedia - depends = sdl + 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.8.5 + source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.9.0 source = git+https://github.com/jbeder/yaml-cpp.git source = git+https://github.com/raphaelcoeffic/AccessDenied.git source = git+https://github.com/FreeRTOS/FreeRTOS-Kernel.git diff --git a/PKGBUILD b/PKGBUILD index 9158eaa..5a51950 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,16 +4,16 @@ # Contributer: Arnaud pkgname=edgetx-companion -pkgver=2.8.5 +pkgver=2.9.0 pkgrel=1 pkgdesc="EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares" arch=('x86_64') url='https://edgetx.org/' license=('GPL2') -depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'qt5-base' 'qt5-multimedia' 'sdl') +depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'qt5-base' 'qt5-multimedia' 'sdl2') 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' 'cmake' 'fox' 'gcc' 'git' 'icu' 'python' 'python-lz4' + 'avr-gcc' 'avr-libc' 'bc' 'clang' 'cmake' 'fox' 'gcc' 'git' 'icu' 'python' 'python-lz4' 'python-pillow' 'python-pyqt5' 'qt5-svg' 'qt5-tools' 'qt5-translations' 'sed' 'xsd') options=('!debug') From cfd3ae75956df37d0779aa56ab1c9d13518f3798 Mon Sep 17 00:00:00 2001 From: horstderheld Date: Thu, 5 Oct 2023 09:16:44 +0200 Subject: [PATCH 09/10] update to 2.9.1 --- .SRCINFO | 4 ++-- PKGBUILD | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8c0d9a9..cfe3e5c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = edgetx-companion pkgdesc = EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares - pkgver = 2.9.0 + pkgver = 2.9.1 pkgrel = 1 url = https://edgetx.org/ arch = x86_64 @@ -36,7 +36,7 @@ pkgbase = edgetx-companion provides = companion conflicts = companion options = !debug - source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.9.0 + source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.9.1 source = git+https://github.com/jbeder/yaml-cpp.git source = git+https://github.com/raphaelcoeffic/AccessDenied.git source = git+https://github.com/FreeRTOS/FreeRTOS-Kernel.git diff --git a/PKGBUILD b/PKGBUILD index 5a51950..60203ff 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributer: Arnaud pkgname=edgetx-companion -pkgver=2.9.0 +pkgver=2.9.1 pkgrel=1 pkgdesc="EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares" arch=('x86_64') @@ -13,9 +13,9 @@ license=('GPL2') depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'qt5-base' 'qt5-multimedia' 'sdl2') 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-lz4' - 'python-pillow' 'python-pyqt5' 'qt5-svg' 'qt5-tools' 'qt5-translations' - 'sed' 'xsd') + 'avr-gcc' 'avr-libc' 'bc' 'clang' 'cmake' 'fox' 'gcc' 'git' 'icu' 'python' + 'python-lz4' 'python-pillow' 'python-pyqt5' 'qt5-svg' 'qt5-tools' + 'qt5-translations' 'sed' 'xsd') options=('!debug') provides=('companion') conflicts=('companion') From 5e9eb3c390321a6556f40f64913e2a8565106eea Mon Sep 17 00:00:00 2001 From: horstderheld Date: Thu, 16 Nov 2023 17:49:30 +0100 Subject: [PATCH 10/10] upstream release 2.9.2 --- .SRCINFO | 6 ++++-- PKGBUILD | 16 ++++++++-------- remove-ssl-check.patch | 25 +++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 remove-ssl-check.patch diff --git a/.SRCINFO b/.SRCINFO index cfe3e5c..2cdd522 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = edgetx-companion pkgdesc = EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares - pkgver = 2.9.1 + pkgver = 2.9.2 pkgrel = 1 url = https://edgetx.org/ arch = x86_64 @@ -36,7 +36,7 @@ pkgbase = edgetx-companion provides = companion conflicts = companion options = !debug - source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.9.1 + source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.9.2 source = git+https://github.com/jbeder/yaml-cpp.git source = git+https://github.com/raphaelcoeffic/AccessDenied.git source = git+https://github.com/FreeRTOS/FreeRTOS-Kernel.git @@ -46,6 +46,7 @@ pkgbase = edgetx-companion source = git+https://github.com/EdgeTX/lvgl.git source = git+https://github.com/nothings/stb.git source = install.patch + source = remove-ssl-check.patch b2sums = SKIP b2sums = SKIP b2sums = SKIP @@ -56,5 +57,6 @@ pkgbase = edgetx-companion b2sums = SKIP b2sums = SKIP b2sums = 2f2d110ba03c3d852bec93a0705570df93e72f5e3757bd64494083c5a1ae59c5228024fca563043c05014b1962ccde88e029a6bac2fe36be6e852a53b35a43fb + b2sums = 6ad8cfff9f623c1d0182713839419b633f421e762d01cd46b2ce817c1552929d9ffadcb38f112d6ac9d3d196346b781d842ad0d9c34d4dbe0d5709a3edbc6026 pkgname = edgetx-companion diff --git a/PKGBUILD b/PKGBUILD index 60203ff..8fdd006 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,13 +4,13 @@ # Contributer: Arnaud pkgname=edgetx-companion -pkgver=2.9.1 +pkgver=2.9.2 pkgrel=1 pkgdesc="EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares" arch=('x86_64') url='https://edgetx.org/' license=('GPL2') -depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'qt5-base' 'qt5-multimedia' 'sdl2') +depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'qt5-base' 'qt5-multimedia' 'sdl2') 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' @@ -30,7 +30,8 @@ source=("git+https://github.com/EdgeTX/edgetx.git#tag=v$pkgver" "git+https://github.com/FreeRTOS/FreeRTOS-Kernel-Partner-Supported-Ports.git" "git+https://github.com/EdgeTX/lvgl.git" "git+https://github.com/nothings/stb.git" - install.patch) + install.patch + remove-ssl-check.patch) b2sums=('SKIP' 'SKIP' 'SKIP' @@ -40,17 +41,16 @@ b2sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - '2f2d110ba03c3d852bec93a0705570df93e72f5e3757bd64494083c5a1ae59c5228024fca563043c05014b1962ccde88e029a6bac2fe36be6e852a53b35a43fb') + '2f2d110ba03c3d852bec93a0705570df93e72f5e3757bd64494083c5a1ae59c5228024fca563043c05014b1962ccde88e029a6bac2fe36be6e852a53b35a43fb' + '6ad8cfff9f623c1d0182713839419b633f421e762d01cd46b2ce817c1552929d9ffadcb38f112d6ac9d3d196346b781d842ad0d9c34d4dbe0d5709a3edbc6026') prepare() { export EDGETX_VERSION_TAG=$pkgver 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 ./companion/src/CMakeLists.txt < $srcdir/remove-ssl-check.patch cd $srcdir/$_pkgbase/companion/src/thirdparty/ git submodule init diff --git a/remove-ssl-check.patch b/remove-ssl-check.patch new file mode 100644 index 0000000..02eda4c --- /dev/null +++ b/remove-ssl-check.patch @@ -0,0 +1,25 @@ +--- CMakeLists.txt.old 2023-11-12 12:28:49.000000000 +0100 ++++ CMakeLists.txt 2023-11-16 17:08:59.841823856 +0100 +@@ -353,9 +353,6 @@ + cmake_policy(SET CMP0026 OLD) # https://cmake.org/cmake/help/v3.0/policy/CMP0026.html + endif() + +-# OpenSSL +-include(FindOpenSSL) +- + if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + message(STATUS "install " ${CMAKE_BINARY_DIR} " to " ${CMAKE_INSTALL_PREFIX}/bin) + install(TARGETS ${COMPANION_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +@@ -379,12 +376,6 @@ + install(FILES ../targets/linux/45-companion-taranis.rules DESTINATION ${INSTALL_TEMP_LIB_PFX}lib/udev/rules.d RENAME 45-companion${C9X_NAME_SUFFIX}-taranis.rules) + install(FILES ../targets/linux/45-usbasp.rules DESTINATION ${INSTALL_TEMP_LIB_PFX}lib/udev/rules.d RENAME 45-companion${C9X_NAME_SUFFIX}-usbasp.rules) + +- if (OPENSSL_FOUND) +- get_filename_component(OPENSSL_SSL_LIBRARY_DIR ${OPENSSL_SSL_LIBRARY} DIRECTORY) +- # install only files Qt networking requires +- install(DIRECTORY ${OPENSSL_SSL_LIBRARY_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib FILES_MATCHING PATTERN "engines*" EXCLUDE PATTERN "pkg*" EXCLUDE PATTERN "*.so*") +- endif() +- + # Linux specific code + set(OperatingSystem "Linux") + # Shortcut target