Date: Wed, 26 Mar 2014 20:40:01 GMT From: "O. Hartmann" <ohartman@zedat.fu-berlin.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/187897: devel/opencl: Khronos Group released OpenCL 2.0 specification header files Message-ID: <201403262040.s2QKe1xa049351@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/187897; it has been noted by GNATS. From: "O. Hartmann" <ohartman@zedat.fu-berlin.de> To: bug-followup@FreeBSD.org, ohartman@zedat.fu-berlin.de Cc: Subject: Re: ports/187897: devel/opencl: Khronos Group released OpenCL 2.0 specification header files Date: Wed, 26 Mar 2014 21:32:36 +0100 --Sig_/A2UmyD_PyZ.oAYlfl1_.U+m Content-Type: multipart/mixed; boundary="MP_/VktlLYnfxzZnGJo2bE6_Umf" --MP_/VktlLYnfxzZnGJo2bE6_Umf Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline New distinfo necessary.. Patch attached. --MP_/VktlLYnfxzZnGJo2bE6_Umf Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=opencl_patch.txt diff -Nur opencl.orig/Makefile opencl/Makefile --- opencl.orig/Makefile 2014-03-26 21:25:09.000000000 +0100 +++ opencl/Makefile 2014-03-24 07:31:20.204611000 +0100 @@ -2,8 +2,7 @@ # $FreeBSD: head/devel/opencl/Makefile 343462 2014-02-09 11:16:12Z riggs $ =20 PORTNAME=3D opencl -PORTVERSION=3D 1.2 -PORTREVISION=3D 7 +PORTVERSION=3D 2.0 CATEGORIES=3D devel MASTER_SITES=3D http://www.khronos.org/registry/cl/api/${PORTVERSION}/ DISTFILES=3D opencl.h cl_platform.h cl.h cl_ext.h cl_dx9_media_sharing.h \ @@ -12,7 +11,7 @@ EXTRACT_ONLY=3D =20 MAINTAINER=3D ohartman@zedat.fu-berlin.de -COMMENT=3D Open Computing Language (OpenCL) specifications V1.2 (header fi= les) +COMMENT=3D Open Computing Language (OpenCL) specifications V2.0 (header fi= les) =20 LICENSE=3D unknown LICENSE_NAME=3D BSD-esque license agreement diff -Nur opencl.orig/distinfo opencl/distinfo --- opencl.orig/distinfo 2014-03-26 21:25:09.000000000 +0100 +++ opencl/distinfo 2014-03-26 21:27:15.000000000 +0100 @@ -1,20 +1,20 @@ -SHA256 (opencl/opencl.h) =3D be1bf717e103678292d6718b3608c9e54a48588c02d3d= 387a48656fac46ec8d9 +SHA256 (opencl/opencl.h) =3D fceb7e76d81159caab6308a05ff05d18fbd84718eff42= 63473ecd148c458987c SIZE (opencl/opencl.h) =3D 1754 -SHA256 (opencl/cl_platform.h) =3D e212b89bba54f7a4e090a2b2f58f779241ffb3b4= 5b870eee790689fc2ca0e0ae -SIZE (opencl/cl_platform.h) =3D 41127 -SHA256 (opencl/cl.h) =3D a5465c2ed1a0687878c8f7aa25f94626d7cd3a3868163ecaa= 6e8b36d6ed52368 -SIZE (opencl/cl.h) =3D 61545 -SHA256 (opencl/cl_ext.h) =3D ab8dcf1e04ac63cc5a68fdfb4787a44a25a9c0c129ed7= eda046e7911af3d4ebd -SIZE (opencl/cl_ext.h) =3D 13766 -SHA256 (opencl/cl_dx9_media_sharing.h) =3D 26fb40bac8e229747bdc27b350b836e= 3703c1e946cb40893f4c8ab2289203920 -SIZE (opencl/cl_dx9_media_sharing.h) =3D 5157 -SHA256 (opencl/cl_d3d10.h) =3D c7adb38a19663ee240977afc64903f4638d9c5c03ca= 478793c9f7a15c1c6ac2b -SIZE (opencl/cl_d3d10.h) =3D 4859 -SHA256 (opencl/cl_d3d11.h) =3D 8ade5d641e1acd12fa37bac36abf41f24985f4e38ce= b32da9c01cc0e4fc3742f -SIZE (opencl/cl_d3d11.h) =3D 4853 -SHA256 (opencl/cl_gl.h) =3D aa49d380177ac538b8ab00196381301fac6178e5b93139= 8e3da43067ac3c33c4 -SIZE (opencl/cl_gl.h) =3D 7343 -SHA256 (opencl/cl_gl_ext.h) =3D 4d663bbfc932ab405623e5f5d1bba3f438351d0ead= 65e1ccdd9bb769caf7a7d0 +SHA256 (opencl/cl_platform.h) =3D 042877b8091bfeeb489018505ce36c37cd3295e6= 91856461b1c0a8fbb6b2cc21 +SIZE (opencl/cl_platform.h) =3D 42192 +SHA256 (opencl/cl.h) =3D 5c39e93d4492cd3005ae806a91b7dd3cad28f4e69036208be= 21e37f8a4395717 +SIZE (opencl/cl.h) =3D 70803 +SHA256 (opencl/cl_ext.h) =3D be1ff04c63b678383828ab1e69ecf3bec54eec4cf4ae3= 3e210b4a16eff47d809 +SIZE (opencl/cl_ext.h) =3D 14002 +SHA256 (opencl/cl_dx9_media_sharing.h) =3D 41968538b82523ef8fb642a1a4da20a= 6262ce0448f71541db080f8ccc03971b6 +SIZE (opencl/cl_dx9_media_sharing.h) =3D 5181 +SHA256 (opencl/cl_d3d10.h) =3D 14b00ef68a2d7f471c7ef5b4576bc103888da70fc52= 5b263b49ff7fff150e188 +SIZE (opencl/cl_d3d10.h) =3D 4883 +SHA256 (opencl/cl_d3d11.h) =3D 707709a73b6b43b96c55e813efb2d655efcc82eb103= da4b8aea191231df7e1fd +SIZE (opencl/cl_d3d11.h) =3D 4877 +SHA256 (opencl/cl_gl.h) =3D 40375d991f4e847c94ad56c6c14400e3e7d72620117b49= 636518a96d57f30647 +SIZE (opencl/cl_gl.h) =3D 7346 +SHA256 (opencl/cl_gl_ext.h) =3D dccb3b45e53bfe0219bb48e6dbe9591bbe6a090a8b= 0d93a3b8580f526abc4616 SIZE (opencl/cl_gl_ext.h) =3D 2630 -SHA256 (opencl/cl.hpp) =3D a726d674bfa4ee7f71d1287d86afa15db2e360518fd5859= 4257a80f25642d6b4 -SIZE (opencl/cl.hpp) =3D 281446 +SHA256 (opencl/cl.hpp) =3D eeacf0fefc51d618dda67d52e2bbff7dc9a67e90bc38166= b3fad26d44800013a +SIZE (opencl/cl.hpp) =3D 915453 diff -Nur opencl.orig/files/patch-cl.hpp opencl/files/patch-cl.hpp --- opencl.orig/files/patch-cl.hpp 2014-03-26 21:25:09.000000000 +0100 +++ opencl/files/patch-cl.hpp 1970-01-01 01:00:00.000000000 +0100 @@ -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=20 -=20 --#if defined(linux) || defined(__APPLE__) || defined(__MACOSX) -+#if defined(__FreeBSD__) || defined(linux) || defined(__APPLE__) || defin= ed(__MACOSX) - #include <alloca.h> -=20 --#include <emmintrin.h> --#include <xmmintrin.h> - #endif // linux -=20 - #include <cstring> -@@ -1037,7 +1035,7 @@ - #endif // !_WIN32 - } -=20 -- inline void fence() { _mm_mfence(); } -+ inline void fence() { __sync_synchronize(); } - }; // namespace detail -=20 - =20 -@@ -2037,6 +2035,26 @@ - #endif // #if defined(CL_VERSION_1_1) - }; -=20 -+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 =3D f(name, 0, NULL, &required); -+ if (err !=3D CL_SUCCESS) { -+ return err; -+ } -+ -+ cl_device_id* value =3D (cl_device_id*) alloca(required); -+ err =3D f(name, required, value, NULL); -+ if (err !=3D 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 -Nur opencl.orig/pkg-descr opencl/pkg-descr --- opencl.orig/pkg-descr 2014-03-26 21:25:09.000000000 +0100 +++ opencl/pkg-descr 2014-03-24 07:45:26.645572000 +0100 @@ -3,6 +3,4 @@ other processors, giving software developers portable and efficient=20 access to the power of these heterogeneous processing platforms.=20 =20 -This is OpenCL 1.2 - -WWW: http://www.khronos.org/opencl/ +This is OpenCL 2.0 diff -Nur opencl.orig/pkg-message opencl/pkg-message --- opencl.orig/pkg-message 2014-03-26 21:25:09.000000000 +0100 +++ opencl/pkg-message 2014-03-24 07:50:19.685427000 +0100 @@ -1,4 +1,2 @@ OpenCL is the first open, royalty-free standard for cross-platform,=20 parallel programming of modern processors. - -Patchset provided by POCL developers for cl.hpp applied. --MP_/VktlLYnfxzZnGJo2bE6_Umf-- --Sig_/A2UmyD_PyZ.oAYlfl1_.U+m Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQEcBAEBAgAGBQJTMzlpAAoJEOgBcD7A/5N8/QwH/3LtbG4VgxKFHRWicVNqZNWQ W8eR6eFnNGiLnp6P1vX90E9b/I1U+nEsy4vo7miSVh8mrkgmQ+RHtZtfB4NadSLd 3cParPuYusIx1yUZppAjtbAv/gVu+UcgRNhQxrPUKeKPjqIxUc3hwAGPcWZN/5fp KVZ1RalE3xixauOnUmgNwIMoHUswELsFAtBQWKh3/AVoJR5pPlmHW+t3UfEHkvji 8kHoDTaM97gJ7obk0cDqjyMtm3L6VMFs7e0/1Kg1DkXmjnv0hREzY3loUANx+jrC 5m7az+Xo19H311czCqyBwxsbeP/Ylsvz+o/nc2PgcV6h8JcAC6VuM3TghNXJbyI= =SktX -----END PGP SIGNATURE----- --Sig_/A2UmyD_PyZ.oAYlfl1_.U+m--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403262040.s2QKe1xa049351>