Update to 5.8.0
Drop version from directory names Use VTK_PYTHON_SETUP_ARGS instead of patch to set python install dir Drop several patches fixed upstream Remove rpaths from all hand installed binaries (Bug 744437) Don't link against OSMesa (Bug 744434)
This commit is contained in:
parent
d696ba3bcb
commit
ec8139c8fc
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
vtk-5.6.0.tar.gz
|
||||
/vtk-5.6.1.tar.gz
|
||||
/vtk-5.8.0.tar.gz
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
b80a76435207c5d0f74dfcab15b75181 vtk-5.6.1.tar.gz
|
||||
37b7297d02d647cc6ca95b38174cb41f vtk-5.8.0.tar.gz
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- VTK/Wrapping/Python/CMakeLists.txt.pythondestdir 2008-05-03 21:34:42.000000000 +0200
|
||||
+++ VTK/Wrapping/Python/CMakeLists.txt 2008-10-05 11:15:44.000000000 +0200
|
||||
@@ -348,7 +348,7 @@
|
||||
|
||||
# Create default python setup arguments if they are not set.
|
||||
IF(NOT DEFINED VTK_PYTHON_SETUP_ARGS)
|
||||
- SET(VTK_PYTHON_SETUP_ARGS "--prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\""
|
||||
+ SET(VTK_PYTHON_SETUP_ARGS "--prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\" --root=\"${DOLLAR}ENV{DESTDIR}\""
|
||||
CACHE STRING "Arguments passed to \"python setup.py install ...\" during installation.")
|
||||
MARK_AS_ADVANCED(VTK_PYTHON_SETUP_ARGS)
|
||||
ENDIF(NOT DEFINED VTK_PYTHON_SETUP_ARGS)
|
@ -1,13 +0,0 @@
|
||||
diff --git a/CMake/FindPythonLibs.cmake b/CMake/FindPythonLibs.cmake
|
||||
index 1ba21b5..217e7e9 100644
|
||||
--- a/CMake/FindPythonLibs.cmake
|
||||
+++ b/CMake/FindPythonLibs.cmake
|
||||
@@ -27,7 +27,7 @@ INCLUDE(CMakeFindFrameworks)
|
||||
# Search for the python framework on Apple.
|
||||
CMAKE_FIND_FRAMEWORKS(Python)
|
||||
|
||||
-FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
|
||||
+FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
|
||||
STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
|
||||
IF(WIN32)
|
||||
FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
|
@ -1,20 +0,0 @@
|
||||
--- VTK/Graphics/Testing/Cxx/CMakeLists.txt.testcxxjava 2010-03-31 18:44:26.000000000 +0200
|
||||
+++ VTK/Graphics/Testing/Cxx/CMakeLists.txt 2010-07-10 11:29:39.943549435 +0200
|
||||
@@ -107,17 +107,3 @@
|
||||
ENDFOREACH (test)
|
||||
ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
|
||||
|
||||
-IF (VTK_WRAP_JAVA)
|
||||
- ADD_EXECUTABLE(TestJavaProgrammableFilter TestJavaProgrammableFilter.cxx)
|
||||
- ADD_TEST(TestJavaProgrammableFilter
|
||||
- ${CXX_TEST_PATH}/TestJavaProgrammableFilter
|
||||
- -j ${LIBRARY_OUTPUT_PATH}/vtk.jar
|
||||
- -cp ${LIBRARY_OUTPUT_PATH}/vtk.jar
|
||||
- -class vtk/SampleAlgorithm
|
||||
- )
|
||||
- TARGET_LINK_LIBRARIES(TestJavaProgrammableFilter
|
||||
- vtkGraphicsJava
|
||||
- ${JAVA_AWT_LIBRARY}
|
||||
- ${JAVA_JVM_LIBRARY}
|
||||
- )
|
||||
-ENDIF (VTK_WRAP_JAVA)
|
@ -1,23 +0,0 @@
|
||||
diff -up VTK/Common/vtkPythonUtil.cxx.gcc46 VTK/Common/vtkPythonUtil.cxx
|
||||
--- VTK/Common/vtkPythonUtil.cxx.gcc46 2010-09-27 14:40:01.000000000 -0600
|
||||
+++ VTK/Common/vtkPythonUtil.cxx 2011-02-08 11:15:39.596308982 -0700
|
||||
@@ -31,6 +31,8 @@
|
||||
#include <vtkstd/map>
|
||||
#include <vtkstd/string>
|
||||
|
||||
+#include <cstddef>
|
||||
+
|
||||
// Silent warning like
|
||||
// "dereferencing type-punned pointer will break strict-aliasing rules"
|
||||
// it happens because this kind of expression: (long *)&ptr
|
||||
diff -up VTK/Utilities/vtkmetaio/metaUtils.cxx.gcc46 VTK/Utilities/vtkmetaio/metaUtils.cxx
|
||||
--- VTK/Utilities/vtkmetaio/metaUtils.cxx.gcc46 2010-09-27 14:40:10.000000000 -0600
|
||||
+++ VTK/Utilities/vtkmetaio/metaUtils.cxx 2011-02-08 10:43:25.265499011 -0700
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
|
||||
+#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <string>
|
@ -1,41 +0,0 @@
|
||||
diff -up VTK/Utilities/Cosmo/CMakeLists.txt.soversion VTK/Utilities/Cosmo/CMakeLists.txt
|
||||
--- VTK/Utilities/Cosmo/CMakeLists.txt.soversion 2010-09-27 14:40:07.000000000 -0600
|
||||
+++ VTK/Utilities/Cosmo/CMakeLists.txt 2011-02-18 09:25:15.709081940 -0700
|
||||
@@ -35,6 +35,11 @@ INCLUDE_DIRECTORIES (${Cosmo_SOURCE_DIR}
|
||||
ADD_LIBRARY(Cosmo ${Cosmo_SOURCES})
|
||||
TARGET_LINK_LIBRARIES(Cosmo vtksys vtkCommon ${Cosmo_LIBS})
|
||||
|
||||
+# Apply user-defined properties to the library target. Such as SO Version
|
||||
+IF(VTK_LIBRARY_PROPERTIES)
|
||||
+ SET_TARGET_PROPERTIES(Cosmo PROPERTIES ${VTK_LIBRARY_PROPERTIES})
|
||||
+ENDIF(VTK_LIBRARY_PROPERTIES)
|
||||
+
|
||||
IF(NOT VTK_INSTALL_NO_LIBRARIES)
|
||||
INSTALL(TARGETS Cosmo
|
||||
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
|
||||
diff -up VTK/Utilities/VPIC/CMakeLists.txt.soversion VTK/Utilities/VPIC/CMakeLists.txt
|
||||
--- VTK/Utilities/VPIC/CMakeLists.txt.soversion 2010-09-27 14:40:08.000000000 -0600
|
||||
+++ VTK/Utilities/VPIC/CMakeLists.txt 2011-02-18 09:25:15.710081935 -0700
|
||||
@@ -31,6 +31,11 @@ TARGET_LINK_LIBRARIES(VPIC ${MPI_LIBRARY
|
||||
ENDIF(MPI_EXTRA_LIBRARY)
|
||||
ENDIF(VTK_USE_MPI)
|
||||
|
||||
+# Apply user-defined properties to the library target. Such as SO Version
|
||||
+IF(VTK_LIBRARY_PROPERTIES)
|
||||
+ SET_TARGET_PROPERTIES(VPIC PROPERTIES ${VTK_LIBRARY_PROPERTIES})
|
||||
+ENDIF(VTK_LIBRARY_PROPERTIES)
|
||||
+
|
||||
IF(NOT VTK_INSTALL_NO_LIBRARIES)
|
||||
INSTALL(TARGETS VPIC
|
||||
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
|
||||
diff -up VTK/Utilities/vtknetcdf/CMakeLists.txt.soversion VTK/Utilities/vtknetcdf/CMakeLists.txt
|
||||
--- VTK/Utilities/vtknetcdf/CMakeLists.txt.soversion 2010-09-27 14:40:10.000000000 -0600
|
||||
+++ VTK/Utilities/vtknetcdf/CMakeLists.txt 2011-05-19 09:50:07.325757772 -0600
|
||||
@@ -298,6 +298,7 @@ ADD_DEFINITIONS("-DNC_DLL_EXPORT")
|
||||
# Apply user-defined properties to the library target.
|
||||
IF(VTK_LIBRARY_PROPERTIES)
|
||||
SET_TARGET_PROPERTIES(vtkNetCDF PROPERTIES ${VTK_LIBRARY_PROPERTIES})
|
||||
+ SET_TARGET_PROPERTIES(vtkNetCDF_cxx PROPERTIES ${VTK_LIBRARY_PROPERTIES})
|
||||
ENDIF(VTK_LIBRARY_PROPERTIES)
|
||||
|
||||
IF(NOT VTK_INSTALL_NO_LIBRARIES)
|
@ -24,16 +24,3 @@ diff -up VTK/CMake/vtkThirdParty.cmake.system VTK/CMake/vtkThirdParty.cmake
|
||||
MARK_AS_ADVANCED(VTK_USE_SYSTEM_${upper})
|
||||
IF(VTK_USE_SYSTEM_${upper})
|
||||
IF(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
|
||||
diff -up VTK/Rendering/CMakeLists.txt.system VTK/Rendering/CMakeLists.txt
|
||||
--- VTK/Rendering/CMakeLists.txt.system 2010-09-27 14:40:06.000000000 -0600
|
||||
+++ VTK/Rendering/CMakeLists.txt 2011-02-08 14:11:47.379633170 -0700
|
||||
@@ -202,7 +202,8 @@ ENDIF (NOT VTK_LEGACY_REMOVE)
|
||||
|
||||
IF(VTK_USE_GL2PS)
|
||||
SET(Kit_SRCS ${Kit_SRCS} vtkGL2PSExporter.cxx)
|
||||
-
|
||||
+ OPTION(VTK_USE_SYSTEM_GL2PS "Use the system's gl2ps library." ${VTK_USE_SYSTEM_LIBRARIES})
|
||||
+ MARK_AS_ADVANCED(VTK_USE_SYSTEM_GL2PS)
|
||||
IF(VTK_USE_SYSTEM_GL2PS)
|
||||
ELSE(VTK_USE_SYSTEM_GL2PS)
|
||||
SET(Kit_GL2PS_SRCS ${VTK_SOURCE_DIR}/Utilities/vtkgl2ps/gl2ps.c)
|
||||
|
73
vtk.spec
73
vtk.spec
@ -1,31 +1,23 @@
|
||||
%bcond_without OSMesa
|
||||
# Disable OSMesa builds for now - see Bug 744434
|
||||
%bcond_with OSMesa
|
||||
%bcond_without java
|
||||
|
||||
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
|
||||
Summary: The Visualization Toolkit - A high level 3D visualization library
|
||||
Name: vtk
|
||||
Version: 5.6.1
|
||||
Release: 10%{?dist}
|
||||
Version: 5.8.0
|
||||
Release: 1%{?dist}
|
||||
# This is a variant BSD license, a cross between BSD and ZLIB.
|
||||
# For all intents, it has the same rights and restrictions as BSD.
|
||||
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
|
||||
License: BSD
|
||||
Group: System Environment/Libraries
|
||||
Source: http://www.vtk.org/files/release/5.6/%{name}-%{version}.tar.gz
|
||||
Patch0: vtk-5.2.0-pythondestdir.patch
|
||||
Source: http://www.vtk.org/files/release/5.8/%{name}-%{version}.tar.gz
|
||||
Patch1: vtk-5.2.0-gcc43.patch
|
||||
Patch2: vtk-5.6.0-testcxxjavaremove.patch
|
||||
# Python 2.7 compatibility: not yet sent upstream:
|
||||
Patch3: vtk-5.6.0-python27.patch
|
||||
# Add needed includes for gcc 4.6
|
||||
# http://public.kitware.com/Bug/view.php?id=11824
|
||||
Patch4: vtk-5.6.1-gcc46.patch
|
||||
# Use system libraries
|
||||
# http://public.kitware.com/Bug/view.php?id=11823
|
||||
Patch5: vtk-5.6.1-system.patch
|
||||
# Upstream patch to add soversions to libCosmo and libVPIC
|
||||
Patch6: vtk-5.6.1-soversion.patch
|
||||
|
||||
URL: http://vtk.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
@ -48,6 +40,7 @@ BuildRequires: chrpath
|
||||
BuildRequires: doxygen, graphviz
|
||||
BuildRequires: gnuplot
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: hdf5-devel
|
||||
BuildRequires: libtheora-devel
|
||||
BuildRequires: mysql-devel
|
||||
BuildRequires: postgresql-devel
|
||||
@ -135,13 +128,8 @@ programming languages.
|
||||
|
||||
%prep
|
||||
%setup -q -n VTK
|
||||
%patch0 -p1 -b .pythondestdir
|
||||
%patch1 -p1 -b .gcc43
|
||||
%patch2 -p1 -b .testcxxjava
|
||||
%patch3 -p1 -b .python27
|
||||
%patch4 -p1 -b .gcc46
|
||||
%patch5 -p1 -b .system
|
||||
%patch6 -p1 -b .soversion
|
||||
|
||||
# Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version}
|
||||
# otherwise it will break on symlinks.
|
||||
@ -149,11 +137,11 @@ grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs \
|
||||
perl -pi -e's,\.\./\.\./\.\./\.\./VTKData,%{_datadir}/vtkdata-%{version},g'
|
||||
|
||||
# Save an unbuilt copy of the Example's sources for %doc
|
||||
mkdir vtk-examples-5.6
|
||||
cp -a Examples vtk-examples-5.6
|
||||
mkdir vtk-examples
|
||||
cp -a Examples vtk-examples
|
||||
# Don't ship Win32 examples
|
||||
rm -rf vtk-examples-5.6/Examples/GUI/Win32
|
||||
find vtk-examples-5.6 -type f | xargs chmod -R a-x
|
||||
rm -rf vtk-examples/Examples/GUI/Win32
|
||||
find vtk-examples -type f | xargs chmod -R a-x
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags} -D_UNICODE"
|
||||
@ -169,12 +157,13 @@ pushd build
|
||||
-DBUILD_EXAMPLES:BOOL=ON \
|
||||
-DBUILD_TESTING:BOOL=ON \
|
||||
-DVTK_INSTALL_INCLUDE_DIR:PATH=/include/vtk \
|
||||
-DVTK_INSTALL_LIB_DIR:PATH=/%{_lib}/vtk-5.6 \
|
||||
-DVTK_INSTALL_LIB_DIR:PATH=/%{_lib}/vtk \
|
||||
-DVTK_INSTALL_QT_DIR=/%{_lib}/qt4/plugins/designer \
|
||||
-DTK_INTERNAL_PATH:PATH=/usr/include/tk-private/generic \
|
||||
%if %{with OSMesa}
|
||||
-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
|
||||
%endif
|
||||
-DVTK_PYTHON_SETUP_ARGS="--prefix=/usr --root=%{buildroot}" \
|
||||
-DVTK_WRAP_PYTHON:BOOL=ON \
|
||||
%if %{with java}
|
||||
-DVTK_WRAP_JAVA:BOOL=ON \
|
||||
@ -223,7 +212,7 @@ if [ "%{_lib}" != lib -a "`ls %{buildroot}%{_prefix}/lib/*`" != "" ]; then
|
||||
mkdir -p %{buildroot}%{_libdir}
|
||||
mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}/
|
||||
fi
|
||||
mv %{buildroot}%{_libdir}/vtk-5.6/lib*.so* %{buildroot}%{_libdir}/
|
||||
mv %{buildroot}%{_libdir}/vtk/lib*.so* %{buildroot}%{_libdir}/
|
||||
|
||||
# Gather list of non-python/tcl libraries
|
||||
ls %{buildroot}%{_libdir}/*.so.* \
|
||||
@ -286,7 +275,7 @@ for filelist in utils.list examples.list testing.list; do
|
||||
done
|
||||
|
||||
# Remove any remnants of rpaths
|
||||
for file in `cat examples.list`; do
|
||||
for file in `cat utils.list examples.list testing.list`; do
|
||||
chrpath -d %{buildroot}$file
|
||||
done
|
||||
|
||||
@ -296,8 +285,8 @@ popd
|
||||
|
||||
# Make shared libs and scripts executable
|
||||
chmod a+x %{buildroot}%{_libdir}/lib*.so.*
|
||||
chmod a+x %{buildroot}%{_libdir}/vtk-5.6/doxygen/*.pl
|
||||
chmod a+x %{buildroot}%{_libdir}/vtk-5.6/testing/*.{py,tcl}
|
||||
chmod a+x %{buildroot}%{_libdir}/vtk/doxygen/*.pl
|
||||
chmod a+x %{buildroot}%{_libdir}/vtk/testing/*.{py,tcl}
|
||||
|
||||
# Remove exec bit from non-scripts and %%doc
|
||||
for file in `find %{buildroot} -type f -perm 0755 \
|
||||
@ -308,11 +297,10 @@ done
|
||||
find Utilities/Upgrading -type f | xargs chmod -x
|
||||
|
||||
# Add exec bits to shared libs ...
|
||||
#chmod 0755 %{buildroot}%{_libdir}/vtk-5.6/CMake/*.so
|
||||
chmod 0755 %{buildroot}%{_libdir}/python*/site-packages/vtk/*.so
|
||||
|
||||
# Verdict places the docs in the false folder
|
||||
rm -fr %{buildroot}%{_libdir}/vtk-5.6/doc
|
||||
rm -fr %{buildroot}%{_libdir}/vtk/doc
|
||||
|
||||
%check
|
||||
#LD_LIBARARY_PATH=`pwd`/bin ctest -V
|
||||
@ -349,12 +337,13 @@ rm -rf %{buildroot}
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%doc Utilities/Upgrading
|
||||
%{_libdir}/vtk-5.6/doxygen
|
||||
%{_bindir}/vtkWrapHierarchy
|
||||
%{_libdir}/vtk/doxygen
|
||||
%{_includedir}/vtk
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/vtk-5.6/CMake
|
||||
%{_libdir}/vtk-5.6/*.cmake
|
||||
%{_libdir}/vtk-5.6/hints
|
||||
%{_libdir}/vtk/CMake
|
||||
%{_libdir}/vtk/*.cmake
|
||||
%{_libdir}/vtk/hints
|
||||
|
||||
%files tcl
|
||||
%defattr(-,root,root,-)
|
||||
@ -362,8 +351,8 @@ rm -rf %{buildroot}
|
||||
%{_bindir}/vtk
|
||||
%{_bindir}/vtkWrapTcl
|
||||
%{_bindir}/vtkWrapTclInit
|
||||
%{_libdir}/vtk-5.6/pkgIndex.tcl
|
||||
%{_libdir}/vtk-5.6/tcl
|
||||
%{_libdir}/vtk/pkgIndex.tcl
|
||||
%{_libdir}/vtk/tcl
|
||||
|
||||
%files python
|
||||
%defattr(-,root,root,-)
|
||||
@ -378,7 +367,7 @@ rm -rf %{buildroot}
|
||||
%files java
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/*Java.so.*
|
||||
%{_libdir}/vtk-5.6/java
|
||||
%{_libdir}/vtk/java
|
||||
%{_bindir}/vtkParseJava
|
||||
%{_bindir}/vtkWrapJava
|
||||
%endif
|
||||
@ -390,13 +379,21 @@ rm -rf %{buildroot}
|
||||
|
||||
%files testing -f build/testing.list
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/vtk-5.6/testing
|
||||
%{_libdir}/vtk/testing
|
||||
|
||||
%files examples -f build/examples.list
|
||||
%defattr(-,root,root,-)
|
||||
%doc vtk-examples-5.6/Examples
|
||||
%doc vtk-examples/Examples
|
||||
|
||||
%changelog
|
||||
* Fri Oct 7 2011 Orion Poplawski <orion@cora.nwra.com> - 5.8.0-1
|
||||
- Update to 5.8.0
|
||||
- Drop version from directory names
|
||||
- Use VTK_PYTHON_SETUP_ARGS instead of patch to set python install dir
|
||||
- Drop several patches fixed upstream
|
||||
- Remove rpaths from all hand installed binaries (Bug 744437)
|
||||
- Don't link against OSMesa (Bug 744434)
|
||||
|
||||
* Thu Jun 23 2011 Orion Poplawski <orion@cora.nwra.com> - 5.6.1-10
|
||||
- Add BR qtwebkit-devel, fixes FTBS bug 715770
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user