[vtk6] 01/03: Fix FTBFS against new libjpeg. (Closes: #765938)

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository vtk6.

commit b660a4f4cefa9f53d46cc3e1cacc2f7be30485ef
Author: Ondřej Surý <ondrej at debian.org>
Date:   Wed Oct 22 20:44:38 2014 +0200

    Fix FTBFS against new libjpeg. (Closes: #765938)
---
 debian/patches/fix_GLintptr_FTBFS.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series                   |  2 ++
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/fix_GLintptr_FTBFS.patch b/debian/patches/fix_GLintptr_FTBFS.patch
new file mode 100644
index 0000000..a3fcc16
--- /dev/null
+++ b/debian/patches/fix_GLintptr_FTBFS.patch
@@ -0,0 +1,31 @@
+Description: fixes FTBFS against new libjpeg-turbo
+Author: Ondřej Surý <ondrej at debian.org>
+Bug-Debian: https://bugs.debian.org/765938
+Reviewed-By: Anton Gladky <gladk at 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"
diff --git a/debian/patches/series b/debian/patches/series
index ea38e8c..5414c91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,5 @@ use_system_sqlite.patch
 # Temporarly disable system_alglib
 # use_system_alglib.patch
 wxpython3.0.patch
+
+fix_GLintptr_FTBFS.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk6.git