aboutsummaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'libraries')
-rw-r--r--libraries/opencv/opencv.SlackBuild2
-rw-r--r--libraries/opencv/opencv.info2
-rw-r--r--libraries/opencv/patch_fsh-3.4.1.diff11
3 files changed, 9 insertions, 6 deletions
diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild
index 13e5dea42b9bf..dc4bc9b6dcc66 100644
--- a/libraries/opencv/opencv.SlackBuild
+++ b/libraries/opencv/opencv.SlackBuild
@@ -27,7 +27,7 @@
PRGNAM=opencv
PRGNAM2=opencv_contrib
VERSION=${VERSION:-3.4.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
diff --git a/libraries/opencv/opencv.info b/libraries/opencv/opencv.info
index 1a08ce35dde9a..78d93c8c4abc9 100644
--- a/libraries/opencv/opencv.info
+++ b/libraries/opencv/opencv.info
@@ -7,6 +7,6 @@ MD5SUM="a0b7a47899e67b3490ea31edc4f6e8e6 \
dd0c63f4185ab8a4829d8154ae382266"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES="numpy3"
MAINTAINER="Christoph Willing"
EMAIL="chris.willing@linux.com"
diff --git a/libraries/opencv/patch_fsh-3.4.1.diff b/libraries/opencv/patch_fsh-3.4.1.diff
index be539bfa8442a..006b475cc3cfc 100644
--- a/libraries/opencv/patch_fsh-3.4.1.diff
+++ b/libraries/opencv/patch_fsh-3.4.1.diff
@@ -1,5 +1,5 @@
--- CMakeLists.txt.orig 2018-02-23 18:38:33.000000000 +1000
-+++ CMakeLists.txt 2018-03-07 07:55:12.521997610 +1000
++++ CMakeLists.txt 2018-03-15 15:13:45.404082099 +1000
@@ -368,7 +368,7 @@
if(ANDROID OR WIN32)
ocv_update(OPENCV_DOC_INSTALL_PATH doc)
@@ -18,14 +18,16 @@
endif()
if(ANDROID)
-@@ -440,17 +440,17 @@
+@@ -439,18 +439,18 @@
+ ocv_update(OPENCV_CONFIG_INSTALL_PATH ".")
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)
@@ -34,7 +36,8 @@
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}${LIB_SUFFIX}/cmake/opencv)
++ ocv_update(OPENCV_CONFIG_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/cmake/opencv)
else()
- ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
+ ocv_update(OPENCV_CONFIG_INSTALL_PATH share/opencv)