rpms/nvidia-settings/devel 03_do_not_exit_on_no_scanout.patch, NONE, 1.1 nvidia-settings.spec, 1.3, 1.4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/nvidia-settings/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5650

Modified Files:
	nvidia-settings.spec .cvsignore sources 
Added Files:
	03_do_not_exit_on_no_scanout.patch 
Log Message:
- Update internal to 195.36.24
- Avoid failure on NV_CTRL_NO_SCANOUT when not supported in legacy drivers. 


03_do_not_exit_on_no_scanout.patch:
 ctkdisplayconfig-utils.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE 03_do_not_exit_on_no_scanout.patch ---
diff -Nurp nvidia-settings-195.36.08.orig/src/gtk+-2.x/ctkdisplayconfig-utils.c nvidia-settings-195.36.08/src/gtk+-2.x/ctkdisplayconfig-utils.c
--- nvidia-settings-195.36.08.orig/src/gtk+-2.x/ctkdisplayconfig-utils.c	2010-02-25 14:44:28.000000000 +0100
+++ nvidia-settings-195.36.08/src/gtk+-2.x/ctkdisplayconfig-utils.c	2010-04-06 19:47:14.335936746 +0200
@@ -2112,11 +2112,14 @@ static int gpu_add_screen_from_server(nv
     /* See if the screen is set to not scanout */
     ret = NvCtrlGetAttribute(screen->handle, NV_CTRL_NO_SCANOUT, &val);
     if (ret != NvCtrlSuccess) {
+        /*
         *err_str = g_strdup_printf("Failed to query NoScanout for "
                                    "screen %d.",
                                    screen_id);
         nv_warning_msg(*err_str);
         goto fail;
+        */
+        val = NV_CTRL_NO_SCANOUT_DISABLED;
     }
     screen->no_scanout = (val == NV_CTRL_NO_SCANOUT_ENABLED) ? TRUE : FALSE;
 


Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/nvidia-settings.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nvidia-settings.spec	28 Feb 2010 20:55:18 -0000	1.3
+++ nvidia-settings.spec	28 Apr 2010 21:41:49 -0000	1.4
@@ -1,13 +1,13 @@
 # We use the driver version as a snapshot internal number
 # The real version of the package remains 1.0
 # This will prevent missunderstanding and versioning changes on the nvidia driver
-%global nversion 195.36.08
+%global nversion 195.36.24
 #Possible replacement/complement:
 #http://willem.engen.nl/projects/disper/
 
 Name:           nvidia-settings
 Version:        1.0
-Release:        3.4%{?dist}
+Release:        4%{?dist}
 Summary:        Configure the NVIDIA graphics driver
 
 Group:          Applications/System
@@ -17,6 +17,7 @@
 Source1:        nvidia-settings.desktop
 Patch0:         nvidia-settings-1.0-default.patch
 Patch1:         nvidia-settings-1.0-lm.patch
+Patch2:         03_do_not_exit_on_no_scanout.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -52,6 +53,7 @@
 %setup -q
 %patch0 -p1 -b .default
 %patch1 -p1 -b .lm
+%patch2 -p1 -b .noscanout
 rm -rf src/libXNVCtrl/libXNVCtrl.a
 
 sed -i -e 's|# CFLAGS = -Wall|CFLAGS = $(INIT_CFLAGS)|' Makefile
@@ -87,6 +89,10 @@
 
 
 %changelog
+* Wed Apr 28 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.0-4
+- Update internal to 195.36.24
+- Avoid failure on NV_CTRL_NO_SCANOUT when not supported in legacy drivers. 
+
 * Sun Feb 28 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.0-3.4
 - Update internal version to 195.36.08
 - Add patch for -lm


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2010 19:39:24 -0000	1.3
+++ .cvsignore	28 Apr 2010 21:41:49 -0000	1.4
@@ -1 +1 @@
-nvidia-settings-195.36.08.tar.gz
+nvidia-settings-195.36.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2010 19:39:24 -0000	1.3
+++ sources	28 Apr 2010 21:41:49 -0000	1.4
@@ -1 +1 @@
-1d3c4e64169abc8f77442f9a2c1305a9  nvidia-settings-195.36.08.tar.gz
+43008cf2cec84fa27ee6f315845d50f7  nvidia-settings-195.36.24.tar.gz