[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#950765: marked as done (buster-pu: package nvidia-settings-legacy-340xx/340.108-1~deb10u1)

Your message dated Sat, 09 May 2020 11:53:52 +0100
with message-id <fd7fa4d56896c35aab49a5a51cb69727dc60e87a.camel@adam-barratt.org.uk>
and subject line Closing requests included in 10.4 point release
has caused the Debian Bug report #950765,
regarding buster-pu: package nvidia-settings-legacy-340xx/340.108-1~deb10u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
950765: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=950765
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

I just realized that the 340.108 release of nvidia-settings contained
not only version number bumping (therefore I initially planned to not
update nvidia-settings-legacy-340xx along with
nvidia-graphics-drivers-legacy-340xx), but actual code changes: an
upstream fix for Xorg Xserver 1.20 (which is in buster) was backported
from 390.xx. Upstream changelog (in src:nvidia-graphics-drivers) only
mentioned that for nvidia-xconfig, but the same fix was applied upstream
to nvidia-settings.
I'm not aware of any bug reports regarding this issue, but rebuilding
the package from sid was easy ;-)

The package is already uploaded.
There is no need to rush this update to go along with the updated
driver packages sitting in buster-pu, nvidia-settings-legacy-340xx can
well wait for a subsequent point release.


Andreas

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 17:02:18.000000000 +0100
+++ nvidia-settings-legacy-340xx-340.108/debian/changelog	2020-02-05 23:25:44.000000000 +0100
@@ -1,3 +1,18 @@
+nvidia-settings-legacy-340xx (340.108-1~deb10u1) buster; urgency=medium
+
+  * Rebuild for buster.
+
+ -- Andreas Beckmann <anbe@debian.org>  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 <anbe@debian.org>  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 17:02:18.000000000 +0100
+++ nvidia-settings-legacy-340xx-340.108/debian/control	2020-02-05 23:25:44.000000000 +0100
@@ -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 17:02:18.000000000 +0100
+++ nvidia-settings-legacy-340xx-340.108/debian/copyright	2020-02-05 23:25:44.000000000 +0100
@@ -98,7 +98,7 @@
 Files: debian/*
 Copyright: © 2004-2010 Randall Donald <rdonald@debian.org>
            © 2009-2010 Fathi Boudra <fabo@debian.org>
-           © 2011-2018 Andreas Beckmann <anbe@debian.org>
+           © 2011-2020 Andreas Beckmann <anbe@debian.org>
            © 2017      Luca Boccassi <bluca@debian.org>
 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 07:53:29.000000000 +0200
+++ nvidia-settings-legacy-340xx-340.108/doc/version.mk	2019-12-12 00:31:04.000000000 +0100
@@ -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 07:53:29.000000000 +0200
+++ nvidia-settings-legacy-340xx-340.108/samples/version.mk	2019-12-12 00:31:04.000000000 +0100
@@ -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 07:53:29.000000000 +0200
+++ nvidia-settings-legacy-340xx-340.108/src/XF86Config-parser/Generate.c	2019-12-12 00:31:05.000000000 +0100
@@ -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 07:53:29.000000000 +0200
+++ nvidia-settings-legacy-340xx-340.108/src/XF86Config-parser/xf86Parser.h	2019-12-12 00:31:05.000000000 +0100
@@ -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 07:53:29.000000000 +0200
+++ nvidia-settings-legacy-340xx-340.108/src/gtk+-2.x/ctkdisplayconfig.c	2019-12-12 00:31:04.000000000 +0100
@@ -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 07:53:29.000000000 +0200
+++ nvidia-settings-legacy-340xx-340.108/src/libXNVCtrl/version.mk	2019-12-12 00:31:04.000000000 +0100
@@ -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 07:53:29.000000000 +0200
+++ nvidia-settings-legacy-340xx-340.108/src/version.mk	2019-12-12 00:31:04.000000000 +0100
@@ -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 07:53:29.000000000 +0200
+++ nvidia-settings-legacy-340xx-340.108/version.mk	2019-12-12 00:31:04.000000000 +0100
@@ -1 +1 @@
-NVIDIA_VERSION = 340.107
+NVIDIA_VERSION = 340.108

--- End Message ---
--- Begin Message --- 
Package: release.debian.org
Version: 10.4

Hi,

Each of the uploads referred to by these bugs was included in today's
stable point release.

Regards,

Adam

--- End Message ---
Reply to: