[oclgrind] 01/01: Undef conflicting altivec macros (closes 806965)

[James Price]

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

jprice-guest pushed a commit to branch master
in repository oclgrind.

commit 7bea042e7b00f6858f5cbdaf18b369d22f0845bb
Author: James Price <j.price at bristol.ac.uk>
Date:   Tue Dec 8 18:15:19 2015 +0000

    Undef conflicting altivec macros (closes 806965)
---
 debian/changelog                 | 6 ++++++
 debian/patches/altivec_fix.patch | 9 ++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dda45cd..69fef4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+oclgrind (15.5-3) unstable; urgency=low
+
+  * Undef conflicting altivec macros (Closes: #806965)
+
+ -- James Price <j.price at bristol.ac.uk>  Tue, 08 Dec 2015 17:52:35 +0000
+
 oclgrind (15.5-2) unstable; urgency=low
 
   * Fix a couple of compiler warnings.
diff --git a/debian/patches/altivec_fix.patch b/debian/patches/altivec_fix.patch
index 9f84c92..9c96a8e 100644
--- a/debian/patches/altivec_fix.patch
+++ b/debian/patches/altivec_fix.patch
@@ -1,9 +1,9 @@
-Description: Replace vector with __vector to fix build with -malitvec.
+Description: Replace vector with __vector and undef altivec macros
 Author: James Price <j.price at bristol.ac.uk>
-Last-Update: 2015-10-25
+Last-Update: 2015-12-08
 --- a/src/CL/cl_platform.h
 +++ b/src/CL/cl_platform.h
-@@ -332,13 +332,13 @@
+@@ -332,13 +332,16 @@
  /* Define basic vector types */
  #if defined( __VEC__ )
     #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
@@ -14,6 +14,9 @@ Last-Update: 2015-10-25
 -   typedef vector unsigned int      __cl_uint4;
 -   typedef vector signed int        __cl_int4;
 -   typedef vector float             __cl_float4;
++   #undef vector
++   #undef bool
++   #undef pixel
 +   typedef __vector unsigned char     __cl_uchar16;
 +   typedef __vector signed char       __cl_char16;
 +   typedef __vector unsigned short    __cl_ushort8;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/oclgrind.git