1 |
commit: b7fbed581008c7f7e6c6e16028341b60862cd002 |
2 |
Author: Marco Scardovi <marco <AT> scardovi <DOT> com> |
3 |
AuthorDate: Tue Dec 14 22:01:46 2021 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 5 19:51:33 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7fbed58 |
7 |
|
8 |
sci-libs/silo: bump to 4.11 and EAPI 8 |
9 |
|
10 |
I have restricted test because it's broken right now in 4.11 |
11 |
(there's a problem about mismatch in a fortran file, matf77.f). |
12 |
|
13 |
Following the archlinux way I've moved to the BSD version in |
14 |
order to use only BSD license (the full version requires some |
15 |
non-free licenses and We don't really need to complain against them). |
16 |
|
17 |
This PR also bump to latest EAPI (see bug below) |
18 |
and add USE flag browser for browser support |
19 |
|
20 |
Closes: https://bugs.gentoo.org/828693 |
21 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
22 |
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com> |
23 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
24 |
|
25 |
sci-libs/silo/Manifest | 1 + |
26 |
sci-libs/silo/files/silo-4.10.2-mpiposix.patch | 53 --------------- |
27 |
sci-libs/silo/files/silo-4.10.2-qt5.patch | 44 ------------ |
28 |
sci-libs/silo/files/silo-4.10.2-qtlibs.patch | 78 ---------------------- |
29 |
sci-libs/silo/files/silo-4.10.2-tests.patch | 11 --- |
30 |
sci-libs/silo/files/silo-4.11-autoreconf.patch | 35 ++++++++++ |
31 |
sci-libs/silo/files/silo-4.11-hdf5.patch | 46 +++++++++++++ |
32 |
.../files/silo-4.11-test-disable-largefile.patch | 23 +++++++ |
33 |
sci-libs/silo/files/silo-4.11-tests.patch | 26 ++++++++ |
34 |
.../files/silo-4.11-testsuite-python-write.patch | 27 ++++++++ |
35 |
sci-libs/silo/metadata.xml | 1 + |
36 |
sci-libs/silo/silo-4.11.ebuild | 47 +++++++++++++ |
37 |
12 files changed, 206 insertions(+), 186 deletions(-) |
38 |
|
39 |
diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest |
40 |
index b6f65c970d1f..c2c68f4d8730 100644 |
41 |
--- a/sci-libs/silo/Manifest |
42 |
+++ b/sci-libs/silo/Manifest |
43 |
@@ -1 +1,2 @@ |
44 |
DIST silo-4.10.2.tar.gz 13135900 BLAKE2B 6326a42df43c4bb6936522d1730db8ce45c6b74779cf37b7a5a0b7a72def9e9a4f174b68392adbda59936113ccac4ae5e7bf7266effb364eac7e5d0cff8bb37c SHA512 8cd1340ed641c8be77f310b286da344e2fed7ae469ed7bebf5deebaa1a369ca91c283b38eae2c57b7ad046f65343cfaa56a1c07b6c8b07b79aad69c4e5617f6e |
45 |
+DIST silo-4.11-bsd.tgz 13298515 BLAKE2B fcf2e7912381e57d1a64644d3cee4dea50302c12704eaf0ee9e2569b7bc29b1d5c9df66878744ffc2cc04e16834fdf1cd4d677983af36005e4ecf0918c6283d5 SHA512 f642dd21dacffa147aea54d6f8669c704772d5640d6eb7eeff1d7e5e5d37ddbde250d78bad30e9478dcfec63a86863243d7a56cd9b692eaefdd7a89b34df35d0 |
46 |
|
47 |
diff --git a/sci-libs/silo/files/silo-4.10.2-mpiposix.patch b/sci-libs/silo/files/silo-4.10.2-mpiposix.patch |
48 |
deleted file mode 100644 |
49 |
index 30a3f910b196..000000000000 |
50 |
--- a/sci-libs/silo/files/silo-4.10.2-mpiposix.patch |
51 |
+++ /dev/null |
52 |
@@ -1,53 +0,0 @@ |
53 |
---- src/hdf5_drv/silo_hdf5.c.orig 2017-07-28 08:52:09.026638768 +0200 |
54 |
-+++ src/hdf5_drv/silo_hdf5.c 2017-07-28 09:00:12.306635882 +0200 |
55 |
-@@ -4752,18 +4752,19 @@ |
56 |
- } |
57 |
- |
58 |
- /* default HDF5 mpi drivers */ |
59 |
-- case DB_FILE_OPTS_H5_DEFAULT_MPIP: |
60 |
-- { |
61 |
--#ifdef H5_HAVE_PARALLEL |
62 |
-- h5status |= H5Pset_fapl_mpiposix(retval, MPI_COMM_SELF, TRUE); |
63 |
--#else |
64 |
-- H5Pclose(retval); |
65 |
-- return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me); |
66 |
--#endif |
67 |
-- break; |
68 |
-- } |
69 |
-+// case DB_FILE_OPTS_H5_DEFAULT_MPIP: |
70 |
-+// { |
71 |
-+//#ifdef H5_HAVE_PARALLEL |
72 |
-+// h5status |= H5Pset_fapl_mpiposix(retval, MPI_COMM_SELF, TRUE); |
73 |
-+//#else |
74 |
-+// H5Pclose(retval); |
75 |
-+// return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me); |
76 |
-+//#endif |
77 |
-+// break; |
78 |
-+// } |
79 |
- |
80 |
- case DB_FILE_OPTS_H5_DEFAULT_MPIO: |
81 |
-+ case DB_FILE_OPTS_H5_DEFAULT_MPIP: |
82 |
- { |
83 |
- #ifdef H5_HAVE_PARALLEL |
84 |
- MPI_Info info; |
85 |
-@@ -5069,15 +5070,15 @@ |
86 |
- if ((p = DBGetOption(opts, DBOPT_H5_MPIP_NO_GPFS_HINTS))) |
87 |
- use_gpfs_hints = FALSE; |
88 |
- |
89 |
-- if (vfd == DB_H5VFD_MPIO) |
90 |
-+// if (vfd == DB_H5VFD_MPIO) |
91 |
- { |
92 |
- h5status |= H5Pset_fapl_mpio(retval, mpi_comm, mpi_info); |
93 |
- if (created_info) MPI_Info_free(&mpi_info); |
94 |
- } |
95 |
-- else |
96 |
-- { |
97 |
-- h5status |= H5Pset_fapl_mpiposix(retval, mpi_comm, use_gpfs_hints); |
98 |
-- } |
99 |
-+// else |
100 |
-+// { |
101 |
-+// h5status |= H5Pset_fapl_mpiposix(retval, mpi_comm, use_gpfs_hints); |
102 |
-+// } |
103 |
- #else |
104 |
- H5Pclose(retval); |
105 |
- return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me); |
106 |
|
107 |
diff --git a/sci-libs/silo/files/silo-4.10.2-qt5.patch b/sci-libs/silo/files/silo-4.10.2-qt5.patch |
108 |
deleted file mode 100644 |
109 |
index 1e1fe8803a37..000000000000 |
110 |
--- a/sci-libs/silo/files/silo-4.10.2-qt5.patch |
111 |
+++ /dev/null |
112 |
@@ -1,44 +0,0 @@ |
113 |
---- tools/silex/SiloFile.h.orig 2018-01-24 11:01:23.354705068 +0100 |
114 |
-+++ tools/silex/SiloFile.h 2018-01-24 11:01:34.843705761 +0100 |
115 |
-@@ -61,6 +61,8 @@ |
116 |
- #include <vector> |
117 |
- using std::vector; |
118 |
- |
119 |
-+#define toAscii toLatin1 |
120 |
-+ |
121 |
- // **************************************************************************** |
122 |
- // Class: SiloDir |
123 |
- // |
124 |
---- tools/silex/main.cpp.orig 2018-01-24 11:02:21.201708556 +0100 |
125 |
-+++ tools/silex/main.cpp 2018-01-24 11:02:34.146709336 +0100 |
126 |
-@@ -58,7 +58,7 @@ |
127 |
- #include <cstdlib> |
128 |
- |
129 |
- #ifndef Q_WS_MACX |
130 |
--#include "qwindowsstyle.h" |
131 |
-+//#include "qwindowsstyle.h" |
132 |
- #endif |
133 |
- #include "qfiledialog.h" |
134 |
- #include "qstring.h" |
135 |
-@@ -91,7 +91,7 @@ |
136 |
- QApplication::setColorSpec(QApplication::ManyColor); |
137 |
- QApplication a(argc, argv); |
138 |
- #ifndef Q_WS_MACX |
139 |
-- a.setStyle(new QWindowsStyle); |
140 |
-+// a.setStyle(new QWindowsStyle); |
141 |
- #endif |
142 |
- Explorer *w = 0; |
143 |
- if (argc > 1) |
144 |
---- tools/silex/SiloView.cpp.orig 2018-01-24 11:03:13.775711725 +0100 |
145 |
-+++ tools/silex/SiloView.cpp 2018-01-24 11:03:30.032712706 +0100 |
146 |
-@@ -109,8 +109,8 @@ |
147 |
- dirTreeView->OpenRootDir(); |
148 |
- dirView->Set(silo->root); |
149 |
- |
150 |
-- dirTreeView->header()->setResizeMode(QHeaderView::Interactive); |
151 |
-- dirView->header()->setResizeMode(QHeaderView::Interactive); |
152 |
-+ dirTreeView->header()->setSectionResizeMode(QHeaderView::Interactive); |
153 |
-+ dirView->header()->setSectionResizeMode(QHeaderView::Interactive); |
154 |
- } |
155 |
- } |
156 |
- |
157 |
|
158 |
diff --git a/sci-libs/silo/files/silo-4.10.2-qtlibs.patch b/sci-libs/silo/files/silo-4.10.2-qtlibs.patch |
159 |
deleted file mode 100644 |
160 |
index ecd5297c281f..000000000000 |
161 |
--- a/sci-libs/silo/files/silo-4.10.2-qtlibs.patch |
162 |
+++ /dev/null |
163 |
@@ -1,78 +0,0 @@ |
164 |
---- configure.orig 2018-01-24 10:50:10.458664501 +0100 |
165 |
-+++ configure 2018-01-24 10:50:42.967666461 +0100 |
166 |
-@@ -27541,7 +27541,7 @@ |
167 |
- ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p | |
168 |
- sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`" |
169 |
- fi |
170 |
-- ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" |
171 |
-+ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" |
172 |
- else |
173 |
- # Use cached value or do search, starting with suggestions from |
174 |
- # the command line |
175 |
-@@ -27615,7 +27615,7 @@ |
176 |
- ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p | |
177 |
- sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`" |
178 |
- fi |
179 |
-- ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" |
180 |
-+ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" |
181 |
- else |
182 |
- # There is no valid definition for $QTDIR as Trolltech likes to see it |
183 |
- ax_qt_dir= |
184 |
-@@ -27627,7 +27627,7 @@ |
185 |
- ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p | |
186 |
- sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`" |
187 |
- fi |
188 |
-- ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" |
189 |
-+ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" |
190 |
- else |
191 |
- # Normally, when there is no traditional Trolltech installation, |
192 |
- # the library is installed in a place where the linker finds it |
193 |
-@@ -27645,10 +27645,10 @@ |
194 |
- # See if we find the library without any special options. |
195 |
- # Don't add top $LIBS permanently yet |
196 |
- ax_save_LIBS="$LIBS" |
197 |
-- LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" |
198 |
-+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" |
199 |
- ax_qt_LIBS="$LIBS" |
200 |
- ax_save_CXXFLAGS="$CXXFLAGS" |
201 |
-- CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui" |
202 |
-+ CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui -I$ax_qt_include_dir/QtWidgets -fPIC" |
203 |
- cat >conftest.$ac_ext <<_ACEOF |
204 |
- /* confdefs.h. */ |
205 |
- _ACEOF |
206 |
-@@ -27706,7 +27706,7 @@ |
207 |
- # That did not work. Try the multi-threaded version |
208 |
- echo "Non-critical error, please neglect the above." >&5 |
209 |
- ax_qt_lib=qt-mt |
210 |
-- LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" |
211 |
-+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" |
212 |
- cat >conftest.$ac_ext <<_ACEOF |
213 |
- /* confdefs.h. */ |
214 |
- _ACEOF |
215 |
-@@ -27764,7 +27764,7 @@ |
216 |
- # That did not work. Try the OpenGL version |
217 |
- echo "Non-critical error, please neglect the above." >&5 |
218 |
- ax_qt_lib=qt-gl |
219 |
-- LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" |
220 |
-+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" |
221 |
- cat >conftest.$ac_ext <<_ACEOF |
222 |
- /* confdefs.h. */ |
223 |
- _ACEOF |
224 |
-@@ -27847,7 +27847,7 @@ |
225 |
- fi |
226 |
- done |
227 |
- # Try with that one |
228 |
-- LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" |
229 |
-+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" |
230 |
- cat >conftest.$ac_ext <<_ACEOF |
231 |
- /* confdefs.h. */ |
232 |
- _ACEOF |
233 |
-@@ -27955,7 +27955,7 @@ |
234 |
- fi # all $ax_qt_* are set |
235 |
- fi # $have_qt reflects the system status |
236 |
- if test x"$have_qt" = xyes; then |
237 |
-- QT_CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui" |
238 |
-+ QT_CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui -I$ax_qt_include_dir/QtWidgets -fPIC" |
239 |
- if test x"$ax_qt_lib" = xqt-mt; then |
240 |
- QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT" |
241 |
- fi |
242 |
|
243 |
diff --git a/sci-libs/silo/files/silo-4.10.2-tests.patch b/sci-libs/silo/files/silo-4.10.2-tests.patch |
244 |
deleted file mode 100644 |
245 |
index 2e0a52191d0e..000000000000 |
246 |
--- a/sci-libs/silo/files/silo-4.10.2-tests.patch |
247 |
+++ /dev/null |
248 |
@@ -1,11 +0,0 @@ |
249 |
---- tests/Makefile.in.old 2014-07-24 07:25:53.464381420 +0200 |
250 |
-+++ tests/Makefile.in 2014-07-24 07:26:14.951048323 +0200 |
251 |
-@@ -169,7 +169,7 @@ |
252 |
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
253 |
- $(ioperf_stdio_la_LDFLAGS) $(LDFLAGS) -o $@ |
254 |
- rocket_silo_la_LIBADD = |
255 |
--am_rocket_silo_la_OBJECTS = rocket_silo.lo |
256 |
-+am_rocket_silo_la_OBJECTS = rocket_silo.lo ../src/.libs/libsilo.la |
257 |
- rocket_silo_la_OBJECTS = $(am_rocket_silo_la_OBJECTS) |
258 |
- rocket_silo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ |
259 |
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ |
260 |
|
261 |
diff --git a/sci-libs/silo/files/silo-4.11-autoreconf.patch b/sci-libs/silo/files/silo-4.11-autoreconf.patch |
262 |
new file mode 100644 |
263 |
index 000000000000..371b346e921c |
264 |
--- /dev/null |
265 |
+++ b/sci-libs/silo/files/silo-4.11-autoreconf.patch |
266 |
@@ -0,0 +1,35 @@ |
267 |
+Author: Alastair McKinstry <mckinstry@××××××.org> |
268 |
+Description: Fixes needed for autoreconf to work on Debian |
269 |
+ When autoreconf is run, VL_LIB_READLINE is lost from aclocal, so included in config/ |
270 |
+ Also include AX_CHECK_COMPLER_FLAG() which is not in autoconf (just autoconf-archive) |
271 |
+ AX_CHECK_COMPILER_FLAGS() is obsolete |
272 |
+Last-Updated: 2021-01-14 |
273 |
+Forwarded: no |
274 |
+Link: https://sources.debian.org/patches/silo-llnl/4.11-2/autoreconf.patch/ |
275 |
+ |
276 |
+--- a/configure.ac |
277 |
++++ b/configure.ac |
278 |
+@@ -195,6 +195,8 @@ |
279 |
+ dnl This allows multiple src-dir builds within one host. |
280 |
+ AC_PREFIX_DEFAULT("SILO_TOP_SRC_DIR") |
281 |
+ |
282 |
++AC_PROG_F77 |
283 |
++ |
284 |
+ dnl |
285 |
+ dnl Handle the python module right away to determine if we need shared libs. |
286 |
+ dnl Ordinarily, we default to static libs |
287 |
+@@ -618,10 +620,10 @@ |
288 |
+ # it is an argument to the -D argument. So, I think this is |
289 |
+ # just totally bogus! |
290 |
+ # Default to large file support |
291 |
+-AX_CHECK_COMPILER_FLAGS("-D_LARGEFILE_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";) |
292 |
+-AX_CHECK_COMPILER_FLAGS("-D_LARGEFILE64_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";) |
293 |
+-AX_CHECK_COMPILER_FLAGS("-D_FILE_OFFSET_BITS=64",CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";) |
294 |
+-AX_CHECK_COMPILER_FLAGS("-Wdeclaration-after-statement",CFLAGS="$CFLAGS -Wdeclaration-after-statement";) |
295 |
++AX_CHECK_COMPILE_FLAG("-D_LARGEFILE_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";) |
296 |
++AX_CHECK_COMPILE_FLAG("-D_LARGEFILE64_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";) |
297 |
++AX_CHECK_COMPILE_FLAG("-D_FILE_OFFSET_BITS=64",CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";) |
298 |
++AX_CHECK_COMPILE_FLAG("-Wdeclaration-after-statement",CFLAGS="$CFLAGS -Wdeclaration-after-statement";) |
299 |
+ |
300 |
+ # |
301 |
+ # Note: regardless of what the stuff above regarding large file support |
302 |
|
303 |
diff --git a/sci-libs/silo/files/silo-4.11-hdf5.patch b/sci-libs/silo/files/silo-4.11-hdf5.patch |
304 |
new file mode 100644 |
305 |
index 000000000000..6791a44aa2b1 |
306 |
--- /dev/null |
307 |
+++ b/sci-libs/silo/files/silo-4.11-hdf5.patch |
308 |
@@ -0,0 +1,46 @@ |
309 |
+Link: https://aur.archlinux.org/cgit/aur.git/tree/hdf5.patch?h=silo |
310 |
+ |
311 |
+--- a/src/hdf5_drv/H5FDsilo.c 2021-09-11 01:22:52.000000000 +0300 |
312 |
++++ b/src/hdf5_drv/H5FDsilo.c 2021-11-25 00:37:06.685422949 +0200 |
313 |
+@@ -252,13 +252,13 @@ |
314 |
+ snprintf(msg, sizeof(msg), Msg "(errno=%d, \"%s\")", \ |
315 |
+ Errno, strerror(Errno)); \ |
316 |
+ ret_value = Ret; \ |
317 |
+- H5Epush_ret(Func, Cls, Maj, Min, msg, Ret) \ |
318 |
++ H5Epush_ret(Func, Cls, Maj, Min, msg, Ret); \ |
319 |
+ } |
320 |
+ #else |
321 |
+ #define H5E_PUSH_HELPER(Func,Cls,Maj,Min,Msg,Ret,Errno) \ |
322 |
+ { \ |
323 |
+ ret_value = Ret; \ |
324 |
+- H5Epush_ret(Func, Cls, Maj, Min, Msg, Ret) \ |
325 |
++ H5Epush_ret(Func, Cls, Maj, Min, Msg, Ret); \ |
326 |
+ } |
327 |
+ #endif |
328 |
+ |
329 |
+@@ -1355,7 +1355,7 @@ |
330 |
+ assert(sizeof(hsize_t)<=8); |
331 |
+ memcpy(p, &file->block_size, sizeof(hsize_t)); |
332 |
+ if (H5Tconvert(H5T_NATIVE_HSIZE, H5T_STD_U64LE, 1, buf+8, NULL, H5P_DEFAULT)<0) |
333 |
+- H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1) |
334 |
++ H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1); |
335 |
+ |
336 |
+ return 0; |
337 |
+ } |
338 |
+@@ -1383,14 +1383,14 @@ |
339 |
+ |
340 |
+ /* Make sure the name/version number is correct */ |
341 |
+ if (strcmp(name, "LLNLsilo")) |
342 |
+- H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "invalid silo superblock", -1) |
343 |
++ H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "invalid silo superblock", -1); |
344 |
+ |
345 |
+ buf += 8; |
346 |
+ /* Decode block size */ |
347 |
+ assert(sizeof(hsize_t)<=8); |
348 |
+ memcpy(x, buf, 8); |
349 |
+ if (H5Tconvert(H5T_STD_U64LE, H5T_NATIVE_HSIZE, 1, x, NULL, H5P_DEFAULT)<0) |
350 |
+- H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1) |
351 |
++ H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1); |
352 |
+ ap = (hsize_t*)x; |
353 |
+ /*file->block_size = *ap; ignore stored value for now */ |
354 |
+ |
355 |
|
356 |
diff --git a/sci-libs/silo/files/silo-4.11-test-disable-largefile.patch b/sci-libs/silo/files/silo-4.11-test-disable-largefile.patch |
357 |
new file mode 100644 |
358 |
index 000000000000..953453e12fe0 |
359 |
--- /dev/null |
360 |
+++ b/sci-libs/silo/files/silo-4.11-test-disable-largefile.patch |
361 |
@@ -0,0 +1,23 @@ |
362 |
+Author: Alastair McKinstry <mckinstry@××××××.org> |
363 |
+Description: Disable largefile test. Seems to fail on rounding error |
364 |
+Forwarded: yes |
365 |
+Last-Updated: 2011-06-09 |
366 |
+Link: https://sources.debian.org/patches/silo-llnl/4.11-2/test-disable-largefile.patch/ |
367 |
+ |
368 |
+--- a/tests/testsuite.at |
369 |
++++ b/tests/testsuite.at |
370 |
+@@ -324,10 +324,10 @@ |
371 |
+ AT_SETUP(xversion) |
372 |
+ AT_CHECK(test -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND testxvers `pwd`,,ignore,ignore) |
373 |
+ AT_CLEANUP |
374 |
+-AT_SETUP(largefile) |
375 |
+-AT_KEYWORDS(large) |
376 |
+-AT_CHECK(test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND largefile,,ignore,ignore) |
377 |
+-AT_CLEANUP |
378 |
++#AT_SETUP(largefile) |
379 |
++#AT_KEYWORDS(large) |
380 |
++#AT_CHECK(test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND largefile,,ignore,ignore) |
381 |
++#AT_CLEANUP |
382 |
+ #AT_SETUP(memfile_simple) |
383 |
+ #AT_CHECK(testall -small $STARGS,,ignore) |
384 |
+ #AT_CHECK(test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND memfile_simple $STARGS,,ignore,ignore) |
385 |
|
386 |
diff --git a/sci-libs/silo/files/silo-4.11-tests.patch b/sci-libs/silo/files/silo-4.11-tests.patch |
387 |
new file mode 100644 |
388 |
index 000000000000..a093d318ded6 |
389 |
--- /dev/null |
390 |
+++ b/sci-libs/silo/files/silo-4.11-tests.patch |
391 |
@@ -0,0 +1,26 @@ |
392 |
+--- a/tests/Makefile.in |
393 |
++++ b/tests/Makefile.in |
394 |
+@@ -169,7 +169,7 @@ |
395 |
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
396 |
+ $(ioperf_stdio_la_LDFLAGS) $(LDFLAGS) -o $@ |
397 |
+ rocket_silo_la_LIBADD = |
398 |
+-am_rocket_silo_la_OBJECTS = rocket_silo.lo |
399 |
++am_rocket_silo_la_OBJECTS = rocket_silo.lo ../src/.libs/libsiloh5.la |
400 |
+ rocket_silo_la_OBJECTS = $(am_rocket_silo_la_OBJECTS) |
401 |
+ rocket_silo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ |
402 |
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ |
403 |
+ |
404 |
+Author: Alastair McKinstry <mckinstry@××××××.org> |
405 |
+Description: bash is needed to execute this testscript for test 62. |
406 |
+Last-Updated: 2011-04-11 |
407 |
+Forwarded: no |
408 |
+Link: https://sources.debian.org/patches/silo-llnl/4.11-2/testsuite-fix.patch/ |
409 |
+ |
410 |
+--- a/tests/testdtypes |
411 |
++++ b/tests/testdtypes |
412 |
+@@ -1,4 +1,4 @@ |
413 |
+-#!/bin/sh |
414 |
++#!/bin/bash |
415 |
+ |
416 |
+ # Copyright (C) 1994-2016 Lawrence Livermore National Security, LLC. |
417 |
+ # LLNL-CODE-425250. |
418 |
|
419 |
diff --git a/sci-libs/silo/files/silo-4.11-testsuite-python-write.patch b/sci-libs/silo/files/silo-4.11-testsuite-python-write.patch |
420 |
new file mode 100644 |
421 |
index 000000000000..ac0bc859068a |
422 |
--- /dev/null |
423 |
+++ b/sci-libs/silo/files/silo-4.11-testsuite-python-write.patch |
424 |
@@ -0,0 +1,27 @@ |
425 |
+Author: Alastair McKinstry <mckinstry@××××××.org> |
426 |
+Description: Python code seems to be broken. Disable test and inform upstream. |
427 |
+Last-Updated: 2011-06-09 |
428 |
+Forwarded: yes |
429 |
+Link: https://sources.debian.org/patches/silo-llnl/4.11-2/testsuite-python-write.patch/ |
430 |
+ |
431 |
+--- a/tests/test_write.py |
432 |
++++ b/tests/test_write.py |
433 |
+@@ -52,11 +52,13 @@ |
434 |
+ db = Silo.Create("foo.silo", "test file") |
435 |
+ db.Write("t1", 12) |
436 |
+ db.Write("t2", "hello") |
437 |
+-db.Write("t3", (13,)) |
438 |
+-db.Write("t4", 14.5) |
439 |
+-db.Write("t5", (1.2, 10)) |
440 |
+-db.Write("t6", (1.2, 10.2)) |
441 |
+-db.Write("t7", (10, 1.2)) |
442 |
++# Disable writes with floating point. Seem to break on python2.7 |
443 |
++# --amck, 2011-06-09 |
444 |
++#db.Write("t3", (13,)) |
445 |
++#db.Write("t4", 14.5) |
446 |
++#db.Write("t5", (1.2, 10)) |
447 |
++#db.Write("t6", (1.2, 10.2)) |
448 |
++#db.Write("t7", (10, 1.2)) |
449 |
+ db.Write("t8", "a") |
450 |
+ db.MkDir("a") |
451 |
+ db.Write("a/t8", "x2") |
452 |
|
453 |
diff --git a/sci-libs/silo/metadata.xml b/sci-libs/silo/metadata.xml |
454 |
index 042cd6fc239a..ebaabb67af86 100644 |
455 |
--- a/sci-libs/silo/metadata.xml |
456 |
+++ b/sci-libs/silo/metadata.xml |
457 |
@@ -9,6 +9,7 @@ |
458 |
computing platforms. |
459 |
</longdescription> |
460 |
<use> |
461 |
+ <flag name="browser">Enable browser support</flag> |
462 |
<flag name="silex">Build silex data browser</flag> |
463 |
</use> |
464 |
<maintainer type="project"> |
465 |
|
466 |
diff --git a/sci-libs/silo/silo-4.11.ebuild b/sci-libs/silo/silo-4.11.ebuild |
467 |
new file mode 100644 |
468 |
index 000000000000..e7a7f142d2aa |
469 |
--- /dev/null |
470 |
+++ b/sci-libs/silo/silo-4.11.ebuild |
471 |
@@ -0,0 +1,47 @@ |
472 |
+# Copyright 1999-2022 Gentoo Authors |
473 |
+# Distributed under the terms of the GNU General Public License v2 |
474 |
+ |
475 |
+EAPI=8 |
476 |
+ |
477 |
+inherit fortran-2 |
478 |
+ |
479 |
+DESCRIPTION="A mesh and field I/O library and scientific database" |
480 |
+HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/silo" |
481 |
+SRC_URI="https://wci.llnl.gov/sites/wci/files/2021-09/${P}-bsd.tgz" |
482 |
+S="${WORKDIR}/${P}-bsd" |
483 |
+ |
484 |
+LICENSE="BSD" |
485 |
+SLOT="0" |
486 |
+KEYWORDS="~amd64 ~x86" |
487 |
+IUSE="browser +hdf5 +silex" |
488 |
+# Waiting for fix/answer upstream |
489 |
+# See https://github.com/LLNL/Silo/issues/234 |
490 |
+RESTRICT="test" |
491 |
+ |
492 |
+RDEPEND=" |
493 |
+ dev-qt/qtgui:5 |
494 |
+ virtual/szip |
495 |
+ hdf5? ( sci-libs/hdf5 ) |
496 |
+" |
497 |
+DEPEND="${RDEPEND}" |
498 |
+ |
499 |
+PATCHES=( |
500 |
+ "${FILESDIR}"/${P}-autoreconf.patch |
501 |
+ "${FILESDIR}"/${P}-hdf5.patch |
502 |
+ "${FILESDIR}"/${P}-test-disable-largefile.patch |
503 |
+ "${FILESDIR}"/${P}-tests.patch |
504 |
+ "${FILESDIR}"/${P}-testsuite-python-write.patch |
505 |
+) |
506 |
+ |
507 |
+src_configure() { |
508 |
+ econf \ |
509 |
+ --enable-install-lite-headers \ |
510 |
+ --enable-shared \ |
511 |
+ $(use_enable silex silex ) \ |
512 |
+ $(use_enable browser browser ) \ |
513 |
+ $(use_with hdf5 hdf5 "${EPREFIX}"/usr/include,"${EPREFIX}"/usr/$(get_libdir) ) |
514 |
+} |
515 |
+ |
516 |
+# src_test() { |
517 |
+# emake -C tests check |
518 |
+# } |