Archives
Archives
| From: | "Samuli Suominen (ssuominen)" <ssuominen@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in media-video/nvidia-settings/files: nvidia-settings-190.42-xf86vidmodeproto.patch |
| Date: | Tue, 01 Dec 2009 13:56:09 |
| Message-Id: | E1NFTD4-0001xr-Jo@stork.gentoo.org |
| 1 | ssuominen 09/12/01 13:56:06 |
| 2 | |
| 3 | Modified: nvidia-settings-190.42-xf86vidmodeproto.patch |
| 4 | Log: |
| 5 | Update NvCtrlAttributesVidMode patch from bug #291563 by Adrian Ilarion Ciobanu. |
| 6 | (Portage version: 2.2_rc54/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.3 media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch?rev=1.3&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch?rev=1.3&content-type=text/plain |
| 13 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch?r1=1.2&r2=1.3 |
| 14 | |
| 15 | Index: nvidia-settings-190.42-xf86vidmodeproto.patch |
| 16 | =================================================================== |
| 17 | RCS file: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch,v |
| 18 | retrieving revision 1.2 |
| 19 | retrieving revision 1.3 |
| 20 | diff -u -r1.2 -r1.3 |
| 21 | --- nvidia-settings-190.42-xf86vidmodeproto.patch 1 Nov 2009 12:17:14 -0000 1.2 |
| 22 | +++ nvidia-settings-190.42-xf86vidmodeproto.patch 1 Dec 2009 13:56:06 -0000 1.3 |
| 23 | @@ -1,12 +1,16 @@ |
| 24 | ---- src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c |
| 25 | -+++ src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c |
| 26 | -@@ -28,6 +28,9 @@ |
| 27 | - #include "msg.h" |
| 28 | +--- nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c |
| 29 | ++++ nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c |
| 30 | +@@ -210,11 +210,12 @@ |
| 31 | + if (vm) free(vm); |
| 32 | |
| 33 | - #include <X11/extensions/xf86vmode.h> |
| 34 | -+#if !defined(XF86VIDMODE_MAJOR_VERSION) || !defined(XF86VIDMODE_MINOR_VERSION) |
| 35 | -+#include <X11/extensions/xf86vmproto.h> |
| 36 | -+#endif /* XF86VidMode Extension protocol defines */ |
| 37 | + /* restore the original error handler, if we overrode it */ |
| 38 | +- |
| 39 | ++#if defined(X_XF86VidModeGetGammaRampSize) |
| 40 | + if (prev_error_handler) { |
| 41 | + XSetErrorHandler(prev_error_handler); |
| 42 | + prev_error_handler = NULL; |
| 43 | + } |
| 44 | ++#endif |
| 45 | + |
| 46 | + return NULL; |
| 47 | |
| 48 | - #include <stdlib.h> |
| 49 | - #include <string.h> |