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