packages (NVIDIA_173): nvidia-settings/nvidia-settings.spec, nvidia-setting...

[glen]

Author: glen                         Date: Sun May  6 14:29:04 2012 GMT
Module: packages                      Tag: NVIDIA_173
---- Log message:
- fix compile error: ‘prev_error_handler’ undeclared (first use in this function

---- Files affected:
packages/nvidia-settings:
   nvidia-settings.spec (1.21.2.1 -> 1.21.2.2) , prev_error_handler.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nvidia-settings/nvidia-settings.spec
diff -u packages/nvidia-settings/nvidia-settings.spec:1.21.2.1 packages/nvidia-settings/nvidia-settings.spec:1.21.2.2
--- packages/nvidia-settings/nvidia-settings.spec:1.21.2.1	Sun May  6 15:04:02 2012
+++ packages/nvidia-settings/nvidia-settings.spec	Sun May  6 16:28:58 2012
@@ -15,6 +15,7 @@
 # Source0-md5:	f43a46dce18fc11528b8458d5d271041
 Source1:	%{name}.desktop
 Source2:	%{name}.png
+Patch0:		prev_error_handler.patch
 URL:		ftp://download.nvidia.com/XFree86/nvidia-settings/
 BuildRequires:	OpenGL-devel
 BuildRequires:	xorg-lib-libX11-devel
@@ -77,7 +78,8 @@
 sterowników NVIDIA.
 
 %prep
-%setup -q -n nvidia-settings-1.0
+%setup -q -n %{name}-1.0
+%patch0 -p1
 
 %{__rm} src/libXNVCtrl/libXNVCtrl.a
 
@@ -147,6 +149,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21.2.2  2012/05/06 14:28:58  glen
+- fix compile error: ‘prev_error_handler’ undeclared (first use in this function
+
 Revision 1.21.2.1  2012/05/06 13:04:02  glen
 - 173.14.x branch
 

================================================================
Index: packages/nvidia-settings/prev_error_handler.patch
diff -u /dev/null packages/nvidia-settings/prev_error_handler.patch:1.1.2.1
--- /dev/null	Sun May  6 16:29:04 2012
+++ packages/nvidia-settings/prev_error_handler.patch	Sun May  6 16:28:58 2012
@@ -0,0 +1,22 @@
+taken from gentoo-portage/media-video/nvidia-settings/files/nvidia-settings-173.14.31-Makefile.patch
+
+see also:
+https://bugs.gentoo.org/show_bug.cgi?id=290432
+
+diff --git a/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c b/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
+index 633c078..a65a8b4 100644
+--- a/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
++++ b/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
+@@ -211,10 +211,12 @@ NvCtrlInitVidModeAttributes(NvCtrlAttributePrivateHandle *h)
+ 
+     /* 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;
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/nvidia-settings/nvidia-settings.spec?r1=1.21.2.1&r2=1.21.2.2