hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libraries/opencv: Fix library path 

Signed-off-by: Christoph Willing <chris.willing@linux.com>
This commit is contained in:
Christoph Willing 2018-03-15 16:02:10 +10:00 committed by Willy Sudiarto Raharjo
parent 6e3249cda8
commit 782554b7af
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/opencv/opencv.SlackBuild
View File

@ -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

2
libraries/opencv/opencv.info
View File

@ -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"

11
libraries/opencv/patch_fsh-3.4.1.diff
View File

@ -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)