02/02: gnu: vtk: Fix build with mesa-10.

[Mark H. Weaver]

mhw pushed a commit to branch xorg-updates
in repository guix.

commit 7f9b77dc465f35a3689036e12d0bf85ed7d81f52
Author: Mark H Weaver <address@hidden>
Date:   Sat Dec 27 10:01:44 2014 -0500

    gnu: vtk: Fix build with mesa-10.
    
    * gnu/packages/patches/vtk-mesa-10.patch: New file.
    * gnu-system.am (dist_patch_DATA): Add it.
    * gnu/packages/vtk.scm (vtk): Add patch.  Add glu to inputs.
---
 gnu-system.am                          |    1 +
 gnu/packages/patches/vtk-mesa-10.patch |   36 ++++++++++++++++++++++++++++++++
 gnu/packages/vtk.scm                   |    8 +++++-
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index 5acc6f4..fea7447 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -458,6 +458,7 @@ dist_patch_DATA =                                           
\
   gnu/packages/patches/udev-gir-libtool.patch                  \
   gnu/packages/patches/util-linux-perl.patch                   \
   gnu/packages/patches/vpnc-script.patch                       \
+  gnu/packages/patches/vtk-mesa-10.patch                       \
   gnu/packages/patches/w3m-fix-compile.patch                   \
   gnu/packages/patches/wmctrl-64-fix.patch                     \
   gnu/packages/patches/xf86-video-ark-remove-mibstore.patch    \
diff --git a/gnu/packages/patches/vtk-mesa-10.patch 
b/gnu/packages/patches/vtk-mesa-10.patch
new file mode 100644
index 0000000..bc60af6
--- /dev/null
+++ b/gnu/packages/patches/vtk-mesa-10.patch
@@ -0,0 +1,36 @@
+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ý <address@hidden>
+Bug-Debian: https://bugs.debian.org/765938
+Reviewed-By: Anton Gladky <address@hidden>
+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/gnu/packages/vtk.scm b/gnu/packages/vtk.scm
index 3d30279..1731210 100644
--- a/gnu/packages/vtk.scm
+++ b/gnu/packages/vtk.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014 Mark H Weaver <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,6 +22,7 @@
   #:use-module (guix download)
   #:use-module (guix licenses)
   #:use-module (guix build-system cmake)
+  #:use-module (gnu packages)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages gl))
 
@@ -36,7 +38,8 @@
                                   "/VTK-" version ".tar.gz"))
               (sha256
                (base32
-                "0d7shccdkyj4mbh2riilslgx3gd28in4c7xpm0lxa1ln8w5g2zdx"))))
+                "0d7shccdkyj4mbh2riilslgx3gd28in4c7xpm0lxa1ln8w5g2zdx"))
+              (patches (list (search-patch "vtk-mesa-10.patch")))))
     (build-system cmake-build-system)
     (arguments
      ;; Build without '-g' to save space.
@@ -46,7 +49,8 @@
      `(("libXt" ,libxt)
        ("xproto" ,xproto)
        ("libX11" ,libx11)
-       ("mesa" ,mesa)))
+       ("mesa" ,mesa)
+       ("glu" ,glu)))
     (home-page "http://www.vtk.org/";)
     (synopsis "Libraries for 3D computer graphics")
     (description