Revert switch to opencl-1.2 headers, needs proper switching logic. Fixes #512680

Package-Manager: portage-2.2.10/cvs/Linux x86_64

3 files changed, 71 insertions, 2 deletions

diff --git a/app-admin/eselect-opencl/ChangeLog b/app-admin/eselect-opencl/ChangeLog
index 1a7c8a8df7bd..2c9ab3e581a4 100644
--- a/app-admin/eselect-opencl/ChangeLog
+++ b/app-admin/eselect-opencl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/eselect-opencl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opencl/ChangeLog,v 1.11 2014/06/06 03:23:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opencl/ChangeLog,v 1.12 2014/07/14 02:52:20 patrick Exp $
+
+*eselect-opencl-1.1.0-r3 (14 Jul 2014)
+
+  14 Jul 2014; Patrick Lauer <patrick@gentoo.org>
+  +eselect-opencl-1.1.0-r3.ebuild:
+  Revert switch to opencl-1.2 headers, needs proper switching logic. Fixes
+  #512680
 
   06 Jun 2014; Patrick Lauer <patrick@gentoo.org>
   eselect-opencl-1.1.0-r2.ebuild:
diff --git a/app-admin/eselect-opencl/Manifest b/app-admin/eselect-opencl/Manifest
index b70ff42c94d0..66af4b85f8dd 100644
--- a/app-admin/eselect-opencl/Manifest
+++ b/app-admin/eselect-opencl/Manifest
@@ -10,6 +10,7 @@ DIST opencl-headers-1.2.tar.gz 122068 SHA256 c35c1aada9984b24784d6b6a5752e22b9c7
 DIST opencl.h.1.1.xz 944 SHA256 c076e410eaffd9fbb056528f31a59fe1908481f0fd38981c13970727a0c4d096 SHA512 62b5ae61f2d9a44e9f8b6a7e3421cacfe5291bc9b5430845d469ea5a6404d71d3ab49d78c6da2588eab2bcd5f9b0d86c53f3aa74bd7c43c960ad86f0eab9595c WHIRLPOOL bd3d946b6c361187d9d7c4337287c24161fc0f291cfc810c0bcf05d9fe120192a853fe7b69500783b7ec1994e9b265d84eb82b8fc681df060c16aa3d038c8374
 EBUILD eselect-opencl-1.1.0-r1.ebuild 1747 SHA256 bbe039a9617e592c04e692f3c755957463612769151d4b927438a79611904e01 SHA512 2b8d657d97fe59905dcba27dd3a17ea5bbc725af239afdfa2fc5762702c37b40a688fb780f8f64ff1df145ea0be7355b52494144c2e33cba9782904ecd152378 WHIRLPOOL f687748e4f4be6fb67706a36af4934d03cd74ea6687e0d702b7dae56961e4d1561fc64e39a2d6f554bdfb550add87217df360b63c289df6ab01d35557bfef4cf
 EBUILD eselect-opencl-1.1.0-r2.ebuild 2070 SHA256 553b968c0109b0b0b0a4bc85f7e9a4ba21921a15029f3843f27075d3df645693 SHA512 563db5b3f375f842e9ff55fe7cc29f41296e53d7163f4f51bd610f0a4e334d812e333830c494de7060c4bffce86c4cba4f2127887589bb8eb2d61a9be0b8874b WHIRLPOOL 97b621a91fcc9ace55a5e0173d1e451e1e2dfc498cc7f50ba096f71b5a9d06c483c71329b01ad9ac4ad96d0e6ad299cdd54cd4a8df1ad81cd93150e3ebe0966e
+EBUILD eselect-opencl-1.1.0-r3.ebuild 2070 SHA256 df0c7475112753ef6d087ae8270d7f721b547907533715320db71915fad8a22c SHA512 78729949b29db7ae18dc0613ee71dd53648a43bf047559769007b09cd77bec808ceede1de4b85553c07386ea03cef35563fa6c80a26851be44c4f7b4d6207a5b WHIRLPOOL ade805a2937911bc119144579c90334ebd5fa423a955aeed90db75cd17caa5d8034b41baecfff2954684d8f636e9ee06be3ef3ea9a9710e9dcb468d9900786f0
 EBUILD eselect-opencl-1.1.0.ebuild 1718 SHA256 7ab090850033d5dac488dd3170800911a0267168a964e80b6980361c298f5741 SHA512 8dc7fd1d44e3ade16e293f7a02fca584f90cf1db0be205c9dcc5a0915a3a9d3625973c8c2b4e92b8dd6993343dcf688b9add85e2a6eed16a0f6d64ed787228cc WHIRLPOOL 5b1d1da8c4a10dc2ac7b432b3ddbd792699ee981d8f1afaf55d4114d6bcdec58f329586cb9a9acb8e5ffc2730dbb3a2edf592cc17916d5482254da642415d50c
-MISC ChangeLog 1615 SHA256 aa104b42e6915daf64c1f6987e5bc686eb61a4ff83c9b634d0685f98118ed7f2 SHA512 a0d5536ac96a8d522fe8665ca1eb6c54ecbb14be3e08844310c652cfc5cddf2e81a82f85528c6a4d65f96328964437f992d1cab065d26cdb5ee0a9f973a34702 WHIRLPOOL 07a3cdbb9d37eaa61a0f7ee0573a577b56e4dd9f9572d6f947f00b5269b49dd9714b2f6b38f8de4190a1fc0fa31d296a26cb27fe687dae681297eb251104b781
+MISC ChangeLog 1826 SHA256 c1afb597458bc39f8b72f9faa12b8b508a91789cea80940e8439219beb0d65fb SHA512 abfb48bcf8f0be98ccb53027fb7169d9f801665583e1f62d5a8f00c345b9efd73b98628ad406aabed52170bd9fdaea492f40b9704fc2265bd3319232a6968bae WHIRLPOOL f15a7ee7a696502963cf93297e08223254cb849abe53a5c8907b8ecff21a1045ab297fd16e4cb8f298e6922ad387ffea6db6e7ff7e5559cc00c21bd015dcffbf
 MISC metadata.xml 313 SHA256 838a632baaaf971bcef8b261991717e4c2873a6072c8e0b1046c8b7289c68d0b SHA512 5e89e304beecff81094d807d824242db5c0fc1c9423a199c327bb9191856d79225c1cc58427669cb53e8c0ce7eb03b538443bdca14fd150fd403b2cfc9549ac4 WHIRLPOOL 9fc847ed84932320f128d0b3bcc50d0c79a6f0d1bdfcf89dbff631d0459b9e1a11843139b935d8c0f705a8a2f6d7ca101e7b4dba9fa59bf55c415569a2245f44
diff --git a/app-admin/eselect-opencl/eselect-opencl-1.1.0-r3.ebuild b/app-admin/eselect-opencl/eselect-opencl-1.1.0-r3.ebuild
new file mode 100644
index 000000000000..8a5df9f4ae07
--- /dev/null
+++ b/app-admin/eselect-opencl/eselect-opencl-1.1.0-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opencl/eselect-opencl-1.1.0-r3.ebuild,v 1.1 2014/07/14 02:52:20 patrick Exp $
+
+EAPI=4
+
+inherit multilib
+
+DESCRIPTION="Utility to change the OpenCL implementation being used"
+HOMEPAGE="http://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
+
+#MIRROR="http://dev.gentoo.org/~xarthisius/distfiles/"
+SRC_URI="https://github.com/anyc/opencl-headers/archive/opencl-headers-1.2.tar.gz
+	http://dev.gentoo.org/~xarthisius/distfiles/${P}-r1.tar.xz"
+
+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.hpp )
+
+	# We install all versions of OpenCL headers
+	cd "${WORKDIR}/opencl-headers-opencl-headers-1.2"
+	for CL_ABI in 1.0 1.1 1.2; do
+		mkdir -p "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}"
+		for f in ${headers[@]}; do
+			cp OpenCL-${CL_ABI}/${f} "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/${f}"
+		done
+	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.1/${f}" "/usr/$(get_libdir)/OpenCL/global/include/CL/${f}"
+	done
+}