[PR PATCH] Make nvidia packages use ocl-icd instead of libOpenCL

[PR PATCH] Make nvidia packages use ocl-icd instead of libOpenCL

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages nvi
https://github.com/void-linux/void-packages/pull/28503

Make nvidia packages use ocl-icd instead of libOpenCL
@abenson 

A patch file from https://github.com/void-linux/void-packages/pull/28503.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nvi-28503.patch --]
[-- Type: text/x-diff, Size: 2201 bytes --]

From eda2a50eafe48dd70c0ee52e95ab6ff5e84448d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Feb 2021 01:41:03 -0300
Subject: [PATCH 1/2] nvidia: make nvidia-opencl depend directly on ocl-icd.

This only works because ocl-icd is found in the repositories and
provides libOpenCL. If built without knowledge of the repositories, this
would fail.
---
 srcpkgs/nvidia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 8929bf8f60a..db0ff923266 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=460.39
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -286,7 +286,7 @@ nvidia-dkms_package() {
 
 nvidia-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="libOpenCL"
+	depends="ocl-icd"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"

From 9b821445a6348171f29ef9a20df70a847b94d8c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Feb 2021 01:42:22 -0300
Subject: [PATCH 2/2] nvidia390: make nvidia390-opencl depend directly on
 ocl-icd.

See previous commit for explanation.
---
 srcpkgs/nvidia390/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index 40301343166..34451d50c61 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
 version=390.141
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -239,7 +239,7 @@ nvidia390-dkms_package() {
 }
 nvidia390-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
-	depends="libOpenCL"
+	depends="ocl-icd"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"

Re: [PR PATCH] [Merged]: Make nvidia packages use ocl-icd instead of libOpenCL

[abenson]

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

There's a merged pull request on the void-packages repository

Make nvidia packages use ocl-icd instead of libOpenCL
https://github.com/void-linux/void-packages/pull/28503

Description:
@abenson