[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/04: gnu: vtk: Upgrade to 7.1.0.
|
From: |
Eric Bavier |
|
Subject: |
03/04: gnu: vtk: Upgrade to 7.1.0. |
|
Date: |
Fri, 2 Dec 2016 05:57:14 +0000 (UTC) |
bavier pushed a commit to branch master
in repository guix.
commit 0e988a8483de93a5f3f2e09193cadf285f37dea1
Author: Eric Bavier <address@hidden>
Date: Fri Jul 15 20:24:25 2016 -0500
gnu: vtk: Upgrade to 7.1.0.
* gnu/packages/vtk.scm (vtk): Upgrade to 7.1.0.
[source]: Remove patches. Use version-major+minor.
* gnu/packages/patches/vtk-mesa-10.patch: Delete patch.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
gnu/packages/patches/vtk-mesa-10.patch | 36 --------------------------------
gnu/packages/vtk.scm | 9 ++++----
3 files changed, 4 insertions(+), 42 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 6f128ed..f6f2db6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -912,7 +912,6 @@ dist_patch_DATA =
\
%D%/packages/patches/vpnc-script.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt1.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt2.patch \
- %D%/packages/patches/vtk-mesa-10.patch \
%D%/packages/patches/weechat-python.patch \
%D%/packages/patches/wicd-bitrate-none-fix.patch \
%D%/packages/patches/wicd-get-selected-profile-fix.patch \
diff --git a/gnu/packages/patches/vtk-mesa-10.patch
b/gnu/packages/patches/vtk-mesa-10.patch
deleted file mode 100644
index bc60af6..0000000
--- 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ý <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 13ce2e2..eef982a 100644
--- a/gnu/packages/vtk.scm
+++ b/gnu/packages/vtk.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Ludovic Courtès <address@hidden>
;;; Copyright © 2014 Mark H Weaver <address@hidden>
+;;; Copyright © 2016 Eric Bavier <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -29,17 +30,15 @@
(define-public vtk
(package
(name "vtk")
- (version "6.1.0")
+ (version "7.1.0")
(source (origin
(method url-fetch)
(uri (string-append "http://www.vtk.org/files/release/";
- (substring version 0
- (string-rindex version #\.))
+ (version-major+minor version)
"/VTK-" version ".tar.gz"))
(sha256
(base32
- "0d7shccdkyj4mbh2riilslgx3gd28in4c7xpm0lxa1ln8w5g2zdx"))
- (patches (search-patches "vtk-mesa-10.patch"))))
+ "0yj96z58haan77gzilnqp7xpf8hg5jk11a3jx55p2ksd400s0gjz"))))
(build-system cmake-build-system)
(arguments
;; Build without '-g' to save space.