diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-08-15 17:55:01 +0200 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-08-15 17:55:01 +0200 |
| commit | d8259ba519aff42805b7bb6208fee4d8f1534334 (patch) | |
| tree | 1bc400360ebdb27425de0de684f6d6d2d33f330a /media-gfx | |
| parent | Cleaned ebuilds (diff) | |
| parent | media-gfx/brlcad: allow using of system tcl/tk (diff) | |
| download | sci-d8259ba519aff42805b7bb6208fee4d8f1534334.tar.gz sci-d8259ba519aff42805b7bb6208fee4d8f1534334.tar.bz2 sci-d8259ba519aff42805b7bb6208fee4d8f1534334.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci
* 'master' of git+ssh://git.overlays.gentoo.org/proj/sci:
media-gfx/brlcad: allow using of system tcl/tk
[dev-lang/path64] Apply fix for bug #377111, use direct path for crt1.o
Added sample configuration files to numbench.
[sci-chemistry/votca-csg] renamed boost useflag
[sci-libs/votca-tools] renamed boost useflag
Updated numbench.
[sys-cluster/openmpi] Add slurm support by Nicolas Bigaouette <nbigaouette@gmail.com>
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/brlcad/ChangeLog | 3 | ||||
| -rw-r--r-- | media-gfx/brlcad/Manifest | 4 | ||||
| -rw-r--r-- | media-gfx/brlcad/brlcad-9999.ebuild | 36 |
3 files changed, 24 insertions, 19 deletions
diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog index 95fa30042..b8a2ad897 100644 --- a/media-gfx/brlcad/ChangeLog +++ b/media-gfx/brlcad/ChangeLog @@ -4,6 +4,9 @@ *brlcad-7.20.2 (15 Jul 2011) + 15 Aug 2011; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild: + Enable using system tcl/tk for the svn live build + 09 Aug 2011; Dongxu Li <dongxuli2011@gmail.com> +brlcad-9999.ebuild brlcad-7.20.2-r1.ebuild: No need to depend on cmake explicitly, added patch for libpng-1.5, added the subversion version brlcad-9999.ebuild diff --git a/media-gfx/brlcad/Manifest b/media-gfx/brlcad/Manifest index 19308c586..c7d4c89c4 100644 --- a/media-gfx/brlcad/Manifest +++ b/media-gfx/brlcad/Manifest @@ -4,6 +4,6 @@ AUX png_patch.diff 1171 RMD160 6faea89e2fcd65b5dc48e82a3cd343e4aba5b104 SHA1 509 DIST brlcad-7.20.2.tar.gz 56219423 RMD160 b366d6956aa63f22ea14ed03f212e1a184eee429 SHA1 6d465398740a67572cfd9a8c3c6771e0b263d806 SHA256 879d21ff87808bf60956eec915b5bd6f1af1b4869145c239345f2a00267434ca EBUILD brlcad-7.20.2-r1.ebuild 3548 RMD160 0bebb71647cc17c38b1b6a9dae19bd840437ef69 SHA1 758b59511d903251a42c09f1986fb167e77c170c SHA256 adaf01174244ecf5cb6b39adc3f42a21d06e45cca9023b857b5435b8bb808002 EBUILD brlcad-7.20.2.ebuild 2584 RMD160 b0e5363f18e894c77fdf18e340f3f354a977d782 SHA1 cb54a0b829fa9a433b37a185119a3c2568e7c42c SHA256 44d8d0987fab07c5e6b482649eb776fff4055bec021d6dbf8a2e8d66a430aec4 -EBUILD brlcad-9999.ebuild 3525 RMD160 d751d025c898a4b2af235e9cf0f47a4320e2f560 SHA1 e77768b4a4d078bb387b96ed90ef2bb016dd7fc2 SHA256 cbbfe6ca0ff4384cb7377b3e823171c6e00e68f15e41926d9d56a65e9e68de02 -MISC ChangeLog 4090 RMD160 8f8bc2eace4ec11bfa413f6a17d2da6cd22ee10c SHA1 60bf3d6ffe3df28dd8245ab93d527b7c78d9c742 SHA256 80fdceba558b4c4ca193177a1ff161282733af28da5eada53febcb5606a11806 +EBUILD brlcad-9999.ebuild 3533 RMD160 39e773df9336d7df3088a33cba70e0b6a64b65df SHA1 eaf7d503ba83cbfc0b54d9123d861b68c6d5c5c7 SHA256 4407990c82144a663b26fa95a53115d0bd4d4b7a17ca62f5b7c7bc1805120d88 +MISC ChangeLog 4213 RMD160 e805ab7d76e7eff3b0d6da5d02dee8c47e0739a0 SHA1 91f76bb14a569cf17c159038a6a0e9ce01033660 SHA256 f218cf2498a3f195ccc14ddbc58b564bc895791910cc6d27ce9dd8ef774bf780 MISC metadata.xml 1379 RMD160 7407a87496226206896ad41f07cbf1b4900faf05 SHA1 6fb2b9de93b48435f93a968de325d1b483160a63 SHA256 0374773ad63ea0e195813d44eeca951b9b756a73ad1fe034499532aef7e6078d diff --git a/media-gfx/brlcad/brlcad-9999.ebuild b/media-gfx/brlcad/brlcad-9999.ebuild index 76d25444d..6a2526870 100644 --- a/media-gfx/brlcad/brlcad-9999.ebuild +++ b/media-gfx/brlcad/brlcad-9999.ebuild @@ -18,6 +18,8 @@ RDEPEND="media-libs/libpng sys-libs/zlib >=sci-libs/tnt-3 sci-libs/jama + >=dev-lang/tcl-8.5 + >=dev-lang/tk-8.5 =dev-tcltk/itcl-3.4* =dev-tcltk/itk-3.4* dev-tcltk/iwidgets @@ -44,12 +46,11 @@ BRLCAD_DIR="${EPREFIX}/usr/${PN}" 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 link for - # -litcl -litk + if use Debug; then + CMAKE_BUILD_TYPE=Debug + else + CMAKE_BUILD_TYPE=Release + fi local mycmakeargs=( -DCMAKE_INSTALL_PREFIX="${BRLCAD_DIR}" -DBRLCAD-ENABLE_STRICT=OFF @@ -68,13 +69,12 @@ src_configure() { -DBRLCAD_BUILD_LOCAL_SCL=OFF -DBRLCAD-ENABLE_RTSERVER=OFF -DBRLCAD-ENABLE_JOVE=OFF - - -DBRLCAD_BUILD_LOCAL_IWIDGETS_FORCE_ON=ON - -DBRLCAD_BUILD_LOCAL_TCL_FORCE_ON=ON - -DBRLCAD_BUILD_LOCAL_TK_FORCE_ON=ON - -DBRLCAD_BUILD_LOCAL_ITCL_FORCE_ON=ON - -DBRLCAD_BUILD_LOCAL_ITK_FORCE_ON=ON - + -DBRLCAD_BUILD_LOCAL_IWIDGETS=OFF + -DBRLCAD_BUILD_LOCAL_TCL=OFF + -DBRLCAD_BUILD_LOCAL_TK=OFF + -DBRLCAD_BUILD_LOCAL_ITCL=OFF + -DBRLCAD_BUILD_LOCAL_ITK=OFF + -DBRLCAD_BUILD_LOCAL_IWIDGETS_FORCE_ON=OFF ) # use flag triggered options @@ -85,14 +85,16 @@ src_configure() { fi mycmakeargs+=( $(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) |