1 |
dilfridge 11/09/26 22:38:16 |
2 |
|
3 |
Modified: ChangeLog opencv-2.3.0.ebuild |
4 |
Log: |
5 |
Disable cuda support if >=gcc-4.5, bug 383847 |
6 |
|
7 |
(Portage version: 2.1.10.19/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.48 media-libs/opencv/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.48&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.48&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.47&r2=1.48 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v |
19 |
retrieving revision 1.47 |
20 |
retrieving revision 1.48 |
21 |
diff -u -r1.47 -r1.48 |
22 |
--- ChangeLog 22 Sep 2011 20:03:55 -0000 1.47 |
23 |
+++ ChangeLog 26 Sep 2011 22:38:16 -0000 1.48 |
24 |
@@ -1,6 +1,9 @@ |
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.47 2011/09/22 20:03:55 dilfridge Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.48 2011/09/26 22:38:16 dilfridge Exp $ |
29 |
+ |
30 |
+ 26 Sep 2011; Andreas K. Huettel <dilfridge@g.o> opencv-2.3.0.ebuild: |
31 |
+ Disable cuda support if >=gcc-4.5, bug 383847 |
32 |
|
33 |
22 Sep 2011; Andreas K. Huettel <dilfridge@g.o> opencv-2.3.0.ebuild: |
34 |
Tests subdirectory has been removed from distribution |
35 |
|
36 |
|
37 |
|
38 |
1.4 media-libs/opencv/opencv-2.3.0.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild?rev=1.4&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild?rev=1.4&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild?r1=1.3&r2=1.4 |
43 |
|
44 |
Index: opencv-2.3.0.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v |
47 |
retrieving revision 1.3 |
48 |
retrieving revision 1.4 |
49 |
diff -u -r1.3 -r1.4 |
50 |
--- opencv-2.3.0.ebuild 22 Sep 2011 20:03:55 -0000 1.3 |
51 |
+++ opencv-2.3.0.ebuild 26 Sep 2011 22:38:16 -0000 1.4 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2011 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.3 2011/09/22 20:03:55 dilfridge Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.4 2011/09/26 22:38:16 dilfridge Exp $ |
57 |
|
58 |
EAPI=3 |
59 |
|
60 |
@@ -99,7 +99,6 @@ |
61 |
$(cmake-utils_use_enable ssse3 SSSE3) |
62 |
$(cmake-utils_use_with ipp) |
63 |
$(cmake-utils_use_with ieee1394 1394) |
64 |
- $(cmake-utils_use_with cuda) |
65 |
$(cmake-utils_use_with eigen) |
66 |
$(cmake-utils_use_with ffmpeg) |
67 |
$(cmake-utils_use_with gstreamer) |
68 |
@@ -115,6 +114,17 @@ |
69 |
$(cmake-utils_use_with xine) |
70 |
) |
71 |
|
72 |
+ if use cuda; then |
73 |
+ if [ "$(gcc-version)" > "4.4" ]; then |
74 |
+ ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support." |
75 |
+ mycmakeargs+=( "-DWITH_CUDA=OFF" ) |
76 |
+ else |
77 |
+ mycmakeargs+=( "-DWITH_CUDA=ON" ) |
78 |
+ fi |
79 |
+ else |
80 |
+ mycmakeargs+=( "-DWITH_CUDA=OFF" ) |
81 |
+ fi |
82 |
+ |
83 |
if use python && use examples; then |
84 |
mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" ) |
85 |
else |