diff options
Diffstat (limited to 'media-libs/opencv/files/opencv-2.3.1a-nocaps.patch')
| -rw-r--r-- | media-libs/opencv/files/opencv-2.3.1a-nocaps.patch | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch b/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch deleted file mode 100644 index 23abeb2..0000000 --- a/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -ruN OpenCV-2.3.1-3-suffix/CMakeLists.txt OpenCV-2.3.1-4-caps/CMakeLists.txt ---- OpenCV-2.3.1-3-suffix/CMakeLists.txt 2011-11-13 14:33:26.000000000 +0100 -+++ OpenCV-2.3.1-4-caps/CMakeLists.txt 2011-11-13 14:37:04.000000000 +0100 -@@ -123,9 +123,9 @@ - if(ANDROID OR WIN32) - set(OPENCV_DOC_INSTALL_PATH doc) - elseif(OPENCV_MANGLED_INSTALL_PATHS) -- set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc) -+ set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/) - else() -- set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc) -+ set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/) - endif() - - if(ANDROID) -@@ -1347,12 +1347,12 @@ - set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "") - if(ANDROID) - set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/libs/\${ARMEABI_NDK_NAME}\"") -- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/libs/\${ARMEABI_NDK_NAME}\"") -+ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/libs/\${ARMEABI_NDK_NAME}\"") - else() - set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/${OPENCV_LIB_INSTALL_PATH}\"") -- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"") -+ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"") - if(OPENCV_MANGLED_INSTALL_PATHS) -- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"") -+ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"") - endif() - endif() - -@@ -1367,16 +1367,16 @@ - # <prefix>/(share|lib)/<name>*/ (U) - # <prefix>/(share|lib)/<name>*/(cmake|CMake)/ (U) - if(OPENCV_MANGLED_INSTALL_PATHS) -- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/) -- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/) -+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/opencv-${OPENCV_VERSION}/) -+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv-${OPENCV_VERSION}/) - else() -- install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/OpenCV/) -- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV/) -+ install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/opencv/) -+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv/) - endif() - endif() - - if(ANDROID) -- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/OpenCV) -+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/opencv) - endif() - - # -------------------------------------------------------------------------------------------- -@@ -1386,7 +1386,7 @@ - set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/include\" \"\${OpenCV_CONFIG_PATH}/include/opencv\"") - set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "") - set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/${OPENCV_LIB_INSTALL_PATH}\"") -- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"") -+ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"") - - exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"" OUTPUT_VARIABLE RET_VAL) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY) -@@ -1439,7 +1439,7 @@ - set(CMAKE_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/../..") - - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk" IMMEDIATE @ONLY) -- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/OpenCV/) -+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/opencv/) - endif(ANDROID) - - # -------------------------------------------------------------------------------------------- -diff -ruN OpenCV-2.3.1-3-suffix/data/CMakeLists.txt OpenCV-2.3.1-4-caps/data/CMakeLists.txt ---- OpenCV-2.3.1-3-suffix/data/CMakeLists.txt 2011-09-12 20:45:36.000000000 +0200 -+++ OpenCV-2.3.1-4-caps/data/CMakeLists.txt 2011-11-13 14:35:08.000000000 +0100 -@@ -2,6 +2,6 @@ - file(GLOB LBP_CASCADES lbpcascades/*.xml) - - if(NOT WIN32) --install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main) --install(FILES ${LBP_CASCADES} DESTINATION share/OpenCV/lbpcascades COMPONENT main) -+ install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main) -+ install(FILES ${LBP_CASCADES} DESTINATION share/opencv/lbpcascades COMPONENT main) - endif() |