Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian....@packages.debian.org
Usertags: pu
Control: block -1 with 1005129
Hi,
in order to avoid confusion I'd like to keep the major version in sync
and therefore update nvidia-xconfig to a new upstream release from the
470 series along the update of src:nvidia-graphics-drivers (#1005129).
This is a no-chnage rebuild of the package in sid.
Andreas
diff --git a/common-utils/gen-manpage-opts-helper.c
b/common-utils/gen-manpage-opts-helper.c
index b41e2aa..56ba7b3 100644
--- a/common-utils/gen-manpage-opts-helper.c
+++ b/common-utils/gen-manpage-opts-helper.c
@@ -31,7 +31,8 @@
static void print_option(const NVGetoptOption *o)
{
- char scratch[64], *s;
+ char scratch[64];
+ const char *s;
int j, len;
int italics, bold, omitWhiteSpace, firstchar;
diff --git a/common-utils/nvgetopt.h b/common-utils/nvgetopt.h
index 0262aac..37da80e 100644
--- a/common-utils/nvgetopt.h
+++ b/common-utils/nvgetopt.h
@@ -117,8 +117,8 @@ typedef struct {
const char *name;
int val;
unsigned int flags;
- char *arg_name; /* not used by nvgetopt() */
- char *description; /* not used by nvgetopt() */
+ const char *arg_name; /* not used by nvgetopt() */
+ const char *description; /* not used by nvgetopt() */
} NVGetoptOption;
diff --git a/debian/changelog b/debian/changelog
index 5e04ee3..491b031 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+nvidia-xconfig (470.103.01-1~deb11u1) bullseye; urgency=medium
+
+ * Rebuild for bullseye.
+
+ -- Andreas Beckmann <a...@debian.org> Wed, 09 Feb 2022 16:54:58 +0100
+
+nvidia-xconfig (470.103.01-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Andreas Beckmann <a...@debian.org> Tue, 08 Feb 2022 12:09:14 +0100
+
+nvidia-xconfig (470.82.00-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Bump Standards-Version to 4.6.0. No changes needed.
+
+ -- Andreas Beckmann <a...@debian.org> Mon, 08 Nov 2021 16:04:21 +0100
+
+nvidia-xconfig (470.57.02-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Andreas Beckmann <a...@debian.org> Mon, 02 Aug 2021 13:02:45 +0200
+
nvidia-xconfig (460.32.03-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 9fa5f83..f1c8d42 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
pkg-config,
xserver-xorg-dev,
Rules-Requires-Root: no
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
Homepage: https://download.nvidia.com/XFree86/nvidia-xconfig/
Vcs-Browser: https://salsa.debian.org/nvidia-team/nvidia-xconfig
Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-xconfig.git
diff --git a/debian/copyright b/debian/copyright
index 48cfbe6..23fc954 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -125,7 +125,7 @@ License: other-XFree
Files: debian/*
Copyright: © 2005 Randall Donald <rdon...@debian.org>
- © 2010-2021 Andreas Beckmann <a...@debian.org>
+ © 2010-2022 Andreas Beckmann <a...@debian.org>
License: GPL-2+
License: GPL-2
diff --git a/multiple_screens.c b/multiple_screens.c
index cb04740..bfa9b23 100644
--- a/multiple_screens.c
+++ b/multiple_screens.c
@@ -302,6 +302,7 @@ DevicesPtr find_devices(Options *op)
DevicesPtr pDevices = NULL;
DisplayDevicePtr pDisplayDevice;
int i, j, n, count = 0;
+ int swappedIndex;
unsigned int mask, bit;
DeviceRec tmpDevice;
NvCfgPciDevice *devs = NULL;
@@ -366,9 +367,7 @@ DevicesPtr find_devices(Options *op)
__GET_FUNC(__getEDID, "nvCfgGetEDID");
__GET_FUNC(__closeDevice, "nvCfgCloseDevice");
__GET_FUNC(__getDeviceUUID, "nvCfgGetDeviceUUID");
-
- /* optional functions */
- __isPrimaryDevice = dlsym(lib_handle, "nvCfgIsPrimaryDevice");
+ __GET_FUNC(__isPrimaryDevice,"nvCfgIsPrimaryDevice");
if (__getPciDevices(&count, &devs) != NVCFG_TRUE) {
return NULL;
@@ -449,17 +448,21 @@ DevicesPtr find_devices(Options *op)
pDevices->devices[i].displayDevices = NULL;
}
- if ((i != 0) && (__isPrimaryDevice != NULL) &&
+ /* Use this index instead of i to close device after a possible swap */
+ swappedIndex = i;
+
+ if ((i != 0) &&
(__isPrimaryDevice(pDevices->devices[i].handle,
&is_primary_device) == NVCFG_TRUE) &&
(is_primary_device == NVCFG_TRUE)) {
memcpy(&tmpDevice, &pDevices->devices[0], sizeof(DeviceRec));
memcpy(&pDevices->devices[0], &pDevices->devices[i],
sizeof(DeviceRec));
memcpy(&pDevices->devices[i], &tmpDevice, sizeof(DeviceRec));
+ swappedIndex = 0;
}
- ret = __closeDevice(pDevices->devices[i].handle);
- pDevices->devices[i].handle = NULL;
+ ret = __closeDevice(pDevices->devices[swappedIndex].handle);
+ pDevices->devices[swappedIndex].handle = NULL;
if (ret != NVCFG_TRUE) {
goto fail;
diff --git a/utils.mk b/utils.mk
index af0e3d7..e5ac3a2 100644
--- a/utils.mk
+++ b/utils.mk
@@ -33,10 +33,11 @@
##############################################################################
CC ?= gcc
+CXX ?= g++
LD ?= ld
AR ?= ar
-# only set these warnings and optimizations if CFLAGS is unset
-CFLAGS ?= -Wall -O2
+# only set these warnings if CFLAGS is unset
+CFLAGS ?= -Wall
# always set these -f CFLAGS
CFLAGS += -fno-strict-aliasing -fno-omit-frame-pointer
-Wformat=2
CC_ONLY_CFLAGS ?=
@@ -58,16 +59,27 @@ CFLAGS += -Wno-unused-parameter
HOST_CC_ONLY_CFLAGS += -Wno-format-zero-length
HOST_CFLAGS += -Wno-unused-parameter
+DEBUG ?=
+DEVELOP ?=
+
ifeq ($(DEBUG),1)
STRIP_CMD ?= true
DO_STRIP ?=
CFLAGS += -O0 -g
CFLAGS += -DDEBUG=1
else
- STRIP_CMD ?= strip
- DO_STRIP ?= 1
+ CFLAGS += -O2
endif
+ifeq ($(DEVELOP),1)
+ STRIP_CMD ?= true
+ DO_STRIP ?=
+ CFLAGS += -DDEVELOP=1
+endif
+
+STRIP_CMD ?= strip
+DO_STRIP ?= 1
+
INSTALL ?= install
INSTALL_BIN_ARGS ?= -m 755
INSTALL_LIB_ARGS ?= -m 644
@@ -185,6 +197,21 @@ ifneq ($(_eval_available),T)
endif
+##############################################################################
+# Test passing $(1) to $(CC). If $(CC) succeeds, then echo $(1).
+#
+# Because this uses $(shell), it is best to use this to assign simply expanded
+# variables (e.g., ":=").
+#
+# Example usage:
+# CONDITIONAL_CFLAGS := $(call TEST_CC_ARG, -ffoo)
+##############################################################################
+
+TEST_CC_ARG = \
+ $(shell $(CC) -c -x c /dev/null $(1) -o /dev/null > /dev/null 2>&1 && \
+ $(ECHO) $(1))
+
+
##############################################################################
# define variables used when installing the open source utilities from
# the source tarball
@@ -276,7 +303,7 @@ host_target = $(patsubst HOST,HOST_,$(patsubst
TARGET,,$(1)))
ifeq ($(NV_AUTO_DEPEND),1)
AUTO_DEP_SUFFIX = -MMD -MF $$(@:.o=.d.to_be_processed) -MP -MT $$@ && \
- $$(SED) -e "1,3s@ $$< @ @" < $$(@:.o=.d.to_be_processed) > $$(@:.o=.d)
+ $$(SED) -e "1,3s| $$< | |" < $$(@:.o=.d.to_be_processed) > $$(@:.o=.d)
else
AUTO_DEP_SUFFIX =
endif
@@ -486,8 +513,9 @@ endif
define GENERATE_NVIDSTRING
# g_nvid_string.c depends on all objects except g_nvid_string.o, and
version.mk
$(NVIDSTRING): $$(filter-out $$(call BUILD_OBJECT_LIST,$$(NVIDSTRING)),
$(3)) $$(VERSION_MK)
- @$$(ECHO) "const char $(1)[] = \"nvidia id: NVIDIA $$(strip $(2)) for
$$(TARGET_ARCH) $$(NVIDIA_VERSION) $$(NVIDSTRING_BUILD_TYPE_STRING)
(`$$(WHOAMI)`@`$$(HOSTNAME)`) `$$(DATE)`\";" > $$@
- @$$(ECHO) "const char *const p$$(strip $(1)) = $(1) + 11;" >> $$@;
+ $(at_if_quiet)$$(MKDIR) $$(dir $$@)
+ $(at_if_quiet)$$(ECHO) "const char $(1)[] = \"nvidia id: NVIDIA
$$(strip $(2)) for $$(TARGET_ARCH) $$(NVIDIA_VERSION)
$$(NVIDSTRING_BUILD_TYPE_STRING) (`$$(WHOAMI)`@`$$(HOSTNAME)`) `$$(DATE)`\";"
> $$@
+ $(at_if_quiet)$$(ECHO) "const char *const p$$(strip $(1)) = $(1) + 11;"
>> $$@;
endef
@@ -510,6 +538,7 @@ endef
define READ_ONLY_OBJECT_FROM_FILE_RULE
$$(OUTPUTDIR)/$$(notdir $(1)).o: $(1)
+ $(at_if_quiet)$$(MKDIR) $$(OUTPUTDIR)
$(at_if_quiet)cd $$(dir $(1)); \
$$(call quiet_cmd_no_at,LD) -r -z noexecstack --format=binary \
$$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@)
diff --git a/version.mk b/version.mk
index b3f509d..061d452 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 460.32.03
+NVIDIA_VERSION = 470.103.01
# This file.
VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
