8:33 p.m.
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16560/devel
Modified Files:
.cvsignore nvidia-settings.spec sources
Added Files:
03_do_not_exit_on_no_scanout.patch
Log Message:
- Update internal to 260.19.06
- Restore noscanout patch
03_do_not_exit_on_no_scanout.patch:
ctkdisplayconfig-utils.c | 3 +++
1 file changed, 3 insertions(+)
Index: 03_do_not_exit_on_no_scanout.patch
===================================================================
RCS file: 03_do_not_exit_on_no_scanout.patch
diff -N 03_do_not_exit_on_no_scanout.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 03_do_not_exit_on_no_scanout.patch 10 Oct 2010 20:32:57 -0000 1.3
@@ -0,0 +1,18 @@
+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: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 6 Sep 2010 21:03:48 -0000 1.6
+++ .cvsignore 10 Oct 2010 20:32:57 -0000 1.7
@@ -1 +1 @@
-nvidia-settings-256.53.tar.bz2
+nvidia-settings-260.19.06.tar.bz2
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/nvidia-settings.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nvidia-settings.spec 6 Sep 2010 21:03:48 -0000 1.6
+++ nvidia-settings.spec 10 Oct 2010 20:32:57 -0000 1.7
@@ -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 256.53
+%global nversion 260.19.06
#Possible replacement/complement:
#http://willem.engen.nl/projects/disper/
Name: nvidia-settings
Version: 1.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
@@ -15,6 +15,7 @@
URL: ftp://download.nvidia.com/XFree86/nvidia-settings/
Source0:
ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nvers...
Patch0: nvidia-settings-256.35-validate.patch
+Patch1: 03_do_not_exit_on_no_scanout.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -51,6 +52,7 @@
%prep
%setup -q -n nvidia-settings-%{nversion}
%patch0 -p1 -b .validate
+%patch1 -p1 -b .noscanout
rm -rf src/libXNVCtrl/libXNVCtrl.a
sed -i -e 's|/usr/local|$(DESTDIR)/%{_prefix}|g' utils.mk
@@ -93,6 +95,10 @@
%changelog
+* Sun Oct 10 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-7
+- Update internal to 260.19.06
+- Restore noscanout patch
+
* Mon Sep 06 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-6
- Update internal to 256.53
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 6 Sep 2010 21:03:48 -0000 1.6
+++ sources 10 Oct 2010 20:32:57 -0000 1.7
@@ -1 +1 @@
-6bcc65485ec194791228a7df0ab62750 nvidia-settings-256.53.tar.bz2
+4c150283eb2ad07689c329dfa629afac nvidia-settings-260.19.06.tar.bz2