diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 12:45:40 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 12:45:40 +0000 |
| commit | 99408d80475d383b8e2794ea6477babf57e999f8 (patch) | |
| tree | c11234c587a7fe8e4d63927f9675d323a555de21 /media-libs/opencv | |
| parent | QA: When not using an absolute path, you MUST NOT use a file extension (.png,... (diff) | |
| download | gentoo-2-99408d80475d383b8e2794ea6477babf57e999f8.tar.gz gentoo-2-99408d80475d383b8e2794ea6477babf57e999f8.tar.bz2 gentoo-2-99408d80475d383b8e2794ea6477babf57e999f8.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc66/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/opencv')
| -rw-r--r-- | media-libs/opencv/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/opencv/files/opencv-2.0.0-libpng14.patch | 13 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-2.0.0-r1.ebuild | 5 |
3 files changed, 21 insertions, 3 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index 49b5353aa8db..ebf2aa7c8e62 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.18 2010/02/06 11:05:42 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.19 2010/03/09 12:45:38 ssuominen Exp $ + + 09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + opencv-2.0.0-r1.ebuild, +files/opencv-2.0.0-libpng14.patch: + Fix building with libpng14. 06 Feb 2010; Ulrich Mueller <ulm@gentoo.org> opencv-2.0.0.ebuild, opencv-2.0.0-r1.ebuild: diff --git a/media-libs/opencv/files/opencv-2.0.0-libpng14.patch b/media-libs/opencv/files/opencv-2.0.0-libpng14.patch new file mode 100644 index 000000000000..56f7a4e6e401 --- /dev/null +++ b/media-libs/opencv/files/opencv-2.0.0-libpng14.patch @@ -0,0 +1,13 @@ +http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt + +--- src/highgui/grfmt_png.cpp ++++ src/highgui/grfmt_png.cpp +@@ -223,7 +223,7 @@ + png_set_palette_to_rgb( png_ptr ); + + if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 ) +- png_set_gray_1_2_4_to_8( png_ptr ); ++ png_set_expand_gray_1_2_4_to_8( png_ptr ); + + if( CV_MAT_CN(m_type) > 1 && color ) + png_set_bgr( png_ptr ); // convert RGB to BGR diff --git a/media-libs/opencv/opencv-2.0.0-r1.ebuild b/media-libs/opencv/opencv-2.0.0-r1.ebuild index 107f64af0682..0357e17c3bca 100644 --- a/media-libs/opencv/opencv-2.0.0-r1.ebuild +++ b/media-libs/opencv/opencv-2.0.0-r1.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-r1.ebuild,v 1.3 2010/02/06 11:05:42 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0-r1.ebuild,v 1.4 2010/03/09 12:45:38 ssuominen Exp $ EAPI=2 inherit cmake-utils @@ -38,7 +38,8 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} -PATCHES=( "${FILESDIR}/${P}-multilib.patch" ) +PATCHES=( "${FILESDIR}/${P}-multilib.patch" + "${FILESDIR}/${P}-libpng14.patch" ) src_configure() { mycmakeargs="${mycmakeargs} |