summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-11-09 09:08:33 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-11-09 09:08:33 +0000
commit21ed1f72c71bf6acc286798e7edbab694ffa9b02 (patch)
tree1d8fd728d845cf962eb75a029c6cf6e09b542e68 /media-libs
parentUse virtual/jpeg wrt #327487. (diff)
downloadgentoo-2-21ed1f72c71bf6acc286798e7edbab694ffa9b02.tar.gz
gentoo-2-21ed1f72c71bf6acc286798e7edbab694ffa9b02.tar.bz2
gentoo-2-21ed1f72c71bf6acc286798e7edbab694ffa9b02.zip
Use virtual/jpeg wrt #327487.
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/opencv/ChangeLog6
-rw-r--r--media-libs/opencv/opencv-2.0.0.ebuild4
-rw-r--r--media-libs/opencv/opencv-2.1.0.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 0889a4853424..43040969320e 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/opencv
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.23 2010/07/27 19:24:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.24 2010/11/09 09:08:33 ssuominen Exp $
+
+ 09 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> opencv-2.0.0.ebuild,
+ opencv-2.1.0.ebuild:
+ Use virtual/jpeg wrt #327487.
27 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> opencv-2.1.0.ebuild,
+files/opencv-2.1.0-mmap.patch:
diff --git a/media-libs/opencv/opencv-2.0.0.ebuild b/media-libs/opencv/opencv-2.0.0.ebuild
index ae910ce59599..8ce79ca76fc6 100644
--- a/media-libs/opencv/opencv-2.0.0.ebuild
+++ b/media-libs/opencv/opencv-2.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild,v 1.8 2010/07/27 19:27:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild,v 1.9 2010/11/09 09:08:33 ssuominen Exp $
EAPI=2
@@ -27,7 +27,7 @@ RDEPEND="sys-libs/zlib
gstreamer? ( media-libs/gstreamer )
gtk? ( x11-libs/gtk+:2 )
jpeg2k? ( media-libs/jasper )
- jpeg? ( media-libs/jpeg )
+ jpeg? ( virtual/jpeg )
png? ( media-libs/libpng )
tiff? ( media-libs/tiff )
xine? ( media-libs/xine-lib )
diff --git a/media-libs/opencv/opencv-2.1.0.ebuild b/media-libs/opencv/opencv-2.1.0.ebuild
index e6e522c84f8d..4fc835b3dad6 100644
--- a/media-libs/opencv/opencv-2.1.0.ebuild
+++ b/media-libs/opencv/opencv-2.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild,v 1.4 2010/07/28 14:49:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild,v 1.5 2010/11/09 09:08:33 ssuominen Exp $
EAPI=3
@@ -27,7 +27,7 @@ RDEPEND="sys-libs/zlib
gstreamer? ( media-libs/gstreamer )
gtk? ( x11-libs/gtk+:2 )
jpeg2k? ( media-libs/jasper )
- jpeg? ( media-libs/jpeg )
+ jpeg? ( virtual/jpeg )
png? ( >=media-libs/libpng-1.4 )
tiff? ( media-libs/tiff )
xine? ( media-libs/xine-lib )