From ec95075214f59c5475a90cbd50631d4a1dbe6141 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Wed, 3 Mar 2010 15:47:50 +0000 Subject: Added benchmarks which can be run if the tests are enabled. Added a desktop entry, and itk/itcl library path to the LDPATH environment Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- sci-misc/brlcad/ChangeLog | 9 ++- sci-misc/brlcad/Manifest | 12 ++-- sci-misc/brlcad/brlcad-7.16.6-r1.ebuild | 99 +++++++++++++++++++++++++++++++++ sci-misc/brlcad/brlcad-7.16.6.ebuild | 90 ------------------------------ sci-misc/brlcad/metadata.xml | 34 ++++++----- 5 files changed, 132 insertions(+), 112 deletions(-) create mode 100644 sci-misc/brlcad/brlcad-7.16.6-r1.ebuild delete mode 100644 sci-misc/brlcad/brlcad-7.16.6.ebuild (limited to 'sci-misc/brlcad') diff --git a/sci-misc/brlcad/ChangeLog b/sci-misc/brlcad/ChangeLog index eb501c3ec980..30a7130230f4 100644 --- a/sci-misc/brlcad/ChangeLog +++ b/sci-misc/brlcad/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-misc/brlcad # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/brlcad/ChangeLog,v 1.3 2010/02/28 03:35:06 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-misc/brlcad/ChangeLog,v 1.4 2010/03/03 15:47:50 bicatali Exp $ + +*brlcad-7.16.6-r1 (03 Mar 2010) + + 03 Mar 2010; Sébastien Fabbro + -brlcad-7.16.6.ebuild, +brlcad-7.16.6-r1.ebuild, metadata.xml: + Added benchmarks which can be run if the tests are enabled. Added a + desktop entry, and itk/itcl library path to the LDPATH environment 28 Feb 2010; Sébastien Fabbro brlcad-7.16.6.ebuild: Filtered -Werror, still creating problems (bug #307061) diff --git a/sci-misc/brlcad/Manifest b/sci-misc/brlcad/Manifest index 2b1fa9b23623..931390f5fc99 100644 --- a/sci-misc/brlcad/Manifest +++ b/sci-misc/brlcad/Manifest @@ -4,13 +4,13 @@ Hash: SHA1 AUX brlcad-7.16.6-as-needed.patch 523 RMD160 6517dca7843970851e09b9e3194e2bdef617859a SHA1 feeff9d7a85dc8279e2b7b26f0faef8da607c079 SHA256 ab12e2495092f72caff79c949b50b3a5a1b0375ed0093a1bece01176ae32b219 AUX brlcad-7.16.6-stl-headers.patch 333 RMD160 5153582f424147c48cbad22578bb51a2c6108bb2 SHA1 8e6b418c4ec3eed61e42f55560fc98abd1ce9a47 SHA256 3a04fbf6188502a7f4e84243e9a5879a15943a352f36ea7e6d23a1fe6e93f9ad DIST brlcad-7.16.6.tar.gz 51570642 RMD160 d4d460de8f035e355c8213b7bb37145f19181e99 SHA1 b04cb61edcc18ad6d2239e00725e5a3efad92b3c SHA256 5329f1e13e952c6bbc9b2c665e38be7c764674eb82d16c70ee8074063a8eaecd -EBUILD brlcad-7.16.6.ebuild 2483 RMD160 0f59337d71a86ca317a8fc0defb01fad1705221c SHA1 be1dac8c0af7778f7e3e9d4845c11ddad425c7e1 SHA256 b5c9dbb77bf71e0f7c4299e0726ade45173d111a5bfcc38c4107f2ef1125d0d9 -MISC ChangeLog 1892 RMD160 9145bdc4260ad8541501ca78050a370ba4309e08 SHA1 75d07bed38dcc80f20d070139d70130ea547a5a0 SHA256 018a6c7bcf39003d9bc4e2bdf3aead55cf8befd0a67d28f1a469ccced2b2ba57 -MISC metadata.xml 993 RMD160 2d5c3e246d2a1ce29f86d2de3e7e1ee1edfc6439 SHA1 a1388baccc66f393c78915d72f2a96a4bcb92156 SHA256 b3dd606feb759dba2840423c656bb78dfd324dd2e95f1def30a8340c090b8c19 +EBUILD brlcad-7.16.6-r1.ebuild 2858 RMD160 509cd9f7a824657292559beb0a1c21308e766c1a SHA1 cd1d495bde4ab8c11721208c6007933af37b3eb4 SHA256 b952fdb3c32867ca5347505773722a2b8ef09b31b810d48eefa3161bfa7e2b5c +MISC ChangeLog 2185 RMD160 70bdb9633225e96110ec085627a24a0de60340e7 SHA1 8b91aadcffb6f0306d06aaa985b309165e2c75a2 SHA256 ba7bc44ce21904638556b2d2f560571028fff6eaf64f4f5460378f19ae7c3263 +MISC metadata.xml 1134 RMD160 97574ea4a585a042247f2a7dda9371beb8158f24 SHA1 be8ee76ded1a045f3ab4df019452df55065fce2c SHA256 05f016d00b5b6011a13e0d1e0454f8017bd0f177f7d05d3836620e92487027ac -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuJ5HMACgkQ1ycZbhPLE2D2LgCgisNRALR3/4H2zYwtdFwJj/14 -+poAoKZwF/IWSJgjV56YWtGMg6UIqzdI -=/UVs +iEYEARECAAYFAkuOhLAACgkQ1ycZbhPLE2CB4gCfYwtYM6gwIdwIVb7ymqRYFdgP +G24AoIcI7IzbReeFmX8qQErA2FuubXGD +=z+GG -----END PGP SIGNATURE----- diff --git a/sci-misc/brlcad/brlcad-7.16.6-r1.ebuild b/sci-misc/brlcad/brlcad-7.16.6-r1.ebuild new file mode 100644 index 000000000000..561bd4555dda --- /dev/null +++ b/sci-misc/brlcad/brlcad-7.16.6-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-misc/brlcad/brlcad-7.16.6-r1.ebuild,v 1.1 2010/03/03 15:47:50 bicatali Exp $ + +EAPI=2 +inherit eutils java-pkg-opt-2 + +DESCRIPTION="Constructive solid geometry modeling system" +HOMEPAGE="http://brlcad.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2 BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="benchmarks +debug doc examples java opengl smp X" + +RDEPEND="media-libs/libpng + sys-libs/zlib + >=sci-libs/tnt-3 + sci-libs/jama + dev-tcltk/itcl + dev-tcltk/itk + dev-tcltk/iwidgets + dev-tcltk/tkimg + sys-libs/libtermcap-compat + media-libs/urt + java? ( >=virtual/jre-1.5 ) + X? ( x11-libs/libXt x11-libs/libXi )" + +DEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex + java? ( >=virtual/jdk-1.5 ) + doc? ( dev-libs/libxslt )" + +BRLCAD_DIR="/usr/${PN}" + +src_prepare() { + #patch a simple Makefile.in since the Makefile.am would need + # a full and slow autoreconf of many directories + epatch "${FILESDIR}"/${P}-as-needed.patch + epatch "${FILESDIR}"/${P}-stl-headers.patch +} + +src_configure() { + local myitcl="/usr/$(get_libdir)/itcl3.4" myitk="/usr/$(get_libdir)/itk3.4" + export LD_LIBRARY_PATH="${myitcl}:${myitk}:${LD_LIBRARY_PATH}" + econf \ + --disable-strict-build \ + --prefix="${BRLCAD_DIR}" \ + --datadir="/usr/share/${PN}" \ + --mandir="${BRLCAD_DIR}/man" \ + --disable-almost-everything \ + --disable-regex-build \ + --disable-png-build \ + --disable-zlib-build \ + --disable-urt-build \ + --disable-tcl-build \ + --disable-tk-build \ + --disable-itcl-build \ + --disable-tkimg-build \ + --disable-jove-build \ + --disable-tnt-install \ + --disable-iwidgets-install \ + --enable-opennurbs-build \ + --with-ldflags="-L${myitcl} -L${myitk}" \ + $(use_enable debug) \ + $(use_enable debug optimization) \ + $(use_enable debug runtime-debug) \ + $(use_enable debug verbose) \ + $(use_enable debug warnings) \ + $(use_enable debug progress) \ + $(use_enable doc documentation) \ + $(use_enable examples models-install) \ + $(use_enable smp parallel) \ + $(use_with java jdk $(java-config -O)) \ + $(use_with opengl ogl) \ + $(use_with X x) \ + $(use_with X x11) +} + +src_test() { + emake check || die "emake check failed" + if use benchmarks; then + emake benchmark || die "emake benchmark failed" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + rm -f "${D}"usr/share/brlcad/${README,NEWS,AUTHORS,HACKING,INSTALL,COPYING} + dodoc AUTHORS NEWS README HACKING TODO BUGS ChangeLog + echo "PATH=${BRLCAD_DIR}/bin" > 99brlcad + echo "MANPATH=${BRLCAD_DIR}/man" >> 99brlcad + echo "LDPATH=${myitcl}:${myitk}" >> 99brlcad + doenvd 99brlcad || die + newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png brlcad.png + make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering" +} diff --git a/sci-misc/brlcad/brlcad-7.16.6.ebuild b/sci-misc/brlcad/brlcad-7.16.6.ebuild deleted file mode 100644 index f7e123ce55c7..000000000000 --- a/sci-misc/brlcad/brlcad-7.16.6.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/brlcad/brlcad-7.16.6.ebuild,v 1.3 2010/02/28 03:35:06 bicatali Exp $ - -EAPI=2 -inherit eutils java-pkg-opt-2 - -DESCRIPTION="Constructive solid geometry modeling system" -HOMEPAGE="http://brlcad.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2 BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+debug doc examples java opengl smp X" - -RDEPEND="media-libs/libpng - sys-libs/zlib - >=sci-libs/tnt-3 - sci-libs/jama - dev-tcltk/itcl - dev-tcltk/itk - dev-tcltk/iwidgets - dev-tcltk/tkimg - sys-libs/libtermcap-compat - media-libs/urt - java? ( >=virtual/jre-1.5 ) - X? ( x11-libs/libXt x11-libs/libXi )" - -DEPEND="${RDEPEND} - sys-devel/bison - sys-devel/flex - java? ( >=virtual/jdk-1.5 ) - doc? ( dev-libs/libxslt )" - -BRLCAD_DIR="/usr/${PN}" - -src_prepare() { - #patch a simple Makefile.in since the Makefile.am would need - #a full and slow autoreconf of many directories - epatch "${FILESDIR}"/${P}-as-needed.patch - epatch "${FILESDIR}"/${P}-stl-headers.patch - # hack for 7.16.6 only (bug #307061) - sed -i -e 's/-Werror//g' configure || die -} - -src_configure() { - local myitcl="/usr/$(get_libdir)/itcl3.4" - local myitk="/usr/$(get_libdir)/itk3.4" - econf \ - --prefix="${BRLCAD_DIR}" \ - --datadir="/usr/share/${PN}" \ - --mandir="${BRLCAR_DIR}/man" \ - --disable-almost-everything \ - --disable-regex-build \ - --disable-png-build \ - --disable-zlib-build \ - --disable-urt-build \ - --disable-tcl-build \ - --disable-tk-build \ - --disable-itcl-build \ - --disable-tkimg-build \ - --disable-jove-build \ - --disable-tnt-install \ - --disable-iwidgets-install \ - --enable-opennurbs-build \ - --with-ldflags="-L${myitcl} -L${myitk}" \ - $(use_enable debug) \ - $(use_enable debug optimization) \ - $(use_enable debug runtime-debug) \ - $(use_enable debug strict-build) \ - $(use_enable debug verbose) \ - $(use_enable debug warnings) \ - $(use_enable debug progress) \ - $(use_enable doc documentation) \ - $(use_enable examples models-install) \ - $(use_enable smp parallel) \ - $(use_with java jdk $(java-config -O)) \ - $(use_with opengl ogl) \ - $(use_with X x) \ - $(use_with X x11) \ - LD_LIBRARY_PATH="${myitcl}:${myitk}:${LD_LIBRARY_PATH}" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - echo "PATH=${BRLCAD_DIR}/bin" > 99brlcad - echo "MANPATH=${BRLCAD_DIR}/man" >> 99brlcad - doenvd 99brlcad || die -} diff --git a/sci-misc/brlcad/metadata.xml b/sci-misc/brlcad/metadata.xml index ce48108a6e6c..c3f3490ea05e 100644 --- a/sci-misc/brlcad/metadata.xml +++ b/sci-misc/brlcad/metadata.xml @@ -3,20 +3,24 @@ sci -BRL-CAD is a Combinatorial/Constructive Solid Geometry (CSG) -solid modeling system that includes an interactive geometry editor, -ray-tracing support for rendering and geometric analysis, -network-distributed framebuffer support, image and signal-processing -tools, and an embedded scripting language. - -The package is a collection of over 400 tools and utilities. Included -is support for various geometric data format conversions, image and -signal processing capabilities, ray-tracing based lighting models, -network distributed ray-tracing, parallel ray-tracing, animation -capabilities, data compression, image handling, and interactive 3-D -geometric editing, and also an implementation of Weiler's n-Manifold -Geometry (NMG) data structures for surface-based solid models and -photon mapping. + BRL-CAD is a Combinatorial/Constructive Solid Geometry (CSG) + solid modeling system that includes an interactive geometry editor, + ray-tracing support for rendering and geometric analysis, + network-distributed framebuffer support, image and signal-processing + tools, and an embedded scripting language. + + The package is a collection of over 400 tools and utilities. Included + is support for various geometric data format conversions, image and + signal processing capabilities, ray-tracing based lighting models, + network distributed ray-tracing, parallel ray-tracing, animation + capabilities, data compression, image handling, and interactive 3-D + geometric editing, and also an implementation of Weiler's n-Manifold + Geometry (NMG) data structures for surface-based solid models and + photon mapping. + + + Run benchmarks during test phase (need test option enabled) + + - -- cgit v1.2.3-65-gdbad