diff -Nru nvidia-settings-440.44/debian/changelog nvidia-settings-440.64/debian/changelog --- nvidia-settings-440.44/debian/changelog 2020-01-29 11:13:52.000000000 +0000 +++ nvidia-settings-440.64/debian/changelog 2020-03-11 13:52:57.000000000 +0000 @@ -1,3 +1,11 @@ +nvidia-settings (440.64-0ubuntu1) focal; urgency=medium + + * New upstream release. + * debian/rules, debian/rules.defs: + - Add initial support for downloading the original tarball. + + -- Alberto Milone Wed, 11 Mar 2020 14:52:57 +0100 + nvidia-settings (440.44-0ubuntu1) focal; urgency=medium * New upstream release. diff -Nru nvidia-settings-440.44/debian/rules nvidia-settings-440.64/debian/rules --- nvidia-settings-440.44/debian/rules 2019-06-15 18:03:55.000000000 +0000 +++ nvidia-settings-440.64/debian/rules 2020-03-11 13:52:25.000000000 +0000 @@ -1,11 +1,18 @@ #!/usr/bin/make -f # # Copyright (C) 2009 Canonical Ltd. +include /usr/share/dpkg/pkg-info.mk + +include debian/rules.defs + +NVIDIA_RELEASE = $(DEB_VERSION_UPSTREAM) PKG_name := nvidia-settings DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +get_download_url = $(HTTPURL_PREFIX)/$(NVIDIA_FILENAME) + export NV_USE_BUNDLED_LIBJANSSON = 0 build: build-arch @@ -61,3 +68,7 @@ %: dh $@ + +.PHONY: get-orig-source +get-orig-source: + wget $(call get_download_url) -O ../$(NVIDIA_TARBALL) diff -Nru nvidia-settings-440.44/debian/rules.defs nvidia-settings-440.64/debian/rules.defs --- nvidia-settings-440.44/debian/rules.defs 1970-01-01 00:00:00.000000000 +0000 +++ nvidia-settings-440.64/debian/rules.defs 2020-03-11 13:52:25.000000000 +0000 @@ -0,0 +1,3 @@ +NVIDIA_FILENAME = nvidia-settings-${NVIDIA_RELEASE}.tar.bz2 +NVIDIA_TARBALL = nvidia-settings_${NVIDIA_RELEASE}.orig.tar.bz2 +HTTPURL_PREFIX = https://download.nvidia.com/XFree86/nvidia-settings/ diff -Nru nvidia-settings-440.44/doc/version.mk nvidia-settings-440.64/doc/version.mk --- nvidia-settings-440.44/doc/version.mk 2019-12-08 04:25:36.000000000 +0000 +++ nvidia-settings-440.64/doc/version.mk 2020-02-21 00:55:39.000000000 +0000 @@ -1 +1 @@ -NVIDIA_VERSION = 440.44 +NVIDIA_VERSION = 440.64 diff -Nru nvidia-settings-440.44/samples/version.mk nvidia-settings-440.64/samples/version.mk --- nvidia-settings-440.44/samples/version.mk 2019-12-08 04:25:36.000000000 +0000 +++ nvidia-settings-440.64/samples/version.mk 2020-02-21 00:55:39.000000000 +0000 @@ -1 +1 @@ -NVIDIA_VERSION = 440.44 +NVIDIA_VERSION = 440.64 diff -Nru nvidia-settings-440.44/src/gtk+-2.x/ctkdisplayconfig-utils.c nvidia-settings-440.64/src/gtk+-2.x/ctkdisplayconfig-utils.c --- nvidia-settings-440.44/src/gtk+-2.x/ctkdisplayconfig-utils.c 2019-12-08 04:25:38.000000000 +0000 +++ nvidia-settings-440.64/src/gtk+-2.x/ctkdisplayconfig-utils.c 2020-02-21 00:55:40.000000000 +0000 @@ -4803,7 +4803,7 @@ if (tmp_filename) { filename = g_strdup(tmp_filename); } else { - filename = g_strdup(""); + filename = g_strdup("/etc/X11/xorg.conf"); } xconfigCloseConfigFile(); diff -Nru nvidia-settings-440.44/src/libXNVCtrl/version.mk nvidia-settings-440.64/src/libXNVCtrl/version.mk --- nvidia-settings-440.44/src/libXNVCtrl/version.mk 2019-12-08 04:25:36.000000000 +0000 +++ nvidia-settings-440.64/src/libXNVCtrl/version.mk 2020-02-21 00:55:39.000000000 +0000 @@ -1 +1 @@ -NVIDIA_VERSION = 440.44 +NVIDIA_VERSION = 440.64 diff -Nru nvidia-settings-440.44/src/nvml.h nvidia-settings-440.64/src/nvml.h --- nvidia-settings-440.44/src/nvml.h 2019-12-08 04:25:38.000000000 +0000 +++ nvidia-settings-440.64/src/nvml.h 2020-02-21 00:55:41.000000000 +0000 @@ -4175,7 +4175,8 @@ * - \ref NVML_ERROR_UNINITIALIZED if the library has not been successfully initialized * - \ref NVML_ERROR_INVALID_ARGUMENT if \a device is invalid or \a stats are NULL * - \ref NVML_ERROR_NOT_FOUND if process stats were not found - * - \ref NVML_ERROR_NOT_SUPPORTED if the device doesn't support this feature or accounting mode is disabled + * - \ref NVML_ERROR_NOT_SUPPORTED if \a device doesn't support this feature or accounting mode is disabled + * or on vGPU host. * - \ref NVML_ERROR_UNKNOWN on any unexpected error * * @see nvmlDeviceGetAccountingBufferSize @@ -4204,7 +4205,8 @@ * - \ref NVML_SUCCESS if pids were successfully retrieved * - \ref NVML_ERROR_UNINITIALIZED if the library has not been successfully initialized * - \ref NVML_ERROR_INVALID_ARGUMENT if \a device is invalid or \a count is NULL - * - \ref NVML_ERROR_NOT_SUPPORTED if the device doesn't support this feature or accounting mode is disabled + * - \ref NVML_ERROR_NOT_SUPPORTED if \a device doesn't support this feature or accounting mode is disabled + * or on vGPU host. * - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a count is too small (\a count is set to * expected value) * - \ref NVML_ERROR_UNKNOWN on any unexpected error @@ -5749,6 +5751,31 @@ nvmlReturn_t DECLDIR nvmlVgpuInstanceGetUUID(nvmlVgpuInstance_t vgpuInstance, char *uuid, unsigned int size); /** + * Retrieve the MDEV UUID of a vGPU instance. + * + * The MDEV UUID is a globally unique identifier of the mdev device assigned to the VM, and is returned as a 5-part hexadecimal string, + * not exceeding 80 characters in length (including the NULL terminator). + * MDEV UUID is displayed only on KVM platform. + * See \ref nvmlConstants::NVML_DEVICE_UUID_BUFFER_SIZE. + * + * For Maxwell &tm; or newer fully supported devices. + * + * @param vgpuInstance Identifier of the target vGPU instance + * @param mdevUuid Pointer to caller-supplied buffer to hold MDEV UUID + * @param size Size of buffer in bytes + * + * @return + * - \ref NVML_SUCCESS successful completion + * - \ref NVML_ERROR_UNINITIALIZED if the library has not been successfully initialized + * - \ref NVML_ERROR_NOT_SUPPORTED on any hypervisor other than KVM + * - \ref NVML_ERROR_INVALID_ARGUMENT if \a vgpuInstance is 0, or \a mdevUuid is NULL + * - \ref NVML_ERROR_NOT_FOUND if \a vgpuInstance does not match a valid active vGPU instance on the system + * - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a size is too small + * - \ref NVML_ERROR_UNKNOWN on any unexpected error + */ +nvmlReturn_t DECLDIR nvmlVgpuInstanceGetMdevUUID(nvmlVgpuInstance_t vgpuInstance, char *mdevUuid, unsigned int size); + +/** * Retrieve the NVIDIA driver version installed in the VM associated with a vGPU. * * The version is returned as an alphanumeric string in the caller-supplied buffer \a version. The length of the version diff -Nru nvidia-settings-440.44/src/version.h nvidia-settings-440.64/src/version.h --- nvidia-settings-440.44/src/version.h 2019-12-08 04:25:36.000000000 +0000 +++ nvidia-settings-440.64/src/version.h 2020-02-21 00:55:39.000000000 +0000 @@ -1 +1 @@ -#define NVIDIA_VERSION "440.44" +#define NVIDIA_VERSION "440.64" diff -Nru nvidia-settings-440.44/src/version.mk nvidia-settings-440.64/src/version.mk --- nvidia-settings-440.44/src/version.mk 2019-12-08 04:25:36.000000000 +0000 +++ nvidia-settings-440.64/src/version.mk 2020-02-21 00:55:39.000000000 +0000 @@ -1 +1 @@ -NVIDIA_VERSION = 440.44 +NVIDIA_VERSION = 440.64 diff -Nru nvidia-settings-440.44/version.mk nvidia-settings-440.64/version.mk --- nvidia-settings-440.44/version.mk 2019-12-08 04:25:35.000000000 +0000 +++ nvidia-settings-440.64/version.mk 2020-02-21 00:55:39.000000000 +0000 @@ -1 +1 @@ -NVIDIA_VERSION = 440.44 +NVIDIA_VERSION = 440.64