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 1QqwjW-0003KX-DY for garchives@archives.gentoo.org; Wed, 10 Aug 2011 00:33:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5318C21C03C; Wed, 10 Aug 2011 00:33:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0880E21C03C for ; Wed, 10 Aug 2011 00:33:07 +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 25A421B404B for ; Wed, 10 Aug 2011 00:33:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3DFEF80040 for ; Wed, 10 Aug 2011 00:33:06 +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: <43cea46b844c44ef2ea20f8b8dc9bbbb62ae7024.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-r1.ebuild media-gfx/brlcad/brlcad-9999.ebuild media-gfx/brlcad/files/brlcad-9999-cmake.patch media-gfx/brlcad/files/png_patch.diff X-VCS-Directories: media-gfx/brlcad/files/ media-gfx/brlcad/ X-VCS-Committer: dongxuli X-VCS-Committer-Name: Dongxu Li X-VCS-Revision: 43cea46b844c44ef2ea20f8b8dc9bbbb62ae7024 Date: Wed, 10 Aug 2011 00:33:06 +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: d255f03904dac396719d80825f4863d4 commit: 43cea46b844c44ef2ea20f8b8dc9bbbb62ae7024 Author: Dongxu Li gmail com> AuthorDate: Wed Aug 10 00:31:52 2011 +0000 Commit: Dongxu Li gmail com> CommitDate: Wed Aug 10 00:31:52 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D43cea46b media-gfx/brlcad: fixed libpng-1.5, added version 9999 back --- media-gfx/brlcad/ChangeLog | 5 +- media-gfx/brlcad/brlcad-7.20.2-r1.ebuild | 4 +- ...{brlcad-7.20.2-r1.ebuild =3D> brlcad-9999.ebuild} | 5 +- media-gfx/brlcad/files/brlcad-9999-cmake.patch | 11 +++++ media-gfx/brlcad/files/png_patch.diff | 48 ++++++++++++++= ++++++ 5 files changed, 65 insertions(+), 8 deletions(-) diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog index 0f8d166..95fa300 100644 --- a/media-gfx/brlcad/ChangeLog +++ b/media-gfx/brlcad/ChangeLog @@ -4,9 +4,8 @@ =20 *brlcad-7.20.2 (15 Jul 2011) =20 - 09 Aug 2011; Dongxu Li brlcad-7.20.2-r1.ebuil= d: - No need to depend on cmake explicitly - + 09 Aug 2011; Dongxu Li +brlcad-9999.ebuild br= lcad-7.20.2-r1.ebuild: + No need to depend on cmake explicitly, added patch for libpng-1.5, add= ed the subversion version brlcad-9999.ebuild =20 15 Jul 2011; Dongxu Li brlcad-7.20.2-r1.ebuil= d: Patching of CMakeLists.txt still needed. Since upstream already fixed = this problem, the patch won't be necessary after the current release=20 diff --git a/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild b/media-gfx/brlcad/= brlcad-7.20.2-r1.ebuild index de49dac..4a42be0 100644 --- a/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild +++ b/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild @@ -45,6 +45,7 @@ BRLCAD_DIR=3D"${EPREFIX}/usr/${PN}" =20 src_prepare() { epatch "${FILESDIR}/${P}-cmake.patch" + epatch "${FILESDIR}/png_patch.diff" } =20 src_configure() { @@ -63,13 +64,12 @@ src_configure() { -DBRLCAD_BUILD_LOCAL_TKTABLE=3DOFF -DBRLCAD_BUILD_LOCAL_PNG=3DOFF -DBRLCAD_BUILD_LOCAL_REGEX=3DOFF - -DBRLCAD_BUILD_LOCAL_ZLIB=3DOFF -DBRLCAD_BUILD_LOCAL_TERMLIB=3DOFF -DBRLCAD_BUILD_LOCAL_UTAHRLE=3DOFF -DBRLCAD_BUILD_LOCAL_SCL=3DOFF -DBRLCAD-ENABLE_RTSERVER=3DOFF -DBRLCAD-ENABLE_JOVE=3DOFF - + -DBRLCAD_BUILD_LOCAL_ZLIB=3DOFF -DBRLCAD_BUILD_LOCAL_IWIDGETS_FORCE_ON=3DON -DBRLCAD_BUILD_LOCAL_TCL_FORCE_ON=3DON -DBRLCAD_BUILD_LOCAL_TK_FORCE_ON=3DON diff --git a/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild b/media-gfx/brlcad/= brlcad-9999.ebuild similarity index 96% copy from media-gfx/brlcad/brlcad-7.20.2-r1.ebuild copy to media-gfx/brlcad/brlcad-9999.ebuild index de49dac..76d2544 100644 --- a/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild +++ b/media-gfx/brlcad/brlcad-9999.ebuild @@ -3,12 +3,11 @@ # $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/brlcad-7.18.4.ebuild= ,v 1.1 2011/04/18 22:47:37 dilfridge Exp $ =20 EAPI=3D4 -inherit cmake-utils eutils +inherit cmake-utils eutils subversion =20 DESCRIPTION=3D"Constructive solid geometry modeling system" HOMEPAGE=3D"http://brlcad.org/" -SRC_URI=3D"mirror://sourceforge/${PN}/${P}.tar.gz" -# CMAKE_MIN_VERSION=3D"2.8" +ESVN_REPO_URI=3D"https://brlcad.svn.sourceforge.net/svnroot/${PN}/${PN}/= trunk" =20 LICENSE=3D"LGPL-2 BSD" SLOT=3D"0" diff --git a/media-gfx/brlcad/files/brlcad-9999-cmake.patch b/media-gfx/b= rlcad/files/brlcad-9999-cmake.patch new file mode 100644 index 0000000..d85af69 --- /dev/null +++ b/media-gfx/brlcad/files/brlcad-9999-cmake.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2011-08-09 16:41:03.073611709 -0400 ++++ b/CMakeLists.txt 2011-08-09 16:41:22.943844346 -0400 +@@ -1221,7 +1221,7 @@ + ENDFOREACH() + FOREACH(path_label ${PATH_LABELS}) + SET(CURRENT_LABEL ${${path_label}_LABEL}) +- STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH) ++ STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH) + WHILE(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH}) + SET(CURRENT_LABEL " ${CURRENT_LABEL}") + STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH) diff --git a/media-gfx/brlcad/files/png_patch.diff b/media-gfx/brlcad/fil= es/png_patch.diff new file mode 100644 index 0000000..bdae6ba --- /dev/null +++ b/media-gfx/brlcad/files/png_patch.diff @@ -0,0 +1,48 @@ +Index: src/other/libpng.dist +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- src/other/libpng.dist (revision 45616) ++++ src/other/libpng.dist (revision 45617) +@@ -8,7 +8,6 @@ + configure.ac + contrib + example.c +-libpng-1.4.5.txt + libpng-config.in + libpng.3 + libpng.pc.in +Index: src/libged/png.c +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- src/libged/png.c (revision 45616) ++++ src/libged/png.c (revision 45617) +@@ -30,6 +30,7 @@ + #include + #include "bio.h" +=20 ++#include "zlib.h" + #include "png.h" + #include "bu.h" + #include "vmath.h" +Index: src/fb/fb-png.c +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- src/fb/fb-png.c (revision 45616) ++++ src/fb/fb-png.c (revision 45617) +@@ -38,6 +38,7 @@ + # include + #endif +=20 ++#include "zlib.h" + #include "png.h" + #include "bu.h" + #include "fb.h" +Index: src/util/pix-png.c +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- src/util/pix-png.c (revision 45616) ++++ src/util/pix-png.c (revision 45617) +@@ -36,7 +36,6 @@ + #include "bio.h" +=20 + #include "zlib.h" +-#include "pngconf.h" + #include "png.h" +=20 + #include "bu.h"