1 |
commit: 3257d73e3a2bc5076a4ee2646de0ef530dbd36b5 |
2 |
Author: Sven Eden <sven.eden <AT> prydeworx <DOT> com> |
3 |
AuthorDate: Wed Jul 27 11:48:04 2022 +0000 |
4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 1 08:34:39 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3257d73e |
7 |
|
8 |
sci-misc/boinc: Untangle CUDA/OpenCL for nvidia and fix dependencies |
9 |
|
10 |
* OpenCL is not needed to run CUDA apps |
11 |
* BOINC can use CUDA via nvidia-drivers, dev-util/nvidia-cuda-toolkit |
12 |
is not neccessary |
13 |
* BOINC can use OpenCL via nvidia-drivers, |
14 |
media-gfx/nvidia-cg-toolkit is not neccessary |
15 |
* USE flag "opencl" pulls in virtual/opencl instead. |
16 |
|
17 |
Bug: https://bugs.gentoo.org/819378 |
18 |
Closes: https://bugs.gentoo.org/819378 |
19 |
Signed-off-by: Sven Eden <sven.eden <AT> prydeworx.com> |
20 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
21 |
|
22 |
sci-misc/boinc/boinc-7.20.2-r2.ebuild | 6 +++--- |
23 |
sci-misc/boinc/boinc-9999.ebuild | 6 +++--- |
24 |
2 files changed, 6 insertions(+), 6 deletions(-) |
25 |
|
26 |
diff --git a/sci-misc/boinc/boinc-7.20.2-r2.ebuild b/sci-misc/boinc/boinc-7.20.2-r2.ebuild |
27 |
index 2375df6ac7ea..5c03102ff4aa 100644 |
28 |
--- a/sci-misc/boinc/boinc-7.20.2-r2.ebuild |
29 |
+++ b/sci-misc/boinc/boinc-7.20.2-r2.ebuild |
30 |
@@ -35,7 +35,7 @@ IUSE="${IUSE_VIDEO_CARDS} X cuda curl_ssl_gnutls +curl_ssl_openssl opencl" |
31 |
|
32 |
REQUIRED_USE=" |
33 |
^^ ( curl_ssl_gnutls curl_ssl_openssl ) |
34 |
- cuda? ( opencl video_cards_nvidia ) |
35 |
+ cuda? ( video_cards_nvidia ) |
36 |
opencl? ( || ( ${IUSE_VIDEO_CARDS} ) ) |
37 |
" |
38 |
|
39 |
@@ -45,13 +45,13 @@ DEPEND=" |
40 |
acct-user/boinc |
41 |
app-misc/ca-certificates |
42 |
cuda? ( |
43 |
- dev-util/nvidia-cuda-toolkit |
44 |
x11-drivers/nvidia-drivers |
45 |
) |
46 |
opencl? ( |
47 |
+ virtual/opencl |
48 |
video_cards_amdgpu? ( amd64? ( dev-libs/rocm-opencl-runtime ) ) |
49 |
video_cards_intel? ( amd64? ( dev-libs/intel-compute-runtime ) ) |
50 |
- video_cards_nvidia? ( x11-drivers/nvidia-drivers media-gfx/nvidia-cg-toolkit ) |
51 |
+ video_cards_nvidia? ( x11-drivers/nvidia-drivers ) |
52 |
video_cards_radeonsi? ( media-libs/mesa[opencl] ) |
53 |
) |
54 |
dev-libs/openssl:= |
55 |
|
56 |
diff --git a/sci-misc/boinc/boinc-9999.ebuild b/sci-misc/boinc/boinc-9999.ebuild |
57 |
index 9689e98c8f56..08e8f1f9530c 100644 |
58 |
--- a/sci-misc/boinc/boinc-9999.ebuild |
59 |
+++ b/sci-misc/boinc/boinc-9999.ebuild |
60 |
@@ -37,7 +37,7 @@ IUSE="${IUSE_VIDEO_CARDS} X cuda curl_ssl_gnutls +curl_ssl_openssl opencl" |
61 |
|
62 |
REQUIRED_USE=" |
63 |
^^ ( curl_ssl_gnutls curl_ssl_openssl ) |
64 |
- cuda? ( opencl video_cards_nvidia ) |
65 |
+ cuda? ( video_cards_nvidia ) |
66 |
opencl? ( || ( ${IUSE_VIDEO_CARDS} ) ) |
67 |
" |
68 |
|
69 |
@@ -47,13 +47,13 @@ DEPEND=" |
70 |
acct-user/boinc |
71 |
app-misc/ca-certificates |
72 |
cuda? ( |
73 |
- dev-util/nvidia-cuda-toolkit |
74 |
x11-drivers/nvidia-drivers |
75 |
) |
76 |
opencl? ( |
77 |
+ virtual/opencl |
78 |
video_cards_amdgpu? ( amd64? ( dev-libs/rocm-opencl-runtime ) ) |
79 |
video_cards_intel? ( amd64? ( dev-libs/intel-compute-runtime ) ) |
80 |
- video_cards_nvidia? ( x11-drivers/nvidia-drivers media-gfx/nvidia-cg-toolkit ) |
81 |
+ video_cards_nvidia? ( x11-drivers/nvidia-drivers ) |
82 |
video_cards_radeonsi? ( media-libs/mesa[opencl] ) |
83 |
) |
84 |
dev-libs/openssl:= |