diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-01-25 11:01:29 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-01-25 11:01:29 +0000 |
commit | 9037b0a5c157c509b0b4552bae6b3b6e4f912b71 (patch) | |
tree | 302d395a0a46887afafed6030b82a6ccf8b95465 /media-libs/opencv | |
parent | x86 stable wrt bug #492128 (diff) | |
download | gentoo-2-9037b0a5c157c509b0b4552bae6b3b6e4f912b71.tar.gz gentoo-2-9037b0a5c157c509b0b4552bae6b3b6e4f912b71.tar.bz2 gentoo-2-9037b0a5c157c509b0b4552bae6b3b6e4f912b71.zip |
Remove constraint on opengl useflag, bug 499188
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Diffstat (limited to 'media-libs/opencv')
-rw-r--r-- | media-libs/opencv/ChangeLog | 5 | ||||
-rw-r--r-- | media-libs/opencv/opencv-2.4.8.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index 79360b9c028d..1231d681c782 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/opencv # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.106 2014/01/24 23:57:27 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.107 2014/01/25 11:01:29 dilfridge Exp $ + + 25 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.8.ebuild: + Remove constraint on opengl useflag, bug 499188 24 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.8.ebuild: Only enable Qt4 so far, bug 483648 diff --git a/media-libs/opencv/opencv-2.4.8.ebuild b/media-libs/opencv/opencv-2.4.8.ebuild index 49fad38473f4..81bb706b2874 100644 --- a/media-libs/opencv/opencv-2.4.8.ebuild +++ b/media-libs/opencv/opencv-2.4.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.8.ebuild,v 1.2 2014/01/24 23:57:27 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.8.ebuild,v 1.3 2014/01/25 11:01:29 dilfridge Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} ) @@ -17,13 +17,13 @@ SLOT="0/2.4" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l xine" REQUIRED_USE=" - opengl? ( || ( gtk qt4 ) ) python? ( ${PYTHON_REQUIRED_USE} ) " # The following logic is intrinsic in the build system, but we do not enforce # it on the useflags since this just blocks emerging pointlessly: # gtk? ( !qt4 ) +# opengl? ( || ( gtk qt4 ) ) # openmp? ( !threads ) RDEPEND=" |