HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| 7f9b77dc MW |
1 | Fix build against new mesa. See: |
| 2 | ||
| 3 | https://bugs.freedesktop.org/show_bug.cgi?id=83631 | |
| 4 | https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765938 | |
| 5 | ||
| 6 | Description: fixes FTBFS against new libjpeg-turbo | |
| 7 | Author: Ondřej Surý <ondrej@debian.org> | |
| 8 | Bug-Debian: https://bugs.debian.org/765938 | |
| 9 | Reviewed-By: Anton Gladky <gladk@debian.org> | |
| 10 | Last-Update: 2014-10-22 | |
| 11 | ||
| 12 | Index: vtk6-6.1.0+dfsg2/Rendering/OpenGL/vtkOpenGL.h | |
| 13 | =================================================================== | |
| 14 | --- vtk6-6.1.0+dfsg2.orig/Rendering/OpenGL/vtkOpenGL.h | |
| 15 | +++ vtk6-6.1.0+dfsg2/Rendering/OpenGL/vtkOpenGL.h | |
| 16 | @@ -20,6 +20,7 @@ | |
| 17 | ||
| 18 | // To prevent gl.h to include glext.h provided by the system | |
| 19 | #define GL_GLEXT_LEGACY | |
| 20 | +#define GLX_GLEXT_LEGACY | |
| 21 | #if defined(__APPLE__) && (defined(VTK_USE_CARBON) || defined(VTK_USE_COCOA)) | |
| 22 | # include <OpenGL/gl.h> // Include OpenGL API. | |
| 23 | #else | |
| 24 | Index: vtk6-6.1.0+dfsg2/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx | |
| 25 | =================================================================== | |
| 26 | --- vtk6-6.1.0+dfsg2.orig/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx | |
| 27 | +++ vtk6-6.1.0+dfsg2/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx | |
| 28 | @@ -27,7 +27,7 @@ | |
| 29 | ||
| 30 | // define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by | |
| 31 | // the system | |
| 32 | -//#define GLX_GLXEXT_LEGACY | |
| 33 | +#define GLX_GLXEXT_LEGACY | |
| 34 | #include "GL/glx.h" | |
| 35 | ||
| 36 | #include "vtkgl.h" |