Added fixed patch to build with libpng15 (bug #378273)

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

3 files changed, 52 insertions, 7 deletions

diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index bf9b5711178e..97f9d58bb58e 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2011/09/14 12:08:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/ChangeLog,v 1.5 2011/09/23 08:59:24 polynomial-c Exp $
+
+  23 Sep 2011; Lars Wendler <polynomial-c@gentoo.org>
+  files/brlcad-7.18.4-libpng15.patch:
+  non-maintainer commit: Added fixed patch to build with libpng15 (bug
+  #378273). ACKed by ssuominen. Thanks to Ian Stakenvicius for providing a
+  working patch.
 
   14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> brlcad-7.18.4.ebuild,
   +files/brlcad-7.18.4-libpng15.patch:
diff --git a/media-gfx/brlcad/Manifest b/media-gfx/brlcad/Manifest
index 01fb9d385186..fcd33bc6a8fb 100644
--- a/media-gfx/brlcad/Manifest
+++ b/media-gfx/brlcad/Manifest
@@ -1,19 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX brlcad-7.18.4-libpng15.patch 233 RMD160 536bed143cb00f7c8aee7d3526e4a046e7ad44ac SHA1 93bb5b1113a0ae07b39ddbd6e0c857acead3c967 SHA256 4f34c5f896016e675c13ddb14dc8ca5b354527685221b63023c5d7b151bd0176
+AUX brlcad-7.18.4-libpng15.patch 959 RMD160 0b37aad5c6cdde4e29c6ccf760bfb2c74dfa32be SHA1 e3837e9ee11a3501f2f79a896eead580ce5b3a9d SHA256 c01ed2fb05443cbe1e7d70dd05df275105434cbf9023ac41ba3851749a8e86f4
 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 2674 RMD160 554ee4c2841cc23cb3cd68de799a07f099563e5e SHA1 5bf8ec212874c1cc7a27c486f286e6ddf4304274 SHA256 9e78b6254c9f1fb36eed7907d0869317911576b4ef09a5f57f5f6b60db84ecb8
-MISC ChangeLog 3400 RMD160 58b49379ab981969c416fcb73e73a891332366af SHA1 5a37823edcff5d51ba1c252a7df709c208efc2c4 SHA256 30af5e4249f12bae3fa1adf9d82b388048deadecf369ebb8c7cb41e5950471b5
+MISC ChangeLog 3659 RMD160 bdedafab00118a23ae18c929d1a08ff00cbd8243 SHA1 64d70888a3a3a5f006771c5ffa685fd5bc0524d4 SHA256 b3a3d8ba858bfa5ded0ff985a21c34b8714954e0ce7899fe5ac4523d0d9f3eef
 MISC metadata.xml 1379 RMD160 7407a87496226206896ad41f07cbf1b4900faf05 SHA1 6fb2b9de93b48435f93a968de325d1b483160a63 SHA256 0374773ad63ea0e195813d44eeca951b9b756a73ad1fe034499532aef7e6078d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5wmX4ACgkQXkR9YqOcLPEwTgEAi0aki2LqBDIGV0GmDnselkBI
-x6OBEUEpShXrQXhxq4YA/itK+9cudXMsoDm4wtuqzY0gZlHtwHWD23HlbPtzSVR3
-=abQ8
+iQIcBAEBCgAGBQJOfEpxAAoJEPiazRVxLXTFwLUP/jq1TOHhQ4Svs0THmcmIFeUl
+Jr0ANF5dMT72zCjoRScCeoMaT0ARvRA/zZxiTB4olr6yWnfMU1QnCFSWr5PeTAn8
+Nw47B2VpKGLSKjhHcuz9r6580IqOgomxn3GfdPxqevDU1cxc28kGOpXE6C7d2bUJ
+49Lgye3xBtRLSTA40EhtO6cU2Y9yu0xKmcwjQ98w5vmu1MnAy1mdQRBwKhhhp2Q+
+47qSRl6cfNfZFB5NqHGQ9svEi3oRyRkO02g+l6m7bJ4eCkVLYhkP+i9JdIHHDxjJ
+3/FUfx+si0XHpUuMpqYwXeiO8O+wGC8kiD9LLofQ+24sdzX4D4OHDNJiO3zTqjja
+CTQmE9hwPUhm0fSjA1lF/P96/PRoVIHxSZ6fWFxPk1vM7nPLWthr/XcBNgnsM/ey
+a2mwCpEh4pJNk4vtRSfeIVj6u73/7KwIICQUU2U5l/14EehrB2flHNmdLDW+MTpk
+ynbBMKHciIWf1FJ9kdueeDn7nrsFETvVEqxJd35XBkwN34BMdm0nB6fE47eVGlHK
+0cY4vTVMI+q0BjOZk+mFuMsiwZdjqBHbe9pz4G+0/eouHYPOwsn9WtToHRWrUCao
+IxtR/uL0IPjWqhP6ysUKbzYvx6pRxKN1hMRL6GkzARmuSRDzD4JTgFDgrhmmRlNS
+4btQYyNlFTzDkaWw0EdP
+=MyG4
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch b/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch
index 0020f69629ee..e0d42d1e22f9 100644
--- a/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch
+++ b/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch
@@ -11,3 +11,32 @@ http://bugs.gentoo.org/378273
  #include "png.h"
  #include "bu.h"
  #include "vmath.h"
+--- src/fb/fb-png.c	2011-04-12 14:31:56.000000000 -0400
++++ src/fb/fb-png.c.new	2011-09-19 13:18:08.000000000 -0400
+@@ -38,13 +38,13 @@
+ #  include <unistd.h>
+ #endif
+ 
++#include "zlib.h"
+ #include "png.h"
+ #include "bu.h"
+ #include "fb.h"
+ 
+ #include "pkg.h"
+ 
+-
+ /* in cmap-crunch.c */
+ extern void cmap_crunch(RGBpixel (*scan_buf), int pixel_ct, ColorMap *colormap);
+ 
+--- src/util/pix-png.c	2011-04-12 14:34:24.000000000 -0400
++++ src/util/pix-png.c.new	2011-09-19 13:18:59.000000000 -0400
+@@ -36,7 +36,8 @@
+ #include "bio.h"
+ 
+ #include "zlib.h"
+-#include "pngconf.h"
++/* removed as png.h includes this and including it in the wrong order seems to cause bugs
++#include "pngconf.h" */
+ #include "png.h"
+ 
+ #include "bu.h"