diff options
author | Dongxu Li <dongxuli2011@gmail.com> | 2011-09-26 10:35:27 -0400 |
---|---|---|
committer | Dongxu Li <dongxuli2011@gmail.com> | 2011-09-26 10:35:27 -0400 |
commit | 44d4582768174b870467ada6faa89eb6fe9be554 (patch) | |
tree | a9824bef1acdba7c5fc7dcd81500886b51ed2a22 | |
parent | Fix live ebuild (diff) | |
download | sci-44d4582768174b870467ada6faa89eb6fe9be554.tar.gz sci-44d4582768174b870467ada6faa89eb6fe9be554.tar.bz2 sci-44d4582768174b870467ada6faa89eb6fe9be554.zip |
media-gfx/brlcad: included patch for 7.20.2, bug#378273
-rw-r--r-- | media-gfx/brlcad/ChangeLog | 3 | ||||
-rw-r--r-- | media-gfx/brlcad/Manifest | 7 | ||||
-rw-r--r-- | media-gfx/brlcad/brlcad-7.20.2.ebuild | 3 | ||||
-rw-r--r-- | media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch | 42 |
4 files changed, 51 insertions, 4 deletions
diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog index 08295cf27..3a0944da9 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/Manifest b/media-gfx/brlcad/Manifest index 22e53e1d7..42cbe4b9a 100644 --- a/media-gfx/brlcad/Manifest +++ b/media-gfx/brlcad/Manifest @@ -1,8 +1,7 @@ -AUX brlcad-7.20.2-cmake.patch 855 RMD160 a5cdfe4f00113631c677662a6b05d9008ec96959 SHA1 4944966b897e3d89f6815db5164c975f432d0a0c SHA256 98f121ca6b78207f583ed70952ffa29c82787fd1febbaa781cf37a33a316d1f2 +AUX brlcad-7.18.4-libpng15.patch 959 RMD160 0b37aad5c6cdde4e29c6ccf760bfb2c74dfa32be SHA1 e3837e9ee11a3501f2f79a896eead580ce5b3a9d SHA256 c01ed2fb05443cbe1e7d70dd05df275105434cbf9023ac41ba3851749a8e86f4 AUX brlcad-9999-cmake.patch 488 RMD160 51c1eaa27d2248f186746ad1b1b9c5ee32a9abbf SHA1 8f1e9ec4860bd9212892a185eafcfcd20137d328 SHA256 0131261e5ca51aeef5381e528feda1b5b4e24510c65f93861cb4d2ab1e4032b1 -AUX png_patch.diff 1171 RMD160 6faea89e2fcd65b5dc48e82a3cd343e4aba5b104 SHA1 509a912d0114599dcc600601d4eac04e614946b3 SHA256 066d0aec82e7e72d51d7dd3f5b12ce722e21e2b79382256e7e09aeb9a6a2a7e0 DIST brlcad-7.20.2.tar.gz 56219423 RMD160 b366d6956aa63f22ea14ed03f212e1a184eee429 SHA1 6d465398740a67572cfd9a8c3c6771e0b263d806 SHA256 879d21ff87808bf60956eec915b5bd6f1af1b4869145c239345f2a00267434ca -EBUILD brlcad-7.20.2.ebuild 2584 RMD160 b0e5363f18e894c77fdf18e340f3f354a977d782 SHA1 cb54a0b829fa9a433b37a185119a3c2568e7c42c SHA256 44d8d0987fab07c5e6b482649eb776fff4055bec021d6dbf8a2e8d66a430aec4 +EBUILD brlcad-7.20.2.ebuild 2652 RMD160 dfa398f9f3b5fa7cd2e3b7db9e7ab170bff01658 SHA1 5ae842287f9e3b43b6203071d4cb0a24e777e2e6 SHA256 a0861511e0162b2fd6025da1a99100967b4e9eeaf58643371ec51c5bfeafd5ed EBUILD brlcad-9999.ebuild 3661 RMD160 aa52d79587ab5ca2154176628035c61acf56da05 SHA1 1f4cc0732b9c9fb7758b1c9d314fd37aaee33dc4 SHA256 2a2c3a4c6bee71a22ad700e65e6d8d9a55ba29d330cea59028b3f480a21e8181 -MISC ChangeLog 4499 RMD160 6468902c7c141973ada693b3773be59fcbbcd16b SHA1 e884be006ab93600ac6154ec7bdcf308a4fe2b7a SHA256 d692599098baedb727a3544a8ccf24a2f57950e881a41af466a0a6f951c401e9 +MISC ChangeLog 4630 RMD160 3bf788df04d5fb1f734955e686bfb1b139d4a2ad SHA1 cf97c0f3d147a8cfeb2ab3db552eace21d1067bd SHA256 55c1aba39b05093ef0508dd33e11d04623c671d46e959973164bb4df84649d95 MISC metadata.xml 1379 RMD160 7407a87496226206896ad41f07cbf1b4900faf05 SHA1 6fb2b9de93b48435f93a968de325d1b483160a63 SHA256 0374773ad63ea0e195813d44eeca951b9b756a73ad1fe034499532aef7e6078d diff --git a/media-gfx/brlcad/brlcad-7.20.2.ebuild b/media-gfx/brlcad/brlcad-7.20.2.ebuild index c47390161..f5540894d 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 000000000..e0d42d1e2 --- /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" |