diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2013-11-06 08:30:36 -0800 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2013-11-06 08:30:36 -0800 |
| commit | 5063b429c1c26e0a409a86180ffaa4de28668c3a (patch) | |
| tree | 4fed3f2854811434e04a56a64a1c1d8abefd0fed | |
| parent | 72ebfda8e29b48e925f48da6f2594e9a7cc4c275 (diff) | |
331.20331.20
| -rw-r--r-- | command-list.c | 11 | ||||
| -rw-r--r-- | common-utils/common-utils.h | 5 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/command-list.c b/command-list.c index c2015de..a68a980 100644 --- a/command-list.c +++ b/command-list.c @@ -607,16 +607,25 @@ static void find_conflicting_libraries(Options *op, FileList *l); static ConflictingFileInfo __xfree86_opengl_libs[] = { + + /* Conflicting OpenGL libraries */ + { "libnvidia-glcore.", 17, /* strlen("libnvidia-glcore.") */ NULL, CONFLICT_ARCH_ALL }, { "libGL.", 6, /* strlen("libGL.") */ NULL, CONFLICT_ARCH_ALL }, { "libGLwrapper.", 13, /* strlen("libGLwrapper.") */ NULL, CONFLICT_ARCH_ALL }, + + /* Conflicting X extensions */ + { "libglx.", 7, /* strlen("libglx.") */ "glxModuleData", CONFLICT_ARCH_ALL }, + { "libglamoregl.", 13, /* strlen("libglamoregl.") */ + NULL, CONFLICT_ARCH_ALL }, - /* XXX we do not currently build 64-bit EGL libraries due to problems + /* Conflicting EGL libraries: + * XXX we do not currently build 64-bit EGL libraries due to problems * with the ABI, so only conflict with 32-bit EGL libraries for now. */ { "libEGL.", 7, /* strlen("libEGL.") */ diff --git a/common-utils/common-utils.h b/common-utils/common-utils.h index 3bc934f..e9d505e 100644 --- a/common-utils/common-utils.h +++ b/common-utils/common-utils.h @@ -40,8 +40,9 @@ #define VERBOSITY_NONE 0 /* nothing */ #define VERBOSITY_ERROR 1 /* errors only */ -#define VERBOSITY_WARNING 2 /* errors and warnings */ -#define VERBOSITY_ALL 3 /* errors, warnings and other info */ +#define VERBOSITY_DEPRECATED 2 /* errors, deprecation messages and warnings */ +#define VERBOSITY_WARNING 3 /* errors and warnings */ +#define VERBOSITY_ALL 4 /* errors, warnings and other info */ #define VERBOSITY_DEFAULT VERBOSITY_ERROR @@ -1 +1 @@ -NVIDIA_VERSION = 331.17 +NVIDIA_VERSION = 331.20 |