rpms/xorg-x11-drv-i810/devel intel-2.4.2-macmini-fix.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.111, 1.112

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30764

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.4.2-macmini-fix.patch 
Log Message:
* Tue Oct 14 2008 Adam Jackson <ajax at redhat.com> 2.4.2-11
- intel-2.4.2-macmini-fix.patch: Fix a segfault on Mac Mini.


intel-2.4.2-macmini-fix.patch:

--- NEW FILE intel-2.4.2-macmini-fix.patch ---
diff -up xf86-video-intel-2.4.2/src/i830_sdvo.c.jx xf86-video-intel-2.4.2/src/i830_sdvo.c
--- xf86-video-intel-2.4.2/src/i830_sdvo.c.jx	2008-08-06 21:06:40.000000000 -0400
+++ xf86-video-intel-2.4.2/src/i830_sdvo.c	2008-10-14 16:36:42.000000000 -0400
@@ -1495,7 +1495,9 @@ i830_sdvo_get_ddc_modes(xf86OutputPtr ou
     intel_output = crt->driver_private;
     if (intel_output->type == I830_OUTPUT_ANALOG &&
 	crt->funcs->detect(crt) == XF86OutputStatusDisconnected) {
+	I830I2CInit(pScrn, &intel_output->pDDCBus, GPIOA, "CRTDDC_A");
 	edid_mon = xf86OutputGetEDID(crt, intel_output->pDDCBus);
+	xf86DestroyI2CBusRec(intel_output->pDDCBus, TRUE, TRUE);
     }
     if (edid_mon) {
 	xf86OutputSetEDID(output, edid_mon);


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- xorg-x11-drv-i810.spec	14 Oct 2008 03:15:49 -0000	1.111
+++ xorg-x11-drv-i810.spec	14 Oct 2008 21:47:01 -0000	1.112
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.4.2
-Release:   10%{?dist}
+Release:   11%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -24,6 +24,7 @@
 Patch3: intel-2.1.1-fix-xv-reset.patch
 #Patch4: intel-fix-flip.patch
 Patch5: intel-fix-irq.patch
+Patch6: intel-2.4.2-macmini-fix.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -57,6 +58,7 @@
 %patch3 -p1 -b .xvfix
 #patch4 -p1 -b .fixflip
 %patch5 -p1 -b .irqfix
+%patch6 -p1 -b .mini
 
 %build
 
@@ -99,6 +101,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Tue Oct 14 2008 Adam Jackson <ajax at redhat.com> 2.4.2-11
+- intel-2.4.2-macmini-fix.patch: Fix a segfault on Mac Mini.
+
 * Tue Oct 14 2008 Dave Airlie <airlied at redhat.com> 2.4.2-10
 - rebase to latest upstream master