Update to OpenCL 2.0 specification

PR:		ports/187897
Submitted by:	maintainer

5 files changed, 21 insertions, 77 deletions

diff --git a/devel/opencl/Makefile b/devel/opencl/Makefile
index 0d511c69d28e..998e697dfaa6 100644
--- a/devel/opencl/Makefile
+++ b/devel/opencl/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opencl
-PORTVERSION=	1.2
-PORTREVISION=	7
+PORTVERSION=	2.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.khronos.org/registry/cl/api/${PORTVERSION}/
 DISTFILES=	opencl.h cl_platform.h cl.h cl_ext.h cl_dx9_media_sharing.h \
@@ -12,7 +11,7 @@ DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=
 
 MAINTAINER=	ohartman@zedat.fu-berlin.de
-COMMENT=	Open Computing Language (OpenCL) specifications V1.2 (header files)
+COMMENT=	Open Computing Language (OpenCL) specifications V2.0 (header files)
 
 LICENSE=	unknown
 LICENSE_NAME=	BSD-esque license agreement
diff --git a/devel/opencl/distinfo b/devel/opencl/distinfo
index f5efec7c1f24..6502c497326e 100644
--- a/devel/opencl/distinfo
+++ b/devel/opencl/distinfo
@@ -1,20 +1,20 @@
-SHA256 (opencl/opencl.h) = be1bf717e103678292d6718b3608c9e54a48588c02d3d387a48656fac46ec8d9
+SHA256 (opencl/opencl.h) = fceb7e76d81159caab6308a05ff05d18fbd84718eff4263473ecd148c458987c
 SIZE (opencl/opencl.h) = 1754
-SHA256 (opencl/cl_platform.h) = e212b89bba54f7a4e090a2b2f58f779241ffb3b45b870eee790689fc2ca0e0ae
-SIZE (opencl/cl_platform.h) = 41127
-SHA256 (opencl/cl.h) = a5465c2ed1a0687878c8f7aa25f94626d7cd3a3868163ecaa6e8b36d6ed52368
-SIZE (opencl/cl.h) = 61545
-SHA256 (opencl/cl_ext.h) = ab8dcf1e04ac63cc5a68fdfb4787a44a25a9c0c129ed7eda046e7911af3d4ebd
-SIZE (opencl/cl_ext.h) = 13766
-SHA256 (opencl/cl_dx9_media_sharing.h) = 26fb40bac8e229747bdc27b350b836e3703c1e946cb40893f4c8ab2289203920
-SIZE (opencl/cl_dx9_media_sharing.h) = 5157
-SHA256 (opencl/cl_d3d10.h) = c7adb38a19663ee240977afc64903f4638d9c5c03ca478793c9f7a15c1c6ac2b
-SIZE (opencl/cl_d3d10.h) = 4859
-SHA256 (opencl/cl_d3d11.h) = 8ade5d641e1acd12fa37bac36abf41f24985f4e38ceb32da9c01cc0e4fc3742f
-SIZE (opencl/cl_d3d11.h) = 4853
-SHA256 (opencl/cl_gl.h) = aa49d380177ac538b8ab00196381301fac6178e5b931398e3da43067ac3c33c4
-SIZE (opencl/cl_gl.h) = 7343
-SHA256 (opencl/cl_gl_ext.h) = 4d663bbfc932ab405623e5f5d1bba3f438351d0ead65e1ccdd9bb769caf7a7d0
+SHA256 (opencl/cl_platform.h) = 042877b8091bfeeb489018505ce36c37cd3295e691856461b1c0a8fbb6b2cc21
+SIZE (opencl/cl_platform.h) = 42192
+SHA256 (opencl/cl.h) = 5c39e93d4492cd3005ae806a91b7dd3cad28f4e69036208be21e37f8a4395717
+SIZE (opencl/cl.h) = 70803
+SHA256 (opencl/cl_ext.h) = be1ff04c63b678383828ab1e69ecf3bec54eec4cf4ae33e210b4a16eff47d809
+SIZE (opencl/cl_ext.h) = 14002
+SHA256 (opencl/cl_dx9_media_sharing.h) = 41968538b82523ef8fb642a1a4da20a6262ce0448f71541db080f8ccc03971b6
+SIZE (opencl/cl_dx9_media_sharing.h) = 5181
+SHA256 (opencl/cl_d3d10.h) = 14b00ef68a2d7f471c7ef5b4576bc103888da70fc525b263b49ff7fff150e188
+SIZE (opencl/cl_d3d10.h) = 4883
+SHA256 (opencl/cl_d3d11.h) = 707709a73b6b43b96c55e813efb2d655efcc82eb103da4b8aea191231df7e1fd
+SIZE (opencl/cl_d3d11.h) = 4877
+SHA256 (opencl/cl_gl.h) = 40375d991f4e847c94ad56c6c14400e3e7d72620117b49636518a96d57f30647
+SIZE (opencl/cl_gl.h) = 7346
+SHA256 (opencl/cl_gl_ext.h) = dccb3b45e53bfe0219bb48e6dbe9591bbe6a090a8b0d93a3b8580f526abc4616
 SIZE (opencl/cl_gl_ext.h) = 2630
-SHA256 (opencl/cl.hpp) = a726d674bfa4ee7f71d1287d86afa15db2e360518fd58594257a80f25642d6b4
-SIZE (opencl/cl.hpp) = 281446
+SHA256 (opencl/cl.hpp) = eeacf0fefc51d618dda67d52e2bbff7dc9a67e90bc38166b3fad26d44800013a
+SIZE (opencl/cl.hpp) = 915453
diff --git a/devel/opencl/files/patch-cl.hpp b/devel/opencl/files/patch-cl.hpp
deleted file mode 100644
index ffff3cf01896..000000000000
--- a/devel/opencl/files/patch-cl.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
---- cl.hpp.orig	2013-08-20 13:33:04.000000000 +0200
-+++ cl.hpp	2013-08-20 13:35:49.000000000 +0200
-@@ -210,11 +210,9 @@
- #include <string>
- #endif 
- 
--#if defined(linux) || defined(__APPLE__) || defined(__MACOSX)
-+#if defined(__FreeBSD__) || defined(linux) || defined(__APPLE__) || defined(__MACOSX)
- #include <alloca.h>
- 
--#include <emmintrin.h>
--#include <xmmintrin.h>
- #endif // linux
- 
- #include <cstring>
-@@ -1037,7 +1035,7 @@
- #endif // !_WIN32
-     }
- 
--    inline void fence() { _mm_mfence(); }
-+    inline void fence() { __sync_synchronize(); }
- }; // namespace detail
- 
-     
-@@ -2037,6 +2035,26 @@
- #endif // #if defined(CL_VERSION_1_1)
- };
- 
-+template <typename Func>
-+cl_int detail::GetInfoHelper<Func, VECTOR_CLASS<cl::Device> >::
-+    get(Func f, cl_uint name, VECTOR_CLASS<cl::Device>* param)
-+    {
-+        ::size_t required;
-+        cl_int err = f(name, 0, NULL, &required);
-+        if (err != CL_SUCCESS) {
-+            return err;
-+        }
-+
-+        cl_device_id* value = (cl_device_id*) alloca(required);
-+        err = f(name, required, value, NULL);
-+        if (err != CL_SUCCESS) {
-+            return err;
-+        }
-+
-+        param->assign(&value[0], &value[required/sizeof(cl_device_id)]);
-+        return CL_SUCCESS;
-+    }
-+
- /*! \brief Class interface for cl_platform_id.
-  *
-  *  \note Copies of these objects are inexpensive, since they don't 'own'
diff --git a/devel/opencl/pkg-descr b/devel/opencl/pkg-descr
index b46e351ebbc1..12b88d79d995 100644
--- a/devel/opencl/pkg-descr
+++ b/devel/opencl/pkg-descr
@@ -3,6 +3,4 @@ for general purpose parallel programming across CPUs, GPUs and
 other processors, giving software developers portable and efficient 
 access to the power of these heterogeneous processing platforms. 
 
-This is OpenCL 1.2
-
-WWW: http://www.khronos.org/opencl/
+This is OpenCL 2.0
diff --git a/devel/opencl/pkg-message b/devel/opencl/pkg-message
index 1261005300a2..59bb7d3f36b0 100644
--- a/devel/opencl/pkg-message
+++ b/devel/opencl/pkg-message
@@ -1,4 +1,2 @@
 OpenCL is the first open, royalty-free standard for cross-platform, 
 parallel programming of modern processors.
-
-Patchset provided by POCL developers for cl.hpp applied.