1 files changed, 15 insertions, 6 deletions
diff --git a/graphics/paraview/paraview.SlackBuild b/graphics/paraview/paraview.SlackBuild
index 5c109aec63e1..093f9302bdf6 100644
--- a/graphics/paraview/paraview.SlackBuild
+++ b/graphics/paraview/paraview.SlackBuild
@@ -25,7 +25,7 @@
 PRGNAM=paraview
 VERSION=${VERSION:-5.1.2}
 SHORT_VERSION=${SHORT_VERSION:-5.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -91,7 +91,7 @@ cd build
     -DFFMPEG_LIBAVUTIL_INCLUDE_DIRS=/usr/include/libavutil \
     -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS=/usr/include/libswscale \
     -DPARAVIEW_BUILD_QT_GUI=ON \
-    -DPARAVIEW_ENABLE_XDMF3=OFF \
+    -DPARAVIEW_ENABLE_XDMF3=ON \
     -DPARAVIEW_ENABLE_CATALYST=ON \
     -DPARAVIEW_ENABLE_FFMPEG=ON \
     -DPARAVIEW_ENABLE_PYTHON=ON \
@@ -104,10 +104,10 @@ cd build
     -DINSTALL_MAN_DIR=/usr/man \
     -DINSTALL_LIB_DIR=/usr/lib${LIBDIRSUFFIX} \
     -DICET_INSTALL_MAN_DIR=man \
-    -DVTK_INSTALL_ARCHIVE_DIR=lib${LIBDIRSUFFIX}/paraview-${VERSION} \
-    -DVTK_INSTALL_LIBRARY_DIR=lib${LIBDIRSUFFIX}/paraview-${VERSION} \
-    -DVTK_INSTALL_PYTHON_MODULE_DIR=lib${LIBDIRSUFFIX}/paraview-${VERSION}/site-packages \
-    -DVTK_INSTALL_PACKAGE_DIR=lib${LIBDIRSUFFIX}/cmake/paraview-${VERSION} \
+    -DVTK_INSTALL_ARCHIVE_DIR=lib${LIBDIRSUFFIX}/${PRGNAM}-${VERSION} \
+    -DVTK_INSTALL_LIBRARY_DIR=lib${LIBDIRSUFFIX}/${PRGNAM}-${VERSION} \
+    -DVTK_INSTALL_PYTHON_MODULE_DIR=lib${LIBDIRSUFFIX}/${PRGNAM}-${VERSION}/site-packages \
+    -DVTK_INSTALL_PACKAGE_DIR=lib${LIBDIRSUFFIX}/cmake/${PRGNAM}-${VERSION} \
     -DVTK_INSTALL_DOC_DIR=doc/${PRGNAM}-${VERSION} \
     -DQtTesting_INSTALL_LIB_DIR=lib${LIBDIRSUFFIX} \
     -DQtTesting_INSTALL_CMAKE_DIR=lib${LIBDIRSUFFIX}/cmake/qttesting \
@@ -118,6 +118,15 @@ cd build
   make install DESTDIR=$PKG
 cd ..
 
+# Remove duplicate files in usr/lib
+[ -r $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}-${VERSION}/libXdmfCore.so ] && \
+  rm -f $PKG/usr/lib/libXdmfCore.so
+[ -r $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}-${VERSION}/libvtkxdmf3.so ] && \
+  rm -f $PKG/usr/lib/libvtkxdmf3.so
+if [ "$ARCH" = "x86_64" ]; then
+  rm -rf  $PKG/usr/lib
+fi
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true