[khronos-opencl-headers] 05/08: Refresh debian patches

[Vincent Danjean]

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

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

commit eafe9f7eeb79ec099611cb03cb8572e461773ab3
Author: Vincent Danjean <Vincent.Danjean at ens-lyon.org>
Date:   Fri Sep 9 00:15:45 2016 +0200

    Refresh debian patches
    
    And removed upstream-applied ones
---
 debian/patches/AMD_extensions.patch                |  6 +++---
 debian/patches/fix_symbol_clash.patch              | 23 ----------------------
 .../patches/from-upstream-fix-egl-includes.patch   | 16 ---------------
 debian/patches/series                              |  2 --
 debian/patches/use__vector.patch                   |  2 +-
 5 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/debian/patches/AMD_extensions.patch b/debian/patches/AMD_extensions.patch
index b1b8c39..6056d0d 100644
--- a/debian/patches/AMD_extensions.patch
+++ b/debian/patches/AMD_extensions.patch
@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/695136
 
 --- a/cl_ext.h
 +++ b/cl_ext.h
-@@ -40,6 +40,9 @@ extern "C" {
+@@ -45,6 +45,9 @@
          #include <CL/cl.h>
  #endif
  
@@ -14,7 +14,7 @@ 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
  
-@@ -174,9 +177,45 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL
+@@ -179,9 +182,45 @@
  #define CL_DEVICE_INTEGRATED_MEMORY_NV              0x4006
  
  /*********************************
@@ -60,7 +60,7 @@ Bug-Debian: http://bugs.debian.org/695136
  
  /*********************************
  * cl_arm_printf extension
-@@ -248,6 +287,11 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL
+@@ -253,6 +292,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)
  
diff --git a/debian/patches/fix_symbol_clash.patch b/debian/patches/fix_symbol_clash.patch
deleted file mode 100644
index 28896fd..0000000
--- a/debian/patches/fix_symbol_clash.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix symbol clash when including cl2.hpp from multiple source files
-Author: James Price <j.price at bristol.ac.uk>
-Last-Update: 2015-10-24
---- a/cl2.hpp
-+++ b/cl2.hpp
-@@ -6557,7 +6557,7 @@
-     OutOfOrder = CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE,
- };
- 
--QueueProperties operator|(QueueProperties lhs, QueueProperties rhs)
-+inline QueueProperties operator|(QueueProperties lhs, QueueProperties rhs)
- {
-     return static_cast<QueueProperties>(static_cast<cl_command_queue_properties>(lhs) | static_cast<cl_command_queue_properties>(rhs));
- }
-@@ -8080,7 +8080,7 @@
-     Profiling = CL_QUEUE_PROFILING_ENABLE,
- };
- 
--DeviceQueueProperties  operator|(DeviceQueueProperties  lhs, DeviceQueueProperties  rhs)
-+inline DeviceQueueProperties operator|(DeviceQueueProperties lhs, DeviceQueueProperties rhs)
- {
-     return static_cast<DeviceQueueProperties>(static_cast<cl_command_queue_properties>(lhs) | static_cast<cl_command_queue_properties>(rhs));
- }
diff --git a/debian/patches/from-upstream-fix-egl-includes.patch b/debian/patches/from-upstream-fix-egl-includes.patch
deleted file mode 100644
index eae7dd6..0000000
--- a/debian/patches/from-upstream-fix-egl-includes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Vincent Danjean <vdanjean at debian.org>
-Subject: Remove unneeded EGL includes from cl_egl.h
-Bug-Debian: http://bugs.debian.org/809263
-Origin: https://github.com/KhronosGroup/OpenCL-Headers/commit/c1770dcc6cf1daadec1905e7393f3691c1dde200
-Applied-Upstream: commit:c1770dcc6cf1daadec1905e7393f3691c1dde200
---- a/cl_egl.h
-+++ b/cl_egl.h
-@@ -28,8 +28,6 @@
- 
- #else
- #include <CL/cl.h>
--#include <EGL/egl.h>
--#include <EGL/eglext.h>
- #endif  
- 
- #ifdef __cplusplus
diff --git a/debian/patches/series b/debian/patches/series
index 52222ad..60a1758 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 AMD_extensions.patch
 use__vector.patch
-fix_symbol_clash.patch
-from-upstream-fix-egl-includes.patch
diff --git a/debian/patches/use__vector.patch b/debian/patches/use__vector.patch
index 7bc1a10..623c084 100644
--- a/debian/patches/use__vector.patch
+++ b/debian/patches/use__vector.patch
@@ -4,7 +4,7 @@ Bug-Debian: https://bugs.debian.org/760310
 
 --- a/cl_platform.h
 +++ b/cl_platform.h
-@@ -361,13 +361,13 @@
+@@ -387,13 +387,13 @@
  /* 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. */

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