diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 12:08:40 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 12:08:40 +0000 |
| commit | 44482efb228472efa5dfb213ce65c6481fbd32b3 (patch) | |
| tree | 296bea72b7e376b0daab5dcb3955e56ee2ee00ee | |
| parent | x86 stable, see bug 377255 (diff) | |
| download | gentoo-2-44482efb228472efa5dfb213ce65c6481fbd32b3.tar.gz gentoo-2-44482efb228472efa5dfb213ce65c6481fbd32b3.tar.bz2 gentoo-2-44482efb228472efa5dfb213ce65c6481fbd32b3.zip | |
Fix building with libpng15 (missing zlib.h include) wrt #378273 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
| -rw-r--r-- | media-gfx/brlcad/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/brlcad/brlcad-7.18.4.ebuild | 8 | ||||
| -rw-r--r-- | media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch | 13 |
3 files changed, 26 insertions, 2 deletions
diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog index e13431e0ff97..bf9b5711178e 100644 --- a/media-gfx/brlcad/ChangeLog +++ b/media-gfx/brlcad/ChangeLog @@ -1,6 +1,11 @@ # 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.3 2011/04/18 22:47:37 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/ChangeLog,v 1.4 2011/09/14 12:08:39 ssuominen Exp $ + + 14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> brlcad-7.18.4.ebuild, + +files/brlcad-7.18.4-libpng15.patch: + Fix building with libpng15 (missing zlib.h include) wrt #378273 by Diego Elio + Pettenò *brlcad-7.18.4 (18 Apr 2011) diff --git a/media-gfx/brlcad/brlcad-7.18.4.ebuild b/media-gfx/brlcad/brlcad-7.18.4.ebuild index c47390161d3d..d1a730ea093e 100644 --- a/media-gfx/brlcad/brlcad-7.18.4.ebuild +++ b/media-gfx/brlcad/brlcad-7.18.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/brlcad-7.18.4.ebuild,v 1.1 2011/04/18 22:47:37 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/brlcad-7.18.4.ebuild,v 1.2 2011/09/14 12:08:39 ssuominen Exp $ EAPI=3 inherit eutils java-pkg-opt-2 @@ -37,6 +37,12 @@ DEPEND="${RDEPEND} BRLCAD_DIR="${EPREFIX}/usr/${PN}" +src_prepare() { + epatch "${FILESDIR}"/${P}-libpng15.patch + + java-pkg-opt-2_src_prepare +} + src_configure() { local myconf="--without-jdk" use java && myconf="--with-jdk=$(java-config -O)" 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 000000000000..0020f69629ee --- /dev/null +++ b/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch @@ -0,0 +1,13 @@ +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" |