Update to 5.2.0
This commit is contained in:
parent
67945bb646
commit
ae929389a1
|
@ -1 +1 @@
|
||||||
vtk-5.0.4.tar.gz
|
vtk-5.2.0.tar.gz
|
||||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
||||||
1e353886bbd6559633e31436d88a1f03 vtk-5.0.4.tar.gz
|
eb8c3b463c027490164538b0fc3b35ad vtk-5.2.0.tar.gz
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- VTK/Wrapping/Python/CMakeLists.txt~ 2005-08-25 21:31:14.000000000 +0200
|
|
||||||
+++ VTK/Wrapping/Python/CMakeLists.txt 2006-05-27 13:32:40.000000000 +0200
|
|
||||||
@@ -299,7 +299,7 @@
|
|
||||||
# Create default python setup arguments if they are not set.
|
|
||||||
IF(DEFINED VTK_PYTHON_SETUP_ARGS)
|
|
||||||
ELSE(DEFINED VTK_PYTHON_SETUP_ARGS)
|
|
||||||
- SET(VTK_PYTHON_SETUP_ARGS "--prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\""
|
|
||||||
+ SET(VTK_PYTHON_SETUP_ARGS "--root=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\" -O1"
|
|
||||||
CACHE STRING "Arguments passed to \"python setup.py install ...\" during installation.")
|
|
||||||
MARK_AS_ADVANCED(VTK_PYTHON_SETUP_ARGS)
|
|
||||||
ENDIF(DEFINED VTK_PYTHON_SETUP_ARGS)
|
|
|
@ -1,33 +0,0 @@
|
||||||
--- VTK-5.0.4/Utilities/DICOMParser/DICOMAppHelper.cxx.gcc43 2007-05-03 11:12:13.000000000 -0600
|
|
||||||
+++ VTK-5.0.4/Utilities/DICOMParser/DICOMAppHelper.cxx 2008-04-11 13:52:05.000000000 -0600
|
|
||||||
@@ -31,7 +31,7 @@
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
-#include <string>
|
|
||||||
+#include <cstring>
|
|
||||||
#include <math.h>
|
|
||||||
#include <algorithm>
|
|
||||||
#if defined(__BORLANDC__)
|
|
||||||
--- VTK-5.0.4/Utilities/DICOMParser/DICOMFile.cxx.gcc43 2007-11-07 13:51:57.000000000 -0700
|
|
||||||
+++ VTK-5.0.4/Utilities/DICOMParser/DICOMFile.cxx 2008-02-18 10:31:08.000000000 -0700
|
|
||||||
@@ -26,7 +26,7 @@
|
|
||||||
#include "DICOMFile.h"
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
-#include <string>
|
|
||||||
+#include <cstring>
|
|
||||||
|
|
||||||
DICOMFile::DICOMFile() : InputStream()
|
|
||||||
{
|
|
||||||
--- VTK-5.0.4/Utilities/DICOMParser/DICOMParser.cxx.gcc43 2007-11-07 13:51:57.000000000 -0700
|
|
||||||
+++ VTK-5.0.4/Utilities/DICOMParser/DICOMParser.cxx 2008-02-18 10:33:07.000000000 -0700
|
|
||||||
@@ -39,7 +39,7 @@
|
|
||||||
#include <sys/types.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#include <string>
|
|
||||||
+#include <cstring>
|
|
||||||
|
|
||||||
// Define DEBUG_DICOM to get debug messages sent to dicom_stream::cerr
|
|
||||||
// #define DEBUG_DICOM
|
|
62
vtk.spec
62
vtk.spec
|
@ -6,16 +6,16 @@
|
||||||
|
|
||||||
Summary: The Visualization Toolkit - A high level 3D visualization library
|
Summary: The Visualization Toolkit - A high level 3D visualization library
|
||||||
Name: vtk
|
Name: vtk
|
||||||
Version: 5.0.4
|
Version: 5.2.0
|
||||||
Release: 23.99%{?dist}
|
Release: 26%{?dist}
|
||||||
# This is a variant BSD license, a cross between BSD and ZLIB.
|
# This is a variant BSD license, a cross between BSD and ZLIB.
|
||||||
# For all intents, it has the same rights and restrictions as BSD.
|
# For all intents, it has the same rights and restrictions as BSD.
|
||||||
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
|
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
|
||||||
License: BSD
|
License: BSD
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Source: http://www.vtk.org/files/release/5.0/%{name}-%{version}.tar.gz
|
Source: http://www.vtk.org/files/release/5.2/%{name}-%{version}.tar.gz
|
||||||
Patch0: vtk-5.0.0-pythondestdir.patch
|
Patch0: vtk-5.2.0-pythondestdir.patch
|
||||||
Patch1: vtk-5.0.4-gcc43.patch
|
Patch1: vtk-5.2.0-gcc43.patch
|
||||||
URL: http://vtk.org/
|
URL: http://vtk.org/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
BuildRequires: cmake >= 2.0.4
|
BuildRequires: cmake >= 2.0.4
|
||||||
|
@ -28,7 +28,7 @@ BuildRequires: tk-devel, tcl-devel
|
||||||
BuildRequires: python-devel
|
BuildRequires: python-devel
|
||||||
BuildRequires: expat-devel, freetype-devel, libjpeg-devel, libpng-devel
|
BuildRequires: expat-devel, freetype-devel, libjpeg-devel, libpng-devel
|
||||||
BuildRequires: libtiff-devel, zlib-devel
|
BuildRequires: libtiff-devel, zlib-devel
|
||||||
BuildRequires: qt-devel
|
BuildRequires: qt3-devel
|
||||||
%{?with_qt4:BuildRequires: qt4-devel}
|
%{?with_qt4:BuildRequires: qt4-devel}
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
BuildRequires: doxygen, graphviz
|
BuildRequires: doxygen, graphviz
|
||||||
|
@ -104,7 +104,7 @@ programming languages.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n VTK
|
%setup -q -n VTK
|
||||||
%patch0 -p1
|
%patch0 -p1 -b .pythondestdir
|
||||||
%patch1 -p1 -b .gcc43
|
%patch1 -p1 -b .gcc43
|
||||||
|
|
||||||
# Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version}
|
# Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version}
|
||||||
|
@ -116,9 +116,9 @@ grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs \
|
||||||
find . -name \*.c -or -name \*.cxx -or -name \*.h | xargs chmod -x
|
find . -name \*.c -or -name \*.cxx -or -name \*.h | xargs chmod -x
|
||||||
|
|
||||||
# Save an unbuilt copy of the Example's sources for %doc
|
# Save an unbuilt copy of the Example's sources for %doc
|
||||||
mkdir vtk-examples-5.0
|
mkdir vtk-examples-5.2
|
||||||
cp -a Examples vtk-examples-5.0
|
cp -a Examples vtk-examples-5.2
|
||||||
find vtk-examples-5.0 -type f | xargs chmod -R a-x
|
find vtk-examples-5.2 -type f | xargs chmod -R a-x
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="%{optflags} -D_UNICODE"
|
export CFLAGS="%{optflags} -D_UNICODE"
|
||||||
|
@ -139,9 +139,10 @@ cmake_command="cmake . \
|
||||||
-DBUILD_EXAMPLES:BOOL=ON \
|
-DBUILD_EXAMPLES:BOOL=ON \
|
||||||
-DBUILD_TESTING:BOOL=ON \
|
-DBUILD_TESTING:BOOL=ON \
|
||||||
-DCMAKE_INSTALL_PREFIX:PATH=$tmpinstall \
|
-DCMAKE_INSTALL_PREFIX:PATH=$tmpinstall \
|
||||||
|
-DDESIRED_QT_VERSION:STRING=3 \
|
||||||
-DVTK_INSTALL_BIN_DIR:PATH=%{_bindir} \
|
-DVTK_INSTALL_BIN_DIR:PATH=%{_bindir} \
|
||||||
-DVTK_INSTALL_INCLUDE_DIR:PATH=%{_includedir}/vtk \
|
-DVTK_INSTALL_INCLUDE_DIR:PATH=%{_includedir}/vtk \
|
||||||
-DVTK_INSTALL_LIB_DIR:PATH=%{_libdir} \
|
-DVTK_INSTALL_LIB_DIR:PATH=%{_libdir}/vtk-5.2 \
|
||||||
-DVTK_DATA_ROOT:PATH=%{_datadir}/vtkdata-%{version} \
|
-DVTK_DATA_ROOT:PATH=%{_datadir}/vtkdata-%{version} \
|
||||||
-DTK_INTERNAL_PATH:PATH=/usr/include/tk-private/generic \
|
-DTK_INTERNAL_PATH:PATH=/usr/include/tk-private/generic \
|
||||||
%if %{with OSMesa}
|
%if %{with OSMesa}
|
||||||
|
@ -205,13 +206,10 @@ fi
|
||||||
ls %{buildroot}%{_libdir}/*.so.* \
|
ls %{buildroot}%{_libdir}/*.so.* \
|
||||||
| grep -Ev '(Java|QVTK|PythonD|TCL)' | sed -e's,^%{buildroot},,' > libs.list
|
| grep -Ev '(Java|QVTK|PythonD|TCL)' | sed -e's,^%{buildroot},,' > libs.list
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{_libdir}/vtk-examples-5.0 \
|
|
||||||
%{buildroot}%{_libdir}/vtk-testing-5.0
|
|
||||||
|
|
||||||
# List of executable utilities
|
# List of executable utilities
|
||||||
cat > utils.list << EOF
|
cat > utils.list << EOF
|
||||||
vtkParseOGLExt
|
vtkParseOGLExt
|
||||||
vtkVREncodeString
|
vtkEncodeString
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# List of executable examples
|
# List of executable examples
|
||||||
|
@ -273,9 +271,10 @@ done
|
||||||
cat libs.list utils.list > main.list
|
cat libs.list utils.list > main.list
|
||||||
|
|
||||||
# Make shared libs and scripts executable
|
# Make shared libs and scripts executable
|
||||||
|
mv %{buildroot}%{_libdir}/vtk-5.2/lib*.so* %{buildroot}%{_libdir}/
|
||||||
chmod a+x %{buildroot}%{_libdir}/lib*.so.*
|
chmod a+x %{buildroot}%{_libdir}/lib*.so.*
|
||||||
chmod a+x %{buildroot}%{_libdir}/vtk-5.0/doxygen/*.pl
|
chmod a+x %{buildroot}%{_libdir}/vtk-5.2/doxygen/*.pl
|
||||||
chmod a+x %{buildroot}%{_libdir}/vtk-5.0/testing/*.{py,tcl}
|
chmod a+x %{buildroot}%{_libdir}/vtk-5.2/testing/*.{py,tcl}
|
||||||
|
|
||||||
# Remove exec bit from non-scripts and %%doc
|
# Remove exec bit from non-scripts and %%doc
|
||||||
for file in `find %{buildroot} -type f -perm 0755 \
|
for file in `find %{buildroot} -type f -perm 0755 \
|
||||||
|
@ -286,7 +285,7 @@ done
|
||||||
find Utilities/Upgrading -type f | xargs chmod -x
|
find Utilities/Upgrading -type f | xargs chmod -x
|
||||||
|
|
||||||
# Add exec bits to shared libs ...
|
# Add exec bits to shared libs ...
|
||||||
chmod 0755 %{buildroot}%{_libdir}/vtk-5.0/CMake/*.so
|
chmod 0755 %{buildroot}%{_libdir}/vtk-5.2/CMake/*.so
|
||||||
|
|
||||||
%check
|
%check
|
||||||
#LD_LIBARARY_PATH=`pwd`/bin ctest -V
|
#LD_LIBARARY_PATH=`pwd`/bin ctest -V
|
||||||
|
@ -323,12 +322,12 @@ rm -rf %{buildroot}
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc Utilities/Upgrading
|
%doc Utilities/Upgrading
|
||||||
%{_libdir}/vtk-5.0/doxygen
|
%{_libdir}/vtk-5.2/doxygen
|
||||||
%{_includedir}/vtk
|
%{_includedir}/vtk
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
%{_libdir}/vtk-5.0/CMake
|
%{_libdir}/vtk-5.2/CMake
|
||||||
%{_libdir}/vtk-5.0/*.cmake
|
%{_libdir}/vtk-5.2/*.cmake
|
||||||
%{_libdir}/vtk-5.0/hints
|
%{_libdir}/vtk-5.2/hints
|
||||||
|
|
||||||
%files tcl
|
%files tcl
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
@ -336,8 +335,8 @@ rm -rf %{buildroot}
|
||||||
%{_bindir}/vtk
|
%{_bindir}/vtk
|
||||||
%{_bindir}/vtkWrapTcl
|
%{_bindir}/vtkWrapTcl
|
||||||
%{_bindir}/vtkWrapTclInit
|
%{_bindir}/vtkWrapTclInit
|
||||||
%{_libdir}/vtk-5.0/pkgIndex.tcl
|
%{_libdir}/vtk-5.2/pkgIndex.tcl
|
||||||
%{_libdir}/vtk-5.0/tcl
|
%{_libdir}/vtk-5.2/tcl
|
||||||
|
|
||||||
%files python
|
%files python
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
@ -363,15 +362,19 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
%files testing -f testing.list
|
%files testing -f testing.list
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/vtk-5.0/testing
|
%{_libdir}/vtk-5.2/testing
|
||||||
%{_libdir}/vtk-testing-5.0
|
|
||||||
|
|
||||||
%files examples -f examples.list
|
%files examples -f examples.list
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc vtk-examples-5.0/Examples
|
%doc vtk-examples-5.2/Examples
|
||||||
%{_libdir}/vtk-examples-5.0
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Oct 5 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.2.0-26
|
||||||
|
- Update to 5.2.0.
|
||||||
|
|
||||||
|
* Wed Oct 1 2008 Orion Poplawski <orion@cora.nwra.com> - 5.0.2-25
|
||||||
|
- Fix patch fuzz
|
||||||
|
|
||||||
* Mon Aug 25 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.4-24
|
* Mon Aug 25 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.4-24
|
||||||
- Change java build dependencies from java-devel to gcj.
|
- Change java build dependencies from java-devel to gcj.
|
||||||
|
|
||||||
|
@ -385,6 +388,9 @@ rm -rf %{buildroot}
|
||||||
* Sat Apr 12 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.4-21
|
* Sat Apr 12 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.4-21
|
||||||
- Fixes for gcc 4.3 by Orion Poplawski.
|
- Fixes for gcc 4.3 by Orion Poplawski.
|
||||||
|
|
||||||
|
* Sat Apr 5 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.4-20
|
||||||
|
- Change BR to qt-devel to qt3-devel.
|
||||||
|
|
||||||
* Sat Feb 23 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.4-19
|
* Sat Feb 23 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.4-19
|
||||||
- Update to 5.0.4.
|
- Update to 5.0.4.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue