diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2009-04-06 13:01:04 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2009-04-06 13:01:04 -0700 |
| commit | 7bd5230639406882c5f59e5a3dd636627545d71a (patch) | |
| tree | 597b786d9d727f857799e2e140ba741ca0350500 | |
| parent | 7725afc256e5d36d56534a83ec471b14132a4457 (diff) | |
185.19185.19
| -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 24ca57d..b0ec0e9 100644 --- a/DRIVER_VERSION +++ b/DRIVER_VERSION @@ -1 +1 @@ -185.13 +185.19 diff --git a/command-list.c b/command-list.c index 549f649..3e83c98 100644 --- a/command-list.c +++ b/command-list.c @@ -538,15 +538,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 } }; /* |