[packages/khronos-OpenCL-headers] - updated to OpenCL 2.1 + CLHPP 2.0.9; still include cl.hpp for compatibility with OpenCL 1.2 - upda
qboosh
qboosh at pld-linux.org
Tue Jul 12 20:14:17 CEST 2016
commit ac2851b4f2b67023fc1e2fdb1d56bfb6037ce669
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Jul 12 20:14:37 2016 +0200
- updated to OpenCL 2.1 + CLHPP 2.0.9; still include cl.hpp for compatibility with OpenCL 1.2
- updated/cleaned up AMD_extensions patch
AMD_extensions.patch | 22 -----------------
khronos-OpenCL-headers.spec | 60 +++++++++++++++++++++++++--------------------
2 files changed, 33 insertions(+), 49 deletions(-)
---
diff --git a/khronos-OpenCL-headers.spec b/khronos-OpenCL-headers.spec
index d551872..5a9b575 100644
--- a/khronos-OpenCL-headers.spec
+++ b/khronos-OpenCL-headers.spec
@@ -1,33 +1,39 @@
Summary: OpenCL (Open Computing Language) header files
Summary(pl.UTF-8): Pliki nagłówkowe OpenCL (Open Computing Language)
Name: khronos-OpenCL-headers
-Version: 1.2
+Version: 2.1
Release: 1
License: MIT-like
Group: Libraries
-Source0: http://www.khronos.org/registry/cl/api/1.2/cl.h
-# Source0-md5: 393ecb00c9a15a2a942e135fd4eb4b82
-Source1: http://www.khronos.org/registry/cl/api/1.2/cl.hpp
-# Source1-md5: c364c5b654af266fc53711305357419f
-Source2: http://www.khronos.org/registry/cl/api/1.2/cl_egl.h
-# Source2-md5: 7b8446dab1d765ebde0a23095971ac89
-Source3: http://www.khronos.org/registry/cl/api/1.2/cl_ext.h
-# Source3-md5: d5630fb0dc6fb6e9f3b679f26a80a075
-Source4: http://www.khronos.org/registry/cl/api/1.2/cl_gl.h
-# Source4-md5: b8429948c35e43d72f944a4d732967e5
-Source5: http://www.khronos.org/registry/cl/api/1.2/cl_gl_ext.h
-# Source5-md5: 9e389c6edecc8559ca9b861ed3e8e96b
-Source6: http://www.khronos.org/registry/cl/api/1.2/cl_platform.h
-# Source6-md5: 360ac18b454f86e93a63afda1c3061e2
-Source7: http://www.khronos.org/registry/cl/api/1.2/opencl.h
-# Source7-md5: 6f511443ae9d2f85146e0c35221c1e7d
-# Those rely on D3D:
-# SourceXX: http://www.khronos.org/registry/cl/api/1.2/cl_d3d10.h
-## SourceXX-md5: 733d5d6b54cebdd0ecdde27e341bd465
-#SourceXX: http://www.khronos.org/registry/cl/api/1.2/cl_d3d11.h
-## SourceXX-md5: f53b2ffef7d9197fcc3cf80df2059d35
-#SourceXX: http://www.khronos.org/registry/cl/api/1.2/cl_dx9_media_sharing.h
-## SourceXX-md5: 1ad86f41fd01f3ba0388f5b610e65a07
+Source0: https://raw.githubusercontent.com/KhronosGroup/OpenCL-Headers/opencl21/cl.h
+# Source0-md5: 557e4785d3cf96b42de7ac40058d70d4
+Source1: https://raw.githubusercontent.com/KhronosGroup/OpenCL-Headers/opencl21/cl_egl.h
+# Source1-md5: c7f42a37356c2d4e42f2692921ed09a7
+Source2: https://raw.githubusercontent.com/KhronosGroup/OpenCL-Headers/opencl21/cl_ext.h
+# Source2-md5: c8e2cebcac210bfbbff6eaa275ad37de
+Source3: https://raw.githubusercontent.com/KhronosGroup/OpenCL-Headers/opencl21/cl_gl.h
+# Source3-md5: b1dac507ba9b9abf0d6060f4acd5f414
+Source4: https://raw.githubusercontent.com/KhronosGroup/OpenCL-Headers/opencl21/cl_gl_ext.h
+# Source4-md5: 8982a32bca3c81bfab06c265e0a4130e
+Source5: https://raw.githubusercontent.com/KhronosGroup/OpenCL-Headers/opencl21/cl_platform.h
+# Source5-md5: 7e110e1f5a2b39592811df312ffb07e7
+Source6: https://raw.githubusercontent.com/KhronosGroup/OpenCL-Headers/opencl21/opencl.h
+# Source6-md5: 687394644e8c4ec4fd3d77f2f86bc042
+# Three following are Win32 specific (rely on D3D), so we don't package them:
+#Source11: https://raw.githubusercontent.com/KhronosGroup/OpenCL-Headers/opencl21/cl_d3d10.h
+## Source11-md5: 64634186074ea8570ea24ce50b328968
+#Source12: https://raw.githubusercontent.com/KhronosGroup/OpenCL-Headers/opencl21/cl_d3d11.h
+## Source12-md5: 2608ee0f7a6101216cdfe3046591da30
+#Source13: https://raw.githubusercontent.com/KhronosGroup/OpenCL-Headers/opencl21/cl_dx9_media_sharing.h
+## Source13-md5: 6d92fb282cab5cfa91aa05d62ed1953e
+# This actually belongs to OpenCL 1.2, included for backward compatibility (OpenCL 2+ uses cl2.hpp)
+Source50: https://www.khronos.org/registry/cl/api/2.1/cl.hpp
+# Source50-md5: f2c8bee05e5a84ea8282b7b95646c515
+# Source7-md5: f2c8bee05e5a84ea8282b7b95646c515
+# OpenCL 2+ binding from CLHPP project
+#Source51Download: https://www.github.com/KhronosGroup/OpenCL-CLHPP/releases
+Source51: https://github.com/KhronosGroup/OpenCL-CLHPP/releases/download/v2.0.9/cl2.hpp
+# Source51-md5: b3413bff794df6b1b18125f282b22f44
Patch0: AMD_extensions.patch
URL: http://www.khronos.org/registry/cl/
Conflicts: Mesa-libOpenCL-devel
@@ -43,8 +49,8 @@ Pliki nagłówkowe języka obliczeń OpenCL (Open Computing Language).
%prep
%setup -q -cT
-cp %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
- %{SOURCE5} %{SOURCE6} %{SOURCE7} .
+cp %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} \
+ %{SOURCE50} %{SOURCE51} .
%patch0 -p1
@@ -53,7 +59,7 @@ cp %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_includedir}/CL
-install *.h $RPM_BUILD_ROOT%{_includedir}/CL
+cp -p *.h cl.hpp cl2.hpp $RPM_BUILD_ROOT%{_includedir}/CL
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/AMD_extensions.patch b/AMD_extensions.patch
index 27d0697..6309df4 100644
--- a/AMD_extensions.patch
+++ b/AMD_extensions.patch
@@ -4,16 +4,6 @@ Bug-Debian: http://bugs.debian.org/695136
--- a/cl_ext.h
+++ b/cl_ext.h
-@@ -40,6 +40,9 @@
- #include <CL/cl.h>
- #endif
-
-+/* cl_khr_fp64 extension - no extension #define since it has no functions */
-+#define CL_DEVICE_DOUBLE_FP_CONFIG 0x1032
-+
- /* cl_khr_fp16 extension - no extension #define since it has no functions */
- #define CL_DEVICE_HALF_FP_CONFIG 0x1033
-
@@ -170,9 +173,45 @@
#define CL_DEVICE_INTEGRATED_MEMORY_NV 0x4006
@@ -60,15 +50,3 @@ Bug-Debian: http://bugs.debian.org/695136
#ifdef CL_VERSION_1_1
/***********************************
-@@ -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
-+ */
-+ #define CL_DEVICE_MAX_ATOMIC_COUNTERS_EXT 0x4032
-+
- /*********************************
- * cl_qcom_ext_host_ptr extension
- *********************************/
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/khronos-OpenCL-headers.git/commitdiff/ac2851b4f2b67023fc1e2fdb1d56bfb6037ce669
More information about the pld-cvs-commit
mailing list