From af7c7271b80cabd99b7865407550eeaff26dd66e Mon Sep 17 00:00:00 2001 From: thomas Date: Thu, 19 Aug 2021 16:17:15 +0200 Subject: [PATCH 1/2] nvidia-mxlinks: Pull links straight Raise version to 0.14 (sic!). Needed to avoid further confusion with some 0.13 version lingering around. Remove duplicate and outdated links: - remove libOpenCL.so.1 - remove duplicate libnvidia-opencl.so.1 - remove remaining unreferenced links Note: libnvidia-wfb.so.1 and libOpenCL.so.1 _are_ part of the nvidia-390.87 driver, but no workstation should use this driver anymore, since 3D-fuctionality is broken anyway. Drop this cruft. The tool for checking is named check-nvidia-mxlinks.sh, and can be found in /project/admin/tools --- nvidia-mxlinks.be0 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/nvidia-mxlinks.be0 b/nvidia-mxlinks.be0 index c5589ee0d..b28d59282 100755 --- a/nvidia-mxlinks.be0 +++ b/nvidia-mxlinks.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION nvidia-mxlinks-0.12-0 +# BEE_VERSION nvidia-mxlinks-0.14-0 EXCLUDE=("^/usr/lib/(X11|xorg)(|/modules(|/drivers))$") @@ -9,19 +9,13 @@ mee_install() { NVLIBS=( "libnvidia-ml.so.1" - "libnvidia-wfb.so.1" "libnvidia-cfg.so.1" "libnvidia-opencl.so.1" "libnvidia-encode.so.1" "libnvidia-ptxjitcompiler.so.1" "libvdpau_nvidia.so.1" - "libvdpau_trace.so.1" "libnvcuvid.so.1" "libcuda.so.1" - "libOpenCL.so.1" - "libGLcore.1" - "libnvidia-tls.so.1" - "libXvMCNVIDIA_dynamic.so.1" "libEGL_nvidia.so.0" "libGLESv1_CM_nvidia.so.1" "libGLESv2_nvidia.so.2" @@ -31,7 +25,6 @@ mee_install() { "libnvidia-ifr.so.1" "libnvidia-opticalflow.so.1" "libnvoptix.so.1" - "libnvidia-opencl.so.1" ) for i in ${NVLIBS[@]} ; do From a2ac8a81f276f8611e0a314b6b3b04bac588027e Mon Sep 17 00:00:00 2001 From: thomas Date: Thu, 19 Aug 2021 16:19:04 +0200 Subject: [PATCH 2/2] OpenCL: Add headers and loader for drivers Minimum required to build and run OpenCL Apps --- OpenCL-Headers.be0 | 34 ++++++++++++++++++++++++++++++++++ ocl-icd.be0 | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100755 OpenCL-Headers.be0 create mode 100755 ocl-icd.be0 diff --git a/OpenCL-Headers.be0 b/OpenCL-Headers.be0 new file mode 100755 index 000000000..204d08b39 --- /dev/null +++ b/OpenCL-Headers.be0 @@ -0,0 +1,34 @@ +#!/usr/bin/env beesh + +# BEE_VERSION OpenCL-Headers-2021.06.30-0 + +# SRCURL[0]="https://github.com/KhronosGroup/OpenCL-Headers/archive/refs/tags/v${PKGVERSION}.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/22007c68beb0b3c749df6e48e0498762/OpenCL-Headers-2021.06.30.tar.gz" + +# PATCHURL+=() + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} + +## by default this may be 'make install DESTDIR="${D}"' diff --git a/ocl-icd.be0 b/ocl-icd.be0 new file mode 100755 index 000000000..e3ec10187 --- /dev/null +++ b/ocl-icd.be0 @@ -0,0 +1,39 @@ +#!/usr/bin/env beesh + +# BEE_VERSION ocl-icd-2.3.1-0 + +# SRCURL[0]="https://github.com/OCL-dev/ocl-icd/archive/refs/tags/v${PKGVERSION}.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/4eafce4f0212691be5685597e8196564/ocl-icd-2.3.1.tar.gz" + +# PATCHURL+=() + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +mee_patch_post() { # do it here, making buildtype detectable + cd ${S} + ./bootstrap +} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} + +## by default this may be 'make install DESTDIR="${D}"'