Fix building with libpng-1.5. Fixes bug #361319.

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

5 files changed, 44 insertions, 13 deletions

diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 962d1dc24b06..eee29176da63 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,10 +1,16 @@
-DIST libass-0.9.10.tar.bz2 297090 RMD160 f9fd62a69cb280e8dae13a2052cd1baf31c72668 SHA1 988a47620ba3c6615f42fe939d6d11dffe6b5ae9 SHA256 33e6f9cbdbd400640dfb41974861e8493ae35545f3401a51cebc82877dafc4a8
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libass-0.9.11.tar.bz2 297004 RMD160 593e008b802cf4d2ac662f9e648970b5c47d3070 SHA1 6f69f6c4474c649de4fd7913b050bfd4cf8110cb SHA256 ffd0a7ccf635c4795edb8f61015b47ff84ec9c5babf502dd2cc8223d4489745c
 DIST libass-0.9.8.tar.bz2 279121 RMD160 47c8187f8cb65fe23624986a4e962dcbc2226950 SHA1 702d6d12c540e42d8e6505c60505e363ef85511a SHA256 9e04001665cf5ac54c19a0e69ad9135a96ae34e82332cb2163c7fbb0f0ab4ed2
-DIST libass-0.9.9.tar.bz2 280779 RMD160 a9b535ebab05ee8c30363c207fe736c36ac1c378 SHA1 e95923d7833f9ec8aa4f826a6fe113ea30404ad5 SHA256 aa2df48567ec60ff05456419c723bcf5f5686fa54282cd20a2ffc26c9831858b
-EBUILD libass-0.9.10.ebuild 989 RMD160 1e77ffa499fbcb68f6b098071622a17820926633 SHA1 6753f491a172de3e4dc3cb80c6fbfb8fe980f87e SHA256 21cabc11f0a058b7678c1283176eed496d79075fca10bd0ce60521180d0b9c1c
-EBUILD libass-0.9.11.ebuild 913 RMD160 e9702db86145ffd2b60d84ca6e3ad478f32e95fa SHA1 fde7ef701fe1e034fe23dcaefd95a60aa19ba93f SHA256 8da7d245e4fd4f91a3a2a47932dd46f04b0c92dfbb4f94010fb030fe81081fb2
+EBUILD libass-0.9.11.ebuild 1001 RMD160 4307586aa6d66973d24119ff56bdc79c1e8a22e3 SHA1 acfce9592d7730618f80785353aca3c703b35aa5 SHA256 bdfa834e57557ac72a992c330b6f19b2cd9963fdd0caf74e662a3821cd947d77
 EBUILD libass-0.9.8.ebuild 908 RMD160 31479c71d45527f56220295abdaaee709707c39b SHA1 dae2f1dd7ba151f091dd5d45eeafaf2266c60468 SHA256 9386c86300bfb9e560b467e363b8de64f3f20354e92b7fad4f56785b6481ceac
-EBUILD libass-0.9.9.ebuild 988 RMD160 f7e500224178b667743e9633fb6df16d263279f9 SHA1 701875a508d0e46b352735f1c4149a82a1875a94 SHA256 3bc4101a30d1e8d547bdfd3394eafb27f2cc40b77f4fdcf3c59d37cc2ab125a5
-MISC ChangeLog 4917 RMD160 0d76238331ba3e028297d05cf71d660fe050bdc1 SHA1 cb439c4c22f595627c1c24a2a0a5f515e98ab1cc SHA256 593bf49af8d44d11a4f972f988d7684aad28da8b51f92ff92b1e29d61d932122
+MISC ChangeLog 5117 RMD160 a590715dc2242c8496101a695a1382bce99a1108 SHA1 20cba584eb1b00959e9c029b840abefbf032b547 SHA256 4f156b5fc8dc0a3f95aa7d1760c710f32eb57636292468a34fd58c83b6aa0be3
 MISC metadata.xml 318 RMD160 04fbbbc2659e57cca01100801950aab20582f96f SHA1 e15ee10875cdaf0253ee9c11e8b1173a62fb0685 SHA256 3969751760d92f50b10c0e6379a34103d92d9e04baba5530d2f64093771b5717
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2bVHIACgkQHB6c3gNBRYco4QCgj3AZTwhp3zk67auJ3SwNDscG
+OCgAoJbaV6aVuIJYmTtZHCpbyuyigFL/
+=zHHM
+-----END PGP SIGNATURE-----
diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index 31f3991b2c80..1fd3c9f537f8 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/openjpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.44 2011/03/30 13:24:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.45 2011/04/05 17:41:38 scarabeus Exp $
+
+  05 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> openjpeg-1.4-r1.ebuild,
+  +files/openjpeg-1.4-libpng15.patch:
+  Fix building with libpng-1.5. Fixes bug #361319.
 
 *openjpeg-1.4-r1 (30 Mar 2011)
 
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index b5d39e7cfc37..d3f32f0f02c4 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -8,6 +8,7 @@ AUX openjpeg-1.3-codec-Makefile 722 RMD160 fdc0880dfab7f82d56716afb9b73a283953f0
 AUX openjpeg-1.3-darwin.patch 1176 RMD160 b05ce81dfecfa41f15a4f70041a3fa04c70926cb SHA1 49b47307bc11334010c23082ccedc56fd8ba085d SHA256 f23683a40a73745ab1a1914ff75f4bd6da3aaccaeef088cf8c8a9ac6f6673a62
 AUX openjpeg-1.3-freebsd.patch 672 RMD160 b368524439bd11d3c68bc6e2b4aa129c08e7dd5a SHA1 8d51276c8d1ade2a7fe8ff76937d87c69daa7e51 SHA256 ea7113fbe3cdc2bc3d9199b266824be74f3556025a512c0cd2435797aa385809
 AUX openjpeg-1.3-r3-codec-Makefile 520 RMD160 c531f8b8d7bbd3b24606e52ad1d3cb32c485e08e SHA1 91fa1601c45549a4b6a4f7953339033afdc91a7f SHA256 4e9e389ad7cc05d41df63f0e4cb4a6fc5d107a02933dae14a40a5f788d9460cf
+AUX openjpeg-1.4-libpng15.patch 524 RMD160 1f7828677ce4dee97a42a5d412341624ceee3790 SHA1 2f168a0ecfefcec5bc7b0bd59f9064fdd104b266 SHA256 12ed8c1108fc0592f6d007db08c8c374725ef36f52c3cd76f2b378b2ffbae25a
 AUX openjpeg-1.4-linking.patch 595 RMD160 6177609274bd222c2a73c4f56db0b234306c5b20 SHA1 41fbd01354e004f2333a8f4cc74ee5847e9340f8 SHA256 cc79c403d8c9530fe753c5f9cf58d4ab8f95935cf88e02edfe31c98f445b3d0a
 AUX openjpeg-1.4-pkgconfig.patch 1573 RMD160 9de432a117e36ca80c493a50708053010f39b374 SHA1 f755e6aa220c0f107c13a46398aafe60b7189b01 SHA256 f026fc520583943dc5b079d3838fe61d230862cd7e7622a0dd3720427b5de594
 DIST openjpeg_v1_3.tar.gz 1004678 RMD160 2a22cc123058b1974cd1bf3898044acabceba26c SHA1 8d6870d9500ea09e0b1d30b981bea1c8de534de4 SHA256 3bca2e1e040f9dcbbcb1e0627f17a76eeb95e153bf663d082070c044a21202bd
@@ -15,13 +16,13 @@ DIST openjpeg_v1_4_sources_r697.tgz 2365447 RMD160 c0d88c4a312651bac17d50bd6917e
 EBUILD openjpeg-1.3-r2.ebuild 1377 RMD160 fdcd0f029eb7a6928b0466422a4f4a164cafb0ba SHA1 31fa28b2a3bab59a12c8051901a6efd05c4d6a51 SHA256 71c074f8d020d6cb61db8a8c0fc31ccf891c991d72ec8f30aa1009df46128be4
 EBUILD openjpeg-1.3-r3.ebuild 1611 RMD160 9e9441319088983dfe7c5d68598c199940c22bdb SHA1 db31174ea977d7b0cbc747a4e1de07da952b7a15 SHA256 7eaea3ee9cb6c7fb436f67b41a0d6c7760aba6cef185ad7faf14b10ee93babdf
 EBUILD openjpeg-1.3.ebuild 1219 RMD160 5e7b3d3a7c6d589caf0817ba98400960e99b7afa SHA1 f31d8abaa4b7c6904da50d345ec61d5ebe5c44e7 SHA256 579e8185a32741b71355f8aa86252f714eee7fcc89f0640eb0a65f8fb7ecf080
-EBUILD openjpeg-1.4-r1.ebuild 1337 RMD160 f7a60cae580eb6bdc631b459a1d344f36774e862 SHA1 0ded5ecd21cd1b5a26fa60c50aae52747cb44123 SHA256 6cf3e71c467a4379efe9d2a0e929f77dba58df703f20b4b8f4be4ccc7305a1cf
-MISC ChangeLog 6300 RMD160 54fe86a0f8eb5aa21c0a042eb9b380140803c0d3 SHA1 f0e83e6dd3d7ab19c91d52f913d4684f64ea4369 SHA256 48643db08efbd81443efd4ac36fc4197df61f8ac1fc2630fcd3bdf34ef191e40
+EBUILD openjpeg-1.4-r1.ebuild 1372 RMD160 e1c401af397ecee8b177494a0f246ca07860d195 SHA1 c99f206608e55f2d3f502cfe1aaf8c1f3ea13843 SHA256 a32f28284d81192bee5740143896fc879e130ea02dda28ada1856515960386ea
+MISC ChangeLog 6469 RMD160 bc8f5200d4b49763d8ea0dad91179ae58b548b26 SHA1 83ff25a0c737dcc14ba383d3f36c2d914df94b56 SHA256 7c09b528d9471202e82bd20f060ab7d82bbcfc6d549b04bee23e2bf2a7099f41
 MISC metadata.xml 257 RMD160 80c1eb9046b53f99e237da460c933b844ccc7b63 SHA1 84398d153001807fcb12f140046c03c71f81afb3 SHA256 f59744ea0de26f01b0beefb513cb99989c8d295b37b738fbc7814a43ccfb9e59
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2TLkoACgkQHB6c3gNBRYcltQCffI0UKVcyEljNYjfYRyaEInQM
-4YgAoIOmiFXQxaDQkqdD6gLB7Y6UBh5D
-=Y5Ou
+iEYEARECAAYFAk2bU8EACgkQHB6c3gNBRYeVQQCdEPlgGY9ozSVu6yGy8QEeUqEC
++bgAn2uihWMf6+/y1QEEb/WmT1UDArtL
+=Tbdl
 -----END PGP SIGNATURE-----
diff --git a/media-libs/openjpeg/files/openjpeg-1.4-libpng15.patch b/media-libs/openjpeg/files/openjpeg-1.4-libpng15.patch
new file mode 100644
index 000000000000..d6e4babea220
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-1.4-libpng15.patch
@@ -0,0 +1,19 @@
+libpng: Version 1.5.1beta04 [January 16, 2011]
+  Mentioned in the documentation that applications must #include "zlib.h"
+    if they need access to anything in zlib.h.
+---
+ codec/convert.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/codec/convert.c b/codec/convert.c
+index 25e715b..153c4b9 100644
+--- a/codec/convert.c
++++ b/codec/convert.c
+@@ -47,6 +47,7 @@
+ #ifdef _WIN32
+ #include "../libs/png/png.h"
+ #else
++#include <zlib.h>
+ #include <png.h>
+ #endif /* _WIN32 */
+ #endif /* HAVE_LIBPNG */
diff --git a/media-libs/openjpeg/openjpeg-1.4-r1.ebuild b/media-libs/openjpeg/openjpeg-1.4-r1.ebuild
index f4b81151a0cf..6c15e7447ef5 100644
--- a/media-libs/openjpeg/openjpeg-1.4-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.4-r1.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/openjpeg/openjpeg-1.4-r1.ebuild,v 1.1 2011/03/30 13:24:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.4-r1.ebuild,v 1.2 2011/04/05 17:41:38 scarabeus Exp $
 
 EAPI=4
 
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 PATCHES=(
+	"${FILESDIR}/${P}-libpng15.patch"
 	"${FILESDIR}/${P}-linking.patch"
 	"${FILESDIR}/${P}-pkgconfig.patch"
 )