app-eselect/eselect-opencl: Bump, add more headers, switch to opencl1.2 as default

Package-Manager: portage-2.2.28

2 files changed, 75 insertions, 0 deletions

diff --git a/app-eselect/eselect-opencl/Manifest b/app-eselect/eselect-opencl/Manifest
index 0c3a3b675fc2..71de40b820af 100644
--- a/app-eselect/eselect-opencl/Manifest
+++ b/app-eselect/eselect-opencl/Manifest
@@ -5,5 +5,11 @@ DIST cl_gl.h.1.1.xz 1856 SHA256 eeddf3403c13776b3d13a25c9e47a01eee750c0120f74d40
 DIST cl_gl_ext.h.1.1.xz 1356 SHA256 594e463e3a24e62870c5c1914b05e796aeda8892bf6830ee8db3f722993fdf02 SHA512 23fbc933e0beb2748152fa058d8ed413351fcfce167b9788c8a3529323b89e57eb1bf84d998fc262081410985f476bbf56fdd0bffe73f08135f5c90b7d09bb8d WHIRLPOOL 94301285dd567d8c7c9145d49801ea5c7e0ae4f5c01a9f93bcea667df925ea9d55a5ec978c3c05337306bdd0d53b829a9c03cbe8131982b2eddae23fc2eb1e5c
 DIST cl_platform.h.1.1.xz 5584 SHA256 2f70eb47285fd46f75d48476e90ee3b7e9ba62166bc573bbb35cb0f9d7a2ea53 SHA512 8265cd3b3630d367fe494a60911564e57169d03948827a0e2ca0669678b4a5b595b22ae2786a7c42c0b96fd6fbfb7d326c63759cfd1b7888b8cd35588b5f7544 WHIRLPOOL aa5e12ec2eb49323f9812ae51d5b45db2919488bd36fd58bb40eb6538020e8de732aa60a4fc1b8bf913cdfbdf35c0ebe63fd8cd0b8f415d34cbdce4d54207ff7
 DIST eselect-opencl-1.1.0-r1.tar.xz 3276 SHA256 86a2f5f152e543046899989b3a12a065dfc357a2276ce06d69d19bdbf175fdea SHA512 b2be1e2035fda4e119f03e9ef84fbf1f09fc0bd5475d3fe30d2330dac76180930451d78dbb9e158c34dee9ce524076434254757b594e84dea96341e52ef13c14 WHIRLPOOL 4df96b5f97b6071c27c613addd0b579deb800012ba2640814dcb107ec6ab9f3fac6384c4c3313bd245d62eb2a376e378e0820ef891bed6b41b778721b325f667
+DIST opencl-cpp-headers.tar 716800 SHA256 d29bcc187c9f9b92f41498ee4cc9d889e7485f987062c7db3b70652c6a75544d SHA512 b04c653f213b3cc99f0bbe3c589cf8b2f8f6144d61a85a284a60de92fd5148ff3d45204b4c6a08c205fc307300743bcf4654be2b8b18dd970b5d645ac2eec2f5 WHIRLPOOL 335e1b1154dd1dc1ffbc61307406fccdef87ed15b9902eba59b996512753fde49062adfdd09d75dc3d4cf0023969e3f31c3b649185de23d7a678e4ef6d0d24a5
 DIST opencl-headers-1.2.tar.gz 122068 SHA256 c35c1aada9984b24784d6b6a5752e22b9c70646043344e0f45830c9dc5ae28c4 SHA512 0780c96d47a7ad41f6b31d46d41be77651d27d5decd1a4248c452d8bf763b6fc3b76597352bd259778c5846c62c17f077ff8db5504da39844c8e6e07c7d9a264 WHIRLPOOL 4f5c1058d23f91d806dba861fefd5cf3685a12a78217136adc0ac2f630995c82fa6d537e3cd67b6b2e2d01b6de12c30dc7e039b9aaa057661deb7f10a466f48d
 DIST opencl.h.1.1.xz 944 SHA256 c076e410eaffd9fbb056528f31a59fe1908481f0fd38981c13970727a0c4d096 SHA512 62b5ae61f2d9a44e9f8b6a7e3421cacfe5291bc9b5430845d469ea5a6404d71d3ab49d78c6da2588eab2bcd5f9b0d86c53f3aa74bd7c43c960ad86f0eab9595c WHIRLPOOL bd3d946b6c361187d9d7c4337287c24161fc0f291cfc810c0bcf05d9fe120192a853fe7b69500783b7ec1994e9b265d84eb82b8fc681df060c16aa3d038c8374
+DIST opencl10.zip 21701 SHA256 91443f16420a1cbac73e47bfac6d8562494f2b4218039e128131859435a762d6 SHA512 ce3ad95d7314df4b55284d48c54fb7dfca0a218d0e36a732414b53dc7bdcc53199167b6810a3e3ebdd8abf91a4904acd471733b9130e3a38ec0b3e9ba918b691 WHIRLPOOL d853f2a0f82949dbe2204f2c373c2bc6b5db5681108eb09544bf234469740fd5c96a829bf6e86e3034fecb470c5582ee2e9f117e448cdcb00ce76e05d9d78178
+DIST opencl11.zip 25496 SHA256 ce9fb43d981c4d012d9b145c475dc5b00db734a9e0a57dd9bdad024731123131 SHA512 c66664e940a51ceb951a78895df87a5dc3139e76b3f847af43c54400d37f243a390b94aab290d32044e19bdba63d0ee8af94955af9a83326c7ab353242496fcc WHIRLPOOL 3c4e348c5b599e3c98256af4fa281f24ffeeacc149f3b90b95f6da64f8ec33be8bd1d3118066b4903362e3ed00071792c3eac57a56cee6bfa748910b8c10a09e
+DIST opencl12.zip 33311 SHA256 fdaae3850c818947d326e8833ba79335aea28bfc65d87a8d7d5c9599e4a13571 SHA512 af7bb5865372a900a5b79086a54709abc99f6a3afe105adb6fdd276e30ef5c5be576421c206768e0b19e82f83e33727b6f246dfc71a0ee1d847e52d6db6130a8 WHIRLPOOL 675e9f67498111540276ac216c78ffa78ee925288da5ded5e9344bd51251a8c4c1d51c466b24d7e452371fb1764982e24f9f2203e499dbd3b1f917ef85c87984
+DIST opencl20.zip 34892 SHA256 d83af2f3ef3be7c435d154ef37b426bdb43986a0de8a5fbb2e84bb7437d9aa72 SHA512 e4c6f68db91e0946de5a0f2aecd8fbc152f316350088a386cad9de37b377b6e8c362e93e3c2b09b3dce5f4659c753764ec8906b50a86a5107d2c29e6ffcfe71f WHIRLPOOL 7de96d15345fed71cecf21d009158da29ed385e61d831c509d57bbd26ba54f154e9d877aa767d6b8e9da6cda48b6d107d27e09659d7fbe31c244bea8c6eb9976
+DIST opencl21.zip 35514 SHA256 5c6c4b273a3e9c25094fa50702a1f84b25e63e2a9fbe74518bf9d1282c045f0a SHA512 2b6eafc26ff522407f06509197f5eefbb321806ac3f65bb881db4532da6c0e00b9c397468d55881578b116a1c8d05a0599f9f5727f62eb545394a2cecf5d95c0 WHIRLPOOL 55c4c558254a46fecce626a10ff5688d312c9b373de3914fb493f119d14338bf7dc51ba6eb2ca89f934dd6e13286b1f459314af7749666ec3d08dd9baf95f22d
diff --git a/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild b/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild
new file mode 100644
index 000000000000..e12b83f1fe84
--- /dev/null
+++ b/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="Utility to change the OpenCL implementation being used"
+HOMEPAGE="https://www.gentoo.org/"
+
+# Source:
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/opencl.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_platform.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_ext.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl_ext.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.hpp
+
+# Using copy by Mario Kicherer #496418
+
+SRC_URI="
+	https://dev.gentoo.org/~xarthisius/distfiles/${P}-r1.tar.xz
+	https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl10.zip
+	https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl11.zip
+	https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl12.zip
+	https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl20.zip
+	https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl21.zip
+	http://packages.gentooexperimental.org/opencl-cpp-headers.tar
+	"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+RDEPEND=">=app-admin/eselect-1.2.4"
+
+pkg_postinst() {
+	local impl="$(eselect opencl show)"
+	if [[ -n "${impl}"  && "${impl}" != '(none)' ]] ; then
+		eselect opencl set "${impl}"
+	fi
+}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins opencl.eselect
+	#doman opencl.eselect.5
+
+	local headers=( opencl.h cl_platform.h cl.h cl_ext.h cl_gl.h cl_gl_ext.h cl_egl.h )
+
+	# We install all versions of OpenCL headers
+	for CL_ABI in 1.0 1.1 1.2 2.0 2.1; do
+		mkdir -p "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}"
+		for f in ${headers[@]}; do
+			cp "${WORKDIR}"/OpenCL-Headers-opencl${CL_ABI/./}/${f} "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/${f}" > /dev/null
+		done
+	done
+
+	for i in 1.1 1.2 2.1; do
+		cp "${WORKDIR}"/$i/cl.hpp "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/"
+	done
+	# Create symlinks to newest. Maybe this should be switchable?
+	for f in ${headers[@]}; do
+		dosym "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-1.2/${f}" "/usr/include/CL/${f}"
+	done
+}