Update NvCtrlAttributesVidMode patch from bug #291563 by Adrian Ilarion Ciobanu.

Package-Manager: portage-2.2_rc54/cvs/Linux x86_64

3 files changed, 22 insertions, 13 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 7f34740f2f73..fc085793b80d 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.77 2009/11/01 12:11:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.78 2009/12/01 13:56:06 ssuominen Exp $
+
+  01 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  files/nvidia-settings-190.42-xf86vidmodeproto.patch:
+  Update NvCtrlAttributesVidMode patch from bug #291563 by Adrian Ilarion
+  Ciobanu.
 
   01 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
   nvidia-settings-190.42.ebuild,
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index c12445f3e522..a0aebeb28b15 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,7 +1,7 @@
 AUX icon/nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 SHA1 eac0735769b28d7c217d6ab15a3dca3e2adff9b1 SHA256 af43af5db203c1acf9301fa7fb285a7fdfe5aab5ce1aa30a239fd7db1b588168
 AUX icon/nvidia-settings.png 3790 RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b9 SHA1 ff485bf300c6e0c56b3d1f08ee87e4d9a425db65 SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12
 AUX nvidia-settings-169.04-no-display.patch 3365 RMD160 798fb467038f56ae0d7efa4cd3000c2fa3d3f0e3 SHA1 8474ba73681e393b26155d7bd1b7041d66733cf9 SHA256 d150daeffdf6b6bb5a57bb6bdfaa6d359c453ad22739d65871978c620dac40c7
-AUX nvidia-settings-190.42-xf86vidmodeproto.patch 405 RMD160 7668240d63c027dfed7cef3a625cb3cbb251b5ad SHA1 2f3dc069b501986dd01136723cb3dffda5b45c48 SHA256 c9cdd05605a0742a6480651f072802d7c271e0c18e8cbdbb158737fe5db691ab
+AUX nvidia-settings-190.42-xf86vidmodeproto.patch 459 RMD160 92de8111fbaa05d72aa361f4f03b4e5d6614dce0 SHA1 fb62377feb1e2bf3dee9eb4156cfc67eaae58e1a SHA256 ceda295eb10c446edb9240480cb69bcf595682dcf084357723d1108818db8dad
 DIST nvidia-settings-1.0.20070621.tar.gz 1254616 RMD160 4cb1258ac6c3ae9f74eecb4fde79029a7c15f731 SHA1 5aa0349982208153d016ee4565d79f3e7b2277ce SHA256 45ea3322866beab75927d30d5f8b299410b63cd6ebe3b797bd06bd7bf4ba702f
 DIST nvidia-settings-173.14.09.tar.gz 1298573 RMD160 30245f9165196ed7975a1f9060722800e3c9d785 SHA1 0d489c3fc9df013bf162ad71e08f637bc28027b9 SHA256 9abf878f7864e602a6cae20bac4be950540473ba2ca2836d6aaeb18d2598c55d
 DIST nvidia-settings-173.14.12.tar.gz 1298699 RMD160 0255608b6665918ac7ab86affa8ead816ea7d29c SHA1 1f23d964e13fe5bd112d19f5461f7e42efce7a31 SHA256 00a81a95438da95c720611039d72e0ab446e27329ed1f1b773bcacac15bdeed1
@@ -46,5 +46,5 @@ EBUILD nvidia-settings-190.32.ebuild 1916 RMD160 a7e8980be449fc363d811bdb582b16c
 EBUILD nvidia-settings-190.36.ebuild 1916 RMD160 d521125984e096b1462f84ce97fef0f7ae921479 SHA1 c3d3557fbdda47de790afdd3f0d617d223f3e700 SHA256 aa4c34041490eacf6311f5aa6da2d3de5a7537ffce8801b060fee23df92fc6c1
 EBUILD nvidia-settings-190.40.ebuild 1916 RMD160 46a50066d050c6608934a4be416117a553347b15 SHA1 d4e3944f41a9328d5a708334f785fc7c122d9246 SHA256 c33beb4a3322b200a1a6af683c31248a5e678cf2743d572885281bc85dc9df8e
 EBUILD nvidia-settings-190.42.ebuild 2010 RMD160 e10222b73644a726b185fdfef091cea2ee88df00 SHA1 4fd8cfcdfff36718323df627b835a7ac9fec4066 SHA256 d980d28a60ab771169f249723a17e35bcc3f68bc271bc5833ec8e425b37ae5bf
-MISC ChangeLog 13896 RMD160 93d8c7aea72636d4d60b2dff2e89bd659b73f16b SHA1 d2d5b022e6654acfb9ff80b05854ce63413dbd2a SHA256 ce297be5dc465feccc50b691c3b9ae1e7fe630f53e83526de7a462589216fcc4
+MISC ChangeLog 14091 RMD160 050479724cef7be8b156201e0286fa2b4630a25b SHA1 2d002a545c84f970deb2c9f33b0609495db69a1c SHA256 1975c595c94a8e5b062b37f119315e44202dcce5e5dcfa8e0cd687345778a963
 MISC metadata.xml 308 RMD160 bff76dc9f3a6232b09b63a7f8e416ef30fd49ba1 SHA1 07bbc2621be7093f68edda3b41553c422d2dbfbc SHA256 6519f06cce9eac5eeecb7e0cc52227a6d15766957e126a276dad602600a25fd1
diff --git a/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch b/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch
index 159d3f0630ac..77ce7d536011 100644
--- a/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch
+++ b/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch
@@ -1,12 +1,16 @@
---- src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
-+++ src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
-@@ -28,6 +28,9 @@
- #include "msg.h"
+--- nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
++++ nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
+@@ -210,11 +210,12 @@
+     if (vm) free(vm);
  
- #include <X11/extensions/xf86vmode.h>
-+#if !defined(XF86VIDMODE_MAJOR_VERSION) || !defined(XF86VIDMODE_MINOR_VERSION)
-+#include <X11/extensions/xf86vmproto.h>
-+#endif /* XF86VidMode Extension protocol defines */
+     /* restore the original error handler, if we overrode it */
+-
++#if defined(X_XF86VidModeGetGammaRampSize)
+     if (prev_error_handler) {
+         XSetErrorHandler(prev_error_handler);
+         prev_error_handler = NULL;
+     }
++#endif
+ 
+     return NULL;
  
- #include <stdlib.h>
- #include <string.h>