libraries/opencv: Updated for version 3.4.2

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

4 files changed, 24 insertions, 23 deletions

diff --git a/libraries/opencv/README b/libraries/opencv/README
index 71168738ff..76ff06ab69 100644
--- a/libraries/opencv/README
+++ b/libraries/opencv/README
@@ -48,6 +48,13 @@ e.g.
 Enabling either of these modules results in additional downloading during
 the configure stage of building.
 
+The face recognition module is enabled by default. This incurs an additional
+download of the face_landmark_model.dat file (~70M) from OpenCV's github
+repository during configuration. If this is not desired, the face module
+can be disabled by setting OCV_FACE environment variable  to "no"
+e.g.
+    OCV_FACE=no sh ./opencv.SlackBuild
+
 Documentation is generated by the SlackBuild unless it is switched off
 by setting the CVDOCS environment variable i.e.
     CVDOCS=no sh ./opencv.SlackBuild
diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild
index 63cb0c17b8..f87aed3064 100644
--- a/libraries/opencv/opencv.SlackBuild
+++ b/libraries/opencv/opencv.SlackBuild
@@ -26,8 +26,8 @@
 
 PRGNAM=opencv
 PRGNAM2=opencv_contrib
-VERSION=${VERSION:-3.4.1}
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-3.4.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -61,7 +61,8 @@ 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_modern=OFF" ; [ "${DNN:-no}" = "yes" ] && dnn=""
+dnn="-DBUILD_opencv_dnn=OFF" ; [ "${DNN:-no}" = "yes" ] && dnn=""
+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=""
 
@@ -85,11 +86,6 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 
-[ "${DNN:-no}" = "no" ] && {
-  sed -i '2s/^/ocv_module_disable(dnn_modern) \n/' $PRGNAM2-$VERSION/modules/dnn_modern/CMakeLists.txt
-  rm -rf $PRGNAM2-$VERSION/modules/face
-}
-
 mkdir -p build
 cd build
   cmake \
@@ -112,6 +108,7 @@ cd build
     $cvvtk \
     $cvgdal \
     $dnn \
+    $face \
     $xf2d \
     $cvdocs \
     -DOPENCV_EXTRA_MODULES_PATH=../$PRGNAM2-$VERSION/modules ..
diff --git a/libraries/opencv/opencv.info b/libraries/opencv/opencv.info
index 78d93c8c4a..85418a8ff9 100644
--- a/libraries/opencv/opencv.info
+++ b/libraries/opencv/opencv.info
@@ -1,10 +1,10 @@
 PRGNAM="opencv"
-VERSION="3.4.1"
+VERSION="3.4.2"
 HOMEPAGE="https://opencv.org/"
-DOWNLOAD="https://github.com/opencv/opencv/archive/3.4.1/opencv-3.4.1.tar.gz \
-        https://github.com/opencv/opencv_contrib/archive/3.4.1/opencv_contrib-3.4.1.tar.gz"
-MD5SUM="a0b7a47899e67b3490ea31edc4f6e8e6 \
-        dd0c63f4185ab8a4829d8154ae382266"
+DOWNLOAD="https://github.com/opencv/opencv/archive/3.4.2/opencv-3.4.2.tar.gz \
+        https://github.com/opencv/opencv_contrib/archive/3.4.2/opencv_contrib-3.4.2.tar.gz"
+MD5SUM="8aba51c788cac3583bb39a0c24a5888f \
+        67b13857e0668b9e24be5ec6ae91ed48"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="numpy3"
diff --git a/libraries/opencv/patch_fsh-3.4.1.diff b/libraries/opencv/patch_fsh-3.4.2.diff
index 006b475cc3..9a865ff73c 100644
--- a/libraries/opencv/patch_fsh-3.4.1.diff
+++ b/libraries/opencv/patch_fsh-3.4.2.diff
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2018-02-23 18:38:33.000000000 +1000
-+++ CMakeLists.txt	2018-03-15 15:13:45.404082099 +1000
-@@ -368,7 +368,7 @@
+--- CMakeLists.txt.orig	2018-07-04 21:05:47.000000000 +1000
++++ CMakeLists.txt	2018-07-06 08:04:47.804000000 +1000
+@@ -374,7 +374,7 @@
  if(ANDROID OR WIN32)
    ocv_update(OPENCV_DOC_INSTALL_PATH doc)
  else()
@@ -9,7 +9,7 @@
  endif()
  
  if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
-@@ -409,7 +409,7 @@
+@@ -415,7 +415,7 @@
  elseif(WIN32)
    ocv_update(OPENCV_TEST_DATA_INSTALL_PATH "testdata")
  else()
@@ -18,16 +18,14 @@
  endif()
  
  if(ANDROID)
-@@ -439,18 +439,18 @@
-     ocv_update(OPENCV_CONFIG_INSTALL_PATH  ".")
+@@ -446,17 +446,17 @@
    else()
      include(GNUInstallDirs)
--    ocv_update(OPENCV_LIB_INSTALL_PATH     ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX})
+     ocv_update(OPENCV_LIB_INSTALL_PATH     ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX})
 -    ocv_update(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
 -    ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/OpenCV/samples)
 -    ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
 -    ocv_update(OPENCV_OTHER_INSTALL_PATH   share/OpenCV)
-+    ocv_update(OPENCV_LIB_INSTALL_PATH     ${CMAKE_INSTALL_LIBDIR})
 +    ocv_update(OPENCV_3P_LIB_INSTALL_PATH  share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH})
 +    ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/opencv/samples)
 +    ocv_update(OPENCV_JAR_INSTALL_PATH share/opencv/java)
@@ -36,8 +34,7 @@
      if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
        math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
        if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
--        ocv_update(OPENCV_CONFIG_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}/cmake/opencv)
-+        ocv_update(OPENCV_CONFIG_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/cmake/opencv)
+         ocv_update(OPENCV_CONFIG_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}/cmake/opencv)
        else()
 -        ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
 +        ocv_update(OPENCV_CONFIG_INSTALL_PATH share/opencv)