diff options
| -rw-r--r-- | command-list.c | 7 | ||||
| -rw-r--r-- | version.mk | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/command-list.c b/command-list.c index f47bd3f..e09cebf 100644 --- a/command-list.c +++ b/command-list.c @@ -576,10 +576,17 @@ static void find_conflicting_libraries(Options *op, FileList *l); static ConflictingFileInfo __xfree86_opengl_libs[] = { + + /* Conflicting OpenGL libraries */ + { "libnvidia-glcore.", 17, /* strlen("libnvidia-glcore.") */ NULL }, { "libGL.", 6, /* strlen("libGL.") */ NULL }, { "libGLwrapper.", 13, /* strlen("libGLwrapper.") */ NULL }, + + /* Conflicting X extensions */ + { "libglx.", 7, /* strlen("libglx.") */ "glxModuleData" }, + { "libglamoregl.", 13, /* strlen("libglamoregl.") */ NULL }, { NULL, 0, NULL } }; @@ -1 +1 @@ -NVIDIA_VERSION = 304.108 +NVIDIA_VERSION = 304.116 |