adding aarch64

3 files changed, 38 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b046614d28de..7d41b90d0d59 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,23 @@
 pkgbase = vmd-src
 	pkgdesc = Visual Molecular Dynamics
 	pkgver = 1.9.4a51
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.ks.uiuc.edu/Research/vmd/
 	arch = x86_64
+	arch = aarch64
 	license = custom
 	makedepends = gcc
 	depends = tcsh
 	depends = tk
 	depends = python-numpy
 	depends = fltk
-	depends = ospray
 	depends = netcdf
 	depends = ocl-icd
 	depends = libxi
 	depends = opencl-headers
 	optdepends = openbabel: additional file formats support
 	optdepends = sqlite: dmsplugin
+	optdepends = ospray: accelerated ray tracing for Intel CPUs
 	optdepends = optix: accelerated ray tracing for NVIDIA GPUs
 	optdepends = cuda: NVIDIA CUDA GPU acceleration functions
 	conflicts = vmd
@@ -24,7 +25,6 @@ pkgbase = vmd-src
 	source = local://vmd-1.9.4a51.src.tar.gz
 	source = configure.patch
 	sha256sums = b1c40b21111f5bab56d43d5e442c468d327159b07915af2ec175ba6b12842e5c
-	sha256sums = fa4912916f0a9adfe985a456d4ad6a30b302eb31c7be26efabbfdd4466c43e05
+	sha256sums = cef0605dfeb529616c7b760696ac0305aa84e80eeffbbcb6e5473bc5a46760f9
 
 pkgname = vmd-src
-
diff --git a/PKGBUILD b/PKGBUILD
index 97e27944d942..5a13b2da687f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,16 +6,17 @@
 pkgname=vmd-src
 _pkgname=vmd
 pkgver=1.9.4a51
-pkgrel=4
+pkgrel=5
 pkgdesc="Visual Molecular Dynamics"
 url="http://www.ks.uiuc.edu/Research/vmd/"
 license=('custom')
-arch=('x86_64')
-depends=('tcsh' 'tk' 'python-numpy' 'fltk' 'ospray' 'netcdf' 'ocl-icd' 'libxi'
+arch=('x86_64' 'aarch64')
+depends=('tcsh' 'tk' 'python-numpy' 'fltk' 'netcdf' 'ocl-icd' 'libxi'
          'opencl-headers')
 makedepends=('gcc')
 optdepends=('openbabel: additional file formats support'
             'sqlite: dmsplugin'
+            'ospray: accelerated ray tracing for Intel CPUs'
             'optix: accelerated ray tracing for NVIDIA GPUs'
             'cuda: NVIDIA CUDA GPU acceleration functions')
 conflicts=("$_pkgname" "$_pkgname-bin")
@@ -24,7 +25,7 @@ conflicts=("$_pkgname" "$_pkgname-bin")
 source=("local://$_pkgname-${pkgver}.src.tar.gz"
         "configure.patch")
 sha256sums=('b1c40b21111f5bab56d43d5e442c468d327159b07915af2ec175ba6b12842e5c'
-            'fa4912916f0a9adfe985a456d4ad6a30b302eb31c7be26efabbfdd4466c43e05')
+            'cef0605dfeb529616c7b760696ac0305aa84e80eeffbbcb6e5473bc5a46760f9')
 
 prepare() {
   sed -i 's/ltcl8.5/ltcl/g' plugins/Make-arch
@@ -41,18 +42,31 @@ prepare() {
   export VMDINSTALLLIBRARYDIR=$pkgdir/usr/lib/vmd
   
   # Enable CUDA if nvcc is in PATH
-  if [ $( echo -n $( which nvcc) | tail -c 4 ) == nvcc ]
+  if command -v nvcc &> /dev/null
   then
     export ACC=CUDA
   fi
+
+  # Enable OSPRAY if ospray_mpi_worker is in PATH
+  if command -v ospray_mpi_worker &> /dev/null
+  then
+    export RAY=LIBOSPRAY2
+  fi
+
+  # Architecture
+  export MACHINE=LINUXAMD64
+  if [ $CARCH == 'aarch64' ]
+  then
+    export MACHINE=LINUXARM64
+  fi
 }
 
 build() {
   cd "$srcdir/plugins"
-  make -j1 LINUXAMD64
+  make -j1 $MACHINE
   make distrib
   cd ../$_pkgname-$pkgver
-  ./configure LINUXAMD64 OPENGL EGLPBUFFER FLTKOPENGL FLTK TK $ACC IMD OPENCL MPI XINERAMA XINPUT LIBOSPRAY2 LIBPNG ZLIB NETCDF COLVARS TCL PYTHON NUMPY PTHREADS GCC
+  ./configure $MACHINE OPENGL EGLPBUFFER FLTKOPENGL FLTK TK $ACC IMD OPENCL MPI XINERAMA XINPUT $RAY LIBPNG ZLIB NETCDF COLVARS TCL PYTHON NUMPY PTHREADS GCC
   cd src
   make veryclean
   make
@@ -63,5 +77,6 @@ package() {
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   cd src
   make install
-  sed -i 's#set defaultvmddir=.*#set defaultvmddir=/usr/lib/vmd#' "$pkgdir/usr/bin/vmd"
+  sed -i 's#set defaultvmddir=.*#set defaultvmddir=/usr/lib/vmd#' \
+    "$pkgdir/usr/bin/vmd"
 }
diff --git a/configure.patch b/configure.patch
index 318628b67e75..fb26fb46ee94 100644
--- a/configure.patch
+++ b/configure.patch
@@ -1,5 +1,5 @@
---- configure.orig	2020-12-21 20:56:04.000000000 +0300
-+++ configure	2021-04-02 16:48:20.600655457 +0300
+--- configure	2021-08-08 10:32:02.637988859 +0000
++++ configure	2021-08-08 10:31:14.808470930 +0000
 @@ -497,19 +497,19 @@
  
  $arch_cc          = "cc";
@@ -157,7 +157,15 @@
      }
  
      $arch_lex		= "flex"; # has problems with vendor lex
-@@ -2611,7 +2605,7 @@
+@@ -2605,13 +2599,13 @@
+ 
+ 
+ if ($config_arch eq "LINUXARM64") {
+-  $tcl_libs         = "-ltcl8.5";
+-  if ($config_tk) { $tcl_libs = "-ltk8.5 -lX11 " . $tcl_libs; }
++  $tcl_libs         = "-ltcl";
++  if ($config_tk) { $tcl_libs = "-ltk -lX11 " . $tcl_libs; }
+   $vmd_libs          = "$tcl_libs -lz";
  
    $arch_nvcc     = "/usr/local/cuda/bin/nvcc";
    $arch_nvccflags   = "--ptxas-options=-v " .