From 9e221e470364c143c2d596fe3ebb0ce5b7fcfb10 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 25 Apr 2020 12:15:03 +0100
Subject: dev-libs/ocl-icd : revision bump

---
 dev-libs/ocl-icd/ocl-icd-2.2.12-r10.ebuild | 46 +++++++++++++++++++++++++
 dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild  | 54 ------------------------------
 2 files changed, 46 insertions(+), 54 deletions(-)
 create mode 100644 dev-libs/ocl-icd/ocl-icd-2.2.12-r10.ebuild
 delete mode 100644 dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild

(limited to 'dev-libs')

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r10.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r10.ebuild
new file mode 100644
index 00000000..2f086a09
--- /dev/null
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
+HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
+SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Does nothing now but by keeping it here we avoid having to have virtual/opencl
+# handle ebuilds both with and without this flag.
+IUSE="+khronos-headers"
+
+BDEPEND="dev-lang/ruby:2.5
+	virtual/rubygems"
+DEPEND="dev-util/opencl-headers"
+RDEPEND="${DEPEND}
+	!app-eselect/eselect-opencl
+	!dev-libs/opencl-icd-loader"
+
+PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
+
+src_prepare() {
+	replace-flags -Os -O2 # bug 646122
+
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# dev-util/opencl-headers ARE official Khronos Group headers, what this option
+	# does is disable the use of the bundled ones
+	ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers
+}
+
+multilib_src_install() {
+	default
+
+	# Drop .la files
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild
deleted file mode 100644
index 451b66f7..00000000
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
-SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+khronos-headers"
-
-BDEPEND="dev-lang/ruby:2.5
-	virtual/rubygems"
-RDEPEND="app-eselect/eselect-opencl"
-
-PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
-
-src_prepare() {
-	replace-flags -Os -O2 # bug 646122
-
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf --enable-pthread-once
-}
-
-multilib_src_install() {
-	default
-
-	# Drop .la files
-	find "${ED}" -name '*.la' -delete || die
-
-	OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd"
-	dodir ${OCL_DIR}/{,include}
-
-	# Install vendor library
-	mv -f "${ED}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
-
-	# Install vendor headers
-	if use khronos-headers; then
-		cp -r "${S}/khronos-headers/CL" "${ED}${OCL_DIR}/include" || die "Can't install vendor headers"
-	fi
-}
-
-pkg_postinst() {
-	eselect opencl set --use-old ${PN}
-}
-- 
cgit v1.2.3