diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2009-03-20 16:36:15 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2009-03-20 16:36:15 -0700 |
| commit | 427a8bb0547ae8ec5f9cbc2bb6660b90dc73c405 (patch) | |
| tree | 74893653afc6c20b1a5b700103f203f82c4e03cf | |
| parent | 601c6d8bfd5872348e53803186a2abf223cb5f54 (diff) | |
180.41180.41
| -rw-r--r-- | DRIVER_VERSION | 2 | ||||
| -rw-r--r-- | command-list.c | 21 |
2 files changed, 13 insertions, 10 deletions
diff --git a/DRIVER_VERSION b/DRIVER_VERSION index ca5c9a6..92de252 100644 --- a/DRIVER_VERSION +++ b/DRIVER_VERSION @@ -1 +1 @@ -180.37 +180.41 diff --git a/command-list.c b/command-list.c index be37bcc..c088e8d 100644 --- a/command-list.c +++ b/command-list.c @@ -527,15 +527,18 @@ static void find_conflicting_libraries(Options *op, FileList *l); static ConflictingFileInfo __xfree86_libs[] = { - { "libGLcore.", 10, /* strlen("libGLcore.") */ NULL }, - { "libGL.", 6, /* strlen("libGL.") */ NULL }, - { "libGLwrapper.", 13, /* strlen("libGLwrapper.") */ NULL }, - { "libglx.", 7, /* strlen("libglx.") */ "glxModuleData" }, - { "libXvMCNVIDIA", 13, /* strlen("libXvMCNVIDIA") */ NULL }, - { "libnvidia-cfg.", 14, /* strlen("libnvidia-cfg.") */ NULL }, - { "nvidia_drv.", 11, /* strlen("nvidia_drv.") */ NULL }, - { "libcuda.", 8, /* strlen("libcuda.") */ NULL }, - { NULL, 0, NULL } + { "libGLcore.", 10, /* strlen("libGLcore.") */ NULL }, + { "libGL.", 6, /* strlen("libGL.") */ NULL }, + { "libGLwrapper.", 13, /* strlen("libGLwrapper.") */ NULL }, + { "libglx.", 7, /* strlen("libglx.") */ "glxModuleData" }, + { "libXvMCNVIDIA", 13, /* strlen("libXvMCNVIDIA") */ NULL }, + { "libnvidia-cfg.", 14, /* strlen("libnvidia-cfg.") */ NULL }, + { "nvidia_drv.", 11, /* strlen("nvidia_drv.") */ NULL }, + { "libcuda.", 8, /* strlen("libcuda.") */ NULL }, + { "libvdpau.", 9, /* strlen("libvdpau.") */ NULL }, + { "libvdpau_trace.", 15, /* strlen("libvdpau_trace.") */ NULL }, + { "libvdpau_nvidia.", 16, /* strlen("libvdpau_nvidia.") */ NULL }, + { NULL, 0, NULL } }; /* |