9 files changed, 29 insertions, 6 deletions
diff --git a/sys-kernel/nvidia-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-dkms/Manifest
index fd010567..c0c9fd43 100644
--- a/sys-kernel/nvidia-drivers-dkms/Manifest
+++ b/sys-kernel/nvidia-drivers-dkms/Manifest
@@ -1 +1 @@
-DIST NVIDIA-Linux-x86_64-440.44.run 141266881 BLAKE2B bc5ddcf9a6498c14bd9f9421a622bd647e83c8d296953923525680898548012cc9d01d078722a3194b6def5b5a90ed37b2dc08967a9603affabf449dbc87e69d SHA512 c0c0e19cdb82d47575adbcf46e23580977cf7a5097edfb9d76464c2e678a44f556d8c2d0d49515a86b6765f57176460193c6951927e24c278e6a7f411f89f26b
+DIST NVIDIA-Linux-x86_64-440.64.run 141302182 BLAKE2B 1b6830ac970fcc51179c51ed19b9ed768116112a3cb3fcadabd7fbdadfaf3c516ee61d55bf9dc87a984de54759877263c4380731a966b8b64d756216a560f5c1 SHA512 26156974d9a18456ada329f19e93c2f2abb1c5b12fec47df870a0e5b7788204cf0a745ebfefad6ab50d8f659127722905d5156462d4ce794cc52d796b762bf43
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-440.44-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-440.64-conf.patch
index b889c5bc..048c3cb7 100644
--- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-440.44-conf.patch
+++ b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-440.64-conf.patch
@@ -5,7 +5,7 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="440.44"
++PACKAGE_VERSION="440.64"
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-440.44-r1.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-440.64.ebuild
index dcfd79b1..dcfd79b1 100644
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-440.44-r1.ebuild
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-440.64.ebuild
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index fd010567..c0c9fd43 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1 +1 @@
-DIST NVIDIA-Linux-x86_64-440.44.run 141266881 BLAKE2B bc5ddcf9a6498c14bd9f9421a622bd647e83c8d296953923525680898548012cc9d01d078722a3194b6def5b5a90ed37b2dc08967a9603affabf449dbc87e69d SHA512 c0c0e19cdb82d47575adbcf46e23580977cf7a5097edfb9d76464c2e678a44f556d8c2d0d49515a86b6765f57176460193c6951927e24c278e6a7f411f89f26b
+DIST NVIDIA-Linux-x86_64-440.64.run 141302182 BLAKE2B 1b6830ac970fcc51179c51ed19b9ed768116112a3cb3fcadabd7fbdadfaf3c516ee61d55bf9dc87a984de54759877263c4380731a966b8b64d756216a560f5c1 SHA512 26156974d9a18456ada329f19e93c2f2abb1c5b12fec47df870a0e5b7788204cf0a745ebfefad6ab50d8f659127722905d5156462d4ce794cc52d796b762bf43
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.44-conf.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.64-conf.patch
index b889c5bc..048c3cb7 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.44-conf.patch
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.64-conf.patch
@@ -5,7 +5,7 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="440.44"
++PACKAGE_VERSION="440.64"
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.44-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.64.ebuild
index 8b01a799..8b01a799 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.44-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.64.ebuild
diff --git a/x11-misc/nvidia-settings/Manifest b/x11-misc/nvidia-settings/Manifest
index 031fb6ab..705b140c 100644
--- a/x11-misc/nvidia-settings/Manifest
+++ b/x11-misc/nvidia-settings/Manifest
@@ -1 +1 @@
-DIST nvidia-settings-440.44.tar.gz 1314352 BLAKE2B 5708f24bd98cf01064e5cc7eca8f6109d2072996a8ac9f77db1ccbc3e3995c28f6dec2e74729fddf0a7be324193b089835e30d9acb0bf3ae58592dad48914c9d SHA512 5826a5915f0ed50ab80f442d005668dc876565233eb0f36723db5047d7592ca9b81ebfa824bc04f5275792d8b34bb457a7db173d1bdf464df7a186bfc528da1d
+DIST nvidia-settings-440.64.tar.gz 1314493 BLAKE2B e93bdd125c0d31651a390dd93dd7932116a008e0ca23c3d7457e18759ba9b10fc3f36ae00d67505161627c4a0d04258c4f27013d2bc28d58aa672e978e1e65a1 SHA512 dab4148f85cb4f7379a2bff3d4bb6c09510b6ccec6a8520b4896968c00d3ec3bdcb468b6f15a6a33cd10e6c060d95d053a20fa6431e22341f946ead931748322
diff --git a/x11-misc/nvidia-settings/files/nvidia-settings-fno-common.patch b/x11-misc/nvidia-settings/files/nvidia-settings-fno-common.patch
new file mode 100644
index 00000000..be03fa27
--- /dev/null
+++ b/x11-misc/nvidia-settings/files/nvidia-settings-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/src/gtk+-2.x/ctkvdpau.c
++++ b/src/gtk+-2.x/ctkvdpau.c
+@@ -103,6 +103,8 @@
+ const gchar* __video_mixer_attribute_help =
+ "This shows the video mixer attributes and any applicable ranges.";
+ 
++struct VDPAUDeviceImpl VDPAUDeviceFunctions;
++
+ static int queryOutputSurface(CtkVDPAU *ctk_vdpau, VdpDevice device,
+                               VdpGetProcAddress *getProcAddress);
+ 
+--- a/src/gtk+-2.x/ctkvdpau.h
++++ b/src/gtk+-2.x/ctkvdpau.h
+@@ -46,7 +46,7 @@
+     (G_TYPE_INSTANCE_GET_CLASS ((obj), CTK_TYPE_VDPAU, CtkVDPAUClass))
+ 
+ 
+-struct VDPAUDeviceImpl {
++extern struct VDPAUDeviceImpl {
+ 
+     VdpGetErrorString *GetErrorString;
+     VdpGetProcAddress *GetProcAddress;
diff --git a/x11-misc/nvidia-settings/nvidia-settings-440.44-r1.ebuild b/x11-misc/nvidia-settings/nvidia-settings-440.64.ebuild
index d589dd08..6e22c7d7 100644
--- a/x11-misc/nvidia-settings/nvidia-settings-440.44-r1.ebuild
+++ b/x11-misc/nvidia-settings/nvidia-settings-440.64.ebuild
@@ -41,7 +41,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-	eapply "${FILESDIR}"/nvidia-settings-linker.patch
+	eapply "${FILESDIR}"/"${PN}"-linker.patch
+	eapply "${FILESDIR}"/"${PN}"-fno-common.patch
 }