From 7e5f756d7961fcc361bc4cc8ce62da48573ce533 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Tue, 14 Apr 2020 18:58:00 +0300 Subject: [PATCH 1/2] module-nvidia340 fix --- kernel/drivers/module-nvidia340/actions.py | 7 ++++--- kernel/drivers/module-nvidia340/pspec.xml | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kernel/drivers/module-nvidia340/actions.py b/kernel/drivers/module-nvidia340/actions.py index fde735ce5c..fea88c8bc8 100644 --- a/kernel/drivers/module-nvidia340/actions.py +++ b/kernel/drivers/module-nvidia340/actions.py @@ -31,6 +31,7 @@ def setup(): shelltools.move("tmp/.manifest", ".") shelltools.system("patch -p1 < kernel-5.5.patch") shelltools.system("patch -p1 < kernel-5.6.patch") + shelltools.system("patch -p1 < unfuck-340.108-build-fix.patch") # Our libc is TLS enabled so use TLS library @@ -93,9 +94,9 @@ def install(): # pisitools.dosym("libGL.so.%s" % version, "%s/libGL.so.1.2.0" % nvlibdir) # OpenCL - pisitools.dolib("libOpenCL.so.1.0.0", libdir) - pisitools.dosym("libOpenCL.so.1.0.0", "%s/libOpenCL.so.1.0" % libdir) - pisitools.dosym("libOpenCL.so.1.0", "%s/libOpenCL.so.1" % libdir) + #pisitools.dolib("libOpenCL.so.1.0.0", libdir) + #pisitools.dosym("libOpenCL.so.1.0.0", "%s/libOpenCL.so.1.0" % libdir) + #pisitools.dosym("libOpenCL.so.1.0", "%s/libOpenCL.so.1" % libdir) pisitools.dolib("libnvidia-opencl.so.%s" % version, libdir) pisitools.dosym("libnvidia-opencl.so.%s" % version, "%s/libnvidia-opencl.so.1" % libdir) diff --git a/kernel/drivers/module-nvidia340/pspec.xml b/kernel/drivers/module-nvidia340/pspec.xml index eb005d9ed5..fa37904ce7 100644 --- a/kernel/drivers/module-nvidia340/pspec.xml +++ b/kernel/drivers/module-nvidia340/pspec.xml @@ -50,6 +50,7 @@ libXext xorg-server libX11 + opencl-icd module-nvidia340 nvidia340-dkms @@ -84,6 +85,7 @@ zlib-32bit libX11-32bit libXext-32bit + opencl-icd-32bit xorg-video-nvidia340 From ea8c57ae8bc9dd37717b259a05ea1ee25685ca24 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Tue, 14 Apr 2020 18:58:49 +0300 Subject: [PATCH 2/2] module-nvidia430 fix --- .../NVIDIA-Linux-x86_64-430.64-kernel-5.5.patch | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/kernel/drivers/module-nvidia430/files/mageia/NVIDIA-Linux-x86_64-430.64-kernel-5.5.patch b/kernel/drivers/module-nvidia430/files/mageia/NVIDIA-Linux-x86_64-430.64-kernel-5.5.patch index 1cae313315..109fd40006 100644 --- a/kernel/drivers/module-nvidia430/files/mageia/NVIDIA-Linux-x86_64-430.64-kernel-5.5.patch +++ b/kernel/drivers/module-nvidia430/files/mageia/NVIDIA-Linux-x86_64-430.64-kernel-5.5.patch @@ -383,15 +383,4 @@ diff -Nurp a/kernel/nvidia-drm/nvidia-drm-utils.h b/kernel/nvidia-drm/nvidia-drm +#include "nv-drm.h" #include "nvkms-kapi.h" - struct NvKmsKapiConnectorInfo* -diff -Nurp a/.manifest b/.manifest ---- a/.manifest 2019-10-27 13:55:51.000000000 +0200 -+++ b/.manifest 2020-02-09 23:07:31.144465574 +0200 -@@ -37,6 +37,7 @@ kernel/nvidia/nv-rsync.c 0644 KERNEL_MOD - kernel/nvidia/nv-msi.c 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman - kernel/conftest.sh 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman - kernel/common/inc/nv.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman -+kernel/common/inc/nv-drm.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman - kernel/common/inc/nv-pgprot.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman - kernel/common/inc/nv-mm.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman - kernel/common/inc/nv-timer.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman + struct NvKmsKapiConnectorInfo* \ No newline at end of file