Skip to content
Snippets Groups Projects
Commit e018e10f authored by Damian Alvarez's avatar Damian Alvarez
Browse files

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
parent 0e306e7a
No related branches found
No related tags found
No related merge requests found
...@@ -79,6 +79,7 @@ class EB_nvidia_minus_driver(Binary): ...@@ -79,6 +79,7 @@ class EB_nvidia_minus_driver(Binary):
else: else:
libs = expand_glob_paths([os.path.join(self.libsdir, 'libEGL*.so*')]) 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, '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-egl*.so*')])
libs += expand_glob_paths([os.path.join(self.libsdir, 'libnvidia-gl*.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*')]) libs += expand_glob_paths([os.path.join(self.libsdir, 'libnvidia-rtcore*.so*')])
...@@ -140,7 +141,7 @@ class EB_nvidia_minus_driver(Binary): ...@@ -140,7 +141,7 @@ class EB_nvidia_minus_driver(Binary):
libs = [os.path.join("%s", "lib%s.%s.1") % (x, y, shlib_ext) libs = [os.path.join("%s", "lib%s.%s.1") % (x, y, shlib_ext)
for x in chk_libdir for y in nvlibs] for x in chk_libdir for y in nvlibs]
else: else:
nvlibs_0_suffix = ["EGL_nvidia", "GLX_nvidia"] nvlibs_0_suffix = ["EGL_nvidia", "GLX_nvidia", "OpenGL"]
nvlibs_1_suffix = ["GLESv1_CM_nvidia"] nvlibs_1_suffix = ["GLESv1_CM_nvidia"]
nvlibs_2_suffix = ["GLESv2_nvidia"] nvlibs_2_suffix = ["GLESv2_nvidia"]
binaries = [] binaries = []
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment