3 files changed, 40 insertions, 9 deletions
diff --git a/gis/OTB/OTB.SlackBuild b/gis/OTB/OTB.SlackBuild
index ced7f29cbc..d19f05862b 100644
--- a/gis/OTB/OTB.SlackBuild
+++ b/gis/OTB/OTB.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=OTB
 VERSION=${VERSION:-6.4.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -78,6 +78,10 @@ sed -i "s/lib\b/lib${LIBDIRSUFFIX}/" \
   CMake/OTBApplicationMacros.cmake \
   CMake/CPackFunctions.cmake
 
+MONTEVERDI=${MONTEVERDI:-OFF}
+BUILD_MONTEVERDI="-DOTB_USE_QWT=$MONTEVERDI -DOTB_USE_GLEW=$MONTEVERDI -DOTB_USE_OPENGL=$MONTEVERDI"
+BUILD_QT="-DOTB_USE_QT4=${QTGUI:-ON}"
+
 mkdir -p build
 cd build
   cmake \
@@ -85,17 +89,12 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_APPLICATIONS=ON \
     -DBUILD_EXAMPLES=OFF \
     -DBUILD_TESTING=OFF \
     -DOTB_USE_CURL=ON \
-    -DOTB_USE_QT4=ON \
-    -DOTB_USE_QWT=ON \
-    -DOTB_USE_GLEW=ON \
     -DOTB_USE_LIBKML=OFF \
     -DOTB_USE_MUPARSER=ON \
     -DOTB_USE_OPENCV=${OPENCV:-OFF} \
-    -DOTB_USE_OPENGL=ON \
     -DOTB_USE_OPENMP=ON \
     -DOTB_USE_SHARK=ON \
     -DOTB_WRAP_PYTHON=ON \
@@ -103,14 +102,36 @@ cd build
     -DOTB_WRAP_PYTHON3=ON \
     -DOTB_INSTALL_PYTHON3_DIR=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
     -DOTB_INSTALL_DOC_DIR=doc/$PRGNAM-$VERSION \
+    $BUILD_MONTEVERDI \
+    $BUILD_QT \
     ..
 
   make install DESTDIR=$PKG
 cd ..
 
+if [ "$QTGUI" = "OFF" ] ; then
+  # otbgui scripts are added but are unusable
+  rm $PKG/usr/bin/otbgui_*
+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
 
+mkdir -p $PKG/etc/profile.d
+cat > $PKG/etc/profile.d/otb.csh << EOF
+#!/bin/csh
+# Orfeo ToolBox applications path
+setenv OTB_APPLICATION_PATH /usr/lib${LIBDIRSUFFIX}/otb/applications
+EOF
+cat > $PKG/etc/profile.d/otb.sh << EOF
+#!/bin/sh
+# Orfeo ToolBox applications path
+export OTB_APPLICATION_PATH=/usr/lib${LIBDIRSUFFIX}/otb/applications
+EOF
+
+chmod 0755 $PKG/etc/profile.d/otb.csh
+chmod 0755 $PKG/etc/profile.d/otb.sh
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   README.md RELEASE_NOTES.txt \
@@ -119,7 +140,9 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+if [ "$MONTEVERDI" = "ON" ] ; then
+  cat $CWD/doinst.sh > $PKG/install/doinst.sh
+fi
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/gis/OTB/OTB.info b/gis/OTB/OTB.info
index 7a292f6a98..9777e8a392 100644
--- a/gis/OTB/OTB.info
+++ b/gis/OTB/OTB.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/orfeotoolbox/OTB/archive/6.4.0/OTB-6.4.0.tar.gz"
 MD5SUM="21b425dc0b8884bf2441f372ed041d8e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gdal ITK OpenSceneGraph muParser python3 ossim qwt Shark tinyxml"
+REQUIRES="gdal ITK OpenSceneGraph muParser python3 ossim Shark tinyxml"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/gis/OTB/README b/gis/OTB/README
index 706771a02e..456ea30da3 100644
--- a/gis/OTB/README
+++ b/gis/OTB/README
@@ -7,6 +7,14 @@ Ikonos), hyperspectral sensors (Hyperion) or SAR (TerraSarX, ERS, Palsar) are
 available.
 
 Monteverdi, a satellite image viewer with access to OTB processing, will also
-be built as part of this script.
+be built if MONTEVERDI=ON is passed to the script. This will require the qwt
+package to be installed.
+
+A QT application launcher will be built by default. Set QTGUI=OFF to disable
+it (note that disabling Qt support will also disable Monteverdi even if
+MONTEVERDI is set to ON).
 
 OTB may use the following optional dependencies: opencv (use OPENCV=ON).
+
+OTB will be built with support for the following packages if they are
+available at compile time: numpy and numpy3.