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

Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/opencv: ChangeLog opencv-2.2.0.ebuild opencv-2.2.0-r10.ebuild
Date: Sat, 30 Apr 2011 19:37:17
Message-Id: 20110430193706.D9AF220054@flycatcher.gentoo.org
1 dilfridge 11/04/30 19:37:06
2
3 Modified: ChangeLog opencv-2.2.0.ebuild
4 Added: opencv-2.2.0-r10.ebuild
5 Log:
6 Hard-disable ipp in -r0 to ease stabilization, create -r10 with ipp support
7
8 (Portage version: 2.1.9.46/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.29 media-libs/opencv/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.29&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.29&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.28&r2=1.29
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v
20 retrieving revision 1.28
21 retrieving revision 1.29
22 diff -u -r1.28 -r1.29
23 --- ChangeLog 30 Apr 2011 19:23:01 -0000 1.28
24 +++ ChangeLog 30 Apr 2011 19:37:06 -0000 1.29
25 @@ -1,6 +1,13 @@
26 # ChangeLog for media-libs/opencv
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.28 2011/04/30 19:23:01 dilfridge Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.29 2011/04/30 19:37:06 dilfridge Exp $
30 +
31 +*opencv-2.2.0-r10 (30 Apr 2011)
32 +
33 + 30 Apr 2011; Andreas K. Huettel <dilfridge@g.o>
34 + opencv-2.2.0.ebuild, +opencv-2.2.0-r10.ebuild:
35 + Hard-disable ipp in -r0 to ease stabilization, create -r10 with ipp
36 + support
37
38 *opencv-2.2.0 (30 Apr 2011)
39
40
41
42
43 1.2 media-libs/opencv/opencv-2.2.0.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild?rev=1.2&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild?rev=1.2&content-type=text/plain
47 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild?r1=1.1&r2=1.2
48
49 Index: opencv-2.2.0.ebuild
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v
52 retrieving revision 1.1
53 retrieving revision 1.2
54 diff -u -r1.1 -r1.2
55 --- opencv-2.2.0.ebuild 30 Apr 2011 19:23:01 -0000 1.1
56 +++ opencv-2.2.0.ebuild 30 Apr 2011 19:37:06 -0000 1.2
57 @@ -1,6 +1,6 @@
58 # Copyright 1999-2011 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v 1.1 2011/04/30 19:23:01 dilfridge Exp $
61 +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v 1.2 2011/04/30 19:37:06 dilfridge Exp $
62
63 EAPI=3
64
65 @@ -17,7 +17,7 @@
66 LICENSE="BSD"
67 SLOT="0"
68 KEYWORDS="~amd64 ~x86"
69 -IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine"
70 +IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine"
71
72 # all tests fail, needs further investigation, bug 296681 - dilfridge
73 RESTRICT=test
74 @@ -43,7 +43,6 @@
75 jpeg? ( virtual/jpeg )
76 jpeg2k? ( media-libs/jasper )
77 ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
78 - ipp? ( sci-libs/ipp )
79 openexr? ( media-libs/openexr )
80 png? ( media-libs/libpng )
81 python? ( dev-python/numpy )
82 @@ -106,7 +105,7 @@
83 $(cmake-utils_use_enable sse2 SSE2)
84 $(cmake-utils_use_enable sse3 SSE3)
85 $(cmake-utils_use_enable ssse3 SSSE3)
86 - $(cmake-utils_use_use ipp)
87 + -DUSE_ipp=OFF
88 $(cmake-utils_use_with ieee1394 1394)
89 $(cmake-utils_use_with cuda)
90 $(cmake-utils_use_with eigen)
91
92
93
94 1.1 media-libs/opencv/opencv-2.2.0-r10.ebuild
95
96 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild?rev=1.1&view=markup
97 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild?rev=1.1&content-type=text/plain
98
99 Index: opencv-2.2.0-r10.ebuild
100 ===================================================================
101 # Copyright 1999-2011 Gentoo Foundation
102 # Distributed under the terms of the GNU General Public License v2
103 # $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.1 2011/04/30 19:37:06 dilfridge Exp $
104
105 EAPI=3
106
107 PYTHON_DEPEND="python? 2:2.6"
108
109 inherit base cmake-utils python
110
111 MY_P=OpenCV-${PV}
112
113 DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
114 HOMEPAGE="http://opencv.willowgarage.com"
115 SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
116
117 LICENSE="BSD"
118 SLOT="0"
119 KEYWORDS="~amd64 ~x86"
120 IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine"
121
122 # all tests fail, needs further investigation, bug 296681 - dilfridge
123 RESTRICT=test
124
125 RDEPEND="
126 app-arch/bzip2
127 dev-libs/libf2c
128 sys-libs/zlib
129 >=sci-libs/clapack-3.2.1-r4
130 sci-libs/flann
131 virtual/lapack
132 cuda? ( dev-util/nvidia-cuda-toolkit )
133 eigen? ( dev-cpp/eigen:2 )
134 ffmpeg? ( virtual/ffmpeg )
135 gstreamer? (
136 media-libs/gstreamer
137 media-libs/gst-plugins-base
138 )
139 gtk? (
140 dev-libs/glib:2
141 x11-libs/gtk+:2
142 )
143 jpeg? ( virtual/jpeg )
144 jpeg2k? ( media-libs/jasper )
145 ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
146 ipp? ( sci-libs/ipp )
147 openexr? ( media-libs/openexr )
148 png? ( media-libs/libpng )
149 python? ( dev-python/numpy )
150 qt4? (
151 x11-libs/qt-gui:4
152 opengl? ( x11-libs/qt-opengl:4 )
153 )
154 tiff? ( media-libs/tiff )
155 v4l? ( >=media-libs/libv4l-0.8.3 )
156 xine? ( media-libs/xine-lib )
157 "
158 DEPEND="${RDEPEND}
159 doc? ( app-doc/doxygen[-nodot] )
160 dev-util/pkgconfig
161 "
162
163 # REQUIRED_USE="opengl? ( qt )"
164
165 PATCHES=(
166 "${FILESDIR}/${P}-convert_sets_to_options.patch"
167 "${FILESDIR}/${P}-ffmpeg01.patch"
168 "${FILESDIR}/${P}-ffmpeg02.patch"
169 "${FILESDIR}/${P}-gcc46.patch"
170 "${FILESDIR}/${P}-libpng1.5.patch"
171 "${FILESDIR}/${P}-numpy.patch"
172 "${FILESDIR}/${P}-ptrcvcapture.patch"
173 "${FILESDIR}/${P}-use_system_libs.patch"
174 "${FILESDIR}/${P}-v4l_2.6.38.patch"
175 )
176
177 CMAKE_BUILD_TYPE="Release"
178
179 S=${WORKDIR}/${MY_P}
180
181 pkg_setup() {
182 if use python; then
183 python_set_active_version 2
184 python_pkg_setup
185 fi
186 }
187
188 src_prepare() {
189 base_src_prepare
190
191 # remove bundled stuff
192 rm -rf 3rdparty
193 sed -i \
194 -e '/add_subdirectory(3rdparty)/ d' \
195 CMakeLists.txt || die
196 }
197
198 src_configure() {
199 local mycmakeargs=(
200 $(cmake-utils_use_build doc DOXYGEN_DOCS)
201 $(cmake-utils_use_build examples)
202 $(cmake-utils_use examples INSTALL_C_EXAMPLES)
203 $(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
204 $(cmake-utils_use_build test TESTS)
205 $(cmake-utils_use_enable sse SSE)
206 $(cmake-utils_use_enable sse2 SSE2)
207 $(cmake-utils_use_enable sse3 SSE3)
208 $(cmake-utils_use_enable ssse3 SSSE3)
209 $(cmake-utils_use_use ipp)
210 $(cmake-utils_use_with ieee1394 1394)
211 $(cmake-utils_use_with cuda)
212 $(cmake-utils_use_with eigen)
213 $(cmake-utils_use_with ffmpeg)
214 $(cmake-utils_use_with gstreamer)
215 $(cmake-utils_use_with gtk)
216 $(cmake-utils_use_with jpeg2k JASPER)
217 $(cmake-utils_use_with openexr)
218 $(cmake-utils_use_with png)
219 $(cmake-utils_use_with qt4 QT)
220 $(cmake-utils_use_with opengl QT_OPENGL)
221 $(cmake-utils_use_with tiff)
222 $(cmake-utils_use_with v4l V4L)
223 $(cmake-utils_use_with xine)
224 )
225
226 if use python && use examples; then
227 mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
228 else
229 mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
230 fi
231
232 # things we want to be hard off or not yet figured out
233 # UNICAP: http://bugs.gentoo.org/show_bug.cgi?id=175881
234 mycmakeargs+=(
235 "-DUSE_OMIT_FRAME_POINTER=OFF"
236 "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
237 "-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
238 "-DBUILD_LATEX_DOCS=OFF"
239 "-DENABLE_POWERPC=OFF"
240 "-DBUILD_PACKAGE=OFF"
241 "-DENABLE_PROFILING=OFF"
242 "-DUSE_O2=OFF"
243 "-DUSE_O3=OFF"
244 "-DUSE_FAST_MATH=OFF"
245 "-DENABLE_SSE41=OFF"
246 "-DENABLE_SSE42=OFF"
247 "-DWITH_PVAPI=OFF"
248 "-DWITH_UNICAP=OFF"
249 "-DWITH_TBB=OFF"
250 )
251
252 # things we want to be hardly enabled not worth useflag
253 mycmakeargs+=(
254 "-DCMAKE_SKIP_RPATH=ON"
255 "-DBUILD_SHARED_LIBS=ON"
256 "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
257 )
258
259 cmake-utils_src_configure
260 }
261
262 src_test() {
263 export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib"
264 cmake-utils_src_test
265 }
Report Message
Find on MARC Find on Google Groups