aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongxu Li <dongxuli2011@gmail.com>2011-12-16 08:23:28 -0500
committerDongxu Li <dongxuli2011@gmail.com>2011-12-16 08:23:28 -0500
commitee7ecc58311bae3397901ecdf960a3fb1fe873b3 (patch)
tree642d8c25e4ff815ffc17be74b36733ad2b67c300 /media-gfx
parentMerge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci (diff)
downloadsci-ee7ecc58311bae3397901ecdf960a3fb1fe873b3.tar.gz
sci-ee7ecc58311bae3397901ecdf960a3fb1fe873b3.tar.bz2
sci-ee7ecc58311bae3397901ecdf960a3fb1fe873b3.zip
media-gfx/brlcad: version bumped to 7.20.4
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/brlcad/ChangeLog3
-rw-r--r--media-gfx/brlcad/Manifest8
-rw-r--r--media-gfx/brlcad/brlcad-9999.ebuild53
3 files changed, 23 insertions, 41 deletions
diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index 8a2c8494e..694f48c55 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -4,6 +4,9 @@
*brlcad-7.20.2 (15 Jul 2011)
+ 16 Dec 2011; Dongxu Li <dongxuli2011@gmail.com> +brlcad-7.20.4.ebuild brlcad-9999.ebuild:
+ version bumped to 7.20.4; svn version updated
+
26 Sep 2011; Dongxu Li <dongxuli2011@gmail.com> brlcad-7.20.2.ebuild:
Included libpng15 patch by Ian Stakenvicius, bug#378273
diff --git a/media-gfx/brlcad/Manifest b/media-gfx/brlcad/Manifest
index 7ac70d0f3..3da2c9a37 100644
--- a/media-gfx/brlcad/Manifest
+++ b/media-gfx/brlcad/Manifest
@@ -1,9 +1,9 @@
AUX brlcad-7.18.4-libpng15.patch 959 RMD160 0b37aad5c6cdde4e29c6ccf760bfb2c74dfa32be SHA1 e3837e9ee11a3501f2f79a896eead580ce5b3a9d SHA256 c01ed2fb05443cbe1e7d70dd05df275105434cbf9023ac41ba3851749a8e86f4
-AUX brlcad-7.20.2-cmake.patch 855 RMD160 a5cdfe4f00113631c677662a6b05d9008ec96959 SHA1 4944966b897e3d89f6815db5164c975f432d0a0c SHA256 98f121ca6b78207f583ed70952ffa29c82787fd1febbaa781cf37a33a316d1f2
AUX brlcad-9999-cmake.patch 488 RMD160 51c1eaa27d2248f186746ad1b1b9c5ee32a9abbf SHA1 8f1e9ec4860bd9212892a185eafcfcd20137d328 SHA256 0131261e5ca51aeef5381e528feda1b5b4e24510c65f93861cb4d2ab1e4032b1
-AUX png_patch.diff 1171 RMD160 6faea89e2fcd65b5dc48e82a3cd343e4aba5b104 SHA1 509a912d0114599dcc600601d4eac04e614946b3 SHA256 066d0aec82e7e72d51d7dd3f5b12ce722e21e2b79382256e7e09aeb9a6a2a7e0
DIST brlcad-7.20.2.tar.gz 56219423 RMD160 b366d6956aa63f22ea14ed03f212e1a184eee429 SHA1 6d465398740a67572cfd9a8c3c6771e0b263d806 SHA256 879d21ff87808bf60956eec915b5bd6f1af1b4869145c239345f2a00267434ca
+DIST brlcad-7.20.4.tar.gz 70674938 RMD160 09ccbf8409a0edbb132ce689a8b425e1fba79124 SHA1 c94c848c8ec86cc43ad8c9df597c8e10fa0cac7d SHA256 ee6210890f9f2115613b40dc25af95091dc700b5cc1ae390758a62b64854b65e
EBUILD brlcad-7.20.2.ebuild 2652 RMD160 dfa398f9f3b5fa7cd2e3b7db9e7ab170bff01658 SHA1 5ae842287f9e3b43b6203071d4cb0a24e777e2e6 SHA256 a0861511e0162b2fd6025da1a99100967b4e9eeaf58643371ec51c5bfeafd5ed
-EBUILD brlcad-9999.ebuild 3661 RMD160 aa52d79587ab5ca2154176628035c61acf56da05 SHA1 1f4cc0732b9c9fb7758b1c9d314fd37aaee33dc4 SHA256 2a2c3a4c6bee71a22ad700e65e6d8d9a55ba29d330cea59028b3f480a21e8181
-MISC ChangeLog 4625 RMD160 326b5942aa35f9213773eb0c4fb15e06b6df2e24 SHA1 135f2fb2dc2d661f16a7c4adac3d8b11e7c53a1a SHA256 f58a37318ff2fae6995ef387a754a4af45510ac231ea332a92ae953e8681e21d
+EBUILD brlcad-7.20.4.ebuild 2854 RMD160 c5a8c62362791b2d133c89c2db02a1df2b7ed3a4 SHA1 b66065a557906ab87a8df7dcc9ca401ca1134fdd SHA256 a609d0861dde20d7f868d8c0c573b08e30ab3d63b9bbbb4358041ac59a175c2f
+EBUILD brlcad-9999.ebuild 2858 RMD160 8a560af7354b262120a6458027365e902ac21e47 SHA1 91af11a452d53e3ecc31a48f94f7f99376ddff1b SHA256 e501700578eed43dfe548b4ec1e43541704ca4e10ec9ee5d7ac350776b2e24d7
+MISC ChangeLog 4766 RMD160 e9155629c9121e1bc845eae036415d2ec6192be7 SHA1 d36b8d5d23e6a9f3fbdb7cd2b822078fadeeb94a SHA256 e737a3b110df74b99a819ea28e927a2aa44505ad1729a2b279381986318bbd80
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 33de02428..6aa7a2c93 100644
--- a/media-gfx/brlcad/brlcad-9999.ebuild
+++ b/media-gfx/brlcad/brlcad-9999.ebuild
@@ -3,7 +3,7 @@
# $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=4
-inherit cmake-utils eutils subversion java-pkg-2
+inherit cmake-utils eutils subversion java-pkg-2 flag-o-matic
DESCRIPTION="Constructive solid geometry modeling system"
HOMEPAGE="http://brlcad.org/"
@@ -49,6 +49,8 @@ src_prepare() {
}
src_configure() {
+filter-flags -std=c++0x
+filter-ldflags -Wl,--as-needed
if use Debug; then
CMAKE_BUILD_TYPE=Debug
else
@@ -56,28 +58,11 @@ src_configure() {
fi
local mycmakeargs=(
-DCMAKE_INSTALL_PREFIX="${BRLCAD_DIR}"
- -DBRLCAD-ENABLE_STRICT=OFF
- -DBRLCAD_BUILD_LOCAL_OPENNURBS=ON
- -DBUILD_STATIC_LIBS=OFF
- -DBRLCAD-ENABLE_X11=ON
- -DBRLCAD_BUILD_LOCAL_INCRTCL=OFF
- -DBRLCAD_BUILD_LOCAL_TKHTML=OFF
- -DBRLCAD_BUILD_LOCAL_TKPNG=OFF
- -DBRLCAD_BUILD_LOCAL_TKTABLE=OFF
- -DBRLCAD_BUILD_LOCAL_PNG=OFF
- -DBRLCAD_BUILD_LOCAL_REGEX=OFF
- -DBRLCAD_BUILD_LOCAL_ZLIB=OFF
- -DBRLCAD_BUILD_LOCAL_TERMLIB=OFF
- -DBRLCAD_BUILD_LOCAL_UTAHRLE=OFF
- -DBRLCAD_BUILD_LOCAL_SCL=OFF
- -DBRLCAD-ENABLE_RTSERVER=OFF
- -DBRLCAD-ENABLE_JOVE=OFF
- -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
+ -DBRLCAD_ENABLE_STRICT=OFF
+ -DBRLCAD_ENABLE_COMPILER_WARNINGS=OFF
+ -DBRLCAD_FLAGS_OPTIMIZATION=ON
+ -DBRLCAD_ENABLE_X11=ON
+ -DBRLCAD_BUNDLED_LIBS=AUTO
)
# use flag triggered options
@@ -87,23 +72,17 @@ src_configure() {
mycmakeargs += "-DCMAKE_BUILD_TYPE=Release"
fi
mycmakeargs+=(
- $(cmake-utils_use amd64 BRLCAD-ENABLE_64BIT)
- $(cmake-utils_use java BRLCAD-ENABLE_RTSERVER)
- $(cmake-utils_use examples BRLCAD-INSTALL_EXAMPLE_GEOMETRY)
+ $(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 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)
-# $(cmake-utils_use debug BRLCAD-ENABLE_RUNTIME_DEBUG)
-# $(cmake-utils_use debug BRLCAD-ENABLE_COMPILER_WARNINGS_LABEL)
+ $(cmake-utils_use debug BRLCAD_ENABLE_VERBOSE_PROGRESS)
)
cmake-utils_src_configure
}