[med-svn] r23544 - in trunk/packages/ginkgocadx/trunk/debian: . patches

[Gert Wollny]

Author: gert-guest
Date: 2017-01-08 18:46:38 +0000 (Sun, 08 Jan 2017)
New Revision: 23544

Added:
   trunk/packages/ginkgocadx/trunk/debian/patches/
   trunk/packages/ginkgocadx/trunk/debian/patches/01_ocl_clamp_fix.patch
   trunk/packages/ginkgocadx/trunk/debian/patches/series
Modified:
   trunk/packages/ginkgocadx/trunk/debian/changelog
   trunk/packages/ginkgocadx/trunk/debian/control
Log:
Add patch to correct shader and update uploader address

Modified: trunk/packages/ginkgocadx/trunk/debian/changelog
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/changelog	2017-01-08 07:39:57 UTC (rev 23543)
+++ trunk/packages/ginkgocadx/trunk/debian/changelog	2017-01-08 18:46:38 UTC (rev 23544)
@@ -1,3 +1,11 @@
+ginkgocadx (3.8.3-4) UNRELEASED; urgency=medium
+
+  * d/control: Update uploader mail address for Gert Wollny 
+  * d/patches/01: Patch OGLSL shader to work with LLVM compiler 
+    backend 
+
+ -- Gert Wollny <gewo at debian.org>  Sun, 08 Jan 2017 18:44:29 +0000
+
 ginkgocadx (3.8.3-3) unstable; urgency=medium
 
   * d/control: remove libssl-dev because lindcmtk-dev pulls it in

Modified: trunk/packages/ginkgocadx/trunk/debian/control
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/control	2017-01-08 07:39:57 UTC (rev 23543)
+++ trunk/packages/ginkgocadx/trunk/debian/control	2017-01-08 18:46:38 UTC (rev 23544)
@@ -3,7 +3,7 @@
 Uploaders: Andreas Tille <tille at debian.org>,
            Thorsten Alteholz <debian at alteholz.de>,
            Dmitry Smirnov <onlyjob at debian.org>,
-           Gert Wollny <gw.fossdev at gmail.com>
+           Gert Wollny <gewo at debian.org>
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),

Added: trunk/packages/ginkgocadx/trunk/debian/patches/01_ocl_clamp_fix.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/01_ocl_clamp_fix.patch	                        (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/01_ocl_clamp_fix.patch	2017-01-08 18:46:38 UTC (rev 23544)
@@ -0,0 +1,18 @@
+Description: Correct OCLSL shader to compile with LLVM
+Origin: Upstream
+commit 14f7ab71d5dcdcd77979e624b95233019f8f7ae3
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Date:   Sun Jan 8 19:31:15 2017 +0100
+diff --git a/cadxcore/vtk/vtkopenglginkgotexture.cpp b/cadxcore/vtk/vtkopenglginkgotexture.cpp
+index 6a8aa59..041f009 100644
+--- a/cadxcore/vtk/vtkopenglginkgotexture.cpp
++++ b/cadxcore/vtk/vtkopenglginkgotexture.cpp
+@@ -267,7 +267,7 @@ const char *FragmenProgramCode_gray[] = {
+         "{",
+         "vec4 color = texture2D(imagetexture, gl_TexCoord[0].xy);",
+         "float lutColor = (color.r + lutShift) * lutScale;",
+-        "lutColor = clamp(lutColor, 0, 1);",
++        "lutColor = clamp(lutColor, 0.0f, 1.0f);",
+         "vec4 cr = texture1D(lookuptable, lutColor);",
+         //"cr.a = 1.0;",
+         "gl_FragColor = cr;",

Added: trunk/packages/ginkgocadx/trunk/debian/patches/series
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/series	2017-01-08 18:46:38 UTC (rev 23544)
@@ -0,0 +1 @@
+01_ocl_clamp_fix.patch