From: Marek Szuba Date: Fri, 10 Apr 2020 13:15:21 +0000 (+0100) Subject: virtual/opencl: add dev-libs/opencl-icd-loader as alternative provider X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5896f661feb5a387d4d25c79c98ea1779cf56346;p=gentoo.git virtual/opencl: add dev-libs/opencl-icd-loader as alternative provider Works perfectly well, with one caveat - /usr/lib*/libOpenCL.so* symlinks created by eselect-opencl are not actually owned by that package so switching from ocl-icd to opencl-icd-loader will result in file collisions unless said symlinks are manually removed in advance. Signed-off-by: Marek Szuba --- diff --git a/virtual/opencl/opencl-3.ebuild b/virtual/opencl/opencl-3.ebuild index 6268723a166f..baa33caadb73 100644 --- a/virtual/opencl/opencl-3.ebuild +++ b/virtual/opencl/opencl-3.ebuild @@ -9,9 +9,8 @@ DESCRIPTION="Virtual for OpenCL API" SLOT="0" KEYWORDS="~amd64 ~x86" -# Will add dev-libs/opencl-icd-loader here as an alternative once all potential -# file collisions with eselect-opencl have been resolved -RDEPEND="dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]" +RDEPEND="|| ( dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}] + dev-libs/opencl-icd-loader[${MULTILIB_USEDEP}] )" # so that src_install() doesn't fail on missing directory S="${WORKDIR}"