use submodules instead of hardcoding

2 files changed, 53 insertions, 107 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d05aac94f437..e6e88e1710f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qgroundcontrol
 	pkgdesc = Micro air vehicle ground control station.
 	pkgver = 4.2.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/mavlink/qgroundcontrol
 	arch = x86_64
 	license = GPL3
@@ -44,27 +44,25 @@ pkgbase = qgroundcontrol
 	depends = qt5-tools
 	depends = qt5-wayland
 	depends = qt5-x11extras
-	source = qgroundcontrol-4.2.3.tar.gz::https://github.com/mavlink/qgroundcontrol/archive/v4.2.3.tar.gz
-	source = gps-drivers-qgc4.2.3.tar.gz::https://github.com/PX4/GpsDrivers/archive/6fcf06894973240d45dc49d3b31565917dc8f2f6.tar.gz
-	source = eigen-4.2.3.tar.gz::https://gitlab.com/libeigen/eigen/-/archive/0fd6b4f71dd85b2009ee4d1aeb296e2c11fc9d68/eigen-0fd6b4f71dd85b2009ee4d1aeb296e2c11fc9d68.tar.gz
-	source = libevents-qgc4.2.3.tar.gz::https://github.com/mavlink/libevents/archive/b3df80adf5e9a1ffd3520a699d751acddd07763c.tar.gz
-	source = nlohmann-qgc4.2.3.tar.gz::https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent/archive/391786c6c3abdd3eeb993a3154f1f2a4cfe137a0.tar.gz
-	source = mavlink-v2.0-qgc4.2.3.tar.gz::https://github.com/mavlink/c_library_v2/archive/0b8597ce3ec0f294dcf5e15dbbcd6068ef03eaa2.tar.gz
-	source = aossl-qgc4.2.3.tar.gz::https://github.com/Auterion/android_openssl/archive/3aaff1bd9e35047abdb363239bb3e3c114d07ea1.tar.gz
-	source = qengine-qgc4.2.3.tar.gz::https://github.com/patrickelectric/qmdnsengine/archive/bcae73281fd29ab8e7a41fc3246223b15d44d0df.tar.gz
-	source = gst-plugins-good-qgc4.2.3.tar.gz::https://github.com/GStreamer/gst-plugins-good/archive/9d782fad9dc0384ba86ecae64511c193f6149f93.tar.gz
-	source = xz-qgc4.2.3.tar.gz::https://github.com/Auterion/xz-embedded/archive/090e6a054d6283b144d20f5783852b95eade90ee.tar.gz
+	source = qgroundcontrol-4.2.3::git+https://github.com/mavlink/qgroundcontrol.git#tag=v4.2.3
+	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/Auterion/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 = gst-volatile.patch::https://patch-diff.githubusercontent.com/raw/mavlink/gst-plugins-good/pull/1.patch
-	sha256sums = bafbedc67fda6314108fa1217528ac183739cd7f620de93884791b6624120169
-	sha256sums = 30e7924bf96724e0854dc461df131f24ce2221f4aa22c69e43ace34e2699b2d2
-	sha256sums = 0fa24d921e5ead2d5fe405fff2ac9bb167b155cd767ba42a9f613ddb44d7e4ae
-	sha256sums = afb3090975a7da881ff0c8577d13777de5703f71859a5cf8b05387f790bc0748
-	sha256sums = 614ffcc9812aa2d2cbe0d602e258c2fe7d06eddd68dec0c51039f3f210a33ac6
-	sha256sums = 56349916eb2707597439db7d37f1700f2d5a1819872b5bb414557e8559a94a67
-	sha256sums = 93598e63fbbd86fec5e15f2596bba8b1f1654c854a99222099516933fd22a118
-	sha256sums = e709edd7142cfc738e306808b588a8836d9d795856d6d3cd57bd5ac8666516a6
-	sha256sums = d5aad13c8eff7f3cce75c8cf3bbf6ac592ac82455e666dccd17cf006deec3e55
-	sha256sums = 7a6d606198c94c0c84a18c690bcfdf0fc5ba1a3f61a9c8ebc2c51523f0884084
+	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/PKGBUILD b/PKGBUILD
index 4546836d61e1..269994585fdb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,12 @@
 # Contributor: Anselmo L. S. Melo <anselmo.melo@intel.com>
 pkgname=qgroundcontrol
 pkgver=4.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Micro air vehicle ground control station."
 arch=('x86_64')
 url="https://github.com/mavlink/qgroundcontrol"
 license=('GPL3')
 
-# Git commit hash for version-specific submodules
-pkgver_gps='6fcf06894973240d45dc49d3b31565917dc8f2f6' # src/GPS/Drivers
-pkgver_eigen='0fd6b4f71dd85b2009ee4d1aeb296e2c11fc9d68' # libs/eigen
-pkgver_libevents='b3df80adf5e9a1ffd3520a699d751acddd07763c' # libs/libevents/libevents
-pkgver_nlohmann='391786c6c3abdd3eeb993a3154f1f2a4cfe137a0' # libs/libevents/libevents/libs/cpp/parse/nlohmann_json
-pkgver_mavlink='0b8597ce3ec0f294dcf5e15dbbcd6068ef03eaa2' # libs/mavlink/include/mavlink/v2.0
-pkgver_aossl='3aaff1bd9e35047abdb363239bb3e3c114d07ea1' # libs/OpenSSL/android_openssl
-pkgver_qengine='bcae73281fd29ab8e7a41fc3246223b15d44d0df' # libs/qmdnsengine
-pkgver_gst='9d782fad9dc0384ba86ecae64511c193f6149f93' # libs/qmlglsink/gst-plugins-good
-pkgver_xz='090e6a054d6283b144d20f5783852b95eade90ee' # libs/xz-embedded
-
 depends=('bzip2'
          'dbus'
          'flac'
@@ -60,87 +49,46 @@ depends=('bzip2'
 
 makedepends=('git' 'qt5-base' 'patchelf')
 
-source=("qgroundcontrol-${pkgver}.tar.gz::https://github.com/mavlink/qgroundcontrol/archive/v${pkgver}.tar.gz"
-        "gps-drivers-qgc${pkgver}.tar.gz::https://github.com/PX4/GpsDrivers/archive/${pkgver_gps}.tar.gz"
-        "eigen-${pkgver}.tar.gz::https://gitlab.com/libeigen/eigen/-/archive/${pkgver_eigen}/eigen-${pkgver_eigen}.tar.gz"
-        "libevents-qgc${pkgver}.tar.gz::https://github.com/mavlink/libevents/archive/${pkgver_libevents}.tar.gz"
-        "nlohmann-qgc${pkgver}.tar.gz::https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent/archive/${pkgver_nlohmann}.tar.gz"
-        "mavlink-v2.0-qgc${pkgver}.tar.gz::https://github.com/mavlink/c_library_v2/archive/${pkgver_mavlink}.tar.gz"
-        "aossl-qgc${pkgver}.tar.gz::https://github.com/Auterion/android_openssl/archive/${pkgver_aossl}.tar.gz"
-        "qengine-qgc${pkgver}.tar.gz::https://github.com/patrickelectric/qmdnsengine/archive/${pkgver_qengine}.tar.gz"
-        "gst-plugins-good-qgc${pkgver}.tar.gz::https://github.com/GStreamer/gst-plugins-good/archive/${pkgver_gst}.tar.gz"
-        "xz-qgc${pkgver}.tar.gz::https://github.com/Auterion/xz-embedded/archive/${pkgver_xz}.tar.gz"
+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/Auterion/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"
         "gst-volatile.patch::https://patch-diff.githubusercontent.com/raw/mavlink/gst-plugins-good/pull/1.patch"
 )
 
-sha256sums=('bafbedc67fda6314108fa1217528ac183739cd7f620de93884791b6624120169'
-            '30e7924bf96724e0854dc461df131f24ce2221f4aa22c69e43ace34e2699b2d2'
-            '0fa24d921e5ead2d5fe405fff2ac9bb167b155cd767ba42a9f613ddb44d7e4ae'
-            'afb3090975a7da881ff0c8577d13777de5703f71859a5cf8b05387f790bc0748'
-            '614ffcc9812aa2d2cbe0d602e258c2fe7d06eddd68dec0c51039f3f210a33ac6'
-            '56349916eb2707597439db7d37f1700f2d5a1819872b5bb414557e8559a94a67'
-            '93598e63fbbd86fec5e15f2596bba8b1f1654c854a99222099516933fd22a118'
-            'e709edd7142cfc738e306808b588a8836d9d795856d6d3cd57bd5ac8666516a6'
-            'd5aad13c8eff7f3cce75c8cf3bbf6ac592ac82455e666dccd17cf006deec3e55'
-            '7a6d606198c94c0c84a18c690bcfdf0fc5ba1a3f61a9c8ebc2c51523f0884084'
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
             'SKIP'
 )
 
 prepare() {
-  gpsdir="PX4-GPSDrivers-${pkgver_gps}"
-  eigendir="eigen-${pkgver_eigen}"
-  libeventsdir="libevents-${pkgver_libevents}"
-  nlohmanndir="nlohmann_json_cmake_fetchcontent-${pkgver_nlohmann}"
-  mavlinkdir="c_library_v2-${pkgver_mavlink}"
-  aossldir="android_openssl-${pkgver_aossl}"
-  qenginedir="qmdnsengine-${pkgver_qengine}"
-  gstdir="gst-plugins-good-${pkgver_gst}"
-  xzdir="xz-embedded-${pkgver_xz}"
-
-  # Copy in the GPS source
-  rm -r "${srcdir}/${pkgname}-${pkgver}/src/GPS/Drivers"
-  mkdir -p "${srcdir}/${pkgname}-${pkgver}/src/GPS"
-  cp -R "${srcdir}/${gpsdir}" "${srcdir}/${pkgname}-${pkgver}/src/GPS/Drivers"
-
-  # Copy in the eigen source
-  rm -r "${srcdir}/${pkgname}-${pkgver}/libs/eigen"
-  mkdir -p "${srcdir}/${pkgname}-${pkgver}/libs"
-  cp -R "${srcdir}/${eigendir}" "${srcdir}/${pkgname}-${pkgver}/libs/eigen"
-
-  # Copy in the libevents source
-  rm -r "${srcdir}/${pkgname}-${pkgver}/libs/libevents/libevents"
-  mkdir -p "${srcdir}/${pkgname}-${pkgver}/libs/libevents"
-  cp -R "${srcdir}/${libeventsdir}" "${srcdir}/${pkgname}-${pkgver}/libs/libevents/libevents"
-
-  # Copy in the nlohmann source
-  rm -r "${srcdir}/${pkgname}-${pkgver}/libs/libevents/libevents/libs/cpp/parse/nlohmann_json"
-  mkdir -p "${srcdir}/${pkgname}-${pkgver}/libs/libevents/libevents/libs/cpp/parse"
-  cp -R "${srcdir}/${nlohmanndir}" "${srcdir}/${pkgname}-${pkgver}/libs/libevents/libevents/libs/cpp/parse/nlohmann_json"
-
-  # Copy in the mavlink source
-  rm -r "${srcdir}/${pkgname}-${pkgver}/libs/mavlink/include/mavlink/v2.0"
-  mkdir -p "${srcdir}/${pkgname}-${pkgver}/libs/mavlink/include/mavlink"
-  cp -R "${srcdir}/${mavlinkdir}" "${srcdir}/${pkgname}-${pkgver}/libs/mavlink/include/mavlink/v2.0"
-
-  # Copy in the android openssl source
-  rm -r "${srcdir}/${pkgname}-${pkgver}/libs/OpenSSL/android_openssl"
-  mkdir -p "${srcdir}/${pkgname}-${pkgver}/libs/OpenSSL"
-  cp -R "${srcdir}/${aossldir}" "${srcdir}/${pkgname}-${pkgver}/libs/OpenSSL/android_openssl"
-
-  # Copy in the qmdnsengine source
-  rm -r "${srcdir}/${pkgname}-${pkgver}/libs/qmdnsengine"
-  mkdir -p "${srcdir}/${pkgname}-${pkgver}/libs"
-  cp -R "${srcdir}/${qenginedir}" "${srcdir}/${pkgname}-${pkgver}/libs/qmdnsengine"
-
-  # Copy in the GST source
-  rm -r "${srcdir}/${pkgname}-${pkgver}/libs/qmlglsink/gst-plugins-good"
-  mkdir -p "${srcdir}/${pkgname}-${pkgver}/libs"
-  cp -R "${srcdir}/${gstdir}" "${srcdir}/${pkgname}-${pkgver}/libs/qmlglsink/gst-plugins-good"
-
-  # Copy in the xz source
-  rm -r "${srcdir}/${pkgname}-${pkgver}/libs/xz-embedded"
-  mkdir -p "${srcdir}/${pkgname}-${pkgver}/libs"
-  cp -R "${srcdir}/${xzdir}" "${srcdir}/${pkgname}-${pkgver}/libs/xz-embedded"
+
+  cd "$srcdir/${pkgname}-${pkgver}"
+
+  git submodule init
+
+  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 submodule update --init --recursive
 
   cd "${srcdir}/${pkgname}-${pkgver}/libs/qmlglsink/gst-plugins-good"
   patch --strip=1 < "${srcdir}/gst-volatile.patch"