[khronos-opencl-headers] 60/94: rediffed AMD_extensions.patch

[Andreas Beckmann]

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

anbe pushed a commit to branch master
in repository khronos-opencl-headers.

commit f7b41ddd73356d4c0ac2e18ef21a52b46994edf7
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Jul 14 13:28:28 2013 +0000

    rediffed AMD_extensions.patch
    
    git-svn-id: svn://svn.debian.org/svn/pkg-nvidia/packages/khronos-opencl-headers/trunk@3973 b6a4b1ba-b714-0410-8a2d-fc0b36c6496e
---
 debian/changelog                    |  1 +
 debian/patches/AMD_extensions.patch | 26 ++++++++++++--------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f764c71..820adeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 khronos-opencl-headers (1.2-2013.06.28-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * AMD_extensions.patch: Rediffed.
   * Drop Breaks/Replaces against squeeze packages.
   * Use canonical Vcs-* URLs.
   * Switch to debhelper 9.
diff --git a/debian/patches/AMD_extensions.patch b/debian/patches/AMD_extensions.patch
index 359bed9..27d0697 100644
--- a/debian/patches/AMD_extensions.patch
+++ b/debian/patches/AMD_extensions.patch
@@ -5,7 +5,7 @@ Bug-Debian: http://bugs.debian.org/695136
 --- a/cl_ext.h
 +++ b/cl_ext.h
 @@ -40,6 +40,9 @@
- 	#include <CL/cl.h>
+         #include <CL/cl.h>
  #endif
  
 +/* cl_khr_fp64 extension - no extension #define since it has no functions  */
@@ -14,11 +14,10 @@ Bug-Debian: http://bugs.debian.org/695136
  /* cl_khr_fp16 extension - no extension #define since it has no functions  */
  #define CL_DEVICE_HALF_FP_CONFIG                    0x1033
  
-@@ -169,11 +172,46 @@
- #define CL_DEVICE_KERNEL_EXEC_TIMEOUT_NV            0x4005
+@@ -170,9 +173,45 @@
  #define CL_DEVICE_INTEGRATED_MEMORY_NV              0x4006
  
-+/*********************************
+ /*********************************
 +* cl_amd_device_memory_flags *
 +*********************************/
 +#define cl_amd_device_memory_flags 1
@@ -27,8 +26,8 @@ Bug-Debian: http://bugs.debian.org/695136
 +
 +/* cl_device_info */
 +#define CL_DEVICE_MAX_ATOMIC_COUNTERS_EXT           0x4032
- 
- /*********************************
++
++/*********************************
  * cl_amd_device_attribute_query *
  *********************************/
  #define CL_DEVICE_PROFILING_TIMER_OFFSET_AMD        0x4036
@@ -61,16 +60,15 @@ Bug-Debian: http://bugs.debian.org/695136
  
  #ifdef CL_VERSION_1_1
     /***********************************
-@@ -239,7 +277,11 @@
+@@ -238,6 +277,11 @@
      #define CL_PARTITION_BY_COUNTS_LIST_END_EXT         ((cl_device_partition_property_ext) 0)
      #define CL_PARTITION_BY_NAMES_LIST_END_EXT          ((cl_device_partition_property_ext) 0 - 1)
  
--
-+    /* cl_ext_atomic_counters_32 and cl_ext_atomic_counters_64 extensions 
-+     * no extension #define since they have no functions                                              
++    /* cl_ext_atomic_counters_32 and cl_ext_atomic_counters_64 extensions
++     * no extension #define since they have no functions
 +     */
 +    #define CL_DEVICE_MAX_ATOMIC_COUNTERS_EXT           0x4032
-+    
- 
- #endif /* CL_VERSION_1_1 */
- 
++
+ /*********************************
+ * cl_qcom_ext_host_ptr extension
+ *********************************/

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