diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-05-12 11:33:38 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-12 11:33:38 +0000 |
| commit | 2237fd5cf03196b04357c2724511618c835b4c81 (patch) | |
| tree | 78c25775aba7365c1bc05f5a35f1ad7fcbd75fe6 /media-libs | |
| parent | Add descriptions for video_cards_{r100,r200,r300,r600} used in live mesa. (diff) | |
| download | gentoo-2-2237fd5cf03196b04357c2724511618c835b4c81.tar.gz gentoo-2-2237fd5cf03196b04357c2724511618c835b4c81.tar.bz2 gentoo-2-2237fd5cf03196b04357c2724511618c835b4c81.zip | |
Backport -libpng14.patch to -r0 of 2.0.0 because -r1 can't be stabilized.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/opencv/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-2.0.0.ebuild | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index ebf2aa7c8e62..e2d8aa6efeb6 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -1,6 +1,9 @@ # 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.19 2010/03/09 12:45:38 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.20 2010/05/12 11:33:38 ssuominen Exp $ + + 12 May 2010; Samuli Suominen <ssuominen@gentoo.org> opencv-2.0.0.ebuild: + Backport -libpng14.patch to -r0 of 2.0.0 because -r1 can't be stabilized. 09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> opencv-2.0.0-r1.ebuild, +files/opencv-2.0.0-libpng14.patch: diff --git a/media-libs/opencv/opencv-2.0.0.ebuild b/media-libs/opencv/opencv-2.0.0.ebuild index 275d17549329..978957690009 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.6 2010/02/06 11:05:42 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild,v 1.7 2010/05/12 11:33:38 ssuominen Exp $ EAPI=2 inherit cmake-utils @@ -37,7 +37,8 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} -PATCHES=( "${FILESDIR}/${P}-multilib.patch" ) +PATCHES=( "${FILESDIR}/${P}-multilib.patch" + "${FILESDIR}/${P}-libpng14.patch" ) # Skip test suite for -r0, try to solve it in -r1. RESTRICT="test" |