| 1 |
dilfridge 12/08/23 11:06:59 |
| 2 |
|
| 3 |
Modified: ChangeLog opencv-2.4.2.ebuild |
| 4 |
Log: |
| 5 |
Bump required nvidia-cuda-toolkit version to allow gcc-4.6, bug 431808 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.80 media-libs/opencv/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.80&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.80&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.79&r2=1.80 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v |
| 19 |
retrieving revision 1.79 |
| 20 |
retrieving revision 1.80 |
| 21 |
diff -u -r1.79 -r1.80 |
| 22 |
--- ChangeLog 17 Jul 2012 20:13:28 -0000 1.79 |
| 23 |
+++ ChangeLog 23 Aug 2012 11:06:58 -0000 1.80 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for media-libs/opencv |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.79 2012/07/17 20:13:28 dilfridge Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.80 2012/08/23 11:06:58 dilfridge Exp $ |
| 29 |
+ |
| 30 |
+ 23 Aug 2012; Andreas K. Huettel <dilfridge@g.o> opencv-2.4.2.ebuild: |
| 31 |
+ Bump required nvidia-cuda-toolkit version to allow gcc-4.6, bug 431808 |
| 32 |
|
| 33 |
17 Jul 2012; Andreas K. Huettel <dilfridge@g.o> opencv-2.4.2.ebuild: |
| 34 |
Python is always needed now, useflag makes no sense. Bug 419577 |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 media-libs/opencv/opencv-2.4.2.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.2.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.2.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.2.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: opencv-2.4.2.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.2.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- opencv-2.4.2.ebuild 17 Jul 2012 20:13:28 -0000 1.2 |
| 51 |
+++ opencv-2.4.2.ebuild 23 Aug 2012 11:06:59 -0000 1.3 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2012 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.4.2.ebuild,v 1.2 2012/07/17 20:13:28 dilfridge Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.2.ebuild,v 1.3 2012/08/23 11:06:59 dilfridge Exp $ |
| 57 |
|
| 58 |
EAPI=4 |
| 59 |
PYTHON_DEPEND="2:2.6" |
| 60 |
@@ -22,7 +22,7 @@ |
| 61 |
app-arch/bzip2 |
| 62 |
dev-python/numpy |
| 63 |
sys-libs/zlib |
| 64 |
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4.1 ) |
| 65 |
+ cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2 ) |
| 66 |
eigen? ( dev-cpp/eigen:2 ) |
| 67 |
ffmpeg? ( virtual/ffmpeg ) |
| 68 |
gstreamer? ( |
| 69 |
@@ -131,8 +131,8 @@ |
| 70 |
) |
| 71 |
|
| 72 |
if use cuda; then |
| 73 |
- if [[ "$(gcc-version)" > "4.5" ]]; then |
| 74 |
- ewarn "CUDA and >=sys-devel/gcc-4.6 do not play well together. Disabling CUDA support." |
| 75 |
+ if [[ "$(gcc-version)" > "4.6" ]]; then |
| 76 |
+ ewarn "CUDA and >=sys-devel/gcc-4.7 do not play well together. Disabling CUDA support." |
| 77 |
mycmakeargs+=( "-DWITH_CUDA=OFF" ) |
| 78 |
mycmakeargs+=( "-DWITH_CUBLAS=OFF" ) |
| 79 |
mycmakeargs+=( "-DWITH_CUFFT=OFF" ) |
Archives