rpms/paraview/F-9 paraview-3.2.2-hdf5-1.8.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 paraview-3.2.1-gcc43.patch, 1.3, 1.4 paraview.spec, 1.26, 1.27 sources, 1.5, 1.6 paraview-3.2-qt.patch, 1.1, NONE
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Wed Jul 16 17:58:59 UTC 2008
Author: orion
Update of /cvs/pkgs/rpms/paraview/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29698
Modified Files:
.cvsignore paraview-3.2.1-gcc43.patch paraview.spec sources
Added Files:
paraview-3.2.2-hdf5-1.8.patch
Removed Files:
paraview-3.2-qt.patch
Log Message:
* Wed Jul 16 2008 Orion Poplawski <orion at cora.nwra.com> - 3.2.2-1
- Update to 3.2.2
- Drop qt patch as upstream now supports qt 4.2.2-4.3.X
paraview-3.2.2-hdf5-1.8.patch:
--- NEW FILE paraview-3.2.2-hdf5-1.8.patch ---
--- ParaView3.2.2/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx.hdf5-1.8 2008-07-16 11:24:23.000000000 -0600
+++ ParaView3.2.2/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2008-07-16 11:54:06.000000000 -0600
@@ -132,9 +132,15 @@
static herr_t H5FD_dsm_flush(H5FD_t *_file);
#endif
static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))
+static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
+static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
+static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file);
+#else
static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file);
static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr);
static haddr_t H5FD_dsm_get_eof(H5FD_t *_file);
+#endif
static herr_t H5FD_dsm_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
DSM_HSIZE_T size, void *buf);
static herr_t H5FD_dsm_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
@@ -594,7 +600,11 @@
*-------------------------------------------------------------------------
*/
static haddr_t
+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))
+H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
+#else
H5FD_dsm_get_eoa(H5FD_t *_file)
+#endif
{
H5FD_dsm_t *file = (H5FD_dsm_t*)_file;
@@ -622,7 +632,11 @@
*-------------------------------------------------------------------------
*/
static herr_t
+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))
+H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr)
+#else
H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr)
+#endif
{
H5FD_dsm_t *file = (H5FD_dsm_t*)_file;
@@ -663,7 +677,11 @@
*-------------------------------------------------------------------------
*/
static haddr_t
+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))
+H5FD_dsm_get_eof(const H5FD_t *_file)
+#else
H5FD_dsm_get_eof(H5FD_t *_file)
+#endif
{
H5FD_dsm_t *file = (H5FD_dsm_t*)_file;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 18 Nov 2007 20:13:05 -0000 1.5
+++ .cvsignore 16 Jul 2008 17:58:00 -0000 1.6
@@ -1 +1 @@
-paraview-3.2.1.tar.gz
+paraview-3.2.2.tar.gz
paraview-3.2.1-gcc43.patch:
Index: paraview-3.2.1-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-9/paraview-3.2.1-gcc43.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- paraview-3.2.1-gcc43.patch 5 Mar 2008 16:05:01 -0000 1.3
+++ paraview-3.2.1-gcc43.patch 16 Jul 2008 17:58:00 -0000 1.4
@@ -138,3 +138,14 @@
XdmfDataDesc::XdmfDataDesc() {
H5dont_atexit();
+--- ParaView3.3.0-20080626/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx.gcc43 2007-07-12 13:10:04.000000000 -0600
++++ ParaView3.3.0-20080626/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2008-06-27 09:29:19.000000000 -0600
+@@ -34,6 +34,8 @@
+ #include "XdmfDsmComm.h"
+ #include "assert.h"
+ #include "hdf5.h"
++#include <cstdlib>
++#include <cstring>
+
+ #define HDF_IO_DEBUG 1
+ #undef HDF_IO_DEBUG
Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-9/paraview.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- paraview.spec 26 Jun 2008 22:34:07 -0000 1.26
+++ paraview.spec 16 Jul 2008 17:58:00 -0000 1.27
@@ -1,12 +1,12 @@
%{!?build_mpi:%define build_mpi 1}
%define pv_maj 3
%define pv_min 2
-%define pv_patch 1
+%define pv_patch 2
%define pv_majmin %{pv_maj}.%{pv_min}
Name: paraview
Version: %{pv_majmin}.%{pv_patch}
-Release: 7%{?dist}
+Release: 1%{?dist}
Summary: Parallel visualization application
Group: Applications/Engineering
@@ -16,7 +16,6 @@
Source1: paraview_22x22.png
Source2: paraview.xml
Source3: FindMPI.cmake
-Patch0: paraview-3.2-qt.patch
Patch1: paraview-3.2.1-findmpi.patch
Patch2: paraview-3.2.1-install.patch
Patch3: paraview-3.2.1-doc.patch
@@ -24,6 +23,7 @@
Patch5: paraview-3.2.1-make.patch
Patch6: paraview-3.2.1-gcc43.patch
Patch7: paraview-3.2.1-hdf5.patch
+Patch8: paraview-3.2.2-hdf5-1.8.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
@@ -102,7 +102,6 @@
%prep
%setup -q -n ParaView%{version}
cp -p %SOURCE3 CMake/
-%patch -p1 -b .qt
%patch1 -p1 -b .findmpi
%patch2 -p1 -b .install
%patch3 -p1 -b .doc
@@ -110,6 +109,7 @@
%patch5 -p0 -b .make
%patch6 -p1 -b .gcc43
%patch7 -p1 -b .hdf5
+%patch8 -p1 -b .hdf5-1.8
%build
@@ -305,6 +305,11 @@
%changelog
+* Wed Jul 16 2008 Orion Poplawski <orion at cora.nwra.com> - 3.2.2-1
+- Update to 3.2.2
+- Drop qt patch as upstream now supports qt 4.2.2-4.3.X
+- Add patch to support hdf5 1.8 in mpi build
+
* Wed Jun 25 2008 Orion Poplawski <orion at cora.nwra.com> - 3.2.1-7
- Add patch from Tyson Whitehead to fix mpi build (bug #450598)
- Drop rpath patch, use rpath instead of ls.so conf files so mpi and non-mpi
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 18 Nov 2007 20:13:05 -0000 1.5
+++ sources 16 Jul 2008 17:58:00 -0000 1.6
@@ -1 +1 @@
-050830112537c477a1cb20370caded50 paraview-3.2.1.tar.gz
+302475b5d1355edf2d1562f0afd7f59f paraview-3.2.2.tar.gz
--- paraview-3.2-qt.patch DELETED ---
More information about the fedora-extras-commits
mailing list