libraries/opencv: Updated for version 4.5.0

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Christoph Willing 2020-10-14 18:08:14 +10:00 committed by Willy Sudiarto Raharjo
parent 816da98442
commit 7924bf6bc3
No known key found for this signature in database
GPG key ID: 3F617144D7238786
3 changed files with 22 additions and 20 deletions

View file

@ -53,13 +53,14 @@ This package is configured to generate python bindings for Python 3 (via
dependency on the numpy3 package). If bindings for Python 2 are required, dependency on the numpy3 package). If bindings for Python 2 are required,
the numpy package is required when building opencv. the numpy package is required when building opencv.
The Deep Neural Network module and Extra 2D Features Framework from The Extra 2D Features Framework from OpenCV's "extra modules" section
OpenCV's "extra modules" section are disabled by default. They may be is disabled by default as it entails additional downloading during
enabled by setting the DNN and/or XF2D environment variables as required the configure stage of building. It may be enabled by setting the XF2D
e.g. environment variable when building e.g.
DNN=yes sh ./opencv.SlackBuild XF2D=yes sh ./opencv.SlackBuild
Enabling either of these modules results in additional downloading during Usually, this also applies to the Deep Neural Network (DNN) module
the configure stage of building. however it is no longer possible to complete a build without without
it and therefore remains enabled by default.
The face recognition module is enabled by default. This incurs an additional 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 download of the face_landmark_model.dat file (~70M) from OpenCV's github

View file

@ -26,7 +26,7 @@
PRGNAM=opencv PRGNAM=opencv
PRGNAM2=opencv_contrib PRGNAM2=opencv_contrib
VERSION=${VERSION:-4.3.0} VERSION=${VERSION:-4.5.0}
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
@ -58,13 +58,13 @@ else
fi fi
qt5="-DWITH_QT=ON" ; [ "${CVQT5:-yes}" = "no" ] && qt5="-DWITH_QT=OFF" qt5="-DWITH_QT=ON" ; [ "${CVQT5:-yes}" = "no" ] && qt5="-DWITH_QT=OFF"
cvnonfree="" ; [ "${CVNONFREE:-no}" = "yes" ] && cvnonfree="-DOPENCV_ENABLE_NONFREE=ON" cvnonfree="" ; [ "${CVNONFREE:-no}" = "yes" ] && cvnonfree="-DOPENCV_ENABLE_NONFREE=ON"
cv1394="" ; [ "${CV1394:-yes}" = "no" ] && cv1394="-DWITH_1394=OFF" cv1394="" ; [ "${CV1394:-yes}" = "no" ] && cv1394="-DWITH_1394=OFF"
cvffmpeg="" ; [ "${CVFFMPEG:-yes}" = "no" ] && cvffmpeg="-DWITH_FFMPEG=OFF" cvffmpeg="" ; [ "${CVFFMPEG:-yes}" = "no" ] && cvffmpeg="-DWITH_FFMPEG=OFF"
cvvtk="" ; [ "${CVVTK:-yes}" = "no" ] && cvvtk="-DWITH_VTK=OFF" cvvtk="" ; [ "${CVVTK:-yes}" = "no" ] && cvvtk="-DWITH_VTK=OFF"
cvgdal="" ; [ "${CVGDAL:-no}" = "yes" ] && cvgdal="-DWITH_GDAL=ON" cvgdal="" ; [ "${CVGDAL:-no}" = "yes" ] && cvgdal="-DWITH_GDAL=ON"
dnn="-DBUILD_opencv_dnn=OFF" ; [ "${DNN:-no}" = "yes" ] && dnn="" dnn=""; #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="" 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="" cvdocs="-DBUILD_DOCS=ON -DBUILD_EXAMPLES=ON -DINSTALL_C_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON " ; [ "${CVDOCS:-yes}" = "no" ] && cvdocs=""
@ -116,6 +116,7 @@ cd build
$xf2d \ $xf2d \
$cvdocs \ $cvdocs \
$cvnonfree \ $cvnonfree \
-DBUILD_opencv_intensity_transform=OFF \
-DOPENCV_EXTRA_MODULES_PATH=../$PRGNAM2-$VERSION/modules .. -DOPENCV_EXTRA_MODULES_PATH=../$PRGNAM2-$VERSION/modules ..
make VERBOSE=1 make VERBOSE=1

View file

@ -1,10 +1,10 @@
PRGNAM="opencv" PRGNAM="opencv"
VERSION="4.3.0" VERSION="4.5.0"
HOMEPAGE="https://opencv.org/" HOMEPAGE="https://opencv.org/"
DOWNLOAD="https://github.com/opencv/opencv/archive/4.3.0/opencv-4.3.0.tar.gz \ DOWNLOAD="https://github.com/opencv/opencv/archive/4.5.0/opencv-4.5.0.tar.gz \
https://github.com/opencv/opencv_contrib/archive/4.3.0/opencv_contrib-4.3.0.tar.gz" https://github.com/opencv/opencv_contrib/archive/4.5.0/opencv_contrib-4.5.0.tar.gz"
MD5SUM="559953ef6ffaad03421cbba7f31d891c \ MD5SUM="65ecd733f41b8286debfc4f29bd0d453 \
924ed270a66b5234442cf84da8c7e4b1" bcd25c6796f647a4a14e3235c7eddd6a"
DOWNLOAD_x86_64="" DOWNLOAD_x86_64=""
MD5SUM_x86_64="" MD5SUM_x86_64=""
REQUIRES="numpy3 qt5" REQUIRES="numpy3 qt5"