Version in base suite: 340.107-2 Base version: nvidia-settings-legacy-340xx_340.107-2 Target version: nvidia-settings-legacy-340xx_340.108-1~deb10u1 Base file: /srv/ftp-master.debian.org/ftp/pool/contrib/n/nvidia-settings-legacy-340xx/nvidia-settings-legacy-340xx_340.107-2.dsc Target file: /srv/ftp-master.debian.org/policy/pool/contrib/n/nvidia-settings-legacy-340xx/nvidia-settings-legacy-340xx_340.108-1~deb10u1.dsc debian/changelog | 15 +++++++++++++++ debian/control | 2 +- debian/copyright | 2 +- doc/version.mk | 2 +- samples/version.mk | 2 +- src/XF86Config-parser/Generate.c | 19 +++++++++++++++++-- src/XF86Config-parser/xf86Parser.h | 1 + src/gtk+-2.x/ctkdisplayconfig.c | 7 +++++-- src/libXNVCtrl/version.mk | 2 +- src/version.mk | 2 +- version.mk | 2 +- 11 files changed, 45 insertions(+), 11 deletions(-) diff -Nru nvidia-settings-legacy-340xx-340.107/debian/changelog nvidia-settings-legacy-340xx-340.108/debian/changelog --- nvidia-settings-legacy-340xx-340.107/debian/changelog 2019-02-06 16:02:18.000000000 +0000 +++ nvidia-settings-legacy-340xx-340.108/debian/changelog 2020-02-05 22:25:44.000000000 +0000 @@ -1,3 +1,18 @@ +nvidia-settings-legacy-340xx (340.108-1~deb10u1) buster; urgency=medium + + * Rebuild for buster. + + -- Andreas Beckmann Wed, 05 Feb 2020 23:25:44 +0100 + +nvidia-settings-legacy-340xx (340.108-1) unstable; urgency=medium + + * New upstream release 340.108. + - Fixed a bug that could prevent nvidia-xconfig from disabling the X + Composite extension on version 1.20 of the X.org X server. (390.116-1) + * Bump Standards-Version to 4.5.0. No changes needed. + + -- Andreas Beckmann Wed, 05 Feb 2020 22:56:48 +0100 + nvidia-settings-legacy-340xx (340.107-2) unstable; urgency=medium * Synchronize packaging with nvidia-settings-legacy-390xx 390.87-1. diff -Nru nvidia-settings-legacy-340xx-340.107/debian/control nvidia-settings-legacy-340xx-340.108/debian/control --- nvidia-settings-legacy-340xx-340.107/debian/control 2019-02-06 16:02:18.000000000 +0000 +++ nvidia-settings-legacy-340xx-340.108/debian/control 2020-02-05 22:25:44.000000000 +0000 @@ -22,7 +22,7 @@ Build-Conflicts: libxnvctrl-dev, Rules-Requires-Root: no -Standards-Version: 4.3.0 +Standards-Version: 4.5.0 Homepage: https://download.nvidia.com/XFree86/nvidia-settings/ Vcs-Browser: https://salsa.debian.org/nvidia-team/nvidia-settings Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-settings.git -b 340xx/master diff -Nru nvidia-settings-legacy-340xx-340.107/debian/copyright nvidia-settings-legacy-340xx-340.108/debian/copyright --- nvidia-settings-legacy-340xx-340.107/debian/copyright 2019-02-06 16:02:18.000000000 +0000 +++ nvidia-settings-legacy-340xx-340.108/debian/copyright 2020-02-05 22:25:44.000000000 +0000 @@ -98,7 +98,7 @@ Files: debian/* Copyright: © 2004-2010 Randall Donald © 2009-2010 Fathi Boudra - © 2011-2018 Andreas Beckmann + © 2011-2020 Andreas Beckmann © 2017 Luca Boccassi License: GPL-2 diff -Nru nvidia-settings-legacy-340xx-340.107/doc/version.mk nvidia-settings-legacy-340xx-340.108/doc/version.mk --- nvidia-settings-legacy-340xx-340.107/doc/version.mk 2018-05-25 05:53:29.000000000 +0000 +++ nvidia-settings-legacy-340xx-340.108/doc/version.mk 2019-12-11 23:31:04.000000000 +0000 @@ -1 +1 @@ -NVIDIA_VERSION = 340.107 +NVIDIA_VERSION = 340.108 diff -Nru nvidia-settings-legacy-340xx-340.107/samples/version.mk nvidia-settings-legacy-340xx-340.108/samples/version.mk --- nvidia-settings-legacy-340xx-340.107/samples/version.mk 2018-05-25 05:53:29.000000000 +0000 +++ nvidia-settings-legacy-340xx-340.108/samples/version.mk 2019-12-11 23:31:04.000000000 +0000 @@ -1 +1 @@ -NVIDIA_VERSION = 340.107 +NVIDIA_VERSION = 340.108 diff -Nru nvidia-settings-legacy-340xx-340.107/src/XF86Config-parser/Generate.c nvidia-settings-legacy-340xx-340.108/src/XF86Config-parser/Generate.c --- nvidia-settings-legacy-340xx-340.107/src/XF86Config-parser/Generate.c 2018-05-25 05:53:29.000000000 +0000 +++ nvidia-settings-legacy-340xx-340.108/src/XF86Config-parser/Generate.c 2019-12-11 23:31:05.000000000 +0000 @@ -1322,7 +1322,8 @@ 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 @@ } 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 @@ 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 @@ &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 -Nru nvidia-settings-legacy-340xx-340.107/src/XF86Config-parser/xf86Parser.h nvidia-settings-legacy-340xx-340.108/src/XF86Config-parser/xf86Parser.h --- nvidia-settings-legacy-340xx-340.107/src/XF86Config-parser/xf86Parser.h 2018-05-25 05:53:29.000000000 +0000 +++ nvidia-settings-legacy-340xx-340.108/src/XF86Config-parser/xf86Parser.h 2019-12-11 23:31:05.000000000 +0000 @@ -625,6 +625,7 @@ int supports_extension_section; int autoloads_glx; int xinerama_plus_composite_works; + const char *compositeExtensionName; } GenerateOptions; diff -Nru nvidia-settings-legacy-340xx-340.107/src/gtk+-2.x/ctkdisplayconfig.c nvidia-settings-legacy-340xx-340.108/src/gtk+-2.x/ctkdisplayconfig.c --- nvidia-settings-legacy-340xx-340.107/src/gtk+-2.x/ctkdisplayconfig.c 2018-05-25 05:53:29.000000000 +0000 +++ nvidia-settings-legacy-340xx-340.108/src/gtk+-2.x/ctkdisplayconfig.c 2019-12-11 23:31:04.000000000 +0000 @@ -8772,9 +8772,12 @@ 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 -Nru nvidia-settings-legacy-340xx-340.107/src/libXNVCtrl/version.mk nvidia-settings-legacy-340xx-340.108/src/libXNVCtrl/version.mk --- nvidia-settings-legacy-340xx-340.107/src/libXNVCtrl/version.mk 2018-05-25 05:53:29.000000000 +0000 +++ nvidia-settings-legacy-340xx-340.108/src/libXNVCtrl/version.mk 2019-12-11 23:31:04.000000000 +0000 @@ -1 +1 @@ -NVIDIA_VERSION = 340.107 +NVIDIA_VERSION = 340.108 diff -Nru nvidia-settings-legacy-340xx-340.107/src/version.mk nvidia-settings-legacy-340xx-340.108/src/version.mk --- nvidia-settings-legacy-340xx-340.107/src/version.mk 2018-05-25 05:53:29.000000000 +0000 +++ nvidia-settings-legacy-340xx-340.108/src/version.mk 2019-12-11 23:31:04.000000000 +0000 @@ -1 +1 @@ -NVIDIA_VERSION = 340.107 +NVIDIA_VERSION = 340.108 diff -Nru nvidia-settings-legacy-340xx-340.107/version.mk nvidia-settings-legacy-340xx-340.108/version.mk --- nvidia-settings-legacy-340xx-340.107/version.mk 2018-05-25 05:53:29.000000000 +0000 +++ nvidia-settings-legacy-340xx-340.108/version.mk 2019-12-11 23:31:04.000000000 +0000 @@ -1 +1 @@ -NVIDIA_VERSION = 340.107 +NVIDIA_VERSION = 340.108