From 39f85d3abda25f53eb88d729f0426bc2ca67b33f Mon Sep 17 00:00:00 2001 From: Christoph Willing Date: Wed, 9 Jan 2019 12:24:07 +1000 Subject: libraries/opencv: Updated for version 4.0.1 Signed-off-by: Christoph Willing --- libraries/opencv/README | 4 ++++ libraries/opencv/opencv.SlackBuild | 16 +++++++++------- libraries/opencv/opencv.info | 10 +++++----- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/libraries/opencv/README b/libraries/opencv/README index 41d370076069..9e878dc8afae 100644 --- a/libraries/opencv/README +++ b/libraries/opencv/README @@ -33,6 +33,10 @@ environment variable: CVGDAL=yes ./opencv.SlackBuild (to support SBo's gis/gdal) +Access to patented algorithms e.g.SIFT/SURF may be enabled by setting +the CVNONFREE environment variable: + CVNONFREE=yes ./opencv.SlackBuild + Please note that some combinations of options may not be possible. In particular, if both qt5 and VTK are installed on the host build system, VTK support will be disabled unless it was built with qt5 support (which diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild index f2efceb6a0e9..745d8163d536 100644 --- a/libraries/opencv/opencv.SlackBuild +++ b/libraries/opencv/opencv.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2012-2015 Matt Dinslage, Springfield, MO USA # All rights reserved. -# Copyright 2016-2018 Christoph Willing, Brisbane, Australia +# Copyright 2016-2019 Christoph Willing, Brisbane, Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,8 +26,8 @@ PRGNAM=opencv PRGNAM2=opencv_contrib -VERSION=${VERSION:-4.0.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-4.0.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PY2VERSION=${PY2VERSION:-2.7} @@ -61,12 +61,13 @@ else LIBDIRSUFFIX="" fi -cv1394="" ; [ "${CV1394:-yes}" = "no" ] && cv1394="-DWITH_1394=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" +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="" @@ -123,6 +124,7 @@ cd build $face \ $xf2d \ $cvdocs \ + $cvnonfree \ -DOPENCV_EXTRA_MODULES_PATH=../$PRGNAM2-$VERSION/modules .. make VERBOSE=1 diff --git a/libraries/opencv/opencv.info b/libraries/opencv/opencv.info index 50a285669309..4234061a7fd8 100644 --- a/libraries/opencv/opencv.info +++ b/libraries/opencv/opencv.info @@ -1,10 +1,10 @@ PRGNAM="opencv" -VERSION="4.0.0" +VERSION="4.0.1" HOMEPAGE="https://opencv.org/" -DOWNLOAD="https://github.com/opencv/opencv/archive/4.0.0/opencv-4.0.0.tar.gz \ - https://github.com/opencv/opencv_contrib/archive/4.0.0/opencv_contrib-4.0.0.tar.gz" -MD5SUM="f051c1ff7b327b60123d71b53801b316 \ - 6fcf0cc6e6313dd9f740555821ac5e23" +DOWNLOAD="https://github.com/opencv/opencv/archive/4.0.1/opencv-4.0.1.tar.gz \ + https://github.com/opencv/opencv_contrib/archive/4.0.1/opencv_contrib-4.0.1.tar.gz" +MD5SUM="fac354a709708cad57867b33c8bc2829 \ + 171af36dfdf65da1fecad76c62b822c6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="numpy3" -- cgit v1.2.3