From 0071b9d33c19f61dc0ffea0efaeae51eede6e00f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Mar 2010 22:25:56 +0200 Subject: [PATCH] Mesa: - update to Mesa-7.7.1 --- .../Mesa/patches/110_fix-libkms-api.diff | 40 ------------------- packages/graphics/Mesa/url | 4 +- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 packages/graphics/Mesa/patches/110_fix-libkms-api.diff diff --git a/packages/graphics/Mesa/patches/110_fix-libkms-api.diff b/packages/graphics/Mesa/patches/110_fix-libkms-api.diff deleted file mode 100644 index cea46b01fe..0000000000 --- a/packages/graphics/Mesa/patches/110_fix-libkms-api.diff +++ /dev/null @@ -1,40 +0,0 @@ -From 8db8adfd01a1ff1e2a160ae3b0199bd3daa4191a Mon Sep 17 00:00:00 2001 -From: Jakob Bornecrantz -Date: Thu, 28 Jan 2010 16:59:26 +0000 -Subject: st/xorg: Update to new libkms interface but be backwards compatible - ---- -diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c -index 0160b1a..daa9f8b 100644 ---- a/src/gallium/state_trackers/xorg/xorg_crtc.c -+++ b/src/gallium/state_trackers/xorg/xorg_crtc.c -@@ -243,7 +243,11 @@ crtc_load_cursor_argb_kms(xf86CrtcPtr crtc, CARD32 * image) - unsigned attr[8]; - - attr[0] = KMS_BO_TYPE; -+#ifdef KMS_BO_TYPE_CURSOR_64X64_A8R8G8B8 -+ attr[1] = KMS_BO_TYPE_CURSOR_64X64_A8R8G8B8; -+#else - attr[1] = KMS_BO_TYPE_CURSOR; -+#endif - attr[2] = KMS_WIDTH; - attr[3] = 64; - attr[4] = KMS_HEIGHT; -diff --git a/src/gallium/state_trackers/xorg/xorg_driver.c b/src/gallium/state_trackers/xorg/xorg_driver.c -index e4ad789..f53a879 100644 ---- a/src/gallium/state_trackers/xorg/xorg_driver.c -+++ b/src/gallium/state_trackers/xorg/xorg_driver.c -@@ -1008,7 +1008,11 @@ drv_create_front_buffer_kms(ScrnInfoPtr pScrn) - int ret; - - attr[0] = KMS_BO_TYPE; -+#ifdef KMS_BO_TYPE_SCANOUT_X8R8G8B8 -+ attr[1] = KMS_BO_TYPE_SCANOUT_X8R8G8B8; -+#else - attr[1] = KMS_BO_TYPE_SCANOUT; -+#endif - attr[2] = KMS_WIDTH; - attr[3] = pScrn->virtualX; - attr[4] = KMS_HEIGHT; --- -cgit v0.8.3-6-g21f6 diff --git a/packages/graphics/Mesa/url b/packages/graphics/Mesa/url index 162dcaf14a..d0aecb9798 100644 --- a/packages/graphics/Mesa/url +++ b/packages/graphics/Mesa/url @@ -1,2 +1,2 @@ -ftp://ftp.freedesktop.org/pub/mesa/7.7/MesaLib-7.7.tar.bz2 -ftp://ftp.freedesktop.org/pub/mesa/7.7/MesaDemos-7.7.tar.bz2 \ No newline at end of file +ftp://ftp.freedesktop.org/pub/mesa/7.7.1/MesaLib-7.7.1.tar.bz2 +ftp://ftp.freedesktop.org/pub/mesa/7.7.1/MesaDemos-7.7.1.tar.bz2 \ No newline at end of file