From 922a834a37a5592c47a33264644fb4432f360089 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 16 Sep 2013 11:09:00 -0600 Subject: [PATCH 01/19] Add requires sip to vtk-python --- vtk.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 9b00ec1..b897189 100644 --- a/vtk.spec +++ b/vtk.spec @@ -12,7 +12,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 5.10.1 -Release: 5%{?dist} +Release: 6%{?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 @@ -101,6 +101,7 @@ tcl bindings for VTK Summary: Python bindings for VTK Requires: vtk = %{version}-%{release} Group: System Environment/Libraries +Requires: sip %description python python bindings for VTK @@ -419,6 +420,9 @@ rm -rf %{buildroot} %doc vtk-examples/Examples %changelog +* Mon Sep 16 2013 Orion Poplawski - 5.10.1-6 +- Add requires sip to vtk-python + * Sun Jul 28 2013 Orion Poplawski - 5.10.1-5 - Build QVTKWidget and QVTKWidget2 (bug #981786) From 6e6bd7a240b89c29c19c5639d2acb2afa44de997 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 16 Sep 2013 19:11:20 -0600 Subject: [PATCH 02/19] Add requires PyQt4 to vtk-python --- vtk.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index b897189..ff44071 100644 --- a/vtk.spec +++ b/vtk.spec @@ -12,7 +12,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 5.10.1 -Release: 6%{?dist} +Release: 7%{?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 @@ -102,6 +102,7 @@ Summary: Python bindings for VTK Requires: vtk = %{version}-%{release} Group: System Environment/Libraries Requires: sip +Requires: PyQt4 %description python python bindings for VTK @@ -420,6 +421,9 @@ rm -rf %{buildroot} %doc vtk-examples/Examples %changelog +* Mon Sep 16 2013 Orion Poplawski - 5.10.1-7 +- Add requires PyQt4 to vtk-python + * Mon Sep 16 2013 Orion Poplawski - 5.10.1-6 - Add requires sip to vtk-python From a819f2e1e6a49d0a481fe4ef26db0641284d9009 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 10 Feb 2014 10:35:17 -0700 Subject: [PATCH 03/19] Enable Java on ppc64 --- vtk.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/vtk.spec b/vtk.spec index 7672a5c..5e02fd7 100644 --- a/vtk.spec +++ b/vtk.spec @@ -1,12 +1,7 @@ # Disable OSMesa builds for now - see Bug 744434 %bcond_with OSMesa - -# Disable java on ppc64 - fails to build -%ifarch ppc64 -%bcond_with java -%else +# Make Java conditional %bcond_without java -%endif %{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)} %{!?tcl_sitelib: %global tcl_sitelib %{_datadir}/tcl%{tcl_version}} From 5046e8ca5c79e8b65172abd492e019c1d3e79bdb Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 11 Dec 2015 10:49:40 -0700 Subject: [PATCH 04/19] Remove old java comment --- vtk.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 5e02fd7..a2a5fdb 100644 --- a/vtk.spec +++ b/vtk.spec @@ -33,7 +33,6 @@ BuildRequires: cmake28 BuildRequires: cmake %endif BuildRequires: gcc-c++ -#%{?with_java:BuildRequires: gcc-java, libgcj-devel, java-devel} %{?with_java:BuildRequires: java-devel} BuildRequires: libX11-devel, libXt-devel, libXext-devel BuildRequires: libICE-devel, libGL-devel From 21d77505886a1575c517d32d348b5b9a78fd0acf Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 13 Dec 2015 17:17:23 -0700 Subject: [PATCH 05/19] No longer need cmake28 for EPEL6 --- vtk.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/vtk.spec b/vtk.spec index a2a5fdb..52d0777 100644 --- a/vtk.spec +++ b/vtk.spec @@ -27,11 +27,7 @@ Patch2: vtk-6.1.0-netcdf.patch URL: http://vtk.org/ -%if 0%{?rhel} && (0%{?rhel} <= 6) -BuildRequires: cmake28 -%else BuildRequires: cmake -%endif BuildRequires: gcc-c++ %{?with_java:BuildRequires: java-devel} BuildRequires: libX11-devel, libXt-devel, libXext-devel @@ -201,11 +197,7 @@ export JAVA_HOME=/usr/lib/jvm/java mkdir build pushd build -%if 0%{?rhel} && (0%{?rhel} <= 6) -%{cmake28} .. \ -%else %{cmake} .. \ -%endif -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON \ -DBUILD_TESTING:BOOL=OFF \ From 37289cb8b2a0fc908a2581ce8a7f600fc4796cc8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 26 Mar 2014 20:18:27 -0600 Subject: [PATCH 06/19] Add Requires: qtwebkit-devel and hdf5-devel to vtk-devel (bug #1080781) --- vtk.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 52d0777..e0010c3 100644 --- a/vtk.spec +++ b/vtk.spec @@ -9,7 +9,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.1.0 -Release: 4%{?dist} +Release: 6%{?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 @@ -80,6 +80,7 @@ Requires: cmake Requires: gl2ps-devel Requires: expat-devel, libjpeg-devel, libpng-devel Requires: freetype-devel +Requires: hdf5-devel Requires: libogg-devel Requires: libtheora-devel Requires: libtiff-devel @@ -87,6 +88,7 @@ Requires: libxml2-devel Requires: postgresql-devel Requires: mysql-devel Requires: qt4-devel +Requires: qtwebkit-devel Group: Development/Libraries %description devel @@ -441,6 +443,9 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Wed Mar 26 2014 Orion Poplawski - 6.1.0-5 +- Add Requires: qtwebkit-devel and hdf5-devel to vtk-devel (bug #1080781) + * Tue Jan 28 2014 Orion Poplawski - 6.1.0-4 - Really fix requires freetype-devel From 94571bd53df45f3402d8e0d3518ef0bacb6d6407 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 5 Jun 2014 07:30:23 -0600 Subject: [PATCH 07/19] Add requires on blas-devel and lapack-devel to vtk-devel (bug #1105004) Conflicts: vtk.spec --- vtk.spec | 53 +++++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/vtk.spec b/vtk.spec index e0010c3..8757ba4 100644 --- a/vtk.spec +++ b/vtk.spec @@ -9,7 +9,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 6.1.0 -Release: 6%{?dist} +Release: 5%{?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 @@ -74,21 +74,25 @@ volume rendering, LOD control). %package devel Summary: VTK header files for building C++ code -Requires: vtk = %{version}-%{release} -%{?with_OSMesa:Requires: mesa-libOSMesa-devel} +Requires: vtk%{?_isa} = %{version}-%{release} +%{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} Requires: cmake -Requires: gl2ps-devel -Requires: expat-devel, libjpeg-devel, libpng-devel -Requires: freetype-devel -Requires: hdf5-devel -Requires: libogg-devel -Requires: libtheora-devel -Requires: libtiff-devel -Requires: libxml2-devel -Requires: postgresql-devel -Requires: mysql-devel -Requires: qt4-devel -Requires: qtwebkit-devel +Requires: blas-devel%{?_isa} +Requires: gl2ps-devel%{?_isa} +Requires: expat-devel%{?_isa} +Requires: freetype-devel%{?_isa} +Requires: hdf5-devel%{?_isa} +Requires: lapack-devel%{?_isa} +Requires: libjpeg-devel%{?_isa} +Requires: libpng-devel%{?_isa} +Requires: libogg-devel%{?_isa} +Requires: libtheora-devel%{?_isa} +Requires: libtiff-devel%{?_isa} +Requires: libxml2-devel%{?_isa} +Requires: postgresql-devel%{?_isa} +Requires: mysql-devel%{?_isa} +Requires: qt4-devel%{?_isa} +Requires: qtwebkit-devel%{?_isa} Group: Development/Libraries %description devel @@ -97,7 +101,7 @@ use VTK to do 3D visualization. %package tcl Summary: Tcl bindings for VTK -Requires: vtk = %{version}-%{release} +Requires: vtk%{?_isa} = %{version}-%{release} Group: System Environment/Libraries %description tcl @@ -105,7 +109,7 @@ tcl bindings for VTK %package python Summary: Python bindings for VTK -Requires: vtk = %{version}-%{release} +Requires: vtk%{?_isa} = %{version}-%{release} Group: System Environment/Libraries Requires: sip Requires: PyQt4 @@ -116,7 +120,7 @@ python bindings for VTK %if %{with java} %package java Summary: Java bindings for VTK -Requires: vtk = %{version}-%{release} +Requires: vtk%{?_isa} = %{version}-%{release} Group: System Environment/Libraries %description java @@ -125,7 +129,7 @@ Java bindings for VTK %package qt Summary: Qt bindings for VTK -Requires: vtk = %{version}-%{release} +Requires: vtk%{?_isa} = %{version}-%{release} Group: System Environment/Libraries %description qt @@ -133,7 +137,7 @@ Qt bindings for VTK %package qt-python Summary: Qt Python bindings for VTK -Requires: vtk = %{version}-%{release} +Requires: vtk%{?_isa} = %{version}-%{release} Group: System Environment/Libraries %description qt-python @@ -141,7 +145,7 @@ Qt Python bindings for VTK %package qt-tcl Summary: Qt TCL bindings for VTK -Requires: vtk = %{version}-%{release} +Requires: vtk%{?_isa} = %{version}-%{release} Group: System Environment/Libraries %description qt-tcl @@ -149,7 +153,7 @@ Qt TCL bindings for VTK %package testing Summary: Testing programs for VTK -Requires: vtk = %{version}-%{release}, vtkdata = %{version} +Requires: vtk%{?_isa} = %{version}-%{release}, vtkdata = %{version} Group: Applications/Engineering %description testing @@ -157,7 +161,7 @@ Testing programs for VTK %package examples Summary: Examples for VTK -Requires: vtk = %{version}-%{release}, vtkdata = %{version} +Requires: vtk%{?_isa} = %{version}-%{release}, vtkdata = %{version} Group: Applications/Engineering %description examples @@ -443,7 +447,8 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog -* Wed Mar 26 2014 Orion Poplawski - 6.1.0-5 +* Sun Dec 13 2015 Orion Poplawski - 6.1.0-5 +- Add requires on blas-devel and lapack-devel to vtk-devel (bug #1105004) - Add Requires: qtwebkit-devel and hdf5-devel to vtk-devel (bug #1080781) * Tue Jan 28 2014 Orion Poplawski - 6.1.0-4 From 40aab55f2c5e312f433e796a753c726abb13c73c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 4 Sep 2014 13:17:44 -0600 Subject: [PATCH 08/19] Increase java heap space for builds (bug #1115920) Conflicts: vtk.spec --- vtk.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vtk.spec b/vtk.spec index 8757ba4..6fbe611 100644 --- a/vtk.spec +++ b/vtk.spec @@ -199,6 +199,9 @@ export CFLAGS="%{optflags} -D_UNICODE" export CXXFLAGS="%{optflags} -D_UNICODE" %if %{with java} export JAVA_HOME=/usr/lib/jvm/java +# Arm/Aarch64 builders have less ram +# https://bugzilla.redhat.com/show_bug.cgi?id=1115920 +export JAVA_TOOL_OPTIONS=-Xmx2048m %endif mkdir build @@ -448,6 +451,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %changelog * Sun Dec 13 2015 Orion Poplawski - 6.1.0-5 +- Increase java heap space for builds (bug #1115920) - Add requires on blas-devel and lapack-devel to vtk-devel (bug #1105004) - Add Requires: qtwebkit-devel and hdf5-devel to vtk-devel (bug #1080781) From a52ac5b2fd7bfaf7c80d827c5de529b47b95d89f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 19 Nov 2014 10:30:52 -0700 Subject: [PATCH 09/19] Add patch to fix compilation with mesa 10.4 (bug #1138466) Conflicts: vtk.spec --- vtk-glext.patch | 13 +++++++++++++ vtk.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 vtk-glext.patch diff --git a/vtk-glext.patch b/vtk-glext.patch new file mode 100644 index 0000000..b5529a5 --- /dev/null +++ b/vtk-glext.patch @@ -0,0 +1,13 @@ +diff -up VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h.glext VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h +--- VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h.glext 2014-01-22 08:55:41.000000000 -0700 ++++ VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h 2014-11-19 10:27:12.349345199 -0700 +@@ -19,7 +19,8 @@ + #include "vtkConfigure.h" + + // To prevent gl.h to include glext.h provided by the system +-#define GL_GLEXT_LEGACY ++// https://bugzilla.redhat.com/show_bug.cgi?id=1138466 ++// #define GL_GLEXT_LEGACY + #if defined(__APPLE__) && (defined(VTK_USE_CARBON) || defined(VTK_USE_COCOA)) + # include // Include OpenGL API. + #else diff --git a/vtk.spec b/vtk.spec index 6fbe611..b6860d4 100644 --- a/vtk.spec +++ b/vtk.spec @@ -22,8 +22,11 @@ Patch0: vtk-6.1.0-system.patch # Install some more needed cmake files to try to support paraview build # http://www.vtk.org/Bug/view.php?id=14157 Patch1: vtk-install.patch -#Patch to vtk to use system netcdf library +# Patch to vtk to use system netcdf library Patch2: vtk-6.1.0-netcdf.patch +# Fix compilation with mesa 10.4 +# https://bugzilla.redhat.com/show_bug.cgi?id=1138466 +Patch3: vtk-glext.patch URL: http://vtk.org/ @@ -175,6 +178,7 @@ programming languages. %patch0 -p1 -b .system %patch1 -p1 -b .install %patch2 -p1 -b .netcdf +%patch3 -p1 -b .glext # Remove included thirdparty sources just to be sure # TODO - vtksqlite for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtknetcdf vtkoggtheora vtkpng vtktiff twisted vtkzlib zope @@ -451,6 +455,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %changelog * Sun Dec 13 2015 Orion Poplawski - 6.1.0-5 +- Add patch to fix compilation with mesa 10.4 (bug #1291099) - Increase java heap space for builds (bug #1115920) - Add requires on blas-devel and lapack-devel to vtk-devel (bug #1105004) - Add Requires: qtwebkit-devel and hdf5-devel to vtk-devel (bug #1080781) From 9a216079554eb4d61d5d942b11a4e6ac89648d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 20 Nov 2014 09:06:51 +0100 Subject: [PATCH 10/19] - Don't override Java memory settings on s390 (related to bug #1115920) Conflicts: vtk.spec --- vtk.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vtk.spec b/vtk.spec index b6860d4..9623786 100644 --- a/vtk.spec +++ b/vtk.spec @@ -205,8 +205,10 @@ export CXXFLAGS="%{optflags} -D_UNICODE" export JAVA_HOME=/usr/lib/jvm/java # Arm/Aarch64 builders have less ram # https://bugzilla.redhat.com/show_bug.cgi?id=1115920 +%ifnarch s390 export JAVA_TOOL_OPTIONS=-Xmx2048m %endif +%endif mkdir build pushd build @@ -456,6 +458,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %changelog * Sun Dec 13 2015 Orion Poplawski - 6.1.0-5 - Add patch to fix compilation with mesa 10.4 (bug #1291099) +- Don't override Java memory settings on s390 (related to bug #1115920) - Increase java heap space for builds (bug #1115920) - Add requires on blas-devel and lapack-devel to vtk-devel (bug #1105004) - Add Requires: qtwebkit-devel and hdf5-devel to vtk-devel (bug #1080781) From f03e72493c81e333943a41838d9ca48001d75966 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 8 Jan 2015 15:57:04 -0700 Subject: [PATCH 11/19] Add patch to fix compilation error Conflicts: vtk.spec --- vtk.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vtk.spec b/vtk.spec index 9623786..2839927 100644 --- a/vtk.spec +++ b/vtk.spec @@ -27,6 +27,9 @@ Patch2: vtk-6.1.0-netcdf.patch # Fix compilation with mesa 10.4 # https://bugzilla.redhat.com/show_bug.cgi?id=1138466 Patch3: vtk-glext.patch +# Fix types for std::min/man +# http://www.vtk.org/Bug/view.php?id=15249 +Patch4: vtk-type.patch URL: http://vtk.org/ @@ -179,6 +182,7 @@ programming languages. %patch1 -p1 -b .install %patch2 -p1 -b .netcdf %patch3 -p1 -b .glext +%patch4 -p1 -b .type # Remove included thirdparty sources just to be sure # TODO - vtksqlite for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtknetcdf vtkoggtheora vtkpng vtktiff twisted vtkzlib zope @@ -458,6 +462,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %changelog * Sun Dec 13 2015 Orion Poplawski - 6.1.0-5 - Add patch to fix compilation with mesa 10.4 (bug #1291099) +- Add patch to fix compilation error - Don't override Java memory settings on s390 (related to bug #1115920) - Increase java heap space for builds (bug #1115920) - Add requires on blas-devel and lapack-devel to vtk-devel (bug #1105004) From 92f1bf1777b54014e62d60699e90927efdca71d5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 8 Jan 2015 16:51:27 -0700 Subject: [PATCH 12/19] Commit vtk-type.patch --- vtk-type.patch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 vtk-type.patch diff --git a/vtk-type.patch b/vtk-type.patch new file mode 100644 index 0000000..fc891e9 --- /dev/null +++ b/vtk-type.patch @@ -0,0 +1,23 @@ +diff -up VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx.type VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx +--- VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx.type 2014-01-22 08:55:41.000000000 -0700 ++++ VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx 2015-01-08 15:00:40.492667074 -0700 +@@ -1186,7 +1186,7 @@ bool vtkFreeTypeTools::CalculateBounding + if (bitmap) + { + metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent); +- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)), ++ metaData.descent = std::min(-(static_cast(bitmap->rows) - (bitmapGlyph->top - 1)), + metaData.descent); + } + ++heightString; +@@ -1951,8 +1951,8 @@ void vtkFreeTypeTools::GetLineMetrics(T + if (bitmap) + { + bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left); +- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width); +- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows); ++ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast(bitmap->width)); ++ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast(bitmap->rows)); + bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1); + } + else From da82c4aaf474d5b44557c0fe9755fc81cb6d7ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= Date: Sat, 17 Jan 2015 15:09:17 +0100 Subject: [PATCH 13/19] Add jsoncpp-devel and python2-devel to vtk-devel Requires (bug #1183210) Conflicts: vtk.spec --- vtk.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vtk.spec b/vtk.spec index 2839927..f6b74f0 100644 --- a/vtk.spec +++ b/vtk.spec @@ -99,6 +99,8 @@ Requires: postgresql-devel%{?_isa} Requires: mysql-devel%{?_isa} Requires: qt4-devel%{?_isa} Requires: qtwebkit-devel%{?_isa} +Requires: jsoncpp-devel%{?_isa} +Requires: python2-devel Group: Development/Libraries %description devel @@ -462,6 +464,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %changelog * Sun Dec 13 2015 Orion Poplawski - 6.1.0-5 - Add patch to fix compilation with mesa 10.4 (bug #1291099) +- Add jsoncpp-devel and python2-devel to vtk-devel Requires (bug #1183210) - Add patch to fix compilation error - Don't override Java memory settings on s390 (related to bug #1115920) - Increase java heap space for builds (bug #1115920) From 1d22659f6db551649b97a5cdb9680c5349cdef5e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 3 Feb 2015 17:03:55 -0700 Subject: [PATCH 14/19] Add patch to fix tcl library loading Conflicts: vtk.spec --- vtk-tcllib.patch | 37 +++++++++++++++++++++++++++++++++++++ vtk.spec | 5 +++++ 2 files changed, 42 insertions(+) create mode 100644 vtk-tcllib.patch diff --git a/vtk-tcllib.patch b/vtk-tcllib.patch new file mode 100644 index 0000000..a56bce1 --- /dev/null +++ b/vtk-tcllib.patch @@ -0,0 +1,37 @@ +diff -up VTK-6.1.0/CMake/vtkModuleMacros.cmake.tcllib VTK-6.1.0/CMake/vtkModuleMacros.cmake +diff -up VTK-6.1.0/Wrapping/Tcl/CMakeLists.txt.tcllib VTK-6.1.0/Wrapping/Tcl/CMakeLists.txt +--- VTK-6.1.0/Wrapping/Tcl/CMakeLists.txt.tcllib 2014-01-22 08:55:41.000000000 -0700 ++++ VTK-6.1.0/Wrapping/Tcl/CMakeLists.txt 2015-02-03 16:12:42.635456315 -0700 +@@ -261,7 +261,7 @@ endforeach() + # Configure the Tcl package index file for the install tree. + SET(VTK_TCL_SCRIPT_DIR "[file dirname [info script]]") + IF(UNIX) +- SET(VTK_TCL_LIBRARY_DIR "[file dirname [file dirname [file dirname [info script]]]]") ++ SET(VTK_TCL_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/${VTK_INSTALL_LIBRARY_DIR}") + ELSE(UNIX) + SET(VTK_TCL_LIBRARY_DIR + "[file join [file dirname [file dirname [file dirname [file dirname [info script]]]]] bin]") +diff -up VTK-6.1.0/Wrapping/Tcl/pkgIndex.tcl.in.tcllib VTK-6.1.0/Wrapping/Tcl/pkgIndex.tcl.in +--- VTK-6.1.0/Wrapping/Tcl/pkgIndex.tcl.in.tcllib 2014-01-22 08:55:41.000000000 -0700 ++++ VTK-6.1.0/Wrapping/Tcl/pkgIndex.tcl.in 2015-02-03 16:12:42.635456315 -0700 +@@ -7,7 +7,7 @@ package ifneeded vtkinit {@VTK_MAJOR_VER + if {[catch "load {} $libName"]} { + set libExt [info sharedlibextension] + set currentDirectory [pwd] +- set libFile [file join $libPath "$libPrefix$libName-@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@$libExt"] ++ set libFile [file join $libPath "$libPrefix$libName$libExt"] + if {[catch "cd {$libPath}; load {$libFile}" errorMessage]} { + puts $errorMessage + } +diff -up VTK-6.1.0/Wrapping/Tcl/vtkbase/vtkbase.tcl.in.tcllib VTK-6.1.0/Wrapping/Tcl/vtkbase/vtkbase.tcl.in +--- VTK-6.1.0/Wrapping/Tcl/vtkbase/vtkbase.tcl.in.tcllib 2015-02-03 16:12:42.814455894 -0700 ++++ VTK-6.1.0/Wrapping/Tcl/vtkbase/vtkbase.tcl.in 2015-02-03 16:23:08.653411667 -0700 +@@ -44,7 +44,7 @@ namespace eval ::vtk { + } + + foreach dir $dirs { +- set libname [file join $dir ${prefix}${name}-@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@${ext}] ++ set libname [file join $dir ${prefix}${name}${ext}] + if {[file exists $libname]} { + if {![catch {load $libname} errormsg]} { + # WARNING: it HAS to be "" so that pkg_mkIndex work (since diff --git a/vtk.spec b/vtk.spec index f6b74f0..e75f746 100644 --- a/vtk.spec +++ b/vtk.spec @@ -30,6 +30,9 @@ Patch3: vtk-glext.patch # Fix types for std::min/man # http://www.vtk.org/Bug/view.php?id=15249 Patch4: vtk-type.patch +# Fix tcl library loading +# http://www.vtk.org/Bug/view.php?id=15279 +Patch5: vtk-tcllib.patch URL: http://vtk.org/ @@ -185,6 +188,7 @@ programming languages. %patch2 -p1 -b .netcdf %patch3 -p1 -b .glext %patch4 -p1 -b .type +%patch5 -p1 -b .tcllib # Remove included thirdparty sources just to be sure # TODO - vtksqlite for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtknetcdf vtkoggtheora vtkpng vtktiff twisted vtkzlib zope @@ -464,6 +468,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %changelog * Sun Dec 13 2015 Orion Poplawski - 6.1.0-5 - Add patch to fix compilation with mesa 10.4 (bug #1291099) +- Add patch to fix tcl library loading - Add jsoncpp-devel and python2-devel to vtk-devel Requires (bug #1183210) - Add patch to fix compilation error - Don't override Java memory settings on s390 (related to bug #1115920) From 08c1dbbf65abe0630aeed5804b0332bb63697d70 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 5 Mar 2015 15:55:00 -0700 Subject: [PATCH 15/19] Add needed vtk-*-devel requires to vtk-devel (bug #1199310) Conflicts: vtk.spec --- vtk.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vtk.spec b/vtk.spec index e75f746..3e7e228 100644 --- a/vtk.spec +++ b/vtk.spec @@ -84,6 +84,10 @@ volume rendering, LOD control). %package devel Summary: VTK header files for building C++ code Requires: vtk%{?_isa} = %{version}-%{release} +Requires: vtk-python%{?_isa} = %{version}-%{release} +Requires: vtk-qt-python%{?_isa} = %{version}-%{release} +Requires: vtk-qt-tcl%{?_isa} = %{version}-%{release} +Requires: vtk-tcl%{?_isa} = %{version}-%{release} %{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} Requires: cmake Requires: blas-devel%{?_isa} @@ -468,6 +472,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %changelog * Sun Dec 13 2015 Orion Poplawski - 6.1.0-5 - Add patch to fix compilation with mesa 10.4 (bug #1291099) +- Add needed vtk-*-devel requires to vtk-devel (bug #1199310) - Add patch to fix tcl library loading - Add jsoncpp-devel and python2-devel to vtk-devel Requires (bug #1183210) - Add patch to fix compilation error From 5f063548fc03b04afe7475975fd7bf87b3f8227d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 23 May 2015 16:06:36 -0600 Subject: [PATCH 16/19] Add requires netcdf-cxx-devel to vtk-devel (bug #1224512) Conflicts: vtk.spec --- vtk.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vtk.spec b/vtk.spec index 3e7e228..2ab3181 100644 --- a/vtk.spec +++ b/vtk.spec @@ -104,6 +104,7 @@ Requires: libtiff-devel%{?_isa} Requires: libxml2-devel%{?_isa} Requires: postgresql-devel%{?_isa} Requires: mysql-devel%{?_isa} +Requires: netcdf-cxx-devel%{?_isa} Requires: qt4-devel%{?_isa} Requires: qtwebkit-devel%{?_isa} Requires: jsoncpp-devel%{?_isa} @@ -472,6 +473,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %changelog * Sun Dec 13 2015 Orion Poplawski - 6.1.0-5 - Add patch to fix compilation with mesa 10.4 (bug #1291099) +- Add requires netcdf-cxx-devel to vtk-devel (bug #1224512) - Add needed vtk-*-devel requires to vtk-devel (bug #1199310) - Add patch to fix tcl library loading - Add jsoncpp-devel and python2-devel to vtk-devel Requires (bug #1183210) From 3b9a2622282644c2a716253df527b41c1769b382 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 21 Aug 2015 14:46:06 -0600 Subject: [PATCH 17/19] Note bundled kwsys, remove unused kwsys files Conflicts: vtk.spec --- vtk.spec | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/vtk.spec b/vtk.spec index 2ab3181..4068c0f 100644 --- a/vtk.spec +++ b/vtk.spec @@ -71,6 +71,24 @@ BuildRequires: lapack-devel %{!?with_java:Conflicts: vtk-java} Requires: hdf5 = %{_hdf5_version} +# Bundled KWSys +# https://fedorahosted.org/fpc/ticket/555 +# Components used are specified in Utilities/KWSys/CMakeLists.txt +Provides: bundled(kwsys-base64) +Provides: bundled(kwsys-commandlinearguments) +Provides: bundled(kwsys-directory) +Provides: bundled(kwsys-dynamicloader) +Provides: bundled(kwsys-encoding) +Provides: bundled(kwsys-fstream) +Provides: bundled(kwsys-fundamentaltype) +Provides: bundled(kwsys-glob) +Provides: bundled(kwsys-md5) +Provides: bundled(kwsys-process) +Provides: bundled(kwsys-regularexpression) +Provides: bundled(kwsys-system) +Provides: bundled(kwsys-systeminformation) +Provides: bundled(kwsys-systemtools) + # Do not check .so files in the python_sitearch directory %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ @@ -206,6 +224,9 @@ done grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs \ perl -pi -e's,\.\./\.\./\.\./\.\./VTKData,%{_datadir}/vtkdata-%{version},g' +# Remove unused KWSys items +find Utilities/KWSys/vtksys/ -name \*.[ch]\* | grep -vE '^Utilities/KWSys/vtksys/([a-z].*|Configure|SharedForward|String\.hxx|Base64|CommandLineArguments|Directory|DynamicLoader|Encoding|FStream|FundamentalType|Glob|MD5|Process|RegularExpression|System|SystemInformation|SystemTools)(C|CXX|UNIX)?\.' | xargs rm + # Save an unbuilt copy of the Example's sources for %doc mkdir vtk-examples cp -a Examples vtk-examples @@ -473,6 +494,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %changelog * Sun Dec 13 2015 Orion Poplawski - 6.1.0-5 - Add patch to fix compilation with mesa 10.4 (bug #1291099) +- Note bundled kwsys, remove unused kwsys files - Add requires netcdf-cxx-devel to vtk-devel (bug #1224512) - Add needed vtk-*-devel requires to vtk-devel (bug #1199310) - Add patch to fix tcl library loading From 6f13cf1a67aaae545d527d031d73a130c52286a8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 21 Oct 2015 11:44:46 -0600 Subject: [PATCH 18/19] Note bundled libraries Conflicts: vtk.spec --- vtk.spec | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index 4068c0f..de7b26c 100644 --- a/vtk.spec +++ b/vtk.spec @@ -88,6 +88,16 @@ Provides: bundled(kwsys-regularexpression) Provides: bundled(kwsys-system) Provides: bundled(kwsys-systeminformation) Provides: bundled(kwsys-systemtools) +# Other bundled libraries +Provides: bundled(alglib) +Provides: bundled(exodusII) = 2.0.0 +Provides: bundled(ftgl) = 1.32 +Provides: bundled(sqlite) = 3.6.22 +Provides: bundled(utf8cpp) +Provides: bundled(verdict) = 1.2.0 +Provides: bundled(vpic) +Provides: bundled(xdmf2) = 2.1 +Provides: bundled(xdmf3) # Do not check .so files in the python_sitearch directory %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ @@ -213,8 +223,15 @@ programming languages. %patch4 -p1 -b .type %patch5 -p1 -b .tcllib # Remove included thirdparty sources just to be sure -# TODO - vtksqlite -for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtknetcdf vtkoggtheora vtkpng vtktiff twisted vtkzlib zope +# TODO - alglib - http://www.vtk.org/Bug/view.php?id=15729 +# TODO - vtkexodusII - not yet packaged +# TODO - vtksqlite - http://www.vtk.org/Bug/view.php?id=14154 +# TODO - utf8cpp(source) - http://www.vtk.org/Bug/view.php?id=15730 +# TODO - vtkverdict - not yet packaged +# TODO - VPIC - not yet packaged +# TODO - vtkxdmf2 - not yet packaged +# TODO - vtkxdmf3 - not yet packaged +for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtkjsoncpp vtklibxml2 vtknetcdf vtkoggtheora vtkpng vtktiff twisted vtkzlib zope do rm -r ThirdParty/*/${x} done @@ -494,6 +511,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %changelog * Sun Dec 13 2015 Orion Poplawski - 6.1.0-5 - Add patch to fix compilation with mesa 10.4 (bug #1291099) +- Note bundled libraries - Note bundled kwsys, remove unused kwsys files - Add requires netcdf-cxx-devel to vtk-devel (bug #1224512) - Add needed vtk-*-devel requires to vtk-devel (bug #1199310) From b4e4e772cad98890467f043a6e42705bf167b3a0 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 21 Oct 2015 11:46:39 -0600 Subject: [PATCH 19/19] Also bundles metaio Conflicts: vtk.spec --- vtk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vtk.spec b/vtk.spec index de7b26c..7b9f8d5 100644 --- a/vtk.spec +++ b/vtk.spec @@ -92,6 +92,7 @@ Provides: bundled(kwsys-systemtools) Provides: bundled(alglib) Provides: bundled(exodusII) = 2.0.0 Provides: bundled(ftgl) = 1.32 +Provides: bundled(metaio) Provides: bundled(sqlite) = 3.6.22 Provides: bundled(utf8cpp) Provides: bundled(verdict) = 1.2.0