summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/opencv/files/opencv-2.0.0-multilib.patch')
-rw-r--r--media-libs/opencv/files/opencv-2.0.0-multilib.patch120
1 files changed, 0 insertions, 120 deletions
diff --git a/media-libs/opencv/files/opencv-2.0.0-multilib.patch b/media-libs/opencv/files/opencv-2.0.0-multilib.patch
deleted file mode 100644
index 9df1373..0000000
--- a/media-libs/opencv/files/opencv-2.0.0-multilib.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Naur OpenCV-2.0.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.0.0/3rdparty/flann/CMakeLists.txt
---- OpenCV-2.0.0.orig/3rdparty/flann/CMakeLists.txt 2009-09-30 20:21:00.000000000 -0400
-+++ OpenCV-2.0.0/3rdparty/flann/CMakeLists.txt 2009-10-16 08:51:29.000000000 -0400
-@@ -86,8 +86,8 @@
- INSTALL (
- TARGETS flann flann_s
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-+ LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
- )
-
- # INSTALL (
-diff -Naur OpenCV-2.0.0.orig/CMakeLists.txt OpenCV-2.0.0/CMakeLists.txt
---- OpenCV-2.0.0.orig/CMakeLists.txt 2009-09-30 20:21:05.000000000 -0400
-+++ OpenCV-2.0.0/CMakeLists.txt 2009-10-16 10:28:51.000000000 -0400
-@@ -405,8 +405,8 @@
-
- string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
- if(UNIX)
-- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
-- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
-+ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
-+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
- endif()
- if(WIN32)
- get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
-diff -Naur OpenCV-2.0.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.0.0/interfaces/ffopencv/CMakeLists.txt
---- OpenCV-2.0.0.orig/interfaces/ffopencv/CMakeLists.txt 2009-09-30 20:20:57.000000000 -0400
-+++ OpenCV-2.0.0/interfaces/ffopencv/CMakeLists.txt 2009-10-16 08:54:26.000000000 -0400
-@@ -33,5 +33,5 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
- )
-diff -Naur OpenCV-2.0.0.orig/src/cv/CMakeLists.txt OpenCV-2.0.0/src/cv/CMakeLists.txt
---- OpenCV-2.0.0.orig/src/cv/CMakeLists.txt 2009-09-30 20:20:58.000000000 -0400
-+++ OpenCV-2.0.0/src/cv/CMakeLists.txt 2009-10-16 08:52:46.000000000 -0400
-@@ -66,8 +66,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${lib_hdrs}
- DESTINATION include/opencv
-diff -Naur OpenCV-2.0.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.0.0/src/cvaux/CMakeLists.txt
---- OpenCV-2.0.0.orig/src/cvaux/CMakeLists.txt 2009-09-30 20:20:59.000000000 -0400
-+++ OpenCV-2.0.0/src/cvaux/CMakeLists.txt 2009-10-16 08:52:29.000000000 -0400
-@@ -76,8 +76,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${aux_hdrs_ext}
- DESTINATION include/opencv
-diff -Naur OpenCV-2.0.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.0.0/src/cxcore/CMakeLists.txt
---- OpenCV-2.0.0.orig/src/cxcore/CMakeLists.txt 2009-09-30 20:20:59.000000000 -0400
-+++ OpenCV-2.0.0/src/cxcore/CMakeLists.txt 2009-10-16 08:50:19.000000000 -0400
-@@ -66,8 +66,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- # install each module headers separately
- install(FILES ${lib_hdrs}
-diff -Naur OpenCV-2.0.0.orig/src/highgui/CMakeLists.txt OpenCV-2.0.0/src/highgui/CMakeLists.txt
---- OpenCV-2.0.0.orig/src/highgui/CMakeLists.txt 2009-09-30 20:20:58.000000000 -0400
-+++ OpenCV-2.0.0/src/highgui/CMakeLists.txt 2009-10-16 08:53:18.000000000 -0400
-@@ -206,8 +206,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${highgui_ext_hdrs}
- DESTINATION include/opencv
-diff -Naur OpenCV-2.0.0.orig/src/ml/CMakeLists.txt OpenCV-2.0.0/src/ml/CMakeLists.txt
---- OpenCV-2.0.0.orig/src/ml/CMakeLists.txt 2009-09-30 20:20:59.000000000 -0400
-+++ OpenCV-2.0.0/src/ml/CMakeLists.txt 2009-10-16 08:51:57.000000000 -0400
-@@ -61,8 +61,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${lib_hdrs}
- DESTINATION include/opencv
-diff -Naur OpenCV-2.0.0.orig/tests/cxts/CMakeLists.txt OpenCV-2.0.0/tests/cxts/CMakeLists.txt
---- OpenCV-2.0.0.orig/tests/cxts/CMakeLists.txt 2009-09-30 20:20:56.000000000 -0400
-+++ OpenCV-2.0.0/tests/cxts/CMakeLists.txt 2009-10-16 08:53:47.000000000 -0400
-@@ -63,6 +63,6 @@
- if(WIN32)
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
- endif()