diff options
Diffstat (limited to 'libraries/opencv/opencv.SlackBuild')
| -rw-r--r-- | libraries/opencv/opencv.SlackBuild | 13 |
1 files changed, 5 insertions, 8 deletions
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 .. |