Switching to the new OSPRAY API

4 files changed, 40 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7729870a8c0c..b046614d28de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vmd-src
 	pkgdesc = Visual Molecular Dynamics
 	pkgver = 1.9.4a51
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.ks.uiuc.edu/Research/vmd/
 	arch = x86_64
 	license = custom
@@ -23,10 +23,8 @@ pkgbase = vmd-src
 	conflicts = vmd-bin
 	source = local://vmd-1.9.4a51.src.tar.gz
 	source = configure.patch
-	source = mpi.patch
 	sha256sums = b1c40b21111f5bab56d43d5e442c468d327159b07915af2ec175ba6b12842e5c
-	sha256sums = fe50ea892da8fa6bc919bca5c51a27db5c170faf683c884c536c97b8a9f8ed8e
-	sha256sums = e281a57831b8ff60c5a644219f0b6289d32bee239978af676474941c7d8548c0
+	sha256sums = fa4912916f0a9adfe985a456d4ad6a30b302eb31c7be26efabbfdd4466c43e05
 
 pkgname = vmd-src
 
diff --git a/PKGBUILD b/PKGBUILD
index d81115cb0e44..97e27944d942 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=vmd-src
 _pkgname=vmd
 pkgver=1.9.4a51
-pkgrel=3
+pkgrel=4
 pkgdesc="Visual Molecular Dynamics"
 url="http://www.ks.uiuc.edu/Research/vmd/"
 license=('custom')
@@ -22,21 +22,18 @@ conflicts=("$_pkgname" "$_pkgname-bin")
 # You have to download the package from the VMD url
 # and put it in the PKGBUILD folder.
 source=("local://$_pkgname-${pkgver}.src.tar.gz"
-        "configure.patch"
-        "mpi.patch")
+        "configure.patch")
 sha256sums=('b1c40b21111f5bab56d43d5e442c468d327159b07915af2ec175ba6b12842e5c'
-            'fe50ea892da8fa6bc919bca5c51a27db5c170faf683c884c536c97b8a9f8ed8e'
-            'e281a57831b8ff60c5a644219f0b6289d32bee239978af676474941c7d8548c0')
+            'fa4912916f0a9adfe985a456d4ad6a30b302eb31c7be26efabbfdd4466c43e05')
 
 prepare() {
   sed -i 's/ltcl8.5/ltcl/g' plugins/Make-arch
   cd $_pkgname-$pkgver
   mkdir plugins
   sed -i 's#:${LD_LIBRARY_PATH}/:${LD_LIBRARY_PATH}:#/opt/optix/lib64#g' bin/*
+  # Assuming openmpi; if it's not the case edit configure.patch
   patch -p0 < ../configure.patch
   
-  # Assuming openmpi; if not the case edit mpi.patch
-  patch -p0 < ../mpi.patch
   export TCLINC="-I/usr/include"
   export TCLLIB="-L/usr/lib"
   export PLUGINDIR=$srcdir/$_pkgname-$pkgver/plugins
@@ -55,7 +52,7 @@ build() {
   make -j1 LINUXAMD64
   make distrib
   cd ../$_pkgname-$pkgver
-  ./configure LINUXAMD64 OPENGL EGLPBUFFER FLTKOPENGL FLTK TK $ACC IMD OPENCL MPI XINERAMA XINPUT LIBOSPRAY LIBPNG ZLIB NETCDF COLVARS TCL PYTHON NUMPY PTHREADS GCC
+  ./configure LINUXAMD64 OPENGL EGLPBUFFER FLTKOPENGL FLTK TK $ACC IMD OPENCL MPI XINERAMA XINPUT LIBOSPRAY2 LIBPNG ZLIB NETCDF COLVARS TCL PYTHON NUMPY PTHREADS GCC
   cd src
   make veryclean
   make
diff --git a/configure.patch b/configure.patch
index 688a6e3b5465..318628b67e75 100644
--- a/configure.patch
+++ b/configure.patch
@@ -1,5 +1,5 @@
---- configure	2021-01-03 17:31:19.000000000 +0300
-+++ configure	2021-01-03 17:38:02.570553452 +0300
+--- configure.orig	2020-12-21 20:56:04.000000000 +0300
++++ configure	2021-04-02 16:48:20.600655457 +0300
 @@ -497,19 +497,19 @@
  
  $arch_cc          = "cc";
@@ -67,6 +67,30 @@
  @cuda_cc          = ();
  @cuda_cu	  = ('msmpot_cuda.cu',
                       'msmpot_cuda_latcut.cu',
+@@ -1052,15 +1046,15 @@
+ #######################
+ $mpi_defines     = "-DVMDMPI ";
+ ## Argonne MPICH
+-$mpi_dir         = "/usr/lib64/mpich";
+-$mpi_include     = "-I/usr/include/mpich-x86_64";
+-$mpi_library     = "-L$mpi_dir/lib";
+-$mpi_libs        = "-lmpich";
++#$mpi_dir         = "/usr";
++#$mpi_include     = "-I/usr/include";
++#$mpi_library     = "-L$mpi_dir/lib";
++#$mpi_libs        = "-lmpicxx -lmpi";
+ ## OpenMPI
+-# $mpi_dir         = "/usr/lib64/openmpi";
+-# $mpi_include     = "-I/usr/include/openmpi-x86_64";
+-# $mpi_library     = "-L$mpi_dir/lib";
+-# $mpi_libs        = "-lmpi";
++$mpi_dir         = "/usr";
++$mpi_include     = "-I/usr/include";
++$mpi_library     = "-L$mpi_dir/lib/openmpi";
++$mpi_libs        = "-lmpi_cxx -lmpi";
+ ## OSU MVAPICH
+ # $mpi_dir         = "/usr/mpi/gcc/mvapich-1.0.0";
+ # $mpi_include     = "-I$mpi_dir/include";
 @@ -1201,7 +1195,7 @@
  # $liboptix_dir         = "/usr/local/encap/NVIDIA-OptiX-SDK-5.0.1-linux64";
  # $liboptix_dir         = "/usr/local/encap/NVIDIA-OptiX-SDK-5.1.0-linux64";
@@ -76,15 +100,15 @@
  # $liboptix_dir         = "/usr/local/encap/NVIDIA-OptiX-SDK-7.0.0-linux64";
  
  # NCSA Blue Waters
-@@ -1267,7 +1261,7 @@
-   $libospray_dir         = "/usr/local/ospray-1.8.5.x86_64.linux";
-   $libospray_include     = "-I$libospray_dir/include -I$libospray_dir/ospray/include ";
-   $libospray_library     = "-L$libospray_dir/lib ";
--  $libospray_libs        = "-lospray -lospray_common -lembree -ltbb -ltbbmalloc ";
-+  $libospray_libs        = "-lospray -lospray_common -lembree3 -ltbb -ltbbmalloc ";
+@@ -1314,7 +1308,7 @@
+   $libospray2_dir         = "/usr/local/ospray-2.1.1.x86_64.linux";
+   $libospray2_include     = "-I$libospray2_dir/include -I$libospray2_dir/ospray/include ";
+   $libospray2_library     = "-L$libospray2_dir/lib ";
+-  $libospray2_libs        = "-lospray -lospcommon -lembree3 -ltbb -ltbbmalloc ";
++  $libospray2_libs        = "-lospray -lembree3 -ltbb -ltbbmalloc ";
  }
  
- 
+ # Both OptiX and OSPRay renderers use the Tachyon glwin code,
 @@ -1650,16 +1644,16 @@
    $stock_numpy_library_dir=$ENV{"NUMPY_LIBRARY_DIR"} || "$conda_root/lib/python-3.7/site-packages/numpy/core/include";
    $python_libs        = "-fno-lto -lpython3.7m -lpthread";
diff --git a/mpi.patch b/mpi.patch
deleted file mode 100644
index b3822a31f665..000000000000
--- a/mpi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure	2019-05-24 15:48:39.590316691 +0300
-+++ configure	2019-05-24 15:48:07.136424874 +0300
-@@ -970,15 +970,15 @@
- #######################
- $mpi_defines     = "-DVMDMPI ";
- ## Argonne MPICH
--$mpi_dir         = "/usr/lib64/mpich";
--$mpi_include     = "-I/usr/include/mpich-x86_64";
--$mpi_library     = "-L$mpi_dir/lib";
--$mpi_libs        = "-lmpich";
-+#$mpi_dir         = "/usr";
-+#$mpi_include     = "-I/usr/include";
-+#$mpi_library     = "-L$mpi_dir/lib";
-+#$mpi_libs        = "-lmpicxx -lmpi";
- ## OpenMPI
--# $mpi_dir         = "/usr/lib64/openmpi";
--# $mpi_include     = "-I/usr/include/openmpi-x86_64";
--# $mpi_library     = "-L$mpi_dir/lib";
--# $mpi_libs        = "-lmpi";
-+$mpi_dir         = "/usr";
-+$mpi_include     = "-I/usr/include";
-+$mpi_library     = "-L$mpi_dir/lib/openmpi";
-+$mpi_libs        = "-lmpi_cxx -lmpi";
- ## OSU MVAPICH
- # $mpi_dir         = "/usr/mpi/gcc/mvapich-1.0.0";
- # $mpi_include     = "-I$mpi_dir/include";