diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2011-09-23 08:59:24 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2011-09-23 08:59:24 +0000 |
| commit | ab49028266e3471b230f89ac602259f03bb64634 (patch) | |
| tree | a89a5c47fcdce2187a1587dece0d0529cb8b3c7c /media-gfx/brlcad | |
| parent | Readded libpng15 patch (bug #383491). Moved ebuild back to EAPI-4 (diff) | |
| download | gentoo-2-ab49028266e3471b230f89ac602259f03bb64634.tar.gz gentoo-2-ab49028266e3471b230f89ac602259f03bb64634.tar.bz2 gentoo-2-ab49028266e3471b230f89ac602259f03bb64634.zip | |
Added fixed patch to build with libpng15 (bug #378273)
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/brlcad')
| -rw-r--r-- | media-gfx/brlcad/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch | 29 |
2 files changed, 36 insertions, 1 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/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" |