1 |
dilfridge 11/12/31 22:17:19 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: opencv-2.3.1a-r1.ebuild |
5 |
Log: |
6 |
Added the True/False patch, kinda makes sense. Let's hope upstream follows. Bug 393685. |
7 |
|
8 |
(Portage version: 2.1.10.41/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.63 media-libs/opencv/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.63&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.63&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.62&r2=1.63 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v |
20 |
retrieving revision 1.62 |
21 |
retrieving revision 1.63 |
22 |
diff -u -r1.62 -r1.63 |
23 |
--- ChangeLog 29 Nov 2011 23:43:45 -0000 1.62 |
24 |
+++ ChangeLog 31 Dec 2011 22:17:19 -0000 1.63 |
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.62 2011/11/29 23:43:45 dilfridge Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.63 2011/12/31 22:17:19 dilfridge Exp $ |
30 |
+ |
31 |
+*opencv-2.3.1a-r1 (31 Dec 2011) |
32 |
+ |
33 |
+ 31 Dec 2011; Andreas K. Huettel <dilfridge@g.o> |
34 |
+ +opencv-2.3.1a-r1.ebuild, +files/opencv-2.3.1a-True-False.patch: |
35 |
+ Added the True/False patch, kinda makes sense. Let's hope upstream follows. |
36 |
+ Bug 393685. |
37 |
|
38 |
29 Nov 2011; Andreas K. Huettel <dilfridge@g.o> opencv-2.3.1a.ebuild: |
39 |
Does not need fortran anymore, bug 392297 |
40 |
|
41 |
|
42 |
|
43 |
1.1 media-libs/opencv/opencv-2.3.1a-r1.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.3.1a-r1.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.3.1a-r1.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: opencv-2.3.1a-r1.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-r1.ebuild,v 1.1 2011/12/31 22:17:19 dilfridge Exp $ |
53 |
|
54 |
EAPI=3 |
55 |
|
56 |
PYTHON_DEPEND="python? 2:2.6" |
57 |
|
58 |
inherit base toolchain-funcs cmake-utils 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 |
"${FILESDIR}/${P}-libav-0.7.patch" |
114 |
"${FILESDIR}/${P}-True-False.patch" |
115 |
) |
116 |
|
117 |
CMAKE_BUILD_TYPE="Release" |
118 |
|
119 |
S=${WORKDIR}/${MY_P/2.3.1a/2.3.1} |
120 |
|
121 |
pkg_setup() { |
122 |
if use python; then |
123 |
python_set_active_version 2 |
124 |
python_pkg_setup |
125 |
fi |
126 |
} |
127 |
|
128 |
src_prepare() { |
129 |
base_src_prepare |
130 |
|
131 |
# remove bundled stuff |
132 |
rm -rf 3rdparty |
133 |
sed -i \ |
134 |
-e '/add_subdirectory(3rdparty)/ d' \ |
135 |
CMakeLists.txt || die |
136 |
} |
137 |
|
138 |
src_configure() { |
139 |
local mycmakeargs=( |
140 |
$(cmake-utils_use_build doc DOCS) |
141 |
$(cmake-utils_use_build examples) |
142 |
$(cmake-utils_use examples INSTALL_C_EXAMPLES) |
143 |
$(cmake-utils_use_build python NEW_PYTHON_SUPPORT) |
144 |
$(cmake-utils_use_enable sse SSE) |
145 |
$(cmake-utils_use_enable sse2 SSE2) |
146 |
$(cmake-utils_use_enable sse3 SSE3) |
147 |
$(cmake-utils_use_enable ssse3 SSSE3) |
148 |
$(cmake-utils_use_with ipp) |
149 |
$(cmake-utils_use_with ieee1394 1394) |
150 |
$(cmake-utils_use_with eigen) |
151 |
$(cmake-utils_use_with ffmpeg) |
152 |
$(cmake-utils_use_with gstreamer) |
153 |
$(cmake-utils_use_with gtk) |
154 |
$(cmake-utils_use_with jpeg) |
155 |
$(cmake-utils_use_with jpeg2k JASPER) |
156 |
$(cmake-utils_use_with openexr) |
157 |
$(cmake-utils_use_with png) |
158 |
$(cmake-utils_use_with qt4 QT) |
159 |
$(cmake-utils_use_with opengl QT_OPENGL) |
160 |
$(cmake-utils_use_with tiff) |
161 |
$(cmake-utils_use_with v4l V4L) |
162 |
$(cmake-utils_use_with xine) |
163 |
) |
164 |
|
165 |
if use cuda; then |
166 |
if [[ "$(gcc-version)" > "4.4" ]]; then |
167 |
ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support." |
168 |
mycmakeargs+=( "-DWITH_CUDA=OFF" ) |
169 |
else |
170 |
mycmakeargs+=( "-DWITH_CUDA=ON" ) |
171 |
fi |
172 |
else |
173 |
mycmakeargs+=( "-DWITH_CUDA=OFF" ) |
174 |
fi |
175 |
|
176 |
if use python && use examples; then |
177 |
mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" ) |
178 |
else |
179 |
mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" ) |
180 |
fi |
181 |
|
182 |
# things we want to be hard off or not yet figured out |
183 |
# unicap: https://bugs.gentoo.org/show_bug.cgi?id=175881 |
184 |
# openni: ??? |
185 |
mycmakeargs+=( |
186 |
"-DUSE_OMIT_FRAME_POINTER=OFF" |
187 |
"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF" |
188 |
"-DOPENCV_WARNINGS_ARE_ERRORS=OFF" |
189 |
"-DBUILD_LATEX_DOCS=OFF" |
190 |
"-DENABLE_POWERPC=OFF" |
191 |
"-DBUILD_PACKAGE=OFF" |
192 |
"-DENABLE_PROFILING=OFF" |
193 |
"-DUSE_O2=OFF" |
194 |
"-DUSE_O3=OFF" |
195 |
"-DUSE_FAST_MATH=OFF" |
196 |
"-DENABLE_SSE41=OFF" |
197 |
"-DENABLE_SSE42=OFF" |
198 |
"-DWITH_PVAPI=OFF" |
199 |
"-DWITH_UNICAP=OFF" |
200 |
"-DWITH_TBB=OFF" |
201 |
"-DWITH_OPENNI=OFF" |
202 |
) |
203 |
|
204 |
# things we want to be hard enabled not worth useflag |
205 |
mycmakeargs+=( |
206 |
"-DCMAKE_SKIP_RPATH=ON" |
207 |
"-DBUILD_SHARED_LIBS=ON" |
208 |
"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}" |
209 |
) |
210 |
|
211 |
# hardcode cuda paths |
212 |
mycmakeargs+=( |
213 |
"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda" |
214 |
) |
215 |
|
216 |
cmake-utils_src_configure |
217 |
} |