diff options
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | PKGBUILD | 26 | ||||
| -rw-r--r-- | aur-build-qmake.patch | 298 | ||||
| -rw-r--r-- | lzokay-explicit-include.patch | 12 | ||||
| -rw-r--r-- | vesc_tool.pro | 112 |
5 files changed, 335 insertions, 128 deletions
@@ -1,7 +1,8 @@ pkgbase = vesc_tool-git pkgdesc = VESC ESC graphical configuration tool - pkgver = 3.00.r287.b0632c4.r287.b0632c4.r287.b0632c4 + pkgver = r1291.853bb4e pkgrel = 1 + epoch = 1 url = https://vesc-project.com/vesc_tool arch = i686 arch = x86_64 @@ -15,14 +16,18 @@ pkgbase = vesc_tool-git depends = qt5-quickcontrols2 depends = qt5-serialport depends = qt5-location + depends = qt5-gamepad + depends = qt5-serialbus conflicts = vesc-tool source = vesc_tool-git::git+https://github.com/vedderb/vesc_tool.git - source = vesc_tool.pro + source = lzokay-explicit-include.patch::https://github.com/bionade24/lzokay/commit/5cb18da508cc4d3ec41bc04dccdeef9c5ffedfb2.diff + source = aur-build-qmake.patch source = vesc-tool.desktop source = vesc-tool.png sha256sums = SKIP - sha256sums = ec412196053475483de113262fa8ff15d7c95183d0f8cb18572eae3dda21fe16 - sha256sums = a0d31826279e900ab614744afad1a26b849440c298d8a5e6e318df554beebdde - sha256sums = ace90b5a9bd1001e234800b935d3622c6a10c73445f726677e838d51fe4c8e02 + sha256sums = 651ec5822dd2f1197ad76e9e13f5e51bae19058f6ca5573d4ce1976123b55054 + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP pkgname = vesc_tool-git @@ -1,37 +1,41 @@ pkgname=vesc_tool-git -pkgver=3.00.r287.b0632c4.r287.b0632c4.r287.b0632c4 +epoch=1 +pkgver=r1291.853bb4e pkgrel=1 pkgdesc="VESC ESC graphical configuration tool" arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h') url="https://vesc-project.com/vesc_tool" license=('GPL3') -depends=('qt5-base' 'qt5-connectivity' 'qt5-quickcontrols2' 'qt5-serialport' 'qt5-location') +depends=('qt5-base' 'qt5-connectivity' 'qt5-quickcontrols2' 'qt5-serialport' 'qt5-location' 'qt5-gamepad' 'qt5-serialbus') makedepends=('git') conflicts=('vesc-tool') source=("$pkgname"::"git+https://github.com/vedderb/vesc_tool.git" - 'vesc_tool.pro' - 'vesc-tool.desktop' - 'vesc-tool.png') + "lzokay-explicit-include.patch"::"https://github.com/bionade24/lzokay/commit/5cb18da508cc4d3ec41bc04dccdeef9c5ffedfb2.diff" + 'aur-build-qmake.patch' + 'vesc-tool.desktop' + 'vesc-tool.png') sha256sums=('SKIP' - 'ec412196053475483de113262fa8ff15d7c95183d0f8cb18572eae3dda21fe16' - 'a0d31826279e900ab614744afad1a26b849440c298d8a5e6e318df554beebdde' - 'ace90b5a9bd1001e234800b935d3622c6a10c73445f726677e838d51fe4c8e02') + '651ec5822dd2f1197ad76e9e13f5e51bae19058f6ca5573d4ce1976123b55054' + 'SKIP' + 'SKIP' + 'SKIP') pkgver() { cd "${srcdir}/${pkgname}" - printf "${pkgver}.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { cd "${srcdir}/${pkgname}" - cp ${srcdir}/vesc_tool.pro . + patch -i "${srcdir}"/aur-build-qmake.patch + patch -d lzokay -i "${srcdir}"/lzokay-explicit-include.patch } build() { cd "${srcdir}/${pkgname}" - qmake PREFIX=/usr LIBDIR=/usr/lib + qmake-qt5 PREFIX=/usr LIBDIR=/usr/lib make } diff --git a/aur-build-qmake.patch b/aur-build-qmake.patch new file mode 100644 index 000000000000..6ed4964616d2 --- /dev/null +++ b/aur-build-qmake.patch @@ -0,0 +1,298 @@ +--- vesc_tool.pro 2023-08-28 14:39:57.683583762 +0200 ++++ vesc_tool.pro 2023-08-28 14:56:07.186937143 +0200 +@@ -1,102 +1,38 @@ +-#------------------------------------------------- +-# +-# Project created by QtCreator 2016-08-12T21:55:19 +-# +-#------------------------------------------------- +- +-# Version + VT_VERSION = 6.05 + VT_INTRO_VERSION = 1 + VT_CONFIG_VERSION = 2 + + # Set to 0 for stable versions and to test version number for development versions. +-VT_IS_TEST_VERSION = 1 +- +-VT_ANDROID_VERSION_ARMV7 = 134 +-VT_ANDROID_VERSION_ARM64 = 135 +-VT_ANDROID_VERSION_X86 = 136 ++VT_IS_TEST_VERSION = 0 + +-VT_ANDROID_VERSION = $$VT_ANDROID_VERSION_X86 +- +-# Ubuntu 18.04 (should work on raspbian buster too) +-# sudo apt install qml-module-qt-labs-folderlistmodel qml-module-qtquick-extras qml-module-qtquick-controls2 qt5-default libqt5quickcontrols2-5 qtquickcontrols2-5-dev qtcreator qtcreator-doc libqt5serialport5-dev build-essential qml-module-qt3d qt3d5-dev qtdeclarative5-dev qtconnectivity5-dev qtmultimedia5-dev qtpositioning5-dev qtpositioning5-dev libqt5gamepad5-dev qml-module-qt-labs-settings qml-module-qt-labs-platform libqt5svg5-dev ++TEMPLATE = app + + DEFINES += VT_VERSION=$$VT_VERSION + DEFINES += VT_INTRO_VERSION=$$VT_INTRO_VERSION + DEFINES += VT_CONFIG_VERSION=$$VT_CONFIG_VERSION + DEFINES += VT_IS_TEST_VERSION=$$VT_IS_TEST_VERSION + QT_LOGGING_RULES="qt.qml.connections=false" +-#CONFIG += qtquickcompiler + + CONFIG += c++11 + CONFIG += resources_big +-ios: { +- QMAKE_CXXFLAGS_DEBUG += -Wall +-} +- +-!win32-msvc*: { !android: { +- QMAKE_CXXFLAGS += -Wno-deprecated-copy +-}} +- +-# Build mobile GUI +-#CONFIG += build_mobile +- ++QMAKE_CXXFLAGS += -Wno-deprecated-copy + # Exclude built-in firmwares +-#CONFIG += exclude_fw +- +-ios: { +- CONFIG += build_mobile +- DEFINES += QT_NO_PRINTER +-} +- +-# Debug build (e.g. F5 to reload QML files) +-#DEFINES += DEBUG_BUILD +- +-# If BLE disconnects on ubuntu after about 90 seconds the reason is most likely that the connection interval is incompatible. This can be fixed with: +-# sudo bash -c 'echo 6 > /sys/kernel/debug/bluetooth/hci0/conn_min_interval' +- +-# Clear old bluetooth devices +-# sudo rm -rf /var/lib/bluetooth/* +-# sudo service bluetooth restart +- ++CONFIG += exclude_fw + # Bluetooth available + DEFINES += HAS_BLUETOOTH + + # CAN bus available + # Adding serialbus to Qt seems to break the serial port on static builds. TODO: Figure out why. +-#DEFINES += HAS_CANBUS ++DEFINES += HAS_CANBUS + + # Positioning + DEFINES += HAS_POS + +-!ios: { +- QT += printsupport +-!android: { +- # Serial port available +- DEFINES += HAS_SERIALPORT +- DEFINES += HAS_GAMEPAD +-} +-} +- +-win32: { +- DEFINES += _USE_MATH_DEFINES +-} +- +-# https://stackoverflow.com/questions/61444320/what-are-the-configure-options-for-qt-that-enable-dead-keys-usage +-unix: { +-!ios: { +- QTPLUGIN += composeplatforminputcontextplugin +-} +-} +- +-# Options +-#CONFIG += build_original +-#CONFIG += build_platinum +-#CONFIG += build_gold +-#CONFIG += build_silver +-#CONFIG += build_bronze +-#CONFIG += build_free ++DEFINES += HAS_SERIALPORT ++DEFINES += HAS_GAMEPAD + ++QTPLUGIN += composeplatforminputcontextplugin ++QT += printsupport + QT += core gui + QT += widgets + QT += network +@@ -126,81 +62,11 @@ + QT += gamepad + } + +-android: QT += androidextras +- +-ios | macx: { +- TARGET = "VESC Tool" +-}else: { +- android:{ +- TARGET = "vesc_tool" +- }else:{ +- +- TARGET = vesc_tool_$$VT_VERSION +- } +-} +- +-ANDROID_VERSION = 1 +- +-android:contains(QT_ARCH, i386) { +- VT_ANDROID_VERSION = $$VT_ANDROID_VERSION_X86 +-} +- +-contains(ANDROID_TARGET_ARCH, arm64-v8a) { +- VT_ANDROID_VERSION = $$VT_ANDROID_VERSION_ARM64 +-} +- +-contains(ANDROID_TARGET_ARCH, armeabi-v7a) { +- VT_ANDROID_VERSION = $$VT_ANDROID_VERSION_ARMV7 +-} +- +-android: { +- manifest.input = $$PWD/android/AndroidManifest.xml.in +- manifest.output = $$PWD/android/AndroidManifest.xml +- QMAKE_SUBSTITUTES += manifest +-} ++TARGET = vesc_tool_$$VT_VERSION + + TEMPLATE = app +- +-release_win { +- DESTDIR = build/win +- OBJECTS_DIR = build/win/obj +- MOC_DIR = build/win/obj +- RCC_DIR = build/win/obj +- UI_DIR = build/win/obj +-} +- +-release_lin { +- # http://micro.nicholaswilson.me.uk/post/31855915892/rules-of-static-linking-libstdc-libc-libgcc +- # http://insanecoding.blogspot.se/2012/07/creating-portable-linux-binaries.html +- QMAKE_LFLAGS += -static-libstdc++ -static-libgcc + DESTDIR = build/lin + OBJECTS_DIR = build/lin/obj +- MOC_DIR = build/lin/obj +- RCC_DIR = build/lin/obj +- UI_DIR = build/lin/obj +-} +- +-release_macos { +- # brew install qt +- DESTDIR = build/macos +- OBJECTS_DIR = build/macos/obj +- MOC_DIR = build/macos/obj +- RCC_DIR = build/macos/obj +- UI_DIR = build/macos/obj +-} +- +-release_android { +- DESTDIR = build/android +- OBJECTS_DIR = build/android/obj +- MOC_DIR = build/android/obj +- RCC_DIR = build/android/obj +- UI_DIR = build/android/obj +-} +- +-build_mobile { +- DEFINES += USE_MOBILE +-} +- + SOURCES += main.cpp\ + bleuartdummy.cpp \ + codeloader.cpp \ +@@ -271,94 +137,18 @@ + res_custom_module.qrc \ + res_lisp.qrc \ + res_qml.qrc +-RESOURCES += res_config.qrc ++RESOURCES += res_config.qrc res_original.qrc ++DEFINES += VER_ORIGINAL + + !exclude_fw { + RESOURCES += res_fw_bms.qrc + RESOURCES += res/firmwares/res_fw.qrc + RESOURCES += res/firmwares_esp/res_fw_esp.qrc + } +- +-build_original { +- RESOURCES += res_original.qrc +- DEFINES += VER_ORIGINAL +-} else:build_platinum { +- RESOURCES += res_platinum.qrc +- DEFINES += VER_PLATINUM +-} else:build_gold { +- RESOURCES += res_gold.qrc +- DEFINES += VER_GOLD +-} else:build_silver { +- RESOURCES += res_silver.qrc +- DEFINES += VER_SILVER +-} else:build_bronze { +- RESOURCES += res_bronze.qrc +- DEFINES += VER_BRONZE +-} else:build_free { +- RESOURCES += res_free.qrc +- DEFINES += VER_FREE +-} else { +- RESOURCES += res_neutral.qrc +- DEFINES += VER_NEUTRAL +-} +- +-DISTFILES += \ +- android/AndroidManifest.xml \ +- android/gradle/wrapper/gradle-wrapper.jar \ +- android/gradlew \ +- android/gradlew.bat \ +- android/res/values/libs.xml \ +- android/build.gradle \ +- android/gradle/wrapper/gradle-wrapper.properties \ +- android/src/com/vedder/vesc/VForegroundService.java \ +- android/src/com/vedder/vesc/Utils.java +- +-ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android +- +-macx-clang:contains(QMAKE_HOST.arch, arm.*): { +- QMAKE_APPLE_DEVICE_ARCHS=arm64 +-} +- +-macx { +- ICON = macos/appIcon.icns +- QMAKE_INFO_PLIST = macos/Info.plist +- DISTFILES += macos/Info.plist +- QMAKE_CFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO +- QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO +- QMAKE_OBJECTIVE_CFLAGS_RELEASE = $$QMAKE_OBJECTIVE_CFLAGS_RELEASE_WITH_DEBUGINFO +- QMAKE_LFLAGS_RELEASE = $$QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO +-} +- +-ios { +- QMAKE_INFO_PLIST = ios/Info.plist +- HEADERS += ios/src/setIosParameters.h +- SOURCES += ios/src/setIosParameters.mm +- DISTFILES += ios/Info.plist \ +- ios/*.storyboard +- QMAKE_ASSET_CATALOGS = $$PWD/ios/Images.xcassets +- QMAKE_ASSET_CATALOGS_APP_ICON = "AppIcon" +- +- ios_artwork.files = $$files($$PWD/ios/iTunesArtwork*.png) +- QMAKE_BUNDLE_DATA += ios_artwork +- app_launch_images.files = $$files($$PWD/ios/LaunchImage*.png) +- QMAKE_BUNDLE_DATA += app_launch_images +- app_launch_screen.files = $$files($$PWD/ios/MyLaunchScreen.storyboard) +- QMAKE_BUNDLE_DATA += app_launch_screen +- +- #QMAKE_IOS_DEPLOYMENT_TARGET = 11.0 +- +- disable_warning.name = GCC_WARN_64_TO_32_BIT_CONVERSION +- disable_warning.value = NO +- +- QMAKE_MAC_XCODE_SETTINGS += disable_warning +- +- # Note for devices: 1=iPhone, 2=iPad, 1,2=Universal. +- CONFIG -= warn_on +- QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 1,2 +-} + CONFIG -= warn_on + +-contains(ANDROID_TARGET_ARCH,) { +- ANDROID_ABIS = \ +- armeabi-v7a ++isEmpty(PREFIX) { ++ PREFIX = /usr/local + } ++target.path = $${PREFIX}/bin ++INSTALLS += target diff --git a/lzokay-explicit-include.patch b/lzokay-explicit-include.patch new file mode 100644 index 000000000000..db07a2d2c4c4 --- /dev/null +++ b/lzokay-explicit-include.patch @@ -0,0 +1,12 @@ +diff --git a/lzokay.cpp b/lzokay.cpp +index e59e9ca..f1cf52a 100644 +--- a/lzokay.cpp ++++ b/lzokay.cpp +@@ -1,6 +1,7 @@ + #include "lzokay.hpp" + #include <cstring> + #include <algorithm> ++#include <iterator> + + /* + * Based on documentation from the Linux sources: Documentation/lzo.txt diff --git a/vesc_tool.pro b/vesc_tool.pro deleted file mode 100644 index fb8123de563c..000000000000 --- a/vesc_tool.pro +++ /dev/null @@ -1,112 +0,0 @@ -VT_VERSION = 3.00 -VT_INTRO_VERSION = 1 -VT_IS_TEST_VERSION = 0 - -TEMPLATE = app - -DEFINES += VT_VERSION=$$VT_VERSION -DEFINES += VT_INTRO_VERSION=$$VT_INTRO_VERSION -DEFINES += VT_IS_TEST_VERSION=$$VT_IS_TEST_VERSION - -CONFIG += c++11 - -# Debug build (e.g. F5 to reload QML files) -#DEFINES += DEBUG_BUILD - -# Bluetooth available -DEFINES += HAS_BLUETOOTH - -# CAN bus available -# Adding serialbus to Qt seems to break the serial port on static builds. TODO: Figure out why. -#DEFINES += HAS_CANBUS - -# Positioning -DEFINES += HAS_POS - -DEFINES += HAS_SERIALPORT - -QT += core gui -QT += widgets -QT += printsupport -QT += network -QT += quick -QT += quickcontrols2 - -contains(DEFINES, HAS_SERIALPORT) { - QT += serialport -} - -contains(DEFINES, HAS_CANBUS) { - QT += serialbus -} - -contains(DEFINES, HAS_BLUETOOTH) { - QT += bluetooth -} - -contains(DEFINES, HAS_POS) { - QT += positioning -} - - -SOURCES += main.cpp\ - mainwindow.cpp \ - packet.cpp \ - udpserversimple.cpp \ - vbytearray.cpp \ - commands.cpp \ - configparams.cpp \ - configparam.cpp \ - vescinterface.cpp \ - parametereditor.cpp \ - digitalfiltering.cpp \ - setupwizardapp.cpp \ - setupwizardmotor.cpp \ - startupwizard.cpp \ - utility.cpp \ - tcpserversimple.cpp - -HEADERS += mainwindow.h \ - packet.h \ - udpserversimple.h \ - vbytearray.h \ - commands.h \ - datatypes.h \ - configparams.h \ - configparam.h \ - vescinterface.h \ - parametereditor.h \ - digitalfiltering.h \ - setupwizardapp.h \ - setupwizardmotor.h \ - startupwizard.h \ - utility.h \ - tcpserversimple.h - -FORMS += mainwindow.ui \ - parametereditor.ui - -contains(DEFINES, HAS_BLUETOOTH) { - SOURCES += bleuart.cpp - HEADERS += bleuart.h -} - -include(pages/pages.pri) -include(widgets/widgets.pri) -include(mobile/mobile.pri) -include(map/map.pri) -include(lzokay/lzokay.pri) - -RESOURCES += res.qrc \ - res_fw_bms.qrc \ - res_qml.qrc -RESOURCES += res_config.qrc -RESOURCES += res_original.qrc \ -res_fw_original.qrc -DEFINES += VER_ORIGINAL - -isEmpty(PREFIX) { - PREFIX = /usr/local -} -target.path = $${PREFIX}/bin -INSTALLS += target |