From e018e10f8bb83a5875172dfe3cb2a27429a0a240 Mon Sep 17 00:00:00 2001
From: Damian Alvarez <swmanage@jwlogin04.juwels>
Date: Wed, 9 Aug 2023 09:53:49 +0200
Subject: [PATCH] To make sure that OpenGL libs are installed, otherwise we
have libOpenGL from the OS, and libGLdispatch from nvidia-driver, and that
leads to problems
---
Custom_EasyBlocks/nvidia_driver.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Custom_EasyBlocks/nvidia_driver.py b/Custom_EasyBlocks/nvidia_driver.py
index 6c9856d8..75ca2bcc 100644
--- a/Custom_EasyBlocks/nvidia_driver.py
+++ b/Custom_EasyBlocks/nvidia_driver.py
@@ -79,6 +79,7 @@ class EB_nvidia_minus_driver(Binary):
else:
libs = expand_glob_paths([os.path.join(self.libsdir, 'libEGL*.so*')])
libs += expand_glob_paths([os.path.join(self.libsdir, 'libGL*.so*')])
+ libs += expand_glob_paths([os.path.join(self.libsdir, 'libOpenGL.so*')])
libs += expand_glob_paths([os.path.join(self.libsdir, 'libnvidia-egl*.so*')])
libs += expand_glob_paths([os.path.join(self.libsdir, 'libnvidia-gl*.so*')])
libs += expand_glob_paths([os.path.join(self.libsdir, 'libnvidia-rtcore*.so*')])
@@ -140,7 +141,7 @@ class EB_nvidia_minus_driver(Binary):
libs = [os.path.join("%s", "lib%s.%s.1") % (x, y, shlib_ext)
for x in chk_libdir for y in nvlibs]
else:
- nvlibs_0_suffix = ["EGL_nvidia", "GLX_nvidia"]
+ nvlibs_0_suffix = ["EGL_nvidia", "GLX_nvidia", "OpenGL"]
nvlibs_1_suffix = ["GLESv1_CM_nvidia"]
nvlibs_2_suffix = ["GLESv2_nvidia"]
binaries = []
--
GitLab