libraries/opencv: Add qt5 requirement

Signed-off-by: Christoph Willing <chris.willing@linux.com>

3 files changed, 17 insertions, 10 deletions

diff --git a/libraries/opencv/README b/libraries/opencv/README
index 9e878dc8af..d2e02e42d9 100644
--- a/libraries/opencv/README
+++ b/libraries/opencv/README
@@ -14,7 +14,7 @@ the feature set available in the resulting OpenCV package. The
 additional optional packages will mostly be autodetected and used
 at build time without any user intervention. Packages that are
 processed in this way include (by SBo package name):
-    qt5 libdc1394 ffmpeg hdf5 VTK libwebp tesseract glog
+    libdc1394 ffmpeg hdf5 VTK libwebp tesseract glog
     apache-ant numpy OpenBLAS openjdk8 (or openjdk or jdk)
 
 In the unlikely situation that features from these packages are not
@@ -43,6 +43,12 @@ VTK support will be disabled unless it was built with qt5 support (which
 is possible but not its default). Conversely, if VTK has been built with
 qt5, it will be disabled in OpenCV unless it too is being built with qt5.
 
+Since opencv version 4.1.1, Qt5 is the required widget framework
+(Qt4 is insufficient). Therefore qt5 is now a required dependency,
+although this may be bypassed (with reduced functionality) by setting
+the CVQT5 environment variable e.g.
+    CVQT5=no sh ./opencv.SlackBuild
+
 This package is configured to generate python bindings for Python 3 (via
 dependency on the numpy3 package). If bindings for Python 2 are required,
 the numpy package is required when building opencv.
diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild
index f7a24291f0..31199f5279 100644
--- a/libraries/opencv/opencv.SlackBuild
+++ b/libraries/opencv/opencv.SlackBuild
@@ -27,7 +27,7 @@
 PRGNAM=opencv
 PRGNAM2=opencv_contrib
 VERSION=${VERSION:-4.1.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -57,13 +57,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
-cvnonfree="" ;  [ "${CVNONFREE:-no}" = "yes" ] &&   cvnonfree="-DOPENCV_ENABLE_NONFREE=ON"
-cv1394="" ;     [ "${CV1394:-yes}" = "no" ]    &&   cv1394="-DWITH_1394=OFF"
-cvffmpeg="" ;   [ "${CVFFMPEG:-yes}" = "no" ]  &&   cvffmpeg="-DWITH_FFMPEG=OFF"
-cvvtk="" ;      [ "${CVVTK:-yes}" = "no" ]     &&   cvvtk="-DWITH_VTK=OFF"
-cvgdal="" ;     [ "${CVGDAL:-no}" = "yes" ]    &&   cvgdal="-DWITH_GDAL=ON"
+qt5="-DWITH_QT=ON" ; [ "${CVQT5:-yes}" = "no" ] &&   qt5="-DWITH_QT=OFF"
+cvnonfree="" ;  [ "${CVNONFREE:-no}" = "yes" ]  &&   cvnonfree="-DOPENCV_ENABLE_NONFREE=ON"
+cv1394="" ;     [ "${CV1394:-yes}" = "no" ]     &&   cv1394="-DWITH_1394=OFF"
+cvffmpeg="" ;   [ "${CVFFMPEG:-yes}" = "no" ]   &&   cvffmpeg="-DWITH_FFMPEG=OFF"
+cvvtk="" ;      [ "${CVVTK:-yes}" = "no" ]      &&   cvvtk="-DWITH_VTK=OFF"
+cvgdal="" ;     [ "${CVGDAL:-no}" = "yes" ]     &&   cvgdal="-DWITH_GDAL=ON"
 dnn="-DBUILD_opencv_dnn=OFF" ; [ "${DNN:-no}" = "yes" ] && dnn=""
-face="" ;       [ "${OCV_FACE:-yes}" = "no" ]  &&   face="-DBUILD_opencv_face=OFF"
+face="" ;       [ "${OCV_FACE:-yes}" = "no" ]   &&   face="-DBUILD_opencv_face=OFF"
 xf2d="-DBUILD_opencv_xfeatures2d=OFF" ; [ "${XF2D:-no}" = "yes" ] && xf2d=""
 cvdocs="-DBUILD_DOCS=ON -DBUILD_EXAMPLES=ON -DINSTALL_C_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON " ; [ "${CVDOCS:-yes}" = "no" ] && cvdocs=""
 
@@ -100,12 +101,12 @@ cd build
     -DPYTHON3_PACKAGES_PATH=$(python3 -c "import site; print(site.getsitepackages()[0])") \
     -DENABLE_PRECOMPILED_HEADERS=OFF \
     -DWITH_IPP=OFF \
-    -DWITH_QT=ON \
     -DWITH_OPENGL=ON \
     -DWITH_OPENMP=ON \
     -DWITH_XINE=ON \
     -DBUILD_CUDA_STUBS=OFF \
     -DWITH_CUDA=OFF \
+    $qt5 \
     $cv1394 \
     $cvffmpeg \
     $cvvtk \
diff --git a/libraries/opencv/opencv.info b/libraries/opencv/opencv.info
index 177b7bb2fb..7add63d00d 100644
--- a/libraries/opencv/opencv.info
+++ b/libraries/opencv/opencv.info
@@ -7,6 +7,6 @@ MD5SUM="d9d3138d12e52bb0684f4a5862f6a46c \
         c1b2b91f27526ad3b49fbcd00551c96b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="numpy3"
+REQUIRES="numpy3 qt5"
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"