[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fedora-extras-commits
Subject:    [paraview] Add patch to make vtk use system libraries
From:       Orion Poplawski <orion () fedoraproject ! org>
Date:       2012-02-29 22:44:46
Message-ID: 20120229224446.761BF21941 () pkgs01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]

commit 41ae4e2c07a0db0d25014af8dd561c5ae6e3c950
Author: Orion Poplawski <orion@cora.nwra.com>
Date:   Wed Feb 29 15:44:43 2012 -0700

    Add patch to make vtk use system libraries

 paraview.spec          |   18 ++++++++++--------
 vtk-5.6.1-system.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 8 deletions(-)
---
diff --git a/paraview.spec b/paraview.spec
index ba0ca06..95ac68a 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -13,7 +13,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -24,6 +24,8 @@ Source1:        paraview_22x22.png
 Source2:        paraview.xml
 #Add some needed includes
 Patch1:         paraview-3.8.0-include.patch
+#Patch to vtk (from vtk package) to use system libraries
+Patch2:         vtk-5.6.1-system.patch
 #Patch to build with gcc 4.7
 #Reported upstream: http://paraview.org/Bug/view.php?id=12881
 Patch3:         paraview-gcc47.patch
@@ -56,6 +58,7 @@ BuildRequires:  boost-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtheora-devel
+BuildRequires:  libxml2-devel
 Requires:       hdf5 = %{_hdf5_version}
 Requires:       %{name}-data = %{version}-%{release}
 Requires:       %{name}-doc = %{version}-%{release}
@@ -101,13 +104,8 @@ Provides:       paraview-doc = %{version}-%{release}
         -DVTK_USE_INFOVIS:BOOL=OFF \\\
         -DVTK_USE_N_WAY_ARRAYS:BOOL=ON \\\
         -DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \\\
-        -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \\\
-        -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \\\
-        -DVTK_USE_SYSTEM_HDF5:BOOL=ON \\\
-        -DVTK_USE_SYSTEM_JPEG:BOOL=ON \\\
-        -DVTK_USE_SYSTEM_PNG:BOOL=ON \\\
-        -DVTK_USE_SYSTEM_TIFF:BOOL=ON \\\
-        -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \\\
+        -DVTK_USE_SYSTEM_LIBRARIES=ON \\\
+        -DVTK_USE_SYSTEM_LIBPROJ4=OFF \\\
         -DXDMF_WRAP_PYTHON:BOOL=ON \\\
         -DBUILD_DOCUMENTATION:BOOL=ON \\\
         -DBUILD_EXAMPLES:BOOL=ON
@@ -220,6 +218,7 @@ developing applications that use %{name}-mpich2.
 %prep
 %setup -q -n ParaView-%{version}%{?rcver}-Source
 %patch1 -p1 -b .include
+%patch2 -p0 -b .system
 %patch3 -p1 -b .gcc47
 %patch7 -p1 -b .hdf5
 #Remove included hdf5 just to be sure
@@ -469,6 +468,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Wed Feb 29 2012 Orion Poplawski <orion@cora.nwra.com> - 3.14.0-2
+- Add patch to make vtk use system libraries
+
 * Wed Feb 29 2012 Orion Poplawski <orion@cora.nwra.com> - 3.14.0-1
 - Update to 3.14.0
 - Rebase gcc47 patch
diff --git a/vtk-5.6.1-system.patch b/vtk-5.6.1-system.patch
new file mode 100644
index 0000000..5d44c35
--- /dev/null
+++ b/vtk-5.6.1-system.patch
@@ -0,0 +1,26 @@
+diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt
+--- VTK/CMakeLists.txt.system	2010-09-27 14:40:00.000000000 -0600
++++ VTK/CMakeLists.txt	2011-02-08 14:08:29.367122550 -0700
+@@ -106,6 +106,11 @@ IF(CMAKE_CONFIGURATION_TYPES)
+ ENDIF(CMAKE_CONFIGURATION_TYPES)
+ 
+ #-----------------------------------------------------------------------------
++# Do we try to use system libraries by default?
++OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF)
++MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES)
++
++#-----------------------------------------------------------------------------
+ # Load some macros.
+ INCLUDE(vtkDependentOption)
+ INCLUDE(vtkThirdParty)
+diff -up VTK/CMake/vtkThirdParty.cmake.system VTK/CMake/vtkThirdParty.cmake
+--- VTK/CMake/vtkThirdParty.cmake.system	2010-09-27 14:40:00.000000000 -0600
++++ VTK/CMake/vtkThirdParty.cmake	2011-02-08 14:07:46.424662568 -0700
+@@ -1,6 +1,6 @@
+ #-----------------------------------------------------------------------------
+ MACRO(VTK_THIRD_PARTY_OPTION upper lower)
+-  OPTION(VTK_USE_SYSTEM_${upper} "Use the system's ${lower} library." OFF)
++  OPTION(VTK_USE_SYSTEM_${upper} "Use the system's ${lower} library." ${VTK_USE_SYSTEM_LIBRARIES})
+   MARK_AS_ADVANCED(VTK_USE_SYSTEM_${upper})
+   IF(VTK_USE_SYSTEM_${upper})
+     IF(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
-- 
scm-commits mailing list
scm-commits@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/scm-commits
[prev in list] [next in list] [prev in thread] [next in thread]