Pop versin to v2021.07, refactor submodule init

2 files changed, 32 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ddca3e45b2ce..661c40c0a671 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = meshlab
 	pkgdesc = System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version)
-	pkgver = 2021.05
+	pkgver = 2021.07
 	pkgrel = 1
 	url = https://www.meshlab.net
 	arch = i686
@@ -22,13 +22,19 @@ pkgbase = meshlab
 	depends = qt5-declarative
 	depends = qt5-script
 	depends = qt5-xmlpatterns
+	depends = xerces-c
 	optdepends = u3d: for U3D and IDTF file support
 	optdepends = lib3ds: for Autodesk`s 3D-Studio r3 and r4 .3DS file support
 	optdepends = levmar: for isoparametrization and mutualcorrs plugins
 	optdepends = muparser: for filer_func plugins
 	optdepends = mpir: for Constructive Solid Geometry operation filters
-	source = meshlab::git+https://github.com/cnr-isti-vclab/meshlab.git#tag=Meshlab-2021.05
-	source = vcglib::git+https://github.com/cnr-isti-vclab/vcglib.git#tag=2020.12
+	optdepends = openctm-tools: for compressed triangle mesh file format
+	source = meshlab::git+https://github.com/cnr-isti-vclab/meshlab.git#tag=Meshlab-2021.07
+	source = vcglib::git+https://github.com/cnr-isti-vclab/vcglib.git#tag=2021.07
+	source = nexus::git+https://github.com/cnr-isti-vclab/nexus.git
+	source = corto::git+https://github.com/cnr-isti-vclab/corto.git
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 1ed64f0861c4..f48767121db2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 #!/hint/bash
 # Maintainer : bartus <arch-user-repoᘓbartus.33mail.com>
 pkgname=meshlab
-pkgver=2021.05
-_pkgver_vcg=2020.12
+pkgver=2021.07
+_pkgver_vcg=${pkgver}
 pkgrel=1
 pkgdesc="System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version)"
 arch=('i686' 'x86_64')
 url="https://www.meshlab.net"
 license=('GPL2')
-depends=('bzip2' 'glew' 'glu' 'openssl-1.0' 'qt5-base' 'qt5-declarative' 'qt5-script' 'qt5-xmlpatterns')
+depends=('bzip2' 'glew' 'glu' 'openssl-1.0' 'qt5-base' 'qt5-declarative' 'qt5-script' 'qt5-xmlpatterns' 'xerces-c')
 makedepends=('cmake' 'eigen' 'ninja' 'git' 'muparser' 'levmar' 'lib3ds' 'mpir')
 optdepends=('u3d: for U3D and IDTF file support'
             'lib3ds: for Autodesk`s 3D-Studio r3 and r4 .3DS file support'
@@ -21,18 +21,18 @@ source=("$pkgname::git+https://github.com/cnr-isti-vclab/meshlab.git#tag=Meshlab
         )
 sha256sums=('SKIP'
             'SKIP'
-            )
+            'SKIP'
+            'SKIP')
 
 prepare() {
-  git -C "${srcdir}/${pkgname}" submodule init
-  git -C "${srcdir}/${pkgname}" config submodule.vcglib.url "$srcdir"/vcglib
-  git -C "${srcdir}/${pkgname}" submodule update
+  prepare_submodule
 }
 
 
 build() {
   local cmake_flags=( '-DALLOW_SYSTEM_QHULL=OFF'
                       '-DCMAKE_INSTALL_PREFIX=/usr'
+                      '-DCMAKE_BUILD_TYPE=Release'
                     )
   cmake "${cmake_flags[@]}" -G Ninja -B "${srcdir}/build" -S "${srcdir}/meshlab/src"
 # shellcheck disable=SC2046 # allow MAKEFLAGS to split when passing multiple flags.
@@ -43,4 +43,20 @@ package() {
   DESTDIR="$pkgdir" ninja -C "${srcdir}/build" install
 }
 
+# Generated with git_submodule_PKGBUILD_conf.sh ( https://gist.github.com/bartoszek/41a3bfb707f1b258de061f75b109042b )
+# Call prepare_submodule in prepare() function
+
+prepare_submodule() {
+  git -C "$srcdir/meshlab" config submodule.src/vcglib.url "$srcdir/vcglib"
+  git -C "$srcdir/meshlab" config submodule.src/external/nexus.url "$srcdir/nexus"
+  git -C "$srcdir/meshlab" submodule update --init
+  git -C "$srcdir/meshlab/src/external/nexus" config submodule.src/corto.url "$srcdir/corto"
+  git -C "$srcdir/meshlab/src/external/nexus" submodule update --init
+}
+source+=(
+# "vcglib::git+https://github.com/cnr-isti-vclab/vcglib.git"
+  "nexus::git+https://github.com/cnr-isti-vclab/nexus.git"
+  "corto::git+https://github.com/cnr-isti-vclab/corto.git"
+)
+
 # vim:set ts=2 sw=2 et: