rpms/argyllcms/F-12 argyllcms-1.0.4-dispwin-randr-fix.patch, NONE, 1.1 argyllcms.spec, 1.14, 1.15

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/argyllcms/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18520

Modified Files:
	argyllcms.spec 
Added Files:
	argyllcms-1.0.4-dispwin-randr-fix.patch 
Log Message:
* Mon Nov 09 2009 Adam Jackson <ajax at redhat.com> 1.0.4-4
- argyllcms-1.0.4-dispwin-randr-fix.patch: Fix dispwin to not look at
  outputs with no CRTC (which is not the same thing as outputs with no
  connection) (#498931)


argyllcms-1.0.4-dispwin-randr-fix.patch:
 dispwin.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE argyllcms-1.0.4-dispwin-randr-fix.patch ---
diff -up Argyll_V1.0.4/spectro/dispwin.c.jx Argyll_V1.0.4/spectro/dispwin.c
--- Argyll_V1.0.4/spectro/dispwin.c.jx	2009-06-23 02:27:04.000000000 -0400
+++ Argyll_V1.0.4/spectro/dispwin.c	2009-11-09 16:35:42.000000000 -0500
@@ -545,7 +545,8 @@ disppath **get_displays() {
 					return NULL;
 				}
 	
-				if (outi->connection == RR_Disconnected) {
+				if (outi->connection == RR_Disconnected ||
+				    outi->crtc == None) {
 					continue;
 				}
 


Index: argyllcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/F-12/argyllcms.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- argyllcms.spec	30 Oct 2009 17:10:23 -0000	1.14
+++ argyllcms.spec	9 Nov 2009 21:47:05 -0000	1.15
@@ -5,7 +5,7 @@
 
 Name:    argyllcms
 Version: 1.0.4
-Release: 3%{?alphatag}%{?dist}
+Release: 4%{?alphatag}%{?dist}
 Summary: ICC compatible color management system
 
 Group:   User Interface/X
@@ -21,6 +21,7 @@ Patch4:  %{name}-1.0.2-legal.patch
 #Patch5: argyllcms-CVE-2009-0583,0584.patch
 #Patch6: argyllcms-CVE-2009-0792.patch
 #Patch7: argyllcms-1.0.3-autotools.patch
+Patch8: argyllcms-1.0.4-dispwin-randr-fix.patch
 
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libtiff-devel, libusb-devel
@@ -70,6 +71,7 @@ This package contains the Argyll color m
 #%patch5 -p0
 #%patch6 -p0
 #%patch7 -p0
+%patch8 -p1 -b .randr
 
 # Salvage policy files
 mv libusb/19-color.fdi .
@@ -132,6 +134,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Nov 09 2009 Adam Jackson <ajax at redhat.com> 1.0.4-4
+- argyllcms-1.0.4-dispwin-randr-fix.patch: Fix dispwin to not look at
+  outputs with no CRTC (which is not the same thing as outputs with no
+  connection) (#498931)
+
 * Fri Oct 30 2009 Richard Hughes <rhughes at redhat.com> - 1.0.4-3
 - Install the udev rules file so users can get the correct device
   permissions on F12 and above which does not use HAL policy files.