diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-12-01 13:56:06 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-12-01 13:56:06 +0000 |
| commit | 01059ba1a443c0ce4d90e6c843f3f247ff3bdd30 (patch) | |
| tree | e837fcf8dce0ffd4ff057e0b9f8bb7eeaa1e91c9 /media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch | |
| parent | Version bumps (diff) | |
| download | gentoo-2-01059ba1a443c0ce4d90e6c843f3f247ff3bdd30.tar.gz gentoo-2-01059ba1a443c0ce4d90e6c843f3f247ff3bdd30.tar.bz2 gentoo-2-01059ba1a443c0ce4d90e6c843f3f247ff3bdd30.zip | |
Update NvCtrlAttributesVidMode patch from bug #291563 by Adrian Ilarion Ciobanu.
(Portage version: 2.2_rc54/cvs/Linux x86_64)
Diffstat (limited to 'media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch')
| -rw-r--r-- | media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch | 24 |
1 files changed, 14 insertions, 10 deletions
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> |