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: opencv-2.3.1a.ebuild ChangeLog
Date: Sun, 13 Nov 2011 14:27:26
Message-Id: 20111113142717.817672004C@flycatcher.gentoo.org
1 dilfridge 11/11/13 14:27:17
2
3 Modified: ChangeLog
4 Added: opencv-2.3.1a.ebuild
5 Log:
6 Version bump, thanks to Andreas Sturmlechner for his help
7
8 (Portage version: 2.1.10.34/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.57 media-libs/opencv/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.57&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.57&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.56&r2=1.57
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v
20 retrieving revision 1.56
21 retrieving revision 1.57
22 diff -u -r1.56 -r1.57
23 --- ChangeLog 15 Oct 2011 23:17:54 -0000 1.56
24 +++ ChangeLog 13 Nov 2011 14:27:17 -0000 1.57
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.56 2011/10/15 23:17:54 ssuominen Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.57 2011/11/13 14:27:17 dilfridge Exp $
30 +
31 +*opencv-2.3.1a (13 Nov 2011)
32 +
33 + 13 Nov 2011; Andreas K. Huettel <dilfridge@g.o> +opencv-2.3.1a.ebuild,
34 + +files/opencv-2.3.1a-convert_sets_to_options.patch,
35 + +files/opencv-2.3.1a-libsuffix.patch, +files/opencv-2.3.1a-nocaps.patch:
36 + Version bump, thanks to Andreas Sturmlechner for his help
37
38 15 Oct 2011; Samuli Suominen <ssuominen@g.o> metadata.xml:
39 Remove description for USE flags "deprecated" and "octave"
40
41
42
43 1.1 media-libs/opencv/opencv-2.3.1a.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild?rev=1.1&content-type=text/plain
47
48 Index: opencv-2.3.1a.ebuild
49 ===================================================================
50 # Copyright 1999-2011 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild,v 1.1 2011/11/13 14:27:17 dilfridge Exp $
53
54 EAPI=3
55
56 PYTHON_DEPEND="python? 2:2.6"
57
58 inherit base cmake-utils fortran-2 python
59
60 MY_P=OpenCV-${PV}
61
62 DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
63 HOMEPAGE="http://opencv.willowgarage.com"
64 SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
65
66 LICENSE="BSD"
67 SLOT="0"
68 KEYWORDS="~amd64 ~ppc ~x86"
69 IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 tiff v4l xine"
70
71 RDEPEND="
72 app-arch/bzip2
73 sys-libs/zlib
74 cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
75 eigen? ( dev-cpp/eigen:2 )
76 ffmpeg? ( virtual/ffmpeg )
77 gstreamer? (
78 media-libs/gstreamer
79 media-libs/gst-plugins-base
80 )
81 gtk? (
82 dev-libs/glib:2
83 x11-libs/gtk+:2
84 )
85 jpeg? ( virtual/jpeg )
86 jpeg2k? ( media-libs/jasper )
87 ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
88 ipp? ( sci-libs/ipp )
89 openexr? ( media-libs/openexr )
90 png? ( media-libs/libpng )
91 python? ( dev-python/numpy )
92 qt4? (
93 x11-libs/qt-gui:4
94 x11-libs/qt-test:4
95 opengl? ( x11-libs/qt-opengl:4 )
96 )
97 tiff? ( media-libs/tiff )
98 v4l? ( >=media-libs/libv4l-0.8.3 )
99 xine? ( media-libs/xine-lib )
100 "
101 DEPEND="${RDEPEND}
102 doc? ( virtual/latex-base )
103 dev-util/pkgconfig
104 "
105
106 # REQUIRED_USE="opengl? ( qt )"
107
108 PATCHES=(
109 "${FILESDIR}/${PN}-2.3.0-numpy.patch"
110 "${FILESDIR}/${P}-convert_sets_to_options.patch"
111 "${FILESDIR}/${P}-libsuffix.patch"
112 "${FILESDIR}/${P}-nocaps.patch"
113 )
114
115 CMAKE_BUILD_TYPE="Release"
116
117 S=${WORKDIR}/${MY_P/2.3.1a/2.3.1}
118
119 pkg_setup() {
120 fortran-2_pkg_setup
121 if use python; then
122 python_set_active_version 2
123 python_pkg_setup
124 fi
125 }
126
127 src_prepare() {
128 base_src_prepare
129
130 # remove bundled stuff
131 rm -rf 3rdparty
132 sed -i \
133 -e '/add_subdirectory(3rdparty)/ d' \
134 CMakeLists.txt || die
135 }
136
137 src_configure() {
138 local mycmakeargs=(
139 $(cmake-utils_use_build doc DOCS)
140 $(cmake-utils_use_build examples)
141 $(cmake-utils_use examples INSTALL_C_EXAMPLES)
142 $(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
143 $(cmake-utils_use_enable sse SSE)
144 $(cmake-utils_use_enable sse2 SSE2)
145 $(cmake-utils_use_enable sse3 SSE3)
146 $(cmake-utils_use_enable ssse3 SSSE3)
147 $(cmake-utils_use_with ipp)
148 $(cmake-utils_use_with ieee1394 1394)
149 $(cmake-utils_use_with eigen)
150 $(cmake-utils_use_with ffmpeg)
151 $(cmake-utils_use_with gstreamer)
152 $(cmake-utils_use_with gtk)
153 $(cmake-utils_use_with jpeg)
154 $(cmake-utils_use_with jpeg2k JASPER)
155 $(cmake-utils_use_with openexr)
156 $(cmake-utils_use_with png)
157 $(cmake-utils_use_with qt4 QT)
158 $(cmake-utils_use_with opengl QT_OPENGL)
159 $(cmake-utils_use_with tiff)
160 $(cmake-utils_use_with v4l V4L)
161 $(cmake-utils_use_with xine)
162 )
163
164 if use cuda; then
165 if [ "$(gcc-version)" > "4.4" ]; then
166 ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support."
167 mycmakeargs+=( "-DWITH_CUDA=OFF" )
168 else
169 mycmakeargs+=( "-DWITH_CUDA=ON" )
170 fi
171 else
172 mycmakeargs+=( "-DWITH_CUDA=OFF" )
173 fi
174
175 if use python && use examples; then
176 mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
177 else
178 mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
179 fi
180
181 # things we want to be hard off or not yet figured out
182 # unicap: https://bugs.gentoo.org/show_bug.cgi?id=175881
183 # openni: ???
184 mycmakeargs+=(
185 "-DUSE_OMIT_FRAME_POINTER=OFF"
186 "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
187 "-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
188 "-DBUILD_LATEX_DOCS=OFF"
189 "-DENABLE_POWERPC=OFF"
190 "-DBUILD_PACKAGE=OFF"
191 "-DENABLE_PROFILING=OFF"
192 "-DUSE_O2=OFF"
193 "-DUSE_O3=OFF"
194 "-DUSE_FAST_MATH=OFF"
195 "-DENABLE_SSE41=OFF"
196 "-DENABLE_SSE42=OFF"
197 "-DWITH_PVAPI=OFF"
198 "-DWITH_UNICAP=OFF"
199 "-DWITH_TBB=OFF"
200 "-DWITH_OPENNI=OFF"
201 )
202
203 # things we want to be hard enabled not worth useflag
204 mycmakeargs+=(
205 "-DCMAKE_SKIP_RPATH=ON"
206 "-DBUILD_SHARED_LIBS=ON"
207 "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
208 )
209
210 # hardcode cuda paths
211 mycmakeargs+=(
212 "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
213 )
214
215 cmake-utils_src_configure
216 }