diff --git a/intel-2.1.1-fix-xv-reset.patch b/intel-2.1.1-fix-xv-reset.patch deleted file mode 100644 index 12fa26e..0000000 --- a/intel-2.1.1-fix-xv-reset.patch +++ /dev/null @@ -1,11 +0,0 @@ -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; - } - } diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec index 3eebb36..5e1fbe4 100644 --- a/xorg-x11-drv-intel.spec +++ b/xorg-x11-drv-intel.spec @@ -22,7 +22,6 @@ Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-inte Source2: intel.xinf Patch1: intel-2.6.0-to-master.patch -Patch3: intel-2.1.1-fix-xv-reset.patch Patch5: intel-2.5.0-no-legacy-3d.patch Patch6: intel-2.5.0-no-gem-legacy-3d.patch Patch7: kill-svideo.patch @@ -61,7 +60,6 @@ X.Org X11 Intel video driver XvMC development package. %prep %setup -q -n xf86-video-intel-%{version} %patch1 -p1 -b .master -%patch3 -p1 -b .xvfix %patch5 -p1 -b .nolegacy3d %patch6 -p1 -b .nogem3d %patch7 -p1 -b .svideo @@ -110,6 +108,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Sat Feb 28 2009 Kristian Høgsberg - 2.6.0-10 - Update to master again, should fix the 1MB per pixmap problem. +- Drop no-op intel-2.1.1-fix-xv-reset.patch. * Tue Feb 24 2009 Kristian Høgsberg - 2.6.0-9 - Fix copy-fb to be less dumb about picking the crtc.