| 1 |
dilfridge 14/01/24 23:57:27 |
| 2 |
|
| 3 |
Modified: ChangeLog opencv-2.4.8.ebuild |
| 4 |
Log: |
| 5 |
Only enable Qt4 so far, bug 483648 |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.106 media-libs/opencv/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.106&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.106&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.105&r2=1.106 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v |
| 19 |
retrieving revision 1.105 |
| 20 |
retrieving revision 1.106 |
| 21 |
diff -u -r1.105 -r1.106 |
| 22 |
--- ChangeLog 24 Jan 2014 21:16:38 -0000 1.105 |
| 23 |
+++ ChangeLog 24 Jan 2014 23:57:27 -0000 1.106 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for media-libs/opencv |
| 26 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.105 2014/01/24 21:16:38 dilfridge Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.106 2014/01/24 23:57:27 dilfridge Exp $ |
| 29 |
+ |
| 30 |
+ 24 Jan 2014; Andreas K. Huettel <dilfridge@g.o> opencv-2.4.8.ebuild: |
| 31 |
+ Only enable Qt4 so far, bug 483648 |
| 32 |
|
| 33 |
*opencv-2.4.8 (24 Jan 2014) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 media-libs/opencv/opencv-2.4.8.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.8.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.8.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.8.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: opencv-2.4.8.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.8.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- opencv-2.4.8.ebuild 24 Jan 2014 21:16:38 -0000 1.1 |
| 51 |
+++ opencv-2.4.8.ebuild 24 Jan 2014 23:57:27 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2014 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.8.ebuild,v 1.1 2014/01/24 21:16:38 dilfridge Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.8.ebuild,v 1.2 2014/01/24 23:57:27 dilfridge Exp $ |
| 57 |
|
| 58 |
EAPI=5 |
| 59 |
PYTHON_COMPAT=( python2_{6,7} ) |
| 60 |
@@ -127,7 +127,6 @@ |
| 61 |
$(cmake-utils_use_with png) |
| 62 |
$(cmake-utils_use_build python opencv_python) |
| 63 |
-DWITH_PVAPI=OFF # not packaged |
| 64 |
- $(cmake-utils_use_with qt4 QT) |
| 65 |
-DWITH_QUICKTIME=OFF |
| 66 |
$(cmake-utils_use_with threads TBB) |
| 67 |
$(cmake-utils_use_with tiff) |
| 68 |
@@ -159,6 +158,12 @@ |
| 69 |
-DOPENCV_EXTRA_FLAGS_RELEASE="" # black magic |
| 70 |
) |
| 71 |
|
| 72 |
+ if use qt4; then |
| 73 |
+ mycmakeargs+=( "-DWITH_QT=4" ) |
| 74 |
+ else |
| 75 |
+ mycmakeargs+=( "-DWITH_QT=OFF" ) |
| 76 |
+ fi |
| 77 |
+ |
| 78 |
if use cuda; then |
| 79 |
if [[ "$(gcc-version)" > "4.7" ]]; then |
| 80 |
ewarn "CUDA and >=sys-devel/gcc-4.8 do not play well together. Disabling CUDA support." |
Archives