diff --git a/vtk-Mesa10.3-build-failures.patch b/vtk-Mesa10.3-build-failures.patch new file mode 100644 index 0000000..42c9439 --- /dev/null +++ b/vtk-Mesa10.3-build-failures.patch @@ -0,0 +1,13 @@ +Index: VTK-6.1.0/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx +=================================================================== +--- VTK-6.1.0.orig/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx ++++ VTK-6.1.0/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx +@@ -27,7 +27,7 @@ + + // define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by + // the system +-//#define GLX_GLXEXT_LEGACY ++#define GLX_GLXEXT_LEGACY + #include "GL/glx.h" + + #include "vtkgl.h" diff --git a/vtk.changes b/vtk.changes index 5cc45d8..414e894 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 11 01:52:56 UTC 2014 - badshah400@gmail.com + +- Add vtk-Mesa10.3-build-failures.patch to workaround build + failures when compiling against Mesa >= 10.3; patch taken from + upstream git and rebased; applied only for openSUSE >= 13.2. + ------------------------------------------------------------------- Fri Jan 24 20:44:24 UTC 2014 - badshah400@gmail.com diff --git a/vtk.spec b/vtk.spec index a83500b..bae4bf1 100644 --- a/vtk.spec +++ b/vtk.spec @@ -34,6 +34,8 @@ Patch0: vtk-system.patch Patch1: vtk-fix-file-contains-date-time.patch # PATCH-FIX-UPSTREAM vtk-install-missing-modules.patch badshah400@gmail.com -- Install some cmake modules missed in upstream packaging (will be required if in future we can get paraview to use system installed vtk) Patch2: vtk-install-missing-modules.patch +# PATCH-FIX-UPSTREAM vtk-Mesa10.3-build-failures.patch badshah400@gmail.com -- Actually define GLX_GLXEXT_LEGACY to prevent the system glext.h include; fixes buld failures with Mesa >= 10.3; fix taken from upstream git and rebased +Patch3: vtk-Mesa10.3-build-failures.patch BuildRequires: Mesa-libGL-devel BuildRequires: R-base-devel BuildRequires: boost-devel @@ -224,6 +226,9 @@ This package provides a few testing programs for VTK. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%if 0%{?suse_version} > 1310 +%patch3 -p1 +%endif # Replace relative path ../../../VTKData with %%{_datadir}/%%{name}data-%%{version} # otherwise it will break on symlinks.