diff options
| -rw-r--r-- | .SRCINFO | 40 | ||||
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | PKGBUILD | 172 | ||||
| -rw-r--r-- | qgroundcontrol-libicudata.patch | 18 | ||||
| -rw-r--r-- | qgroundcontrol-mavlink-warn.patch | 10 |
5 files changed, 125 insertions, 119 deletions
@@ -1,12 +1,13 @@ pkgbase = qgroundcontrol pkgdesc = Micro air vehicle ground control station. - pkgver = 3.5.5 - pkgrel = 2 - url = http://qgroundcontrol.org/ + pkgver = 4.3.0 + pkgrel = 1 + url = https://github.com/mavlink/qgroundcontrol arch = x86_64 license = GPL3 makedepends = git makedepends = qt5-base + makedepends = patchelf depends = bzip2 depends = dbus depends = flac @@ -40,12 +41,31 @@ pkgbase = qgroundcontrol depends = qt5-location depends = qt5-svg depends = qt5-graphicaleffects - source = qgroundcontrol-3.5.5.tar.gz::https://github.com/mavlink/qgroundcontrol/archive/v3.5.5.tar.gz - source = mavlink-v2.0-qgc3.5.5.zip::https://github.com/mavlink/c_library_v2/archive/d240d0986710045663894aebcea89e71ce981ee4.zip - source = gps-drivers-qgc3.5.5.zip::https://github.com/PX4/GpsDrivers/archive/2a4865adc3808687d6c6f550f497a02eb920c382.zip - sha256sums = 0fa99ea10d9d82ab5702cf9f1fd694ecc2656e89c5a83b15a3174c7fd9ec8852 - sha256sums = 65c0fc60be9435375f74990a5c83fb0cdef6d15c100245759d2465d480a5b9b5 - sha256sums = 1ab58c633edcfff9288bd868bf33e2c9990afa27fa5df8f1731675d98a4ce6e4 + depends = qt5-tools + depends = qt5-wayland + depends = qt5-x11extras + depends = speech-dispatcher + source = qgroundcontrol-4.3.0::git+https://github.com/mavlink/qgroundcontrol.git#tag=v4.3.0 + source = qgroundcontrol-GpsDrivers::git+https://github.com/PX4/GpsDrivers.git + source = qgroundcontrol-c_library_v2::git+https://github.com/mavlink/c_library_v2.git + source = qgroundcontrol-android_openssl::git+https://github.com/KDAB/android_openssl.git + source = qgroundcontrol-gst-plugins-good::git+https://github.com/mavlink/gst-plugins-good.git + source = qgroundcontrol-xz-embedded::git+https://github.com/Auterion/xz-embedded.git + source = qgroundcontrol-libevents::git+https://github.com/mavlink/libevents.git + source = qgroundcontrol-eigen::git+https://gitlab.com/libeigen/eigen.git + source = qgroundcontrol-qmdnsengine::git+https://github.com/patrickelectric/qmdnsengine.git + source = qgroundcontrol-shapelib::git+https://github.com/OSGeo/shapelib.git + source = qgroundcontrol-ArduPilot-Parameter-Repository::git+https://github.com/ArduPilot/ArduPilot-Parameter-Repository.git + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP pkgname = qgroundcontrol - diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 9d98872d07c6..000000000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/pkg -/src -/qgroundcontrol -*.tar.* @@ -1,90 +1,116 @@ -# Maintainer: K. Morton <pryre.dev@outlook.com> +# Maintainer: acxz <akashpatel2008@yahoo.com> +# Contributor: K. Morton <pryre.dev@outlook.com> # Contributor: Anselmo L. S. Melo <anselmo.melo@intel.com> pkgname=qgroundcontrol -pkgver=3.5.5 -pkgrel=2 +pkgver=4.3.0 +pkgrel=1 pkgdesc="Micro air vehicle ground control station." arch=('x86_64') -url="http://qgroundcontrol.org/" +url="https://github.com/mavlink/qgroundcontrol" license=('GPL3') -#Git commit hash for version-specific submodules -pkgver_mavlink='d240d0986710045663894aebcea89e71ce981ee4' -pkgver_gps='2a4865adc3808687d6c6f550f497a02eb920c382' - depends=('bzip2' - 'dbus' - 'flac' - 'gst-plugins-base-libs' - 'libasyncns' - 'libffi' - 'libgcrypt' - 'libgpg-error' - 'libogg' - 'libsndfile' - 'libsystemd' - 'libunwind' - 'libx11' - 'libxau' - 'libxcb' - 'libxdmcp' - 'libxext' - 'lz4' - 'orc' - 'pcre' - 'sdl2' - 'xz' - 'zlib' - 'icu' - 'qt5-speech' - 'qt5-multimedia' - 'qt5-serialport' - 'qt5-charts' - 'qt5-quickcontrols' - 'qt5-quickcontrols2' - 'qt5-location' - 'qt5-svg' - 'qt5-graphicaleffects' + 'dbus' + 'flac' + 'gst-plugins-base-libs' + 'libasyncns' + 'libffi' + 'libgcrypt' + 'libgpg-error' + 'libogg' + 'libsndfile' + 'libsystemd' + 'libunwind' + 'libx11' + 'libxau' + 'libxcb' + 'libxdmcp' + 'libxext' + 'lz4' + 'orc' + 'pcre' + 'sdl2' + 'xz' + 'zlib' + 'icu' + 'qt5-speech' + 'qt5-multimedia' + 'qt5-serialport' + 'qt5-charts' + 'qt5-quickcontrols' + 'qt5-quickcontrols2' + 'qt5-location' + 'qt5-svg' + 'qt5-graphicaleffects' + 'qt5-tools' + 'qt5-wayland' + 'qt5-x11extras' + 'speech-dispatcher' ) -makedepends=('git' 'qt5-base') +makedepends=('git' 'qt5-base' 'patchelf') -source=("qgroundcontrol-${pkgver}.tar.gz::https://github.com/mavlink/qgroundcontrol/archive/v${pkgver}.tar.gz" - "mavlink-v2.0-qgc${pkgver}.zip::https://github.com/mavlink/c_library_v2/archive/${pkgver_mavlink}.zip" - "gps-drivers-qgc${pkgver}.zip::https://github.com/PX4/GpsDrivers/archive/${pkgver_gps}.zip" +source=("${pkgname}-${pkgver}::git+https://github.com/mavlink/qgroundcontrol.git#tag=v${pkgver}" + "${pkgname}-GpsDrivers::git+https://github.com/PX4/GpsDrivers.git" + "${pkgname}-c_library_v2::git+https://github.com/mavlink/c_library_v2.git" + "${pkgname}-android_openssl::git+https://github.com/KDAB/android_openssl.git" + "${pkgname}-gst-plugins-good::git+https://github.com/mavlink/gst-plugins-good.git" + "${pkgname}-xz-embedded::git+https://github.com/Auterion/xz-embedded.git" + "${pkgname}-libevents::git+https://github.com/mavlink/libevents.git" + "${pkgname}-eigen::git+https://gitlab.com/libeigen/eigen.git" + "${pkgname}-qmdnsengine::git+https://github.com/patrickelectric/qmdnsengine.git" + "${pkgname}-shapelib::git+https://github.com/OSGeo/shapelib.git" + "${pkgname}-ArduPilot-Parameter-Repository::git+https://github.com/ArduPilot/ArduPilot-Parameter-Repository.git" ) -sha256sums=('0fa99ea10d9d82ab5702cf9f1fd694ecc2656e89c5a83b15a3174c7fd9ec8852' - '65c0fc60be9435375f74990a5c83fb0cdef6d15c100245759d2465d480a5b9b5' - '1ab58c633edcfff9288bd868bf33e2c9990afa27fa5df8f1731675d98a4ce6e4' +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' ) prepare() { - mavlinkdir="c_library_v2-${pkgver_mavlink}" - gpsdir="GpsDrivers-${pkgver_gps}" + cd "$srcdir/${pkgname}-${pkgver}" - mkdir -p "${srcdir}/${pkgname}-${pkgver}/build" + git submodule init - # Copy in the mavlink source - rm -r "${srcdir}/${pkgname}-${pkgver}/libs/mavlink/include/mavlink/v2.0" - cp -R "${srcdir}/${mavlinkdir}" "${srcdir}/${pkgname}-${pkgver}/libs/mavlink/include/mavlink/" - mv "${srcdir}/${pkgname}-${pkgver}/libs/mavlink/include/mavlink/${mavlinkdir}" "${srcdir}/${pkgname}-${pkgver}/libs/mavlink/include/mavlink/v2.0" - # Copy in the GPS source - rm -r "${srcdir}/${pkgname}-${pkgver}/src/GPS/Drivers" - cp -R "${srcdir}/${gpsdir}" "${srcdir}/${pkgname}-${pkgver}/src/GPS/" - mv "${srcdir}/${pkgname}-${pkgver}/src/GPS/${gpsdir}" "${srcdir}/${pkgname}-${pkgver}/src/GPS/Drivers" + git config submodule."src/GPS/Drivers".url "${srcdir}/${pkgname}"-GpsDrivers + git config submodule."libs/mavlink/include/mavlink/v2.0".url "${srcdir}/${pkgname}"-c_library_v2 + git config submodule."libs/OpenSSL/android_openssl".url "${srcdir}/${pkgname}"-android_openssl + git config submodule."libs/qmlglsink/gst-plugins-good".url "${srcdir}/${pkgname}"-gst-plugins-good + git config submodule."libs/xz-embedded".url "${srcdir}/${pkgname}"-xz-embedded + git config submodule."libs/libevents/libevents".url "${srcdir}/${pkgname}"-libevents + git config submodule."libs/eigen".url "${srcdir}/${pkgname}"-eigen + git config submodule."libs/qmdnsengine".url "${srcdir}/${pkgname}"-qmdnsengine + git config submodule."libs/shapelib".url "${srcdir}/${pkgname}"-shapelib + git config submodule."src/FirmwarePlugin/APM/ArduPilot-Parameter-Repository".url "${srcdir}/${pkgname}"-ArduPilot-Parameter-Repository - cd "${srcdir}/${pkgname}-${pkgver}/" - patch --strip=1 < "${startdir}/${pkgname}-libicudata.patch" - patch --strip=1 < "${startdir}/${pkgname}-mavlink-warn.patch" + git -c protocol.file.allow=always submodule update --init --recursive } build() { - cd "$srcdir/${pkgname}-${pkgver}/build" - qmake ../qgroundcontrol.pro - make + mkdir -p "${srcdir}/${pkgname}-${pkgver}/build" + cd "$srcdir/${pkgname}-${pkgver}/build" + qmake .. + make +} + +package() { + mkdir -p "${pkgdir}/opt" "${pkgdir}/usr/bin" "${pkgdir}/usr/share/applications" + cp -r "${srcdir}/${pkgname}-${pkgver}/build/staging" "${pkgdir}/opt/${pkgname}" + cp "${srcdir}/${pkgname}-${pkgver}/resources/icons/qgroundcontrol.png" "${pkgdir}/opt/${pkgname}" + cp "${srcdir}/${pkgname}-${pkgver}/deploy/qgroundcontrol-start.sh" "${pkgdir}/opt/${pkgname}" - echo "[Desktop Entry] + # Use our own desktop file and remove the default one + + echo "[Desktop Entry] Type=Application Name=QGroundControl Release Comment=Ground control for unmanned vehicles @@ -93,20 +119,12 @@ Exec=/usr/bin/${pkgname} Icon=/opt/${pkgname}/qgroundcontrol.png Terminal=false Categories=Qt;Utility;" > "$srcdir/${pkgname}.desktop" -} - -package() { - mkdir -p "${pkgdir}/opt" "${pkgdir}/usr/bin" "${pkgdir}/usr/share/applications" - cp -R "${srcdir}/${pkgname}-${pkgver}/build/release" "${pkgdir}/opt/${pkgname}" - cp "${srcdir}/${pkgname}-${pkgver}/resources/icons/qgroundcontrol.png" "${pkgdir}/opt/${pkgname}" - cp "${srcdir}/${pkgname}-${pkgver}/deploy/qgroundcontrol-start.sh" "${pkgdir}/opt/${pkgname}" - # Remove the default one as we want to use our own desktop file - rm "${pkgdir}/opt/${pkgname}/${pkgname}.desktop" - cp "${srcdir}/${pkgname}.desktop" "${pkgdir}/opt/${pkgname}" + rm "${pkgdir}/opt/${pkgname}/${pkgname}.desktop" + cp "${srcdir}/${pkgname}.desktop" "${pkgdir}/opt/${pkgname}" - ln -s "/opt/${pkgname}/qgroundcontrol-start.sh" "${pkgdir}/usr/bin/${pkgname}" - ln -s "/opt/${pkgname}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + ln -s "/opt/${pkgname}/QGroundControl" "${pkgdir}/usr/bin/${pkgname}" + ln -s "/opt/${pkgname}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" } # vim:set ts=2 sw=2 et: diff --git a/qgroundcontrol-libicudata.patch b/qgroundcontrol-libicudata.patch deleted file mode 100644 index 213223db823d..000000000000 --- a/qgroundcontrol-libicudata.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --unified --recursive --text qgroundcontrol-3.5.0/QGCSetup.pri qgroundcontrol-3.5.0.new/QGCSetup.pri ---- qgroundcontrol-3.5.0/QGCSetup.pri 2019-02-05 07:38:43.000000000 +1000 -+++ qgroundcontrol-3.5.0.new/QGCSetup.pri 2019-04-18 18:35:13.792079826 +1000 -@@ -135,10 +135,11 @@ - libQt5TextToSpeech.so.5 - - !contains(DEFINES, __rasp_pi2__) { -+ # Some Qt distributions link with *.so.56 - QT_LIB_LIST += \ -- libicudata.so.56 \ -- libicui18n.so.56 \ -- libicuuc.so.56 -+ libicudata.so.* \ -+ libicui18n.so.* \ -+ libicuuc.so.* - } - - for(QT_LIB, QT_LIB_LIST) { diff --git a/qgroundcontrol-mavlink-warn.patch b/qgroundcontrol-mavlink-warn.patch deleted file mode 100644 index 4bf9ba758eb5..000000000000 --- a/qgroundcontrol-mavlink-warn.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- qgroundcontrol-3.5.5/QGCCommon.pri.old 2019-10-21 11:49:43.026322877 +1000 -+++ qgroundcontrol-3.5.5/QGCCommon.pri 2019-10-21 11:49:33.886275250 +1000 -@@ -26,6 +26,7 @@ - message("Linux clang") - QMAKE_CXXFLAGS += -Qunused-arguments -fcolor-diagnostics - } -+ QMAKE_CXXFLAGS += -Wno-address-of-packed-member - } else : linux-rasp-pi2-g++ { - message("Linux R-Pi2 build") - CONFIG += LinuxBuild |