Fix building with libpng15 (missing zlib.h include) wrt #378273 by Diego Elio Pettenò

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

4 files changed, 34 insertions, 19 deletions

diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index e13431e0ff97..bf9b5711178e 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/brlcad
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/ChangeLog,v 1.3 2011/04/18 22:47:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/ChangeLog,v 1.4 2011/09/14 12:08:39 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> brlcad-7.18.4.ebuild,
+  +files/brlcad-7.18.4-libpng15.patch:
+  Fix building with libpng15 (missing zlib.h include) wrt #378273 by Diego Elio
+  Pettenò
 
 *brlcad-7.18.4 (18 Apr 2011)
 
diff --git a/media-gfx/brlcad/Manifest b/media-gfx/brlcad/Manifest
index dfd7355fbc87..01fb9d385186 100644
--- a/media-gfx/brlcad/Manifest
+++ b/media-gfx/brlcad/Manifest
@@ -1,28 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX brlcad-7.18.4-libpng15.patch 233 RMD160 536bed143cb00f7c8aee7d3526e4a046e7ad44ac SHA1 93bb5b1113a0ae07b39ddbd6e0c857acead3c967 SHA256 4f34c5f896016e675c13ddb14dc8ca5b354527685221b63023c5d7b151bd0176
 DIST brlcad-7.16.8.tar.gz 50696484 RMD160 08924ba07f95d959a24e5921cecb48214ae0566f SHA1 003effd929f619a5496453aaafb5a03880649ee6 SHA256 f5e65aee61cbafb187ab1967cd2050cb80f04c7594012700118d1a96999ee9e5
 DIST brlcad-7.18.2.tar.gz 55276026 RMD160 dc5788466c58f58b685b46e065f89322fab68265 SHA1 2c61825fc8fd8a8d45d1f3e06cbed8c9668b7dce SHA256 a790de0a9e9d192be5165e87d4158428a0856d7233e6d84565fa2f5bc374912e
 DIST brlcad-7.18.4.tar.gz 55406130 RMD160 ac2806a807c59fc5c55944ad63205d1fdf10c0df SHA1 fd40e86eaa04ec8be4682f78ab407af5b33d941e SHA256 90bd0c5afaa7a5c48846f6d4f4a59ae482c231b666e457ccf4ad7524236e928f
 EBUILD brlcad-7.16.8.ebuild 2567 RMD160 c1d2444c489db1a0c2bc53bec8c91a410d6506ca SHA1 1a24cdc5c2cfec794296630633107cfda886c060 SHA256 3723e4291279ca5c1f951f0a8518ccc94ff36e2b92e27891bccd751bfe221d27
 EBUILD brlcad-7.18.2.ebuild 2567 RMD160 259e6559fab26b75ad718bac56c37963b5515e7e SHA1 9d99dc870e626e2b312ec91b72bf2db2fa79f912 SHA256 ed4bb72f561798d719d065bda136fc02efd79a6605e756958f965639736ac020
-EBUILD brlcad-7.18.4.ebuild 2584 RMD160 b0e5363f18e894c77fdf18e340f3f354a977d782 SHA1 cb54a0b829fa9a433b37a185119a3c2568e7c42c SHA256 44d8d0987fab07c5e6b482649eb776fff4055bec021d6dbf8a2e8d66a430aec4
-MISC ChangeLog 3193 RMD160 454913c223e832529ba2b3a6398f4bdf377e472f SHA1 05d4eb0560bf13751757eec6cd0be84da9378de9 SHA256 d70efab518a238fb9be6730cfd59339062be93a5bb864d5dc250e81c9f8ffb0b
+EBUILD brlcad-7.18.4.ebuild 2674 RMD160 554ee4c2841cc23cb3cd68de799a07f099563e5e SHA1 5bf8ec212874c1cc7a27c486f286e6ddf4304274 SHA256 9e78b6254c9f1fb36eed7907d0869317911576b4ef09a5f57f5f6b60db84ecb8
+MISC ChangeLog 3400 RMD160 58b49379ab981969c416fcb73e73a891332366af SHA1 5a37823edcff5d51ba1c252a7df709c208efc2c4 SHA256 30af5e4249f12bae3fa1adf9d82b388048deadecf369ebb8c7cb41e5950471b5
 MISC metadata.xml 1379 RMD160 7407a87496226206896ad41f07cbf1b4900faf05 SHA1 6fb2b9de93b48435f93a968de325d1b483160a63 SHA256 0374773ad63ea0e195813d44eeca951b9b756a73ad1fe034499532aef7e6078d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNrMBKAAoJENwGBM22xffemQEP/0gz5nV8xm2JaXkEv5ZAE3/U
-er3H9+k/aIryo2Wu4CHnaJE8VafYm/O2C/fhmLKPlWcfeP3qT70/66Td9MYGx0Zy
-JXTd1/d1i3WAwnd1V3k2QaufcMjn/2TTgzVCHlhhYkNMmy2GNtRw6MrbSLltF+Ay
-7PtaAEddMu0njKRD4UIjn4sRtlWld5OHlJRLr2LNxJ1rlylMR4+TBOmNdPSaAKnk
-f5Bb+heIZlcb63vHGtjH72hLKpXKZb6gxQHCoExriAocaFf3gPZhPi2K6PzCTXKR
-pXQb20FfNA3PEFzvElTif7tYJj09C/DmjOzSma1rzcM+FQL4U2W/bTSz0sAkzEvn
-SWi7tQL6zAzCZd5s7Zxamv6Kc7am8I3dhruhESAY+ph8rEwK21V8kPNTZLaHr9+T
-rUB5p+x7hXzEKn7wXl2VphE9aaJbxmWJdhCZD1DDgIYC5Ha/B3PfW3W4f+0mOFSs
-PK16Q2NXQseJjLw+nLdYFLIiSXDAaIPdHt5HuwZFTZn/Pru3/k6ki8i5bhkkQ4NC
-x2/XCq1UFPEaRKyAyD+ocBpmGM2JOEJmfge5eb8atB/QEGDfMt6W7EFLaUvzjuuV
-aZPnMsDzBb0U7RM5ZtoTMKg2HsIzitu/+0YsiNVkzEd3Z3IN4Ts7P6crsr/xcIft
-2brM7k77E9R/1+3OX+tq
-=+Awq
+iF4EAREIAAYFAk5wmX4ACgkQXkR9YqOcLPEwTgEAi0aki2LqBDIGV0GmDnselkBI
+x6OBEUEpShXrQXhxq4YA/itK+9cudXMsoDm4wtuqzY0gZlHtwHWD23HlbPtzSVR3
+=abQ8
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/brlcad/brlcad-7.18.4.ebuild b/media-gfx/brlcad/brlcad-7.18.4.ebuild
index c47390161d3d..d1a730ea093e 100644
--- a/media-gfx/brlcad/brlcad-7.18.4.ebuild
+++ b/media-gfx/brlcad/brlcad-7.18.4.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-gfx/brlcad/brlcad-7.18.4.ebuild,v 1.1 2011/04/18 22:47:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/brlcad-7.18.4.ebuild,v 1.2 2011/09/14 12:08:39 ssuominen Exp $
 
 EAPI=3
 inherit eutils java-pkg-opt-2
@@ -37,6 +37,12 @@ DEPEND="${RDEPEND}
 
 BRLCAD_DIR="${EPREFIX}/usr/${PN}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+
+	java-pkg-opt-2_src_prepare
+}
+
 src_configure() {
 	local myconf="--without-jdk"
 	use java &&	myconf="--with-jdk=$(java-config -O)"
diff --git a/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch b/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch
new file mode 100644
index 000000000000..0020f69629ee
--- /dev/null
+++ b/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/378273
+
+--- src/libged/png.c
++++ src/libged/png.c
+@@ -30,6 +30,8 @@
+ #include <string.h>
+ #include "bio.h"
+ 
++#include <zlib.h> /* Z_BEST_COMPRESSION */
++
+ #include "png.h"
+ #include "bu.h"
+ #include "vmath.h"