Package: release.debian.org Severity: normal Tags: buster User: release.debian....@packages.debian.org Usertags: pu
In addition to the updated nvidia-graphics-drivers, there is a new bugfix release for nvidia-settings as well. This is a no-change rebuild of the package from sid. Andreas
debian/changelog | 36 +++++++++++++++++++++++++++++ debian/control | 4 ++-- debian/rules | 2 ++ debian/salsa-ci.yml | 7 ++++++ debian/source/lintian-overrides | 4 ++-- doc/version.mk | 2 +- samples/version.mk | 2 +- src/libXNVCtrl/version.mk | 2 +- src/libXNVCtrlAttributes/NvCtrlAttributes.c | 26 +++++++++++++++++---- src/version.mk | 2 +- version.mk | 2 +- 11 files changed, 76 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index a7fc1a4..c201e76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,39 @@ +nvidia-settings (470.141.03-1~deb11u1) bullseye; urgency=medium + + * Rebuild for bullseye. + + -- Andreas Beckmann <a...@debian.org> Mon, 29 Aug 2022 11:16:28 +0200 + +nvidia-settings (470.141.03-1) unstable; urgency=medium + + * New upstream release 470.141.03. + - Fixed a bug that prevented nvidia-settings from accurately reflecting + changes to some configuration properties. + + -- Andreas Beckmann <a...@debian.org> Tue, 09 Aug 2022 14:45:12 +0200 + +nvidia-settings (470.129.06-1) unstable; urgency=medium + + * New upstream release 470.129.06. + * Bump Standards-Version to 4.6.1. No changes needed. + * Update Lintian overrides. + + -- Andreas Beckmann <a...@debian.org> Tue, 28 Jun 2022 04:14:03 +0200 + +nvidia-settings (470.103.01-2) unstable; urgency=medium + + [ Luca Boccassi ] + * Add salsa-ci.yml. + + [ Helmut Grohne ] + * Improve cross building: Pass more build tools to make. (Closes: #1005958) + + [ Debian Janitor ] + * Remove constraints unnecessary since buster: + + Build-Depends: Drop versioned constraint on libvdpau-dev. + + -- Andreas Beckmann <a...@debian.org> Thu, 14 Apr 2022 16:22:46 +0200 + nvidia-settings (470.103.01-1~deb11u1) bullseye; urgency=medium * Rebuild for bullseye. diff --git a/debian/control b/debian/control index 5619cff..281c4ff 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: libgl1-mesa-dev | libgl-dev, libgtk-3-dev, libjansson-dev, - libvdpau-dev (>= 0.9), + libvdpau-dev, libxv-dev, libxxf86vm-dev, pkg-config, @@ -19,7 +19,7 @@ Build-Depends: Build-Conflicts: libxnvctrl-dev, Rules-Requires-Root: no -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 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 diff --git a/debian/rules b/debian/rules index 83f75cb..1515fa4 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all include /usr/share/dpkg/buildflags.mk include /usr/share/dpkg/pkg-info.mk +DPKG_EXPORT_BUILDTOOLS=1 +include /usr/share/dpkg/buildtools.mk PKG_CONFIG_XORG_XSERVER_LIBDIR = $(shell pkg-config --variable=libdir xorg-server) CPPFLAGS += -DPKG_CONFIG_XORG_XSERVER_LIBDIR='\"$(PKG_CONFIG_XORG_XSERVER_LIBDIR)\"' diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..bfed02b --- /dev/null +++ b/debian/salsa-ci.yml @@ -0,0 +1,7 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + +variables: + SALSA_CI_COMPONENTS: 'main contrib non-free' diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index 65e87b6..4eb1edb 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -1,5 +1,5 @@ # upstream provides no signatures debian-watch-does-not-check-gpg-signature -very-long-line-length-in-source-file src/parse.c * -very-long-line-length-in-source-file src/xpm_data/*.h * +very-long-line-length-in-source-file * > 512 [src/parse.c:*] +very-long-line-length-in-source-file * > 512 [src/xpm_data/*.h:*] diff --git a/doc/version.mk b/doc/version.mk index 061d452..cca9ae5 100644 --- a/doc/version.mk +++ b/doc/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 470.103.01 +NVIDIA_VERSION = 470.141.03 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST)) diff --git a/samples/version.mk b/samples/version.mk index 061d452..cca9ae5 100644 --- a/samples/version.mk +++ b/samples/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 470.103.01 +NVIDIA_VERSION = 470.141.03 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST)) diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk index 061d452..cca9ae5 100644 --- a/src/libXNVCtrl/version.mk +++ b/src/libXNVCtrl/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 470.103.01 +NVIDIA_VERSION = 470.141.03 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST)) diff --git a/src/libXNVCtrlAttributes/NvCtrlAttributes.c b/src/libXNVCtrlAttributes/NvCtrlAttributes.c index 0d4aea0..677e5aa 100644 --- a/src/libXNVCtrlAttributes/NvCtrlAttributes.c +++ b/src/libXNVCtrlAttributes/NvCtrlAttributes.c @@ -152,6 +152,20 @@ const CtrlTargetTypeInfo *NvCtrlGetTargetTypeInfoByName(const char *name) } +static int NvCtrlConvertTargetTypeIndex(int nvctrl_type) +{ + int i; + + for (i = 0; i < targetTypeInfoTableLen; i++) { + if (targetTypeInfoTable[i].nvctrl == nvctrl_type) { + return i; + } + } + + return INVALID_TARGET; +} + + /* * Initializes the control panel backend; this includes probing for the @@ -1819,7 +1833,8 @@ NvCtrlEventHandleNextEvent(NvCtrlEventHandle *handle, CtrlEvent *event) (XNVCtrlAttributeChangedEventTarget *) &xevent; event->type = CTRL_EVENT_TYPE_INTEGER_ATTRIBUTE; - event->target_type = nvctrlevent->target_type; + event->target_type = + NvCtrlConvertTargetTypeIndex(nvctrlevent->target_type); event->target_id = nvctrlevent->target_id; event->int_attr.attribute = nvctrlevent->attribute; @@ -1838,7 +1853,8 @@ NvCtrlEventHandleNextEvent(NvCtrlEventHandle *handle, CtrlEvent *event) (XNVCtrlAttributeChangedEventTargetAvailability *) &xevent; event->type = CTRL_EVENT_TYPE_INTEGER_ATTRIBUTE; - event->target_type = nvctrlevent->target_type; + event->target_type = + NvCtrlConvertTargetTypeIndex(nvctrlevent->target_type); event->target_id = nvctrlevent->target_id; event->int_attr.attribute = nvctrlevent->attribute; @@ -1858,7 +1874,8 @@ NvCtrlEventHandleNextEvent(NvCtrlEventHandle *handle, CtrlEvent *event) (XNVCtrlStringAttributeChangedEventTarget *) &xevent; event->type = CTRL_EVENT_TYPE_STRING_ATTRIBUTE; - event->target_type = nvctrlevent->target_type; + event->target_type = + NvCtrlConvertTargetTypeIndex(nvctrlevent->target_type); event->target_id = nvctrlevent->target_id; event->str_attr.attribute = nvctrlevent->attribute; @@ -1875,7 +1892,8 @@ NvCtrlEventHandleNextEvent(NvCtrlEventHandle *handle, CtrlEvent *event) (XNVCtrlBinaryAttributeChangedEventTarget *) &xevent; event->type = CTRL_EVENT_TYPE_BINARY_ATTRIBUTE; - event->target_type = nvctrlevent->target_type; + event->target_type = + NvCtrlConvertTargetTypeIndex(nvctrlevent->target_type); event->target_id = nvctrlevent->target_id; event->bin_attr.attribute = nvctrlevent->attribute; diff --git a/src/version.mk b/src/version.mk index 061d452..cca9ae5 100644 --- a/src/version.mk +++ b/src/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 470.103.01 +NVIDIA_VERSION = 470.141.03 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST)) diff --git a/version.mk b/version.mk index 061d452..cca9ae5 100644 --- a/version.mk +++ b/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 470.103.01 +NVIDIA_VERSION = 470.141.03 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
