Bug#920379: stretch-pu: package nvidia-xconfig/390.87-1~deb9u1
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu
Hi,
in addition to switching nvidia-graphics-drivers to the new 390.xx
upstream release in stretch (#916632), we also need to update some
related packages to the 390.xx series. We don't want to mix different
(major) versions which is completely untested (and unsupported
upstream). And since we build all the components of the driver that are
available in source code form as separate packages in contrib, we need
to update a few extra packages in case of the upstream major version
bump.
This request is for the nvidia-xconfig package.
Andreas
diff --git a/debian/changelog b/debian/changelog
index b4838f9..b9809d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+nvidia-xconfig (390.87-1~deb9u1) stretch; urgency=medium
+
+ * Rebuild for stretch.
+
+ -- Andreas Beckmann <anbe@debian.org> Thu, 24 Jan 2019 21:27:17 +0100
+
+nvidia-xconfig (390.87-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Bump Standards-Version to 4.3.0. No changes needed.
+
+ -- Andreas Beckmann <anbe@debian.org> Fri, 18 Jan 2019 16:48:41 +0100
+
+nvidia-xconfig (390.25-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Andreas Beckmann <anbe@debian.org> Wed, 07 Mar 2018 01:58:28 +0100
+
+nvidia-xconfig (387.34-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Add debian/upstream/metadata.
+ * Fix new Lintian issues.
+ * Switch Vcs-* URLs to salsa.debian.org.
+
+ -- Andreas Beckmann <anbe@debian.org> Tue, 06 Mar 2018 01:23:54 +0100
+
nvidia-xconfig (384.111-1~deb9u1) stretch; urgency=medium
* Rebuild for stretch.
@@ -420,4 +448,3 @@ nvidia-xconfig (1.0+20051122-1) unstable; urgency=low
* Initial Upload.
-- Randall Donald <rdonald@debian.org> Mon, 7 Nov 2005 10:54:24 -0800
-
diff --git a/debian/control b/debian/control
index 43c7899..a2a89d5 100644
--- a/debian/control
+++ b/debian/control
@@ -12,10 +12,10 @@ Build-Depends:
pkg-config,
xserver-xorg-dev,
Rules-Requires-Root: no
-Standards-Version: 4.1.3
+Standards-Version: 4.3.0
Homepage: https://download.nvidia.com/XFree86/nvidia-xconfig/
-Vcs-Git: https://anonscm.debian.org/git/pkg-nvidia/nvidia-xconfig.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nvidia/nvidia-xconfig.git
+Vcs-Browser: https://salsa.debian.org/nvidia-team/nvidia-xconfig
+Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-xconfig.git
Package: nvidia-xconfig
Architecture: i386 amd64 armhf
diff --git a/debian/copyright b/debian/copyright
index b1b087a..9503b72 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,12 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: nvidia-xconfig
Upstream-Contact: NVIDIA Corporation
Source: https://download.nvidia.com/XFree86/nvidia-xconfig/
+Disclaimer:
+ This package is not part of the GNU/Linux Debian distribution. It is
+ provided in the contrib archive area as a convenience to Debian users.
+ The contents of this source package are freely licensed under the Expat,
+ GPL, and other licenses, but it is only useful in combination with the
+ proprietary NVIDIA drivers in non-free.
Files: *
Copyright: (C) 2004-2012 NVIDIA Corporation
@@ -119,7 +125,7 @@ License: other-XFree
Files: debian/*
Copyright: © 2005 Randall Donald <rdonald@debian.org>
- © 2010-2018 Andreas Beckmann <anbe@debian.org>
+ © 2010-2019 Andreas Beckmann <anbe@debian.org>
License: GPL-2+
License: GPL-2
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 7ec9f82..8ebed74 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,2 +1,2 @@
# upstream provides no signatures
-debian-watch-may-check-gpg-signature
+debian-watch-does-not-check-gpg-signature
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..e9de2f9
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,3 @@
+Name: nvidia-xconfig
+Repository: https://github.com/NVIDIA/nvidia-xconfig.git
+Repository-Browse: https://github.com/NVIDIA/nvidia-xconfig
diff --git a/nvidia-cfg.h b/nvidia-cfg.h
index 41c7a54..cac7565 100644
--- a/nvidia-cfg.h
+++ b/nvidia-cfg.h
@@ -442,4 +442,12 @@ NvCfgBool nvCfgFlashGSyncDevice(NvCfgGSyncHandle handle, int format,
const unsigned char *newFirmwareImage,
int size);
+
+/*
+ * nvCfgDumpDisplayPortAuxLog() - dump the DisplayPort AUX channel log to the
+ * system log. On success, NVCFG_TRUE will be returned. On failure, NVCFG_FALSE
+ * will be returned.
+ */
+NvCfgBool nvCfgDumpDisplayPortAuxLog(NvCfgDeviceHandle handle);
+
#endif /* __NVIDIA_CFG__ */
diff --git a/nvidia-xconfig.c b/nvidia-xconfig.c
index 8e7a40a..fc007b3 100644
--- a/nvidia-xconfig.c
+++ b/nvidia-xconfig.c
@@ -333,7 +333,7 @@ static void parse_commandline(Options *op, int argc, char *argv[])
break;
}
- if (intval < 0 || intval > 13) {
+ if (intval < 0 || intval > 14) {
fprintf(stderr, "\n");
fprintf(stderr, "Invalid stereo: %d.\n", intval);
fprintf(stderr, "\n");
diff --git a/option_table.h b/option_table.h
index c0735fa..87718df 100644
--- a/option_table.h
+++ b/option_table.h
@@ -644,10 +644,11 @@ static const NVGetoptOption __options[] = {
{ "force-yuv-420", XCONFIG_BOOL_VAL(FORCE_YUV_420),
NVGETOPT_IS_BOOLEAN, NULL, "Enable or disable the "
- "\"ForceYUV420\" X configuration option. Setting this option "
- "will enable YUV 4:2:0 compression on HDMI 2.0 4K@60hz modes "
- "if possible, even if the current display and GPU both support "
- "uncompressed RGB 4:4:4 output with these modes." },
+ "\"ForceYUV420\" X configuration option. If the current display and GPU "
+ "both support uncompressed RGB 4:4:4 output and YUV 4:2:0 compressed "
+ "output with the current mode, then RGB 4:4:4 output is selected by "
+ "default. This option forces the use of YUV 4:2:0 output (where "
+ "supported) instead." },
{ "force-composition-pipeline", FORCE_COMPOSITION_PIPELINE_OPTION,
NVGETOPT_STRING_ARGUMENT | NVGETOPT_ALLOW_DISABLE, NULL,
diff --git a/utils.mk b/utils.mk
index 31d40f9..66dbb16 100644
--- a/utils.mk
+++ b/utils.mk
@@ -80,6 +80,7 @@ HOSTNAME_CMD ?= hostname
DATE ?= date
GZIP_CMD ?= gzip
CHMOD ?= chmod
+OBJCOPY ?= objcopy
NV_AUTO_DEPEND ?= 1
NV_VERBOSE ?= 0
@@ -271,10 +272,14 @@ endif
NV_MODULE_LOGGING_NAME ?=
ifeq ($(NV_VERBOSE),0)
- quiet_cmd = @$(PRINTF) \
+ at_if_quiet := @
+ quiet_cmd_no_at = $(PRINTF) \
" $(if $(NV_MODULE_LOGGING_NAME),[ %-17.17s ],%s) $(quiet_$(1))\n" \
"$(NV_MODULE_LOGGING_NAME)" && $($(1))
+ quiet_cmd = @$(quiet_cmd_no_at)
else
+ at_if_quiet :=
+ quiet_cmd_no_at = $($(1))
quiet_cmd = $($(1))
endif
@@ -295,6 +300,8 @@ quiet_HOST_LINK = $(call define_quiet_cmd,HOST_LINK ,$@)
quiet_M4 = $(call define_quiet_cmd,M4 ,$<)
quiet_STRIP_CMD = $(call define_quiet_cmd,STRIP ,$@)
quiet_HARDLINK = $(call define_quiet_cmd,HARDLINK ,$@)
+quiet_LD = $(call define_quiet_cmd,LD ,$@)
+quiet_OBJCOPY = $(call define_quiet_cmd,OBJCOPY ,$@)
##############################################################################
# Tell gmake to delete the target of a rule if it has changed and its
@@ -447,3 +454,30 @@ define DEFINE_STAMP_C_RULE
@ $$(PRINTF) "%s\n" "const char *pNV_ID = NV_ID + 11;" >> $$@
endef
+
+##############################################################################
+# Define rules that can be used for embedding a file into an ELF object that
+# contains the raw contents of that file and symbols pointing to the embedded
+# data.
+#
+# Note that objcopy will name the symbols in the resulting object file based on
+# the filename specified in $(1). For example,
+#
+# $(eval $(call $(READ_ONLY_OBJECT_FROM_FILE_RULE),a/b/c))
+#
+# will create an object named $(OUTPUTDIR)/c.o with the symbols _binary_c_start,
+# _binary_c_end, and _binary_c_size.
+#
+# Arguments:
+# $(1): Path to the file to convert
+##############################################################################
+
+define READ_ONLY_OBJECT_FROM_FILE_RULE
+ $$(OUTPUTDIR)/$$(notdir $(1)).o: $(1)
+ $(at_if_quiet)cd $$(dir $(1)); \
+ $$(call quiet_cmd_no_at,LD) -r -z noexecstack --format=binary \
+ $$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@)
+ $$(call quiet_cmd,OBJCOPY) \
+ --rename-section .data=.rodata,contents,alloc,load,data,readonly \
+ $$@
+endef
diff --git a/version.mk b/version.mk
index f4a6a7c..54ad7ff 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 384.111
+NVIDIA_VERSION = 390.87
Reply to: