Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/opencv/files: opencv-2.1.0-multilib.patch
Date: Tue, 27 Jul 2010 19:19:33
Message-Id: 20100727191928.660EE2CF37@corvid.gentoo.org
1 ssuominen 10/07/27 19:19:28
2
3 Added: opencv-2.1.0-multilib.patch
4 Log:
5 Version bump.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 media-libs/opencv/files/opencv-2.1.0-multilib.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/files/opencv-2.1.0-multilib.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/files/opencv-2.1.0-multilib.patch?rev=1.1&content-type=text/plain
13
14 Index: opencv-2.1.0-multilib.patch
15 ===================================================================
16 diff -ur OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt
17 --- OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt 2010-04-06 04:24:34.000000000 +0300
18 +++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt 2010-07-27 21:41:18.000000000 +0300
19 @@ -89,8 +89,8 @@
20 INSTALL (
21 TARGETS flann # flann_s
22 RUNTIME DESTINATION bin
23 - LIBRARY DESTINATION lib
24 - ARCHIVE DESTINATION lib
25 + LIBRARY DESTINATION "lib${LIB_SUFFIX}"
26 + ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
27 )
28
29 # INSTALL (
30 diff -ur OpenCV-2.1.0.orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
31 --- OpenCV-2.1.0.orig/CMakeLists.txt 2010-04-06 04:24:37.000000000 +0300
32 +++ OpenCV-2.1.0/CMakeLists.txt 2010-07-27 21:56:58.000000000 +0300
33 @@ -467,8 +467,8 @@
34
35 string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
36 if(UNIX)
37 - set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
38 - set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
39 + set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
40 + set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
41 endif()
42 if(WIN32)
43 get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
44 diff -ur OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt
45 --- OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt 2010-04-06 04:24:40.000000000 +0300
46 +++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt 2010-07-27 21:42:00.000000000 +0300
47 @@ -40,6 +40,6 @@
48
49 install(TARGETS ${the_target}
50 RUNTIME DESTINATION bin COMPONENT main
51 - ARCHIVE DESTINATION lib COMPONENT main
52 - LIBRARY DESTINATION lib COMPONENT main
53 + ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
54 + LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
55 )
56 diff -ur OpenCV-2.1.0.orig/src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt
57 --- OpenCV-2.1.0.orig/src/cv/CMakeLists.txt 2010-04-06 04:24:42.000000000 +0300
58 +++ OpenCV-2.1.0/src/cv/CMakeLists.txt 2010-07-27 21:44:32.000000000 +0300
59 @@ -71,8 +71,8 @@
60
61 install(TARGETS ${the_target}
62 RUNTIME DESTINATION bin COMPONENT main
63 - LIBRARY DESTINATION lib COMPONENT main
64 - ARCHIVE DESTINATION lib COMPONENT main)
65 + LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
66 + ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
67
68 install(FILES ${lib_hdrs}
69 DESTINATION include/opencv
70 diff -ur OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt
71 --- OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt 2010-04-06 04:24:43.000000000 +0300
72 +++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt 2010-07-27 21:43:22.000000000 +0300
73 @@ -76,8 +76,8 @@
74
75 install(TARGETS ${the_target}
76 RUNTIME DESTINATION bin COMPONENT main
77 - LIBRARY DESTINATION lib COMPONENT main
78 - ARCHIVE DESTINATION lib COMPONENT main)
79 + LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
80 + ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
81
82 install(FILES ${aux_hdrs_ext}
83 DESTINATION include/opencv
84 diff -ur OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt
85 --- OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300
86 +++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt 2010-07-27 21:44:51.000000000 +0300
87 @@ -71,8 +71,8 @@
88
89 install(TARGETS ${the_target}
90 RUNTIME DESTINATION bin COMPONENT main
91 - LIBRARY DESTINATION lib COMPONENT main
92 - ARCHIVE DESTINATION lib COMPONENT main)
93 + LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
94 + ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
95
96 # install each module headers separately
97 install(FILES ${lib_hdrs}
98 diff -ur OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt
99 --- OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300
100 +++ OpenCV-2.1.0/src/highgui/CMakeLists.txt 2010-07-27 21:43:00.000000000 +0300
101 @@ -282,8 +282,8 @@
102
103 install(TARGETS ${the_target}
104 RUNTIME DESTINATION bin COMPONENT main
105 - LIBRARY DESTINATION lib COMPONENT main
106 - ARCHIVE DESTINATION lib COMPONENT main)
107 + LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
108 + ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
109
110 install(FILES ${highgui_ext_hdrs}
111 DESTINATION include/opencv
112 diff -ur OpenCV-2.1.0.orig/src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt
113 --- OpenCV-2.1.0.orig/src/ml/CMakeLists.txt 2010-04-06 04:24:45.000000000 +0300
114 +++ OpenCV-2.1.0/src/ml/CMakeLists.txt 2010-07-27 21:43:42.000000000 +0300
115 @@ -61,8 +61,8 @@
116
117 install(TARGETS ${the_target}
118 RUNTIME DESTINATION bin COMPONENT main
119 - LIBRARY DESTINATION lib COMPONENT main
120 - ARCHIVE DESTINATION lib COMPONENT main)
121 + LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
122 + ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
123
124 install(FILES ${lib_hdrs}
125 DESTINATION include/opencv
Report Message
Find on MARC Find on Google Groups