From 95ab46fd3e6e1ea09d40fb8dd0b8fc6a401d3315 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 21 Feb 2010 11:16:11 +0100 Subject: [PATCH] xf86-video-intel: - update to xf86-video-intel-20100221 --- .../xf86-video-intel/patches/upstream.diff | 75 ------------------- packages/x11/driver/xf86-video-intel/url | 2 +- 2 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 packages/x11/driver/xf86-video-intel/patches/upstream.diff diff --git a/packages/x11/driver/xf86-video-intel/patches/upstream.diff b/packages/x11/driver/xf86-video-intel/patches/upstream.diff deleted file mode 100644 index 87254d626d..0000000000 --- a/packages/x11/driver/xf86-video-intel/patches/upstream.diff +++ /dev/null @@ -1,75 +0,0 @@ -From 1c3aaad09d6ef207fba748ad4ef4575a26ab2e5c Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Wed, 17 Feb 2010 17:48:32 +0000 -Subject: dri2: Silence the compiler for an unused function with proto < 4 - -Move the unused function into the #if DRI2INFOREC_VERSION >= 4 block. - -Signed-off-by: Chris Wilson ---- -diff --git a/src/i830_dri.c b/src/i830_dri.c -index e64b25d..8356525 100644 ---- a/src/i830_dri.c -+++ b/src/i830_dri.c -@@ -269,29 +269,6 @@ static void I830DRI2DestroyBuffer(DrawablePtr drawable, DRI2Buffer2Ptr buffer) - - #endif - --static int --I830DRI2DrawablePipe(DrawablePtr pDraw) --{ -- ScreenPtr pScreen = pDraw->pScreen; -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -- BoxRec box, crtcbox; -- xf86CrtcPtr crtc; -- int pipe = -1; -- -- box.x1 = pDraw->x; -- box.y1 = pDraw->y; -- box.x2 = box.x1 + pDraw->width; -- box.y2 = box.y1 + pDraw->height; -- -- crtc = i830_covering_crtc(pScrn, &box, NULL, &crtcbox); -- -- /* Make sure the CRTC is valid and this is the real front buffer */ -- if (crtc != NULL && !crtc->rotatedData) -- pipe = i830_crtc_to_pipe(crtc); -- -- return pipe; --} -- - static void - I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion, - DRI2BufferPtr destBuffer, DRI2BufferPtr sourceBuffer) -@@ -425,6 +402,29 @@ typedef struct _DRI2FrameEvent { - DRI2BufferPtr back; - } DRI2FrameEventRec, *DRI2FrameEventPtr; - -+static int -+I830DRI2DrawablePipe(DrawablePtr pDraw) -+{ -+ ScreenPtr pScreen = pDraw->pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ BoxRec box, crtcbox; -+ xf86CrtcPtr crtc; -+ int pipe = -1; -+ -+ box.x1 = pDraw->x; -+ box.y1 = pDraw->y; -+ box.x2 = box.x1 + pDraw->width; -+ box.y2 = box.y1 + pDraw->height; -+ -+ crtc = i830_covering_crtc(pScrn, &box, NULL, &crtcbox); -+ -+ /* Make sure the CRTC is valid and this is the real front buffer */ -+ if (crtc != NULL && !crtc->rotatedData) -+ pipe = i830_crtc_to_pipe(crtc); -+ -+ return pipe; -+} -+ - static void - I830DRI2ExchangeBuffers(DrawablePtr draw, DRI2BufferPtr front, - DRI2BufferPtr back) --- -cgit v0.8.3-6-g21f6 diff --git a/packages/x11/driver/xf86-video-intel/url b/packages/x11/driver/xf86-video-intel/url index 730bf9218a..b45558e5ce 100644 --- a/packages/x11/driver/xf86-video-intel/url +++ b/packages/x11/driver/xf86-video-intel/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xf86-video-intel-20100213.tar.bz2 +http://sources.openelec.tv/svn/xf86-video-intel-20100221.tar.bz2