1 |
dilfridge 11/05/01 17:59:49 |
2 |
|
3 |
Modified: ChangeLog opencv-2.2.0.ebuild |
4 |
Log: |
5 |
Disable cuda to ease stabilization |
6 |
|
7 |
(Portage version: 2.1.9.46/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.31 media-libs/opencv/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.31&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.31&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.30&r2=1.31 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v |
19 |
retrieving revision 1.30 |
20 |
retrieving revision 1.31 |
21 |
diff -u -r1.30 -r1.31 |
22 |
--- ChangeLog 1 May 2011 17:53:38 -0000 1.30 |
23 |
+++ ChangeLog 1 May 2011 17:59:49 -0000 1.31 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for media-libs/opencv |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.30 2011/05/01 17:53:38 dilfridge Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.31 2011/05/01 17:59:49 dilfridge Exp $ |
29 |
+ |
30 |
+ 01 May 2011; Andreas K. Huettel <dilfridge@g.o> |
31 |
+ opencv-2.2.0.ebuild: |
32 |
+ Disable cuda to ease stabilization |
33 |
|
34 |
01 May 2011; Andreas K. Huettel <dilfridge@g.o> |
35 |
opencv-2.2.0.ebuild, opencv-2.2.0-r10.ebuild, |
36 |
|
37 |
|
38 |
|
39 |
1.4 media-libs/opencv/opencv-2.2.0.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild?rev=1.4&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild?rev=1.4&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild?r1=1.3&r2=1.4 |
44 |
|
45 |
Index: opencv-2.2.0.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v |
48 |
retrieving revision 1.3 |
49 |
retrieving revision 1.4 |
50 |
diff -u -r1.3 -r1.4 |
51 |
--- opencv-2.2.0.ebuild 1 May 2011 17:53:38 -0000 1.3 |
52 |
+++ opencv-2.2.0.ebuild 1 May 2011 17:59:49 -0000 1.4 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2011 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v 1.3 2011/05/01 17:53:38 dilfridge Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v 1.4 2011/05/01 17:59:49 dilfridge Exp $ |
58 |
|
59 |
EAPI=3 |
60 |
|
61 |
@@ -17,7 +17,7 @@ |
62 |
LICENSE="BSD" |
63 |
SLOT="0" |
64 |
KEYWORDS="~amd64 ~x86" |
65 |
-IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine" |
66 |
+IUSE="doc eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine" |
67 |
|
68 |
# all tests fail, needs further investigation, bug 296681 - dilfridge |
69 |
RESTRICT=test |
70 |
@@ -30,7 +30,6 @@ |
71 |
>=sci-libs/clapack-3.2.1-r4 |
72 |
sci-libs/flann |
73 |
virtual/lapack |
74 |
- cuda? ( dev-util/nvidia-cuda-toolkit ) |
75 |
eigen? ( dev-cpp/eigen:2 ) |
76 |
ffmpeg? ( virtual/ffmpeg ) |
77 |
gstreamer? ( |
78 |
@@ -109,7 +108,7 @@ |
79 |
$(cmake-utils_use_enable ssse3 SSSE3) |
80 |
-DUSE_ipp=OFF |
81 |
$(cmake-utils_use_with ieee1394 1394) |
82 |
- $(cmake-utils_use_with cuda) |
83 |
+ -DWITH_cuda=OFF |
84 |
$(cmake-utils_use_with eigen) |
85 |
$(cmake-utils_use_with ffmpeg) |
86 |
$(cmake-utils_use_with gstreamer) |