fixed multiple build issues

3 files changed, 40 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1ecf0888da2..a1d7667740f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ants-git
 	pkgdesc = Advanced Normalization Tools (ANTs) computes high-dimensional \ mappings to capture the statistics of brain structure and function
-	pkgver = v2.3.4.r15.g0f2c3017
+	pkgver = v2.3.5.r38.ga7eca60d
 	pkgrel = 2
 	url = http://www.picsl.upenn.edu/ANTS/
 	arch = i686
@@ -11,11 +11,12 @@ pkgbase = ants-git
 	depends = r
 	depends = vtk
 	depends = perl
-	depends = insight-toolkit>=5
+	depends = gdcm
 	provides = ants
 	conflicts = ants
 	source = ants-git::git+https://github.com/stnava/ANTs.git
+	source = 0001-fix-for-GDCM-build-isssue-with-superbuilding-on-Arch.patch
 	sha256sums = SKIP
+	sha256sums = f28f9a2edf0e14e7ecdba68fccf78a2226538c268529b16bc66b9a484490b9b0
 
 pkgname = ants-git
-
diff --git a/0001-fix-for-GDCM-build-isssue-with-superbuilding-on-Arch.patch b/0001-fix-for-GDCM-build-isssue-with-superbuilding-on-Arch.patch
new file mode 100644
index 000000000000..706a358e2e32
--- /dev/null
+++ b/0001-fix-for-GDCM-build-isssue-with-superbuilding-on-Arch.patch
@@ -0,0 +1,28 @@
+From 67b29178b5e87752ffc6d55805ba40e9beba1226 Mon Sep 17 00:00:00 2001
+From: Liam Timms <timms5000@gmail.com>
+Date: Thu, 15 Jul 2021 19:56:34 -0400
+Subject: [PATCH] fix for GDCM build isssue with superbuilding on Arch
+
+---
+ SuperBuild/External_ITKv5.cmake | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/SuperBuild/External_ITKv5.cmake b/SuperBuild/External_ITKv5.cmake
+index 31cc34e4..a7d046fd 100644
+--- a/SuperBuild/External_ITKv5.cmake
++++ b/SuperBuild/External_ITKv5.cmake
+@@ -119,6 +119,11 @@ if(NOT DEFINED ${extProjName}_DIR AND NOT ${USE_SYSTEM_${extProjName}})
+       -DITK_FUTURE_LEGACY_REMOVE:BOOL=ON
+       -DITKV3_COMPATIBILITY:BOOL=OFF
+       -DITK_BUILD_DEFAULT_MODULES:BOOL=ON
++      -DITK_USE_SYSTEM_JPEG:BOOL=ON
++      -DITK_USE_SYSTEM_PNG:BOOL=ON
++      -DITK_USE_SYSTEM_ZLIB:BOOL=ON
++      -DITK_USE_SYSTEM_TIFF:BOOL=ON
++      -DITK_USE_SYSTEM_GDCM:BOOL=ON
+ #      -DITK_MODULE_Core:BOOL=ON
+ #      -DITK_MODULE_IO:BOOL=ON
+ #      -DITK_MODULE_Filtering:BOOL=ON
+-- 
+2.32.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 55e69ac69cc7..1bf5ec03fd95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,22 @@
 
 _pkgname='ants'
 pkgname="${_pkgname}-git"
-pkgver=v2.3.4.r15.g0f2c3017
+pkgver=v2.3.5.r38.ga7eca60d
 pkgrel=2
 pkgdesc='Advanced Normalization Tools (ANTs) computes high-dimensional \
 mappings to capture the statistics of brain structure and function'
 arch=('i686' 'x86_64')
 url='http://www.picsl.upenn.edu/ANTS/'
 license=('Apache')
-depends=('r' 'vtk' 'perl' 'insight-toolkit>=5')
+depends=('r' 'vtk' 'perl' 'gdcm')
 makedepends=('git' 'cmake')
 optdepends=()
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
-source=("${pkgname}"'::git+https://github.com/stnava/ANTs.git')
-sha256sums=("SKIP")
+source=("${pkgname}"'::git+https://github.com/stnava/ANTs.git'
+        '0001-fix-for-GDCM-build-isssue-with-superbuilding-on-Arch.patch')
+sha256sums=('SKIP'
+            'f28f9a2edf0e14e7ecdba68fccf78a2226538c268529b16bc66b9a484490b9b0')
 
 pkgver() {
   cd "${srcdir}/${pkgname}"
@@ -25,6 +27,7 @@ pkgver() {
 
 prepare() {
   cd "${srcdir}/${pkgname}"
+  patch -Np1 -i "${srcdir}"/0001-fix-for-GDCM-build-isssue-with-superbuilding-on-Arch.patch
   mkdir -p antsBuild
 }
 
@@ -50,7 +53,7 @@ build() {
       -DUSE_SYSTEM_VTK=ON \
       -DUSE_VTK=ON \
       ..
-  make
+  make -j1
 }
 
 package() {