commit 5e30aa5794d6eaf5ef7df17ce2a4e09ca318e50f
Author: Jakub Bogusz <[email protected]>
Date: Tue Jun 4 18:24:42 2024 +0200
- updated to 7.5.0
lal-env.patch | 8 ++++----
lal-octave.patch | 37 +++++++++++++++++++++++--------------
lal-swig.patch | 11 -----------
lal.spec | 22 ++++++++++++----------
4 files changed, 39 insertions(+), 39 deletions(-)
---
diff --git a/lal.spec b/lal.spec
index 1612a3c..c33d0a7 100644
--- a/lal.spec
+++ b/lal.spec
@@ -1,24 +1,26 @@
-# TODO: bconds for boinc, cuda
+# TODO:
+# - bconds for boinc, cuda
+# - apidocs (doxygen >= 1.8.1.2 required, 1.8.11 preferred)
Summary: LALSuite - various gravitational wave data analysis routines
Summary(pl.UTF-8): LALSuite - różne procedury do analizy danych fal
grawitacyjnych
Name: lal
-Version: 7.2.4
-Release: 2
+Version: 7.5.0
+Release: 1
License: GPL v2
Group: Applications/Science
Source0:
http://software.igwn.org/lscsoft/source/lalsuite/%{name}-%{version}.tar.xz
-# Source0-md5: 14994c1e60f71409e3765ece76adb021
+# Source0-md5: 15a1d845aa0f3bd09890fe069fa51f06
Patch0: %{name}-env.patch
Patch1: no-simd.patch
-Patch2: %{name}-swig.patch
Patch3: %{name}-octave.patch
URL: https://wiki.ligo.org/Computing/LALSuite
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.11
-BuildRequires: fftw3-devel
-BuildRequires: fftw3-single-devel
+BuildRequires: fftw3-devel >= 3
+BuildRequires: fftw3-single-devel >= 3
BuildRequires: gsl-devel >= 1.13
BuildRequires: hdf5-devel
+BuildRequires: help2man >= 1.37
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:2
BuildRequires: octave-devel >= 2:6
@@ -51,8 +53,8 @@ Summary: Header files for LAL core libraries
Summary(pl.UTF-8): Pliki nagłówkowe podstawowych bibliotek LAL
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: fftw3-devel
-Requires: fftw3-single-devel
+Requires: fftw3-devel >= 3
+Requires: fftw3-single-devel >= 3
Requires: gsl-devel >= 1.13
Requires: zlib-devel
@@ -108,7 +110,6 @@ Wiązania Pythona do bibliotek LAL.
%ifarch %{ix86}
%patch1 -p1
%endif
-%patch2 -p1
%patch3 -p1
%build
@@ -168,6 +169,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/lal_simd_detect.1*
%{_mandir}/man1/lal_tconvert.1*
%{_mandir}/man1/lal_version.1*
+%{_mandir}/man7/LAL_DEBUG_LEVEL.7*
%files devel
%defattr(644,root,root,755)
diff --git a/lal-env.patch b/lal-env.patch
index 1b067de..21ecc0d 100644
--- a/lal-env.patch
+++ b/lal-env.patch
@@ -1,7 +1,7 @@
---- lal-6.18.0/Makefile.am.orig 2015-03-27 05:14:38.000000000 +0100
-+++ lal-6.18.0/Makefile.am 2017-07-02 11:55:20.751535928 +0200
-@@ -23,11 +23,6 @@
- user_environment = \
+--- lal-7.5.0/Makefile.am.orig 2024-06-03 06:11:27.718254594 +0200
++++ lal-7.5.0/Makefile.am 2024-06-03 06:18:51.389233063 +0200
+@@ -26,11 +26,6 @@ user_environment = \
+ trailingcolon MANPATH; \
set $(PACKAGE)_PREFIX $(prefix); \
set $(PACKAGE)_DATADIR $(pkgdatadir); \
- prepend MANPATH $(mandir); \
diff --git a/lal-octave.patch b/lal-octave.patch
index 60abbda..ca1d34a 100644
--- a/lal-octave.patch
+++ b/lal-octave.patch
@@ -1,6 +1,15 @@
---- lal-7.2.4/swig/SWIGOctave.i.orig 2022-05-19 18:57:34.384694788 +0200
-+++ lal-7.2.4/swig/SWIGOctave.i 2023-01-20 06:25:57.713659940 +0100
-@@ -82,7 +82,7 @@ SWIGINTERN int swiglal_output_stdouterr(
+--- lal-7.5.0/swig/SWIGOctave.i.orig 2024-03-25 19:21:03.848162545 +0100
++++ lal-7.5.0/swig/SWIGOctave.i 2024-06-03 22:10:04.152171042 +0200
+@@ -46,7 +46,7 @@ extern "C++" {
+
+ // Evaluates true if an octave_value is not empty, false otherwise.
+ %header %{
+-#define swiglal_not_empty(v) (!(v).is_empty())
++#define swiglal_not_empty(v) (!(v).isempty())
+ %}
+
+ // Name of octave_value containing the SWIG wrapping of the struct whose
members are being accessed.
+@@ -87,7 +87,7 @@ SWIGINTERN int swiglal_output_stdouterr(
// Write standard output
{
@@ -9,7 +18,7 @@
if (args.length() < 1) {
return 0;
}
-@@ -91,13 +91,13 @@ SWIGINTERN int swiglal_output_stdouterr(
+@@ -96,13 +96,13 @@ SWIGINTERN int swiglal_output_stdouterr(
char buf[512];
while (fgets(buf, sizeof(buf), swiglal_tmp_stdout) != NULL) {
args(2) = octave_value(std::string(buf));
@@ -25,7 +34,7 @@
if (args.length() < 1) {
return 0;
}
-@@ -106,7 +106,7 @@ SWIGINTERN int swiglal_output_stdouterr(
+@@ -111,7 +111,7 @@ SWIGINTERN int swiglal_output_stdouterr(
char buf[512];
while (fgets(buf, sizeof(buf), swiglal_tmp_stderr) != NULL) {
args(2) = octave_value(std::string(buf));
@@ -34,7 +43,7 @@
}
}
-@@ -198,7 +198,7 @@ SWIGINTERN int swiglal_output_stdouterr(
+@@ -203,7 +203,7 @@ SWIGINTERN int swiglal_output_stdouterr(
}
octave_value_list retn;
if (datenum_args.length() > 0) {
@@ -43,7 +52,7 @@
}
if (retn.length() == 0) {
%argument_fail(SWIG_ValueError, "$type", $symname, $argnum);
-@@ -457,7 +457,7 @@ SWIGINTERN bool swiglal_release_parent(v
+@@ -462,7 +462,7 @@ SWIGINTERN bool swiglal_release_parent(v
// Get the scalar index of the Octave array element, and the
element itself.
objidx.front()(0) = get_scalar_idx(idx, objdims) + 1;
@@ -52,7 +61,7 @@
// Copy the Octave array element to the C array.
int res = HELPER::incall(sloav_parent, objelem,
sloav_get_element_ptr(idx), pelemalloc, sloav_esize, sloav_isptr, sloav_tinfo,
sloav_tflags | tflags);
-@@ -497,7 +497,7 @@ SWIGINTERN bool swiglal_release_parent(v
+@@ -502,7 +502,7 @@ SWIGINTERN bool swiglal_release_parent(v
// Copy the C array element to the Octave array.
octave_value objelem = HELPER::outcall(sloav_parent, copyobj,
sloav_get_element_ptr(idx), sloav_esize, sloav_isptr, sloav_tinfo,
sloav_tflags);
@@ -61,7 +70,7 @@
// Increment the Octave array index.
sloav_increment_idx(idx);
-@@ -583,7 +583,7 @@ SWIGINTERN bool swiglal_release_parent(v
+@@ -588,7 +588,7 @@ SWIGINTERN bool swiglal_release_parent(v
bool save_binary(std::ostream& os, bool& save_as_floats) {
return sloav_array_out().save_binary(os, save_as_floats);
}
@@ -70,7 +79,7 @@
octave_value obj = sloav_array_out();
int elemalloc = 0;
return obj.load_binary(is, swap, fmt) &&
SWIG_IsOK(sloav_array_in(obj, &elemalloc, 0));
-@@ -654,7 +654,7 @@ SWIGINTERN bool swiglal_release_parent(v
+@@ -659,7 +659,7 @@ SWIGINTERN bool swiglal_release_parent(v
SLOAV_OBV_METH_FROM_CLASS_0(is_classdef_superclass_ref, bool);
SLOAV_OBV_METH_FROM_CLASS_0(is_complex_matrix, bool);
SLOAV_OBV_METH_FROM_CLASS_0(is_complex_scalar, bool);
@@ -79,7 +88,7 @@
SLOAV_OBV_METH_FROM_CLASS_0(is_constant, bool);
SLOAV_OBV_METH_FROM_CLASS_0(is_cs_list, bool);
SLOAV_OBV_METH_FROM_CLASS_0(is_defined, bool);
-@@ -683,7 +683,7 @@ SWIGINTERN bool swiglal_release_parent(v
+@@ -688,7 +688,7 @@ SWIGINTERN bool swiglal_release_parent(v
SLOAV_OBV_METH_FROM_CLASS_0(is_real_matrix, bool);
SLOAV_OBV_METH_FROM_CLASS_0(is_real_nd_array, bool);
SLOAV_OBV_METH_FROM_CLASS_0(is_real_scalar, bool);
@@ -88,7 +97,7 @@
SLOAV_OBV_METH_FROM_CLASS_0(is_scalar_type, bool);
SLOAV_OBV_METH_FROM_CLASS_0(is_single_type, bool);
SLOAV_OBV_METH_FROM_CLASS_0(is_sparse_type, bool);
-@@ -845,7 +845,7 @@ SWIGINTERN bool swiglal_release_parent(v
+@@ -850,7 +850,7 @@ SWIGINTERN bool swiglal_release_parent(v
SLOAV_OBV_METH_FROM_ARRAY_2(ushort_value, unsigned short int, bool,
bool);
SLOAV_OBV_METH_FROM_ARRAY_3(convert_to_str_internal, octave_value,
bool, bool, char);
SLOAV_OBV_METH_FROM_ARRAY_3(sort, octave_value,
Array<octave_idx_type>&, octave_idx_type, sortmode);
@@ -97,7 +106,7 @@
#undef SLOAV_OBV_METH_FROM_ARRAY_0
#undef SLOAV_OBV_METH_FROM_ARRAY_1
#undef SLOAV_OBV_METH_FROM_ARRAY_2
-@@ -1091,7 +1091,7 @@ SWIGINTERN bool swiglal_release_parent(v
+@@ -1096,7 +1096,7 @@ SWIGINTERN bool swiglal_release_parent(v
// Get pointer to Octave array data, a highly complicated and dodgy
process! Usually
// mex_get_data() does the job, apart from complex arrays where that
creates a copy ...
// in which case try data() and try to detect copying ...
@@ -106,7 +115,7 @@
if (obj.is_double_type()) {
Complex c;
{
-@@ -1183,14 +1183,14 @@ SWIGINTERN bool swiglal_release_parent(v
+@@ -1188,14 +1188,14 @@ SWIGINTERN bool swiglal_release_parent(v
%swiglal_oct_array_asvalfrom_frags(uint64_t, octave_uint64_matrix,
intNDArray<octave_int<uint64_t> >, uint64_array_value, obj.is_uint64_type());
// Array conversion fragments for floating-precision real arrays.
diff --git a/lal-swig.patch b/lal-swig.patch
deleted file mode 100644
index a0251c5..0000000
--- a/lal-swig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lal-7.2.4/swig/SWIGCommon.i.orig 2022-09-30 03:49:28.787869586 +0200
-+++ lal-7.2.4/swig/SWIGCommon.i 2023-01-20 06:26:56.484191559 +0100
-@@ -1805,7 +1805,7 @@ if (strides[I-1] == 0) {
- return res;
- }
- }
--%typemaps_string_alloc(%checkcode(STRING), %checkcode(char), char, LALchar,
-+%typemaps_string_alloc(%checkcode(STRING), %checkcode(char), "Leak!", char,
LALchar,
- SWIG_AsLALcharPtrAndSize, SWIG_FromLALcharPtrAndSize,
- strlen, SWIG_strnlen, %swiglal_new_copy_array,
XLALFree,
- "<limits.h>", CHAR_MIN, CHAR_MAX);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lal.git/commitdiff/5e30aa5794d6eaf5ef7df17ce2a4e09ca318e50f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
