| 1 |
commit: 44d4582768174b870467ada6faa89eb6fe9be554 |
| 2 |
Author: Dongxu Li <dongxuli2011 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Sep 26 14:35:27 2011 +0000 |
| 4 |
Commit: Dongxu Li <dongxuli2011 <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Sep 26 14:35:27 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=44d45827 |
| 7 |
|
| 8 |
media-gfx/brlcad: included patch for 7.20.2, bug#378273 |
| 9 |
|
| 10 |
--- |
| 11 |
media-gfx/brlcad/ChangeLog | 3 + |
| 12 |
media-gfx/brlcad/brlcad-7.20.2.ebuild | 3 + |
| 13 |
.../brlcad/files/brlcad-7.18.4-libpng15.patch | 42 ++++++++++++++++++++ |
| 14 |
3 files changed, 48 insertions(+), 0 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog |
| 17 |
index 08295cf..3a0944d 100644 |
| 18 |
--- a/media-gfx/brlcad/ChangeLog |
| 19 |
+++ b/media-gfx/brlcad/ChangeLog |
| 20 |
@@ -4,6 +4,9 @@ |
| 21 |
|
| 22 |
*brlcad-7.20.2 (15 Jul 2011) |
| 23 |
|
| 24 |
+ 26 Sep 2011; Dongxu Li <dongxuli2011@×××××.com> brlcad-7.20.2.ebuild: |
| 25 |
+ Included libpng15 patch by Ian Stakenvicius, bug#378273 |
| 26 |
+ |
| 27 |
18 Aug 2011; Dongxu Li <dongxuli2011@×××××.com> brlcad-9999.ebuild: |
| 28 |
Fixed an ebuild configuration issue |
| 29 |
|
| 30 |
|
| 31 |
diff --git a/media-gfx/brlcad/brlcad-7.20.2.ebuild b/media-gfx/brlcad/brlcad-7.20.2.ebuild |
| 32 |
index c473901..f554089 100644 |
| 33 |
--- a/media-gfx/brlcad/brlcad-7.20.2.ebuild |
| 34 |
+++ b/media-gfx/brlcad/brlcad-7.20.2.ebuild |
| 35 |
@@ -36,6 +36,9 @@ DEPEND="${RDEPEND} |
| 36 |
doc? ( dev-libs/libxslt )" |
| 37 |
|
| 38 |
BRLCAD_DIR="${EPREFIX}/usr/${PN}" |
| 39 |
+src_prepare() { |
| 40 |
+ epatch "${FILESDIR}/${PN}-7.18.4-libpng15.patch" |
| 41 |
+} |
| 42 |
|
| 43 |
src_configure() { |
| 44 |
local myconf="--without-jdk" |
| 45 |
|
| 46 |
diff --git a/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch b/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch |
| 47 |
new file mode 100644 |
| 48 |
index 0000000..e0d42d1 |
| 49 |
--- /dev/null |
| 50 |
+++ b/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch |
| 51 |
@@ -0,0 +1,42 @@ |
| 52 |
+http://bugs.gentoo.org/378273 |
| 53 |
+ |
| 54 |
+--- src/libged/png.c |
| 55 |
++++ src/libged/png.c |
| 56 |
+@@ -30,6 +30,8 @@ |
| 57 |
+ #include <string.h> |
| 58 |
+ #include "bio.h" |
| 59 |
+ |
| 60 |
++#include <zlib.h> /* Z_BEST_COMPRESSION */ |
| 61 |
++ |
| 62 |
+ #include "png.h" |
| 63 |
+ #include "bu.h" |
| 64 |
+ #include "vmath.h" |
| 65 |
+--- src/fb/fb-png.c 2011-04-12 14:31:56.000000000 -0400 |
| 66 |
++++ src/fb/fb-png.c.new 2011-09-19 13:18:08.000000000 -0400 |
| 67 |
+@@ -38,13 +38,13 @@ |
| 68 |
+ # include <unistd.h> |
| 69 |
+ #endif |
| 70 |
+ |
| 71 |
++#include "zlib.h" |
| 72 |
+ #include "png.h" |
| 73 |
+ #include "bu.h" |
| 74 |
+ #include "fb.h" |
| 75 |
+ |
| 76 |
+ #include "pkg.h" |
| 77 |
+ |
| 78 |
+- |
| 79 |
+ /* in cmap-crunch.c */ |
| 80 |
+ extern void cmap_crunch(RGBpixel (*scan_buf), int pixel_ct, ColorMap *colormap); |
| 81 |
+ |
| 82 |
+--- src/util/pix-png.c 2011-04-12 14:34:24.000000000 -0400 |
| 83 |
++++ src/util/pix-png.c.new 2011-09-19 13:18:59.000000000 -0400 |
| 84 |
+@@ -36,7 +36,8 @@ |
| 85 |
+ #include "bio.h" |
| 86 |
+ |
| 87 |
+ #include "zlib.h" |
| 88 |
+-#include "pngconf.h" |
| 89 |
++/* removed as png.h includes this and including it in the wrong order seems to cause bugs |
| 90 |
++#include "pngconf.h" */ |
| 91 |
+ #include "png.h" |
| 92 |
+ |
| 93 |
+ #include "bu.h" |
Archives