[vtk7] 23/24: Add patch to correct for new gl2ps

[Gert Wollny]

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

gewo pushed a commit to branch master
in repository vtk7.

commit d69d8d8dd1039598f070ae2b5a1b0edb00dd95d6
Author: Gert Wollny <gewo at debian.org>
Date:   Sat Jul 8 22:05:52 2017 +0000

    Add patch to correct for new gl2ps
---
 debian/patches/107_gl2ps_1.4.0.patch | 57 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 58 insertions(+)

diff --git a/debian/patches/107_gl2ps_1.4.0.patch b/debian/patches/107_gl2ps_1.4.0.patch
new file mode 100644
index 0000000..796b7be
--- /dev/null
+++ b/debian/patches/107_gl2ps_1.4.0.patch
@@ -0,0 +1,57 @@
+From 4a104a692cfc43594d7558b879fd96c75037dbcd Mon Sep 17 00:00:00 2001
+From: jiapei100 <jp4work at gmail.com>
+Date: Mon, 26 Sep 2016 23:59:06 -0700
+Subject: [PATCH] For gl2ps most recent git, gl2psAddPolyPrimitive() requires
+ different parameters.
+
+---
+ Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx b/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx
+index ad086b03f89..1bdd0072d17 100644
+--- a/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx
++++ b/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx
+@@ -183,15 +183,15 @@ void vtkOpenGLGL2PSHelperImpl::ProcessTransformFeedback(
+       {
+       case GL_POINTS:
+         gl2psAddPolyPrimitive(GL2PS_POINT, 1, verts, 0, 0.f, 0.f, 0xffff, 1,
+-                              pointSize, 0);
++                              pointSize, gl2psLineCap (GL2PS_LINE_CAP_ROUND), gl2psLineJoin (GL2PS_LINE_JOIN_ROUND), 0);
+         break;
+ 
+       case GL_LINES:
+         curVert = (curVert + 1) % 2;
+         if (curVert == 0)
+           {
+-          gl2psAddPolyPrimitive(GL2PS_LINE, 2, verts, 0, 0.f, 0.f,
+-                                this->LineStipple, 1, lineWidth, 0);
++          gl2psAddPolyPrimitive(GL2PS_LINE, 2, verts, 0, 0.f, 0.f, this->LineStipple, 1, 
++                                lineWidth, gl2psLineCap (GL2PS_LINE_CAP_ROUND), gl2psLineJoin (GL2PS_LINE_JOIN_ROUND), 0);
+           }
+         break;
+ 
+@@ -199,8 +199,8 @@ void vtkOpenGLGL2PSHelperImpl::ProcessTransformFeedback(
+         curVert = (curVert + 1) % 3;
+         if (curVert == 0)
+           {
+-          gl2psAddPolyPrimitive(GL2PS_TRIANGLE, 3, verts, 0, 0.f, 0.f, 0xffff,
+-                                1, 1, 0);
++          gl2psAddPolyPrimitive(GL2PS_TRIANGLE, 3, verts, 0, 0.f, 0.f, 0xffff, 1, 
++                                1, gl2psLineCap (GL2PS_LINE_CAP_ROUND), gl2psLineJoin (GL2PS_LINE_JOIN_ROUND), 0);
+           }
+         break;
+ 
+@@ -270,9 +270,9 @@ void vtkOpenGLGL2PSHelperImpl::DrawString(const std::string &str,
+       bgVerts[4].xyz[2] = bgVerts[0].xyz[2];
+ 
+       gl2psAddPolyPrimitive(GL2PS_TRIANGLE, 3, bgVerts,     0, 0, 0, 0xffff, 0,
+-                            0, 0);
++                            0, gl2psLineCap (GL2PS_LINE_CAP_ROUND), gl2psLineJoin (GL2PS_LINE_JOIN_ROUND), 0);
+       gl2psAddPolyPrimitive(GL2PS_TRIANGLE, 3, bgVerts + 2, 0, 0, 0, 0xffff, 0,
+-                            0, 0);
++                            0, gl2psLineCap (GL2PS_LINE_CAP_ROUND), gl2psLineJoin (GL2PS_LINE_JOIN_ROUND), 0);
+       }
+     }
+ 
+
diff --git a/debian/patches/series b/debian/patches/series
index 5cd6baf..44e93b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 105_unforce_embedded_glew.patch
 106_install_doxygen_scripts_in_nodoc_build.patch
 99-hdf5-1.10-compatibility
+107_gl2ps_1.4.0.patch

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