[gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/

["Dongxu Li" <dongxuli2011@gmail.com>]

commit:     44d4582768174b870467ada6faa89eb6fe9be554
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 14:35:27 2011 +0000
Commit:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
CommitDate: Mon Sep 26 14:35:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=44d45827

media-gfx/brlcad: included patch for 7.20.2, bug#378273

---
 media-gfx/brlcad/ChangeLog                         |    3 +
 media-gfx/brlcad/brlcad-7.20.2.ebuild              |    3 +
 .../brlcad/files/brlcad-7.18.4-libpng15.patch      |   42 ++++++++++++++++++++
 3 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index 08295cf..3a0944d 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -4,6 +4,9 @@
 
 *brlcad-7.20.2 (15 Jul 2011)
 
+  26 Sep 2011; Dongxu Li <dongxuli2011@gmail.com> brlcad-7.20.2.ebuild:
+  Included libpng15 patch by Ian Stakenvicius, bug#378273
+
   18 Aug 2011; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild:
   Fixed an ebuild configuration issue
 

diff --git a/media-gfx/brlcad/brlcad-7.20.2.ebuild b/media-gfx/brlcad/brlcad-7.20.2.ebuild
index c473901..f554089 100644
--- a/media-gfx/brlcad/brlcad-7.20.2.ebuild
+++ b/media-gfx/brlcad/brlcad-7.20.2.ebuild
@@ -36,6 +36,9 @@ DEPEND="${RDEPEND}
 	doc? ( dev-libs/libxslt )"
 
 BRLCAD_DIR="${EPREFIX}/usr/${PN}"
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-7.18.4-libpng15.patch"
+}
 
 src_configure() {
 	local myconf="--without-jdk"

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 0000000..e0d42d1
--- /dev/null
+++ b/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch
@@ -0,0 +1,42 @@
+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"
+--- 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"