Add patch for libpng-1.5 support. Bug #383571. Thanks to Erich Seifert <eseifert...

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 77d22b6d5cafffd1ed3ab4e49543fce706862f15..5a5cc7ebfae263bce1ceab22ecca5a693f0f1bab 100644 (file)
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.45 2011/09/18 20:30:22 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.46 2011/09/20 11:28:54 hwoarang Exp $
+
+  20 Sep 2011; Markos Chandras <hwoarang@gentoo.org> opencv-2.3.0.ebuild,
+  +files/opencv-2.3.0-libpng15.patch:
+  Add patch for libpng-1.5 support. Bug #383571. Thanks to Erich Seifert
+  <eseifert@error-reports.org>
 
 *opencv-2.3.0 (18 Sep 2011)
 

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 5a6b12247aa59325bd7332903b0aa8efff89d94b..afd71de8c12fd42aaadbe5c72b7f7a9555fa8438 100644 (file)
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -18,6 +18,7 @@ AUX opencv-2.2.0-use_system_libs.patch 5117 RMD160 02a9c2e896ebc453ee63770e5f216
 AUX opencv-2.2.0-v4l_2.6.38.patch 1165 RMD160 1bf13eca350e015ce53611c77dc4e85d81fa8530 SHA1 64e4ea4df8d17843c73248bef778459660b556d9 SHA256 2d4e0c72c3f4e9c60cb10a5fc5a8512275c48e3f38ec3441a240ed49dd8a1b5b
 AUX opencv-2.3.0-convert_sets_to_options.patch 14590 RMD160 1fdf49d3981ddb4e222728c133ec68d2d5ffd17d SHA1 91a34455fc16be04ebc5e89bb9c093928fae39cd SHA256 60e50e5e66213fe174d220a546f40081def4604862e060ba9dce6cbd012a52ac
 AUX opencv-2.3.0-ffmpeg.patch 4940 RMD160 ad9e319212530581cecefe1880605000ff8d8dfe SHA1 002fe2cfe2b9ecd00ac0a83681c2d2291fd61c89 SHA256 4c181a768089366d3e124130629df4ac9a0a975a239c77031b7ab2d1e76fc861
+AUX opencv-2.3.0-libpng15.patch 214 RMD160 ec21b397068516716749a0550baa262c5acb22e9 SHA1 6543c741b1cf79b2ceb0a9c681aa3e93661c97b5 SHA256 03cd546c755d4be88b14d5ad2f5987c5abc78633a3e608f4a471db85b21fa22c
 AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c4d08bb0f SHA1 766e8c14f4e407a5e252f3a9228f260be8f50e28 SHA256 5b835add26f1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378
 AUX opencv-2.3.0-symlink.patch 838 RMD160 787ef6c6ae59a4d614701fbafe48c8803cf29807 SHA1 08059632d29f08069c8abbc294e501487d97d201 SHA256 286f946ca13760406c8afcf71358758df0051fd51a74578058f263610c05c448
 DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
@@ -26,23 +27,23 @@ DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81
 EBUILD opencv-2.1.0.ebuild 2962 RMD160 e6db74fcd2d4c76c3b1f0dc50b6623921ffc5d4f SHA1 9a266d3406186a1e6ca1c619cda3119ea3483413 SHA256 e0f1622906fcefd8f128e60291db8a23eecc5179286704080c8663c7663423b5
 EBUILD opencv-2.2.0-r10.ebuild 4496 RMD160 e4f404e4d2368b27736501bd0d493e6e9dddb196 SHA1 50673483544b1760774a7c25629273b98e15df3a SHA256 979fe4eaf0b7ad221080e5663a973af68ad64385e7adb70017306328def340da
 EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc
-EBUILD opencv-2.3.0.ebuild 4125 RMD160 8f9b3757bb1e8bfbcac3d0c0e1bf4124e7625ae1 SHA1 f883eb2bd7454bf35dc5cb9f10b16f167531aedb SHA256 0c7a3f2140aa3fb9fcf655782a7a8eb034291a9dd14093fadce32077a7ae1e07
-MISC ChangeLog 7874 RMD160 4b2f85dbb3c0f24db0dd81b0c2da7f6e7b26d974 SHA1 d0e251a973511278b2977ef611f5d2c6ea7c6821 SHA256 d73d2ac86bf5547756c4a561ac7fe592e4e9036dcbbf183fbe6b122ff8d9a730
+EBUILD opencv-2.3.0.ebuild 4220 RMD160 446b49532d815f25449b89f35ac28d384267c45f SHA1 83c54f65b724a7e2ef318e72e4d43356daeb5682 SHA256 73ea296f3325698545707ef853476c46103b3c9fa249d3cac3fe0b8732ab5c74
+MISC ChangeLog 8090 RMD160 a34fdccd2e4344a510b24b08dbe89f6eff60d223 SHA1 6317e5c601bf6f4abdc88b7204cd70f3ccab970b SHA256 30c65cb0d3c5043ec89e5b8b5ac9b18d09da0e5ba830ffcf59014c151f0db87a
 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOdlT7AAoJENwGBM22xffe7bsP+weKtNaX1GWkKQgkwIR8aTFh
-mx7xXxjUQ1It1mpZgZrTwmRyB5XIyH3uzMeWCQkYOA6QfqBaWMUEoIkBDQWV4Xt0
-NvFRKIoAMrNN9HaU4xff/wXUZf0eUj+qN5bApxBdYoNDNiRd9gRUgX2BGFCKcttx
-huO5hoajNwgEuDCgS1Od7uBkWqhh7G+OlpvATneij/tTOHPdUNMP168I6UCP24u6
-73uMc3XsQe9ek2z+6oYkyuVsr+XoXNk6X2u6KBcF3aU1G7uamshpQdt/ieaxxodN
-2+hkWSveZiMW7nKMgPeLBlc88uSM7aYk3uQtiD1I5N/uLIBv7/BlyKHtz4JKGeL3
-vHBtxBTFiS/jjASZj8nAAkIGBnwvJDeZSA7FBO471aonNYeFTQx31EqfSGopHnlZ
-QiV21a2RK3QmCaJ9LWHjdvOkRbt1B0DLvdh8c17e56ns0s5tCTWxj2BYE1hf5tlh
-dbf3geYFMsRelKUFEpze+feJnoAY2S5Ngk28nnBEWCBahlExiMCLkK3Nt1FBHiRs
-Nuhbi/+XfPfkcymA4bIUlWAIJAkuGD7nzSvnzXfJydPSdw9hiOCt6Mb4XPKIRf/u
-ID+PYZTtuOYT+NmFgFU+oT1qRt+mV055lFYwuQRhmQT7nNO2AJQBD8KeEUEIBWWn
-3l0txnYQOplkJOy4wkwM
-=6Izh
+iQIcBAEBCgAGBQJOeHjjAAoJEPqDWhW0r/LC5moQAKT2HZ5CPIKHpudKUMw2Xmq5
+TYUhQ3FLB+IQYOJpZFh17fIqOVeclTu8X8JDTkzfkO+fjkp+m+uevR27SWCBouR3
+2mLEnJFfHWEZv5a/GiB9Qx9MQJWkaMw0PMdR3gRjj0VKoKSN3wNOLGc0eTv8sxdP
+fyfalzAsDUN33DqsoKqIVwwis91O+ZLKdnyLBVUxfSA9BNZzpWzBKuEK4dhDxfSL
+sD+f8SXFA2v9In/LC5y0s5t+w+DBw75dww+BsYqaMbRgw9kRC2lvODCagpMl0aKB
+9Gj8eJughqfkqkg3IRz5Q+pm2l2WoKQpcbY6ZkUGBOzSuluywW4XFokUzAs4DsXY
+lMfz3zIrtoTbp4OwOFExinF66RbK8wa2BNzQcFss3kClz131Z2PllkIAeuZIZ4qJ
+RpSDU1Nmpd+IytFbe54YUfSUY1vPnFTvYifoHLewCMQQRspv6iDeX60XrmeAL59l
+kPmVQ6reOvInKnYncXD+OmwydiVxaShLzMDxnE45da42i9WQKw55yoLjT3lPfHDl
+efnPBZrCzNmqV+kVtpN60unSGJCR4yMf/1iaS4J41EKQ/1fQ2x+3jRMqKbywlxNG
+Tx7iOFMNx2hBP3nmzYNUMFz9JQkjxR2FxGytm1JuyT3RYOeIRgwR2ylREq2+dInP
+zDSZU8sbCcivsVsBfB6e
+=LsGk
 -----END PGP SIGNATURE-----

diff --git a/media-libs/opencv/files/opencv-2.3.0-libpng15.patch b/media-libs/opencv/files/opencv-2.3.0-libpng15.patch
new file mode 100644 (file)
index 0000000..c811766
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.3.0-libpng15.patch
@@ -0,0 +1,8 @@
+--- opencv/modules/highgui/src/grfmt_png.cpp   (revision 4945)
++++ opencv/modules/highgui/src/grfmt_png.cpp   (revision 6143)
+@@ -57,4 +57,5 @@ 
+ #include <png.h>
+ #endif
++#include <zlib.h>
+ #include "grfmt_png.hpp"
+ 

diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
index e75a33066dcb000a1d403ba6b597b0554f005aa6..78e65463d8e82acf6e81c5707457d55389fa17b9 100644 (file)
--- a/media-libs/opencv/opencv-2.3.0.ebuild
+++ b/media-libs/opencv/opencv-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.1 2011/09/18 20:30:22 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.2 2011/09/20 11:28:54 hwoarang Exp $
 
 EAPI=3
 
@@ -80,6 +80,8 @@ pkg_setup() {
 
 src_prepare() {
        base_src_prepare
+       # include missing zlib.h for libpng>1.5. Bug #383571
+       epatch "${FILESDIR}"/${P}-libpng15.patch
 
        # remove bundled stuff
        rm -rf 3rdparty