Date: Tue, 20 Aug 2013 11:50:02 GMT From: "O. Hartmann" <ohartman@zedat.fu-berlin.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/180338: devel/opencl: new hashes (distinfo), minor changes Message-ID: <201308201150.r7KBo2Ld022899@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/180338; it has been noted by GNATS. From: "O. Hartmann" <ohartman@zedat.fu-berlin.de> To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/180338: devel/opencl: new hashes (distinfo), minor changes Date: Tue, 20 Aug 2013 13:49:19 +0200 --Sig_/QXYobXZYt2oouuWNaRgxLih Content-Type: multipart/mixed; boundary="MP_/kXekT4_4lw8HcFgK.XIWt5w" --MP_/kXekT4_4lw8HcFgK.XIWt5w Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Find attached a revision of the port devel/opencl. It is tagged PORTREVISION =3D 5 as it does in my internal SVN.=20 If someone could be so kind to review, eventually correct and commit the patches? The hash in distinfo of the recent port devel/opencl is outdated, I mentioned that before and there were reports of that fact - but nobody seems to take care of that. I can not commit. oh =20 --MP_/kXekT4_4lw8HcFgK.XIWt5w Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=patch-opencl.txt diff -Nur opencl.orig/Makefile opencl/Makefile --- opencl.orig/Makefile 2013-08-20 13:42:43.000000000 +0200 +++ opencl/Makefile 2013-08-20 13:46:51.000000000 +0200 @@ -3,7 +3,7 @@ =20 PORTNAME=3D opencl PORTVERSION=3D 1.2 -PORTREVISION=3D 2 +PORTREVISION=3D 5 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,21 +12,27 @@ EXTRACT_ONLY=3D =20 MAINTAINER=3D ohartman@zedat.fu-berlin.de -COMMENT=3D Open Computing Language (OpenCL) specifications V1.2 +COMMENT=3D Open Computing Language (OpenCL) specifications V1.2 (header fi= les) =20 CONFLICTS=3D opencl-1.[0-1] =20 NO_BUILD=3D yes -NO_WRKSUBDIR=3D yes =20 -PLIST_DIRS=3D include/CL +PLIST_DIRS+=3D include/CL .for f in ${DISTFILES} PLIST_FILES+=3Dinclude/CL/$f .endfor =20 +pre-patch: + @${MKDIR} ${WRKSRC} +.for f in ${DISTFILES} + @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$f ${WRKSRC}/ +.endfor + do-install: - ${MKDIR} ${PREFIX}/include/CL - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.h ${PREFIX}/include/CL - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.hpp ${PREFIX}/include/CL + @${MKDIR} ${PREFIX}/include/CL +.for f in ${DISTFILES} + @${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/include/CL +.endfor =20 .include <bsd.port.mk> diff -Nur opencl.orig/distinfo opencl/distinfo --- opencl.orig/distinfo 2013-08-20 13:42:43.000000000 +0200 +++ opencl/distinfo 2013-08-20 13:30:58.000000000 +0200 @@ -4,8 +4,8 @@ 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 3eafb74bc1b9456fd0e12393bfe65e48c9b3246d3c36b= 9f69ac253f73e0b50c7 -SIZE (opencl/cl_ext.h) =3D 11540 +SHA256 (opencl/cl_ext.h) =3D d23a11d1daebe39c6f5a9743f356bb58cdf0bf5a2019c= 723a6e2dc1e7dcb0360 +SIZE (opencl/cl_ext.h) =3D 13646 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 @@ -16,5 +16,5 @@ SIZE (opencl/cl_gl.h) =3D 7343 SHA256 (opencl/cl_gl_ext.h) =3D 4d663bbfc932ab405623e5f5d1bba3f438351d0ead= 65e1ccdd9bb769caf7a7d0 SIZE (opencl/cl_gl_ext.h) =3D 2630 -SHA256 (opencl/cl.hpp) =3D 006671ee638a29a95c19bf37fbbf71ec8df445d2ea46df8= 1f65faaff2d8a5133 -SIZE (opencl/cl.hpp) =3D 272297 +SHA256 (opencl/cl.hpp) =3D d7c8f5c17f88e098dc9f71d80e4b7408fab353e2828b0ba= 4d4bb55adaa427e83 +SIZE (opencl/cl.hpp) =3D 277155 diff -Nur opencl.orig/files/patch-cl.hpp opencl/files/patch-cl.hpp --- opencl.orig/files/patch-cl.hpp 1970-01-01 01:00:00.000000000 +0100 +++ opencl/files/patch-cl.hpp 2013-08-20 13:35:55.000000000 +0200 @@ -0,0 +1,51 @@ +--- 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-message opencl/pkg-message --- opencl.orig/pkg-message 1970-01-01 01:00:00.000000000 +0100 +++ opencl/pkg-message 2013-08-20 13:37:36.000000000 +0200 @@ -0,0 +1,4 @@ +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_/kXekT4_4lw8HcFgK.XIWt5w-- --Sig_/QXYobXZYt2oouuWNaRgxLih Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSE1fFAAoJEOgBcD7A/5N8ihcIAKXXowfpdGHW4el7sFy+AjJ4 Gp7Ms4IkaYCgsltAB8mfjRX8ndVc6ZmJsKXiRblBo5ZM/QhTA4QNR6i+rsDherHM Yd9JG4gWD1yDO4GnktbA+IH6/SpFXbjTFd1ASplzekob4lppSX5+7eUvc20AGYRg MFcAIUqYvNMDhIYzs3apx+AgOP4e7BE7Bi4HBaqlxhb5T+9BaF62s6jYYMU/S2Bz IYQg7RefFQUneIdUX0bGXCmTAOwgbSgBp9lq49evVHrWmIAehtI1jJ3C8El0biC3 qERgDiHLjMkz1Zm362JOwi5BxtenRtxdbQvblZpD7/Zm4kGAifHL0yfQkSKS9Tg= =ziHZ -----END PGP SIGNATURE----- --Sig_/QXYobXZYt2oouuWNaRgxLih--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308201150.r7KBo2Ld022899>