summaryrefslogtreecommitdiffstats
path: root/libraries
diff options
context:
space:
mode:
author Christoph Willing2018-03-09 07:12:38 +0100
committer Willy Sudiarto Raharjo2018-03-10 01:11:08 +0100
commit98e195e585a2daed5b231fcfa1d705029d5b2a7b (patch)
tree57143b9b013cc63e5bdcac4dcf9aa9adf74899c5 /libraries
parent40516d791bd1db8ee8f12be55a364e7707832e86 (diff)
downloadslackbuilds-98e195e585a2daed5b231fcfa1d705029d5b2a7b.tar.gz
libraries/opencv: Updated patch for version 3.4.1
Signed-off-by: Christoph Willing <chris.willing@linux.com>
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.diff (renamed from libraries/opencv/patch_fsh-3.4.0.diff)21
3 files changed, 9 insertions, 16 deletions
diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild
index 195c65269a..13e5dea42b 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:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
diff --git a/libraries/opencv/opencv.info b/libraries/opencv/opencv.info
index 0ad82dc741..1a08ce35dd 100644
--- a/libraries/opencv/opencv.info
+++ b/libraries/opencv/opencv.info
@@ -3,7 +3,7 @@ VERSION="3.4.1"
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="6dc76f640595acf077977264762f45aa \
+MD5SUM="a0b7a47899e67b3490ea31edc4f6e8e6 \
dd0c63f4185ab8a4829d8154ae382266"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/libraries/opencv/patch_fsh-3.4.0.diff b/libraries/opencv/patch_fsh-3.4.1.diff
index 0f5deebebb..be539bfa84 100644
--- a/libraries/opencv/patch_fsh-3.4.0.diff
+++ b/libraries/opencv/patch_fsh-3.4.1.diff
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2017-12-23 05:46:21.000000000 +1000
-+++ CMakeLists.txt 2018-02-06 11:04:07.434035665 +1000
-@@ -351,7 +351,7 @@
+--- CMakeLists.txt.orig 2018-02-23 18:38:33.000000000 +1000
++++ CMakeLists.txt 2018-03-07 07:55:12.521997610 +1000
+@@ -368,7 +368,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)
-@@ -392,7 +392,7 @@
+@@ -409,7 +409,7 @@
elseif(WIN32)
ocv_update(OPENCV_TEST_DATA_INSTALL_PATH "testdata")
else()
@@ -18,16 +18,14 @@
endif()
if(ANDROID)
-@@ -421,18 +421,18 @@
- ocv_update(OPENCV_CONFIG_INSTALL_PATH ".")
+@@ -440,17 +440,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,15 +34,10 @@
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)
endif()
endif()
endif()
-56c56
-< export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/OpenCV/testdata
----
-> export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/opencv/testdata