WIP: Update to OSPRay 1.8.4

tapestry.sh

@@ -279,28 +279,34 @@ tapestry-do-depend() {
         tapestry-run ${opt_verbose:+-v} git submodule update
     fi
 
-    if ! [ -f tapestry/ispc-v1.9.1-linux.tar.gz ]; then
+    if ! [ -f tapestry/ispc-v1.10.0-linux.tar.gz ]; then
+        printf $'Retrieving ISPC...' >&2
         tapestry-download \
-            -u http://sourceforge.net/projects/ispcmirror/files/v1.9.1/ispc-v1.9.1-linux.tar.gz/download \
-            -o tapestry/ispc-v1.9.1-linux.tar.gz \
+            -u https://sourceforge.net/projects/ispcmirror/files/v1.10.0/ispc-v1.10.0-linux.tar.gz/download \
+            -o tapestry/ispc-v1.10.0-linux.tar.gz \
             ${opt_verbose:+-v} \
             ${opt_progress:+-p}
+        printf $'done\n' >&2
     fi
 
-    if ! [ -f tapestry/embree-2.16.4.x86_64.linux.tar.gz ]; then
+    if ! [ -f tapestry/embree-3.5.2.x86_64.linux.tar.gz ]; then
+        printf $'Retrieving Embree...' >&2
         tapestry-download \
-            -u https://github.com/embree/embree/releases/download/v2.16.4/embree-2.16.4.x86_64.linux.tar.gz \
-            -o tapestry/embree-2.16.4.x86_64.linux.tar.gz \
+            -u https://github.com/embree/embree/releases/download/v3.5.2/embree-3.5.2.x86_64.linux.tar.gz \
+            -o tapestry/embree-3.5.2.x86_64.linux.tar.gz \
             ${opt_verbose:+-v} \
             ${opt_progress:+-p}
+        printf $'done\n' >&2
     fi
 
-    if ! [ -f tapestry/tbb2017_20161128oss_lin.tgz ]; then
+    if ! [ -f tapestry/tbb2019_20190320oss_lin.tgz ]; then
+        printf $'Retrieving TBB...' >&2
         tapestry-download \
-            -u https://github.com/01org/tbb/releases/download/2017_U3/tbb2017_20161128oss_lin.tgz \
-            -o tapestry/tbb2017_20161128oss_lin.tgz \
+            -u https://github.com/01org/tbb/releases/download/2019_U5/tbb2019_20190320oss_lin.tgz \
+            -o tapestry/tbb2019_20190320oss_lin.tgz \
             ${opt_verbose:+-v} \
             ${opt_progress:+-p}
+        printf $'done\n' >&2
     fi
 }
 

tapestry/Dockerfile

@@ -45,19 +45,19 @@ RUN true && \
     rm -rf /opt/rapidjson
 
 WORKDIR /opt/
-ADD tbb2017_20161128oss_lin.tgz /opt/
-RUN mv tbb2017_20161128oss tbb
+ADD tbb2019_20190320oss_lin.tgz /opt/
+RUN mv tbb2019_20190320oss tbb
 WORKDIR /opt/tbb/
 
 WORKDIR /opt/
-ADD ispc-v1.9.1-linux.tar.gz /opt/
-RUN mv ispc-v1.9.1-linux ispc
+ADD ispc-v1.10.0-linux.tar.gz /opt/
+RUN mv ispc-1.10.0-Linux ispc
 WORKDIR /opt/ispc/
-RUN update-alternatives --install /usr/bin/ispc ispc /opt/ispc/ispc 1
+RUN update-alternatives --install /usr/bin/ispc ispc /opt/ispc/bin/ispc 1
 
 WORKDIR /opt/
-ADD embree-2.16.4.x86_64.linux.tar.gz /opt/
-RUN mv embree-2.16.4.x86_64.linux embree
+ADD embree-3.5.2.x86_64.linux.tar.gz /opt/
+RUN mv embree-3.5.2.x86_64.linux embree
 WORKDIR /opt/embree/
 
 WORKDIR /opt/
@@ -68,6 +68,7 @@ RUN true && \
     cmake .. \
           -Dembree_DIR=/opt/embree \
           -DOSPRAY_ENABLE_APPS:BOOL=OFF \
+          -DOSPRAY_ENABLE_TUTORIALS:BOOL=OFF \
           -DTBB_ROOT=/opt/tbb/ \
           -DOSPRAY_TASKING_SYSTEM=TBB \
     && \