diff options
| author |   Christoph Willing <chris.willing@linux.com> | 2018-12-10 10:16:47 +1000 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-12-15 20:44:25 +0700 |
| commit | a584b9952848cce3ce75f84ad866712e52141887 (patch) | |
| tree | eb895697c6742594426f449db09675b1dc864db6 /libraries/opencv/patch_fsh-3.4.4.diff | |
| parent | 7db4e5c2800ad9bb851023567e48e352e8679985 (diff) | |
| download | slackbuilds-a584b9952848cce3ce75f84ad866712e52141887.tar.gz slackbuilds-a584b9952848cce3ce75f84ad866712e52141887.tar.xz | |
libraries/opencv: Updated for version 4.0.0
Signed-off-by: Christoph Willing <chris.willing@linux.com>
Diffstat (limited to '')
| -rw-r--r-- | libraries/opencv/patch_fsh-3.4.4.diff | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/libraries/opencv/patch_fsh-3.4.4.diff b/libraries/opencv/patch_fsh-3.4.4.diff deleted file mode 100644 index a123c97f3c..0000000000 --- a/libraries/opencv/patch_fsh-3.4.4.diff +++ /dev/null @@ -1,43 +0,0 @@ ---- CMakeLists.txt.orig 2018-11-17 20:22:17.000000000 +1000 -+++ CMakeLists.txt 2018-11-27 18:04:17.029000000 +1000 -@@ -383,7 +383,7 @@ - if(ANDROID OR WIN32) - ocv_update(OPENCV_DOC_INSTALL_PATH doc) - else() -- ocv_update(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc) -+ ocv_update(OPENCV_DOC_INSTALL_PATH share/opencv/doc) - endif() - - if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows) -@@ -424,7 +424,7 @@ - elseif(WIN32) - ocv_update(OPENCV_TEST_DATA_INSTALL_PATH "testdata") - else() -- ocv_update(OPENCV_TEST_DATA_INSTALL_PATH "share/OpenCV/testdata") -+ ocv_update(OPENCV_TEST_DATA_INSTALL_PATH "share/opencv/testdata") - endif() - - if(ANDROID) -@@ -455,17 +455,17 @@ - else() - include(GNUInstallDirs) - 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_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) - - 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) - else() -- ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV) -+ ocv_update(OPENCV_CONFIG_INSTALL_PATH share/opencv) - endif() - endif() - endif() |