From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R8CNy-0003nc-M6 for garchives@archives.gentoo.org; Mon, 26 Sep 2011 14:42:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 897EE21C07C; Mon, 26 Sep 2011 14:42:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 482C821C07C for ; Mon, 26 Sep 2011 14:42:13 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B38E71B4024 for ; Mon, 26 Sep 2011 14:42:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B855780042 for ; Mon, 26 Sep 2011 14:42:11 +0000 (UTC) From: "Dongxu Li" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Dongxu Li" Message-ID: <44d4582768174b870467ada6faa89eb6fe9be554.dongxuli@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/ X-VCS-Repository: proj/sci X-VCS-Files: media-gfx/brlcad/ChangeLog media-gfx/brlcad/brlcad-7.20.2.ebuild media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch X-VCS-Directories: media-gfx/brlcad/files/ media-gfx/brlcad/ X-VCS-Committer: dongxuli X-VCS-Committer-Name: Dongxu Li X-VCS-Revision: 44d4582768174b870467ada6faa89eb6fe9be554 Date: Mon, 26 Sep 2011 14:42:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d99a485236192538f211b57b0a9b4c4c commit: 44d4582768174b870467ada6faa89eb6fe9be554 Author: Dongxu Li gmail com> AuthorDate: Mon Sep 26 14:35:27 2011 +0000 Commit: Dongxu Li gmail com> CommitDate: Mon Sep 26 14:35:27 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D44d45827 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 @@ =20 *brlcad-7.20.2 (15 Jul 2011) =20 + 26 Sep 2011; Dongxu Li brlcad-7.20.2.ebuild: + Included libpng15 patch by Ian Stakenvicius, bug#378273 + 18 Aug 2011; Dongxu Li brlcad-9999.ebuild: Fixed an ebuild configuration issue =20 diff --git a/media-gfx/brlcad/brlcad-7.20.2.ebuild b/media-gfx/brlcad/brl= cad-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=3D"${RDEPEND} doc? ( dev-libs/libxslt )" =20 BRLCAD_DIR=3D"${EPREFIX}/usr/${PN}" +src_prepare() { + epatch "${FILESDIR}/${PN}-7.18.4-libpng15.patch" +} =20 src_configure() { local myconf=3D"--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 + #include "bio.h" +=20 ++#include /* 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 + #endif +=20 ++#include "zlib.h" + #include "png.h" + #include "bu.h" + #include "fb.h" +=20 + #include "pkg.h" +=20 +- + /* in cmap-crunch.c */ + extern void cmap_crunch(RGBpixel (*scan_buf), int pixel_ct, ColorMap *c= olormap); +=20 +--- 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" +=20 + #include "zlib.h" +-#include "pngconf.h" ++/* removed as png.h includes this and including it in the wrong order s= eems to cause bugs ++#include "pngconf.h" */ + #include "png.h" +=20 + #include "bu.h"