diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2016-12-04 17:41:36 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2016-12-04 17:41:36 +0100 |
| commit | a351fc83694f436c3bff7cbdef09bd3cc91c74fc (patch) | |
| tree | 646145378742a6943d7c4dda995fc0fb67f9db32 /gnu/packages/patches/vtk-mesa-10.patch | |
| parent | 80b63e670ef4fe1fd40a903bcd4ee47a11415bd9 (diff) | |
| parent | d1a5b20081c30da7503201df260cf20b8d0ba633 (diff) | |
| download | guix-a351fc83694f436c3bff7cbdef09bd3cc91c74fc.tar guix-a351fc83694f436c3bff7cbdef09bd3cc91c74fc.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/vtk-mesa-10.patch')
| -rw-r--r-- | gnu/packages/patches/vtk-mesa-10.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/gnu/packages/patches/vtk-mesa-10.patch b/gnu/packages/patches/vtk-mesa-10.patch deleted file mode 100644 index bc60af68c4..0000000000 --- a/gnu/packages/patches/vtk-mesa-10.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix build against new mesa. See: - - https://bugs.freedesktop.org/show_bug.cgi?id=83631 - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765938 - -Description: fixes FTBFS against new libjpeg-turbo -Author: Ondřej Surý <ondrej@debian.org> -Bug-Debian: https://bugs.debian.org/765938 -Reviewed-By: Anton Gladky <gladk@debian.org> -Last-Update: 2014-10-22 - -Index: vtk6-6.1.0+dfsg2/Rendering/OpenGL/vtkOpenGL.h -=================================================================== ---- vtk6-6.1.0+dfsg2.orig/Rendering/OpenGL/vtkOpenGL.h -+++ vtk6-6.1.0+dfsg2/Rendering/OpenGL/vtkOpenGL.h -@@ -20,6 +20,7 @@ - - // To prevent gl.h to include glext.h provided by the system - #define GL_GLEXT_LEGACY -+#define GLX_GLEXT_LEGACY - #if defined(__APPLE__) && (defined(VTK_USE_CARBON) || defined(VTK_USE_COCOA)) - # include <OpenGL/gl.h> // Include OpenGL API. - #else -Index: vtk6-6.1.0+dfsg2/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx -=================================================================== ---- vtk6-6.1.0+dfsg2.orig/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx -+++ vtk6-6.1.0+dfsg2/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" |