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 1Ru3nZ-0007Rt-D5 for garchives@archives.gentoo.org; Sun, 05 Feb 2012 15:14:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5B1EE05ED; Sun, 5 Feb 2012 15:14:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A3CC8E05ED for ; Sun, 5 Feb 2012 15:14:29 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0284A1B400C for ; Sun, 5 Feb 2012 15:14:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3E69080043 for ; Sun, 5 Feb 2012 15:14:28 +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: <463bf69b4b08b44cca93888602132e9f9016aa94.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.4.ebuild media-gfx/brlcad/files/brlcad-7.20.2-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: 463bf69b4b08b44cca93888602132e9f9016aa94 Date: Sun, 5 Feb 2012 15:14:28 +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: f0de210e-f110-49ad-a9bc-6a267c3b89c6 X-Archives-Hash: c42e1ddfcbc8a31739f49bd763bcc6a9 commit: 463bf69b4b08b44cca93888602132e9f9016aa94 Author: Dongxu Li gmail com> AuthorDate: Sun Feb 5 15:14:22 2012 +0000 Commit: Dongxu Li gmail com> CommitDate: Sun Feb 5 15:14:22 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D463bf69b media-gfx/brlcad: version bumped 7.20.4 --- media-gfx/brlcad/ChangeLog | 2 +- media-gfx/brlcad/brlcad-7.20.4.ebuild | 112 ++++++++++++++++= ++++++ media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch | 19 ---- media-gfx/brlcad/files/png_patch.diff | 48 --------- 4 files changed, 113 insertions(+), 68 deletions(-) diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog index 150102a..a1a1414 100644 --- a/media-gfx/brlcad/ChangeLog +++ b/media-gfx/brlcad/ChangeLog @@ -4,7 +4,7 @@ =20 *brlcad-7.20.2 (15 Jul 2011) =20 - 16 Dec 2011; Dongxu Li brlcad-9999.ebuild: + 5 Feb 2012; Dongxu Li brlcad-9999.ebuild: Use system libraries =20 16 Dec 2011; Dongxu Li +brlcad-7.20.4.ebuild = brlcad-9999.ebuild: diff --git a/media-gfx/brlcad/brlcad-7.20.4.ebuild b/media-gfx/brlcad/brl= cad-7.20.4.ebuild new file mode 100644 index 0000000..f150a45 --- /dev/null +++ b/media-gfx/brlcad/brlcad-7.20.4.ebuild @@ -0,0 +1,112 @@ +# 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 $ + +EAPI=3D4 +inherit cmake-utils eutils java-pkg-2 flag-o-matic + +DESCRIPTION=3D"Constructive solid geometry modeling system" +HOMEPAGE=3D"http://brlcad.org/" +SRC_URI=3D"mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE=3D"LGPL-2 BSD" +SLOT=3D"0" +KEYWORDS=3D"~amd64 ~x86" +IUSE=3D"benchmarks debug doc examples java opengl smp" + +RDEPEND=3D"media-libs/libpng + sys-libs/zlib + >=3Dsci-libs/tnt-3 + sci-libs/jama + >=3Ddev-lang/tcl-8.5 + >=3Ddev-lang/tk-8.5 + =3Ddev-tcltk/itcl-3.4* + =3Ddev-tcltk/itk-3.4* + dev-tcltk/iwidgets + dev-tcltk/tkimg + dev-tcltk/tkpng + sys-libs/libtermcap-compat + media-libs/urt + x11-libs/libXt + x11-libs/libXi + java? ( >=3Dvirtual/jre-1.5 ) + " + +DEPEND=3D"${RDEPEND} + sys-devel/bison + sys-devel/flex + dev-tcltk/tktable + >=3Dvirtual/jre-1.5 + doc? ( + dev-libs/libxslt + app-doc/doxygen + )" + +BRLCAD_DIR=3D"${EPREFIX}/usr/${PN}" + +src_prepare() { + epatch "${FILESDIR}/${PN}-9999-cmake.patch" +} + +src_configure() { +filter-flags -std=3Dc++0x +filter-ldflags -Wl,--as-needed + if use Debug; then + CMAKE_BUILD_TYPE=3DDebug + else + CMAKE_BUILD_TYPE=3DRelease + fi + local mycmakeargs=3D( + -DCMAKE_INSTALL_PREFIX=3D"${BRLCAD_DIR}" + -DBRLCAD_ENABLE_STRICT=3DOFF + -DBRLCAD-ENABLE_STRICT=3DOFF + -DBRLCAD-ENABLE_COMPILER_WARNINGS=3DOFF + -DBRLCAD_FLAGS_OPTIMIZATION=3DON + -DBRLCAD_ENABLE_X11=3DON + -DBRLCAD_BUNDLED_LIBS=3DAUTO + ) + + # use flag triggered options + if use debug; then + mycmakeargs +=3D "-DCMAKE_BUILD_TYPE=3DDebug" + else + mycmakeargs +=3D "-DCMAKE_BUILD_TYPE=3DRelease" + fi + mycmakeargs+=3D( + $(cmake-utils_use opengl BRLCAD_ENABLE_OPENGL) +#experimental RTGL support + # $(cmake-utils_use opengl BRLCAD_ENABLE_RTGL) + $(cmake-utils_use amd64 BRLCAD_ENABLE_64BIT) + $(cmake-utils_use smp BRLCAD_ENABLE_SMP) + # $(cmake-utils_use java BRLCAD_ENABLE_RTSERVER) + $(cmake-utils_use examples BRLCAD_INSTALL_EXAMPLE_GEOMETRY) + $(cmake-utils_use doc BRLCAD_EXTRADOCS) + $(cmake-utils_use doc BRLCAD_EXTRADOCS_PDF) + $(cmake-utils_use doc BRLCAD_EXTRADOCS_MAN) + $(cmake-utils_use debug BRLCAD_ENABLE_VERBOSE_PROGRESS) + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_test() { + cmake-utils_src_test + #emake check || die "emake check failed" + if use benchmarks; then + emake benchmark || die "emake benchmark failed" + fi +} + +src_install() { + cmake-utils_src_install + rm -f "${D}"usr/share/brlcad/{README,NEWS,AUTHORS,HACKING,INSTALL,COPYI= NG} + dodoc AUTHORS NEWS README HACKING TODO BUGS ChangeLog + echo "PATH=3D\"${BRLCAD_DIR}/bin\"" > 99brlcad + echo "MANPATH=3D\"${BRLCAD_DIR}/man\"" >> 99brlcad + doenvd 99brlcad || die + newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png brlcad.p= ng + make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering" +} diff --git a/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch b/media-gfx= /brlcad/files/brlcad-7.20.2-cmake.patch deleted file mode 100644 index 7635211..0000000 --- a/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- old/CMakeLists.txt 2011-07-14 16:14:18.053187225 -0400 -+++ new/CMakeLists.txt 2011-07-14 16:14:39.073507247 -0400 -@@ -1187,14 +1187,14 @@ - SET(PATH_LABELS CMAKE_INSTALL_PREFIX BIN_DIR MAN_DIR CONF_DIR DATA_DIR= ) - SET(PATH_LABEL_LENGTH 0) - FOREACH(path_label ${PATH_LABELS}) -- STRING(LENGTH ${${path_label}_LABEL} CURRENT_LENGTH) -+ STRING(LENGTH "${${path_label}_LABEL}" CURRENT_LENGTH) - if (${CURRENT_LENGTH} GREATER ${PATH_LABEL_LENGTH}) - SET(PATH_LABEL_LENGTH ${CURRENT_LENGTH}) - endif() - 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) \ No newline at end of file diff --git a/media-gfx/brlcad/files/png_patch.diff b/media-gfx/brlcad/fil= es/png_patch.diff deleted file mode 100644 index bdae6ba..0000000 --- a/media-gfx/brlcad/files/png_patch.diff +++ /dev/null @@ -1,48 +0,0 @@ -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"