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 1Qszec-0002oX-KN for garchives@archives.gentoo.org; Mon, 15 Aug 2011 16:04:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BA3721C24B for ; Mon, 15 Aug 2011 16:04:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BE9A321C0CF for ; Mon, 15 Aug 2011 15:18:48 +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 762061B4060 for ; Mon, 15 Aug 2011 15:18:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 88A0D80040 for ; Mon, 15 Aug 2011 15:18:46 +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: <4d94e6f56b4c62a12de2ceb9d54d8036b5b74bce.dongxuli@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/ X-VCS-Repository: proj/sci X-VCS-Files: media-gfx/brlcad/ChangeLog media-gfx/brlcad/brlcad-9999.ebuild X-VCS-Directories: media-gfx/brlcad/ X-VCS-Committer: dongxuli X-VCS-Committer-Name: Dongxu Li X-VCS-Revision: 4d94e6f56b4c62a12de2ceb9d54d8036b5b74bce Date: Mon, 15 Aug 2011 15:18:46 +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: 1565eb6970f5cf2fe1ef07cdacaf0d54 commit: 4d94e6f56b4c62a12de2ceb9d54d8036b5b74bce Author: Dongxu Li gmail com> AuthorDate: Mon Aug 15 15:18:40 2011 +0000 Commit: Dongxu Li gmail com> CommitDate: Mon Aug 15 15:18:40 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D4d94e6f5 media-gfx/brlcad: allow using of system tcl/tk --- media-gfx/brlcad/ChangeLog | 3 ++ media-gfx/brlcad/brlcad-9999.ebuild | 36 ++++++++++++++++++-----------= ----- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog index 95fa300..b8a2ad8 100644 --- a/media-gfx/brlcad/ChangeLog +++ b/media-gfx/brlcad/ChangeLog @@ -4,6 +4,9 @@ =20 *brlcad-7.20.2 (15 Jul 2011) =20 + 15 Aug 2011; Dongxu Li brlcad-9999.ebuild: + Enable using system tcl/tk for the svn live build + 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 diff --git a/media-gfx/brlcad/brlcad-9999.ebuild b/media-gfx/brlcad/brlca= d-9999.ebuild index 76d2544..6a25268 100644 --- a/media-gfx/brlcad/brlcad-9999.ebuild +++ b/media-gfx/brlcad/brlcad-9999.ebuild @@ -18,6 +18,8 @@ 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 @@ -44,12 +46,11 @@ BRLCAD_DIR=3D"${EPREFIX}/usr/${PN}" =20 src_prepare() { epatch "${FILESDIR}/${P}-cmake.patch" -} - -src_configure() { - #waiting for upstream to fix itck/itk issues for cmake - #have to enable tcl/tk local build, otherwise cmake won't be able to l= ink for - # -litcl -litk + 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 @@ -68,13 +69,12 @@ src_configure() { -DBRLCAD_BUILD_LOCAL_SCL=3DOFF -DBRLCAD-ENABLE_RTSERVER=3DOFF -DBRLCAD-ENABLE_JOVE=3DOFF - - -DBRLCAD_BUILD_LOCAL_IWIDGETS_FORCE_ON=3DON - -DBRLCAD_BUILD_LOCAL_TCL_FORCE_ON=3DON - -DBRLCAD_BUILD_LOCAL_TK_FORCE_ON=3DON - -DBRLCAD_BUILD_LOCAL_ITCL_FORCE_ON=3DON - -DBRLCAD_BUILD_LOCAL_ITK_FORCE_ON=3DON - + -DBRLCAD_BUILD_LOCAL_IWIDGETS=3DOFF + -DBRLCAD_BUILD_LOCAL_TCL=3DOFF + -DBRLCAD_BUILD_LOCAL_TK=3DOFF + -DBRLCAD_BUILD_LOCAL_ITCL=3DOFF + -DBRLCAD_BUILD_LOCAL_ITK=3DOFF + -DBRLCAD_BUILD_LOCAL_IWIDGETS_FORCE_ON=3DOFF ) =20 # use flag triggered options @@ -85,14 +85,16 @@ src_configure() { fi mycmakeargs+=3D( $(cmake-utils_use amd64 BRLCAD-ENABLE_64BIT) - $(cmake-utils_use aqua BRLCAD-ENABLE_AQUA) $(cmake-utils_use examples BRLCAD-INSTALL_EXAMPLE_GEOMETRY) - $(cmake-utils_use doc BRLCAD-BUILD_EXTRADOCS) - $(cmake-utils_use doc BRLCAD-BUILD_EXTRADOCS_PDF) - $(cmake-utils_use doc BRLCAD-BUILD_EXTRADOCS_MAN) + $(cmake-utils_use doc BRLCAD_EXTRADOCS) + $(cmake-utils_use doc BRLCAD_EXTRADOCS_PDF) + $(cmake-utils_use doc BRLCAD_EXTRADOCS_MAN) $(cmake-utils_use opengl BRLCAD-ENABLE_OPENGL) +#experimental RTGL support + $(cmake-utils_use opengl BRLCAD-ENABLE_RTGL) $(cmake-utils_use smp BRLCAD-ENABLE_SMP) $(cmake-utils_use debug BRLCAD-ENABLE_VERBOSE_PROGRESS) +# $(cmake-utils_use aqua BRLCAD-ENABLE_AQUA) # $(cmake-utils_use !debug BRLCAD-ENABLE_OPTIMIZED_BUILD) # $(cmake-utils_use !debug ) # $(cmake-utils_use debug BRLCAD-ENABLE_DEBUG_BUILD)