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 | 17eed92b7a8fee35d9286f6229c6e4df3025c233 (patch) | |
| tree | af544a711927cf4fc278a6988555e3c96b908716 /media-libs/opencv | |
| parent | QA: When not using an absolute path, you MUST NOT use a file extension (.png,... (diff) | |
| download | historical-17eed92b7a8fee35d9286f6229c6e4df3025c233.tar.gz historical-17eed92b7a8fee35d9286f6229c6e4df3025c233.tar.bz2 historical-17eed92b7a8fee35d9286f6229c6e4df3025c233.zip | |
Fix building with libpng14.
Package-Manager: portage-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/Manifest | 15 | ||||
| -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 |
4 files changed, 24 insertions, 15 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/Manifest b/media-libs/opencv/Manifest index 3dd4787348bb..816cb8c39d4b 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -1,16 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX opencv-2.0.0-libpng14.patch 505 RMD160 86ef29284531519dcc5c6da1bb3abfd3c46efc73 SHA1 81bf18db6984144a0cc5b49e47e180e5337aae75 SHA256 78dc27ae16b2fcbef7cc05496dddf227640f47c37d8da05fe469eeb04146af4a AUX opencv-2.0.0-multilib.patch 5569 RMD160 f519c1276600d6d22bce7415a0fd1411fc4bd5aa SHA1 1727a3d8d5673d647b128f627e24ec22584fea40 SHA256 594cdaf2b49253b6ab1e1d7c6b55c99e4f0a9924d743e5bf0947846459099777 DIST OpenCV-2.0.0.tar.bz2 12779856 RMD160 f46b993ded3d579dc52175131e5485476ac1f569 SHA1 2090c2aaff77c3b0cc669c2ee81bea389db0a366 SHA256 c17db9974d87290aefc12bf7987a9f417946bc313823985de4df48ae3e1e0022 -EBUILD opencv-2.0.0-r1.ebuild 2274 RMD160 8e8753ef59ab170564539c61c9e9cfc5e8140394 SHA1 0f606afa3b68fd6c00f130f5e055694e1be88098 SHA256 905944541ac0ef2d3bb3c240aad3cc47550df7d01075d3a579041f131046d5c0 +EBUILD opencv-2.0.0-r1.ebuild 2315 RMD160 92a3e36cd71f59b97d70b1f228dc3b48330bf759 SHA1 0017175fb8c702842bd1f020f800a8f4b6d4ea7f SHA256 85bf3c9726d44989c860615c2d7dc6774d1ae424d289f08848a63d3caf381d9d EBUILD opencv-2.0.0.ebuild 2286 RMD160 45f4291003b6f1e2ae3a6ea3be7b401b6f52d774 SHA1 83d55bc3b6d402d7691ece9f714ebc41b364de21 SHA256 3d79b5439874bae02a6a503b2f21acb8a50a36702d601e14f865c6a7cf5516b0 -MISC ChangeLog 3480 RMD160 bac3f08b76f0da10686ef9eec1c9bf34bbd922c8 SHA1 4e092789cd9aa7a934bc2ba35daa12b802324d08 SHA256 894c47e5b2462b7e17d76a025f0ce8344c7404b77a0167b91e89673236710289 +MISC ChangeLog 3633 RMD160 968ffa4c532b725ef3d0d57e5d042a6221a62b28 SHA1 df6f54e95f1a641ad3a596d18222fedc825b995e SHA256 dc846c933bf54bb823425693fbb5bcb3f629ab80d0db17139ce1177eab81890c MISC metadata.xml 959 RMD160 531c61b88ecf1af6829078553580f7025d369bc0 SHA1 ce297f8ddef36af86f1e711a958a5f9873e1df7d SHA256 7f676e603c47c6182fe0b333395f735993743c22b2989b11e71fed579f7aa359 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkttTR8ACgkQOeoy/oIi7uwiJwCffo5EPjtlqv9WeTMSlGM78FlK -FGcAn27c8af/9OvIfUWI38tPswQBsjkG -=6E5f ------END PGP SIGNATURE----- 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} |