rpms/xorg-x11-drv-i810/devel intel-2.1.1-fix-xv-reset.patch, 1.1, 1.2 xorg-x11-drv-i810.spec, 1.95, 1.96

[Adam Jackson (ajax)]

Author: ajax

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

Modified Files:
	intel-2.1.1-fix-xv-reset.patch xorg-x11-drv-i810.spec 
Log Message:
rediff

intel-2.1.1-fix-xv-reset.patch:

Index: intel-2.1.1-fix-xv-reset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/intel-2.1.1-fix-xv-reset.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intel-2.1.1-fix-xv-reset.patch	15 Oct 2007 11:57:25 -0000	1.1
+++ intel-2.1.1-fix-xv-reset.patch	11 Aug 2008 13:14:52 -0000	1.2
@@ -1,9 +1,9 @@
-diff -up xf86-video-intel-2.1.1/src/i830_video.c.da xf86-video-intel-2.1.1/src/i830_video.c
---- xf86-video-intel-2.1.1/src/i830_video.c.da	2007-10-15 21:30:57.000000000 +1000
-+++ xf86-video-intel-2.1.1/src/i830_video.c	2007-10-15 21:31:21.000000000 +1000
-@@ -2921,6 +2921,7 @@ i830_crtc_dpms_video(xf86CrtcPtr crtc, B
- 	 */
+diff -up xf86-video-intel-2.4.0/src/i830_video.c.xvfix xf86-video-intel-2.4.0/src/i830_video.c
+--- xf86-video-intel-2.4.0/src/i830_video.c.xvfix	2008-07-23 02:14:09.000000000 -0400
++++ xf86-video-intel-2.4.0/src/i830_video.c	2008-08-11 09:14:02.000000000 -0400
+@@ -2913,6 +2913,7 @@ i830_crtc_dpms_video(xf86CrtcPtr crtc, B
  	I830StopVideo(pScrn, pPriv, TRUE);
+ 	pPriv->current_crtc = NULL;
  	pPriv->overlayOK = FALSE;
 +	pPriv->current_crtc = NULL;
  	pPriv->oneLineMode = FALSE;


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.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- xorg-x11-drv-i810.spec	11 Aug 2008 13:09:52 -0000	1.95
+++ xorg-x11-drv-i810.spec	11 Aug 2008 13:14:52 -0000	1.96
@@ -57,6 +57,7 @@
 %prep
 %setup -q -n xf86-video-intel-%{version}
 %patch3 -p1 -b .xvfix
+exit
 %patch8 -p1 -b .disablettm
 #patch9 -p1 -b .xaadefault
 %patch100 -p1 -b .intel-master