* [gentoo-commits] gentoo-x86 commit in media-video/nvidia-settings/files: nvidia-settings-190.42-xf86vidmodeproto.patch
@ 2009-11-01 12:11 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2009-11-01 12:11 UTC (permalink / raw
To: gentoo-commits
ssuominen 09/11/01 12:11:45
Added: nvidia-settings-190.42-xf86vidmodeproto.patch
Log:
Missing X11/extensions/xf86vmproto.h include from xf86vidmodeproto to compile with libXxf86vm >= 1.1.0.
(Portage version: 2.2_rc47/cvs/Linux x86_64)
Revision Changes Path
1.1 media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch?rev=1.1&content-type=text/plain
Index: nvidia-settings-190.42-xf86vidmodeproto.patch
===================================================================
diff -ur nvidia-settings-1.0.orig/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
--- nvidia-settings-1.0.orig/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c 2009-10-21 07:04:35.000000000 +0300
+++ nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c 2009-11-01 15:08:53.000000000 +0200
@@ -28,6 +28,7 @@
#include "msg.h"
#include <X11/extensions/xf86vmode.h>
+#include <X11/extensions/xf86vmproto.h>
#include <stdlib.h>
#include <string.h>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/nvidia-settings/files: nvidia-settings-190.42-xf86vidmodeproto.patch
@ 2009-11-01 12:17 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2009-11-01 12:17 UTC (permalink / raw
To: gentoo-commits
ssuominen 09/11/01 12:17:15
Modified: nvidia-settings-190.42-xf86vidmodeproto.patch
Log:
Update patch for a open bug.
(Portage version: 2.2_rc47/cvs/Linux x86_64)
Revision Changes Path
1.2 media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch?r1=1.1&r2=1.2
Index: nvidia-settings-190.42-xf86vidmodeproto.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-settings-190.42-xf86vidmodeproto.patch 1 Nov 2009 12:11:45 -0000 1.1
+++ nvidia-settings-190.42-xf86vidmodeproto.patch 1 Nov 2009 12:17:14 -0000 1.2
@@ -1,11 +1,12 @@
-diff -ur nvidia-settings-1.0.orig/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
---- nvidia-settings-1.0.orig/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c 2009-10-21 07:04:35.000000000 +0300
-+++ nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c 2009-11-01 15:08:53.000000000 +0200
-@@ -28,6 +28,7 @@
+--- src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
++++ src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
+@@ -28,6 +28,9 @@
#include "msg.h"
#include <X11/extensions/xf86vmode.h>
++#if !defined(XF86VIDMODE_MAJOR_VERSION) || !defined(XF86VIDMODE_MINOR_VERSION)
+#include <X11/extensions/xf86vmproto.h>
++#endif /* XF86VidMode Extension protocol defines */
#include <stdlib.h>
#include <string.h>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/nvidia-settings/files: nvidia-settings-190.42-xf86vidmodeproto.patch
@ 2009-12-01 13:56 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2009-12-01 13:56 UTC (permalink / raw
To: gentoo-commits
ssuominen 09/12/01 13:56:06
Modified: nvidia-settings-190.42-xf86vidmodeproto.patch
Log:
Update NvCtrlAttributesVidMode patch from bug #291563 by Adrian Ilarion Ciobanu.
(Portage version: 2.2_rc54/cvs/Linux x86_64)
Revision Changes Path
1.3 media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch
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
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
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
Index: nvidia-settings-190.42-xf86vidmodeproto.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia-settings-190.42-xf86vidmodeproto.patch 1 Nov 2009 12:17:14 -0000 1.2
+++ nvidia-settings-190.42-xf86vidmodeproto.patch 1 Dec 2009 13:56:06 -0000 1.3
@@ -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>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-12-01 13:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-01 13:56 [gentoo-commits] gentoo-x86 commit in media-video/nvidia-settings/files: nvidia-settings-190.42-xf86vidmodeproto.patch Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2009-11-01 12:17 Samuli Suominen (ssuominen)
2009-11-01 12:11 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox