1 |
commit: 463bf69b4b08b44cca93888602132e9f9016aa94 |
2 |
Author: Dongxu Li <dongxuli2011 <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Feb 5 15:14:22 2012 +0000 |
4 |
Commit: Dongxu Li <dongxuli2011 <AT> gmail <DOT> com> |
5 |
CommitDate: Sun Feb 5 15:14:22 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=463bf69b |
7 |
|
8 |
media-gfx/brlcad: version bumped 7.20.4 |
9 |
|
10 |
--- |
11 |
media-gfx/brlcad/ChangeLog | 2 +- |
12 |
media-gfx/brlcad/brlcad-7.20.4.ebuild | 112 ++++++++++++++++++++++ |
13 |
media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch | 19 ---- |
14 |
media-gfx/brlcad/files/png_patch.diff | 48 --------- |
15 |
4 files changed, 113 insertions(+), 68 deletions(-) |
16 |
|
17 |
diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog |
18 |
index 150102a..a1a1414 100644 |
19 |
--- a/media-gfx/brlcad/ChangeLog |
20 |
+++ b/media-gfx/brlcad/ChangeLog |
21 |
@@ -4,7 +4,7 @@ |
22 |
|
23 |
*brlcad-7.20.2 (15 Jul 2011) |
24 |
|
25 |
- 16 Dec 2011; Dongxu Li <dongxuli2011@×××××.com> brlcad-9999.ebuild: |
26 |
+ 5 Feb 2012; Dongxu Li <dongxuli2011@×××××.com> brlcad-9999.ebuild: |
27 |
Use system libraries |
28 |
|
29 |
16 Dec 2011; Dongxu Li <dongxuli2011@×××××.com> +brlcad-7.20.4.ebuild brlcad-9999.ebuild: |
30 |
|
31 |
diff --git a/media-gfx/brlcad/brlcad-7.20.4.ebuild b/media-gfx/brlcad/brlcad-7.20.4.ebuild |
32 |
new file mode 100644 |
33 |
index 0000000..f150a45 |
34 |
--- /dev/null |
35 |
+++ b/media-gfx/brlcad/brlcad-7.20.4.ebuild |
36 |
@@ -0,0 +1,112 @@ |
37 |
+# Copyright 1999-2011 Gentoo Foundation |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/brlcad-7.18.4.ebuild,v 1.1 2011/04/18 22:47:37 dilfridge Exp $ |
40 |
+ |
41 |
+EAPI=4 |
42 |
+inherit cmake-utils eutils java-pkg-2 flag-o-matic |
43 |
+ |
44 |
+DESCRIPTION="Constructive solid geometry modeling system" |
45 |
+HOMEPAGE="http://brlcad.org/" |
46 |
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
47 |
+ |
48 |
+LICENSE="LGPL-2 BSD" |
49 |
+SLOT="0" |
50 |
+KEYWORDS="~amd64 ~x86" |
51 |
+IUSE="benchmarks debug doc examples java opengl smp" |
52 |
+ |
53 |
+RDEPEND="media-libs/libpng |
54 |
+ sys-libs/zlib |
55 |
+ >=sci-libs/tnt-3 |
56 |
+ sci-libs/jama |
57 |
+ >=dev-lang/tcl-8.5 |
58 |
+ >=dev-lang/tk-8.5 |
59 |
+ =dev-tcltk/itcl-3.4* |
60 |
+ =dev-tcltk/itk-3.4* |
61 |
+ dev-tcltk/iwidgets |
62 |
+ dev-tcltk/tkimg |
63 |
+ dev-tcltk/tkpng |
64 |
+ sys-libs/libtermcap-compat |
65 |
+ media-libs/urt |
66 |
+ x11-libs/libXt |
67 |
+ x11-libs/libXi |
68 |
+ java? ( >=virtual/jre-1.5 ) |
69 |
+ " |
70 |
+ |
71 |
+DEPEND="${RDEPEND} |
72 |
+ sys-devel/bison |
73 |
+ sys-devel/flex |
74 |
+ dev-tcltk/tktable |
75 |
+ >=virtual/jre-1.5 |
76 |
+ doc? ( |
77 |
+ dev-libs/libxslt |
78 |
+ app-doc/doxygen |
79 |
+ )" |
80 |
+ |
81 |
+BRLCAD_DIR="${EPREFIX}/usr/${PN}" |
82 |
+ |
83 |
+src_prepare() { |
84 |
+ epatch "${FILESDIR}/${PN}-9999-cmake.patch" |
85 |
+} |
86 |
+ |
87 |
+src_configure() { |
88 |
+filter-flags -std=c++0x |
89 |
+filter-ldflags -Wl,--as-needed |
90 |
+ if use Debug; then |
91 |
+ CMAKE_BUILD_TYPE=Debug |
92 |
+ else |
93 |
+ CMAKE_BUILD_TYPE=Release |
94 |
+ fi |
95 |
+ local mycmakeargs=( |
96 |
+ -DCMAKE_INSTALL_PREFIX="${BRLCAD_DIR}" |
97 |
+ -DBRLCAD_ENABLE_STRICT=OFF |
98 |
+ -DBRLCAD-ENABLE_STRICT=OFF |
99 |
+ -DBRLCAD-ENABLE_COMPILER_WARNINGS=OFF |
100 |
+ -DBRLCAD_FLAGS_OPTIMIZATION=ON |
101 |
+ -DBRLCAD_ENABLE_X11=ON |
102 |
+ -DBRLCAD_BUNDLED_LIBS=AUTO |
103 |
+ ) |
104 |
+ |
105 |
+ # use flag triggered options |
106 |
+ if use debug; then |
107 |
+ mycmakeargs += "-DCMAKE_BUILD_TYPE=Debug" |
108 |
+ else |
109 |
+ mycmakeargs += "-DCMAKE_BUILD_TYPE=Release" |
110 |
+ fi |
111 |
+ mycmakeargs+=( |
112 |
+ $(cmake-utils_use opengl BRLCAD_ENABLE_OPENGL) |
113 |
+#experimental RTGL support |
114 |
+ # $(cmake-utils_use opengl BRLCAD_ENABLE_RTGL) |
115 |
+ $(cmake-utils_use amd64 BRLCAD_ENABLE_64BIT) |
116 |
+ $(cmake-utils_use smp BRLCAD_ENABLE_SMP) |
117 |
+ # $(cmake-utils_use java BRLCAD_ENABLE_RTSERVER) |
118 |
+ $(cmake-utils_use examples BRLCAD_INSTALL_EXAMPLE_GEOMETRY) |
119 |
+ $(cmake-utils_use doc BRLCAD_EXTRADOCS) |
120 |
+ $(cmake-utils_use doc BRLCAD_EXTRADOCS_PDF) |
121 |
+ $(cmake-utils_use doc BRLCAD_EXTRADOCS_MAN) |
122 |
+ $(cmake-utils_use debug BRLCAD_ENABLE_VERBOSE_PROGRESS) |
123 |
+ ) |
124 |
+ cmake-utils_src_configure |
125 |
+} |
126 |
+ |
127 |
+src_compile() { |
128 |
+ cmake-utils_src_compile |
129 |
+} |
130 |
+ |
131 |
+src_test() { |
132 |
+ cmake-utils_src_test |
133 |
+ #emake check || die "emake check failed" |
134 |
+ if use benchmarks; then |
135 |
+ emake benchmark || die "emake benchmark failed" |
136 |
+ fi |
137 |
+} |
138 |
+ |
139 |
+src_install() { |
140 |
+ cmake-utils_src_install |
141 |
+ rm -f "${D}"usr/share/brlcad/{README,NEWS,AUTHORS,HACKING,INSTALL,COPYING} |
142 |
+ dodoc AUTHORS NEWS README HACKING TODO BUGS ChangeLog |
143 |
+ echo "PATH=\"${BRLCAD_DIR}/bin\"" > 99brlcad |
144 |
+ echo "MANPATH=\"${BRLCAD_DIR}/man\"" >> 99brlcad |
145 |
+ doenvd 99brlcad || die |
146 |
+ newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png brlcad.png |
147 |
+ make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering" |
148 |
+} |
149 |
|
150 |
diff --git a/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch b/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch |
151 |
deleted file mode 100644 |
152 |
index 7635211..0000000 |
153 |
--- a/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch |
154 |
+++ /dev/null |
155 |
@@ -1,19 +0,0 @@ |
156 |
---- old/CMakeLists.txt 2011-07-14 16:14:18.053187225 -0400 |
157 |
-+++ new/CMakeLists.txt 2011-07-14 16:14:39.073507247 -0400 |
158 |
-@@ -1187,14 +1187,14 @@ |
159 |
- SET(PATH_LABELS CMAKE_INSTALL_PREFIX BIN_DIR MAN_DIR CONF_DIR DATA_DIR) |
160 |
- SET(PATH_LABEL_LENGTH 0) |
161 |
- FOREACH(path_label ${PATH_LABELS}) |
162 |
-- STRING(LENGTH ${${path_label}_LABEL} CURRENT_LENGTH) |
163 |
-+ STRING(LENGTH "${${path_label}_LABEL}" CURRENT_LENGTH) |
164 |
- if (${CURRENT_LENGTH} GREATER ${PATH_LABEL_LENGTH}) |
165 |
- SET(PATH_LABEL_LENGTH ${CURRENT_LENGTH}) |
166 |
- endif() |
167 |
- ENDFOREACH() |
168 |
- FOREACH(path_label ${PATH_LABELS}) |
169 |
- SET(CURRENT_LABEL ${${path_label}_LABEL}) |
170 |
-- STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH) |
171 |
-+ STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH) |
172 |
- WHILE(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH}) |
173 |
- SET(CURRENT_LABEL " ${CURRENT_LABEL}") |
174 |
- STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH) |
175 |
\ No newline at end of file |
176 |
|
177 |
diff --git a/media-gfx/brlcad/files/png_patch.diff b/media-gfx/brlcad/files/png_patch.diff |
178 |
deleted file mode 100644 |
179 |
index bdae6ba..0000000 |
180 |
--- a/media-gfx/brlcad/files/png_patch.diff |
181 |
+++ /dev/null |
182 |
@@ -1,48 +0,0 @@ |
183 |
-Index: src/other/libpng.dist |
184 |
-=================================================================== |
185 |
---- src/other/libpng.dist (revision 45616) |
186 |
-+++ src/other/libpng.dist (revision 45617) |
187 |
-@@ -8,7 +8,6 @@ |
188 |
- configure.ac |
189 |
- contrib |
190 |
- example.c |
191 |
--libpng-1.4.5.txt |
192 |
- libpng-config.in |
193 |
- libpng.3 |
194 |
- libpng.pc.in |
195 |
-Index: src/libged/png.c |
196 |
-=================================================================== |
197 |
---- src/libged/png.c (revision 45616) |
198 |
-+++ src/libged/png.c (revision 45617) |
199 |
-@@ -30,6 +30,7 @@ |
200 |
- #include <string.h> |
201 |
- #include "bio.h" |
202 |
- |
203 |
-+#include "zlib.h" |
204 |
- #include "png.h" |
205 |
- #include "bu.h" |
206 |
- #include "vmath.h" |
207 |
-Index: src/fb/fb-png.c |
208 |
-=================================================================== |
209 |
---- src/fb/fb-png.c (revision 45616) |
210 |
-+++ src/fb/fb-png.c (revision 45617) |
211 |
-@@ -38,6 +38,7 @@ |
212 |
- # include <unistd.h> |
213 |
- #endif |
214 |
- |
215 |
-+#include "zlib.h" |
216 |
- #include "png.h" |
217 |
- #include "bu.h" |
218 |
- #include "fb.h" |
219 |
-Index: src/util/pix-png.c |
220 |
-=================================================================== |
221 |
---- src/util/pix-png.c (revision 45616) |
222 |
-+++ src/util/pix-png.c (revision 45617) |
223 |
-@@ -36,7 +36,6 @@ |
224 |
- #include "bio.h" |
225 |
- |
226 |
- #include "zlib.h" |
227 |
--#include "pngconf.h" |
228 |
- #include "png.h" |
229 |
- |
230 |
- #include "bu.h" |