diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2020-05-18 16:07:00 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2020-05-18 16:07:12 -0700 |
| commit | 8ebc1074e6fe4999fa706e6b58b1ca53327991a5 (patch) | |
| tree | ba594142443b0237e2d74e39dfeadf6e70cea590 | |
| parent | bb2443d41e5aeeb03e5ed9b7a82f325f4d113a5e (diff) | |
Fixes #53
| -rw-r--r-- | doc/version.mk | 2 | ||||
| -rw-r--r-- | samples/version.mk | 2 | ||||
| -rw-r--r-- | src/XF86Config-parser/Generate.c | 19 | ||||
| -rw-r--r-- | src/XF86Config-parser/xf86Parser.h | 1 | ||||
| -rw-r--r-- | src/gtk+-2.x/ctkdisplayconfig.c | 7 | ||||
| -rw-r--r-- | src/libXNVCtrl/version.mk | 2 | ||||
| -rw-r--r-- | src/version.mk | 2 | ||||
| -rw-r--r-- | version.mk | 2 |
8 files changed, 28 insertions, 9 deletions
diff --git a/doc/version.mk b/doc/version.mk index df1844b..0d7aa61 100644 --- a/doc/version.mk +++ b/doc/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 340.107 +NVIDIA_VERSION = 340.108 diff --git a/samples/version.mk b/samples/version.mk index df1844b..0d7aa61 100644 --- a/samples/version.mk +++ b/samples/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 340.107 +NVIDIA_VERSION = 340.108 diff --git a/src/XF86Config-parser/Generate.c b/src/XF86Config-parser/Generate.c index cdd7054..0947216 100644 --- a/src/XF86Config-parser/Generate.c +++ b/src/XF86Config-parser/Generate.c @@ -1322,7 +1322,8 @@ static int get_xserver_information(const char *versionString, int *isModular, int *autoloadsGLX, int *supportsExtensionSection, - int *xineramaPlusCompositeWorks) + int *xineramaPlusCompositeWorks, + const char **compositeExtensionName) { #define XSERVER_VERSION_FORMAT_1 "X Window System Version" #define XSERVER_VERSION_FORMAT_2 "X.Org X Server" @@ -1412,6 +1413,18 @@ static int get_xserver_information(const char *versionString, } else { *xineramaPlusCompositeWorks = TRUE; } + + /* + * With X.Org xserver version 1.20, the name of the composite + * extension was changed from "Composite" to "COMPOSITE". As of + * that release extension names are case-sensitive so we must + * ensure the correct case is used. + */ + if (major == 1 && minor >= 20) { + *compositeExtensionName = "COMPOSITE"; + } else { + *compositeExtensionName = "Composite"; + } return TRUE; @@ -1449,6 +1462,7 @@ void xconfigGetXServerInUse(GenerateOptions *gop) gop->supports_extension_section = FALSE; gop->autoloads_glx = FALSE; gop->xinerama_plus_composite_works = FALSE; + gop->compositeExtensionName = NULL; /* run `X -version` with a PATH that hopefully includes the X binary */ @@ -1479,7 +1493,8 @@ void xconfigGetXServerInUse(GenerateOptions *gop) &dummy, /* isModular */ &gop->autoloads_glx, &gop->supports_extension_section, - &gop->xinerama_plus_composite_works); + &gop->xinerama_plus_composite_works, + &gop->compositeExtensionName); if (found) { if (isXorg) { diff --git a/src/XF86Config-parser/xf86Parser.h b/src/XF86Config-parser/xf86Parser.h index 89c1569..131876e 100644 --- a/src/XF86Config-parser/xf86Parser.h +++ b/src/XF86Config-parser/xf86Parser.h @@ -625,6 +625,7 @@ typedef struct { int supports_extension_section; int autoloads_glx; int xinerama_plus_composite_works; + const char *compositeExtensionName; } GenerateOptions; diff --git a/src/gtk+-2.x/ctkdisplayconfig.c b/src/gtk+-2.x/ctkdisplayconfig.c index 8b2240f..05e15e1 100644 --- a/src/gtk+-2.x/ctkdisplayconfig.c +++ b/src/gtk+-2.x/ctkdisplayconfig.c @@ -8772,9 +8772,12 @@ static int generateXConfig(CtkDisplayConfig *ctk_object, XConfigPtr *pConfig) if (!config->extensions) { config->extensions = nvalloc(sizeof(XConfigExtensionsRec)); } - xconfigRemoveNamedOption(&(config->extensions->options), "Composite", + xconfigRemoveNamedOption(&(config->extensions->options), + go.compositeExtensionName, NULL); - xconfigAddNewOption(&config->extensions->options, "Composite", "Disable"); + xconfigAddNewOption(&config->extensions->options, + go.compositeExtensionName, + "Disable"); nvfree(composite_disabled_str); } } diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk index df1844b..0d7aa61 100644 --- a/src/libXNVCtrl/version.mk +++ b/src/libXNVCtrl/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 340.107 +NVIDIA_VERSION = 340.108 diff --git a/src/version.mk b/src/version.mk index df1844b..0d7aa61 100644 --- a/src/version.mk +++ b/src/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 340.107 +NVIDIA_VERSION = 340.108 @@ -1 +1 @@ -NVIDIA_VERSION = 340.107 +NVIDIA_VERSION = 340.108 |