From 5873cc3c02aa8015475affa720e019cb50990f57 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@mobile.openelec.tv>
Date: Fri, 28 Aug 2009 22:38:30 +0200
Subject: [PATCH] xorg-server: update to xorg-server-20090828

---
 .../patches/30_dri-no-xinerama.diff           | 47 -------------------
 packages/x11/xserver/xorg-server/url          |  2 +-
 2 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 packages/x11/xserver/xorg-server/patches/30_dri-no-xinerama.diff

diff --git a/packages/x11/xserver/xorg-server/patches/30_dri-no-xinerama.diff b/packages/x11/xserver/xorg-server/patches/30_dri-no-xinerama.diff
deleted file mode 100644
index 62e3c5d1d5..0000000000
--- a/packages/x11/xserver/xorg-server/patches/30_dri-no-xinerama.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naur xorg-server-1.4.orig/hw/xfree86/dri/dri.c xorg-server-1.4/hw/xfree86/dri/dri.c
---- xorg-server-1.4.orig/hw/xfree86/dri/dri.c	2008-01-14 19:25:12.000000000 +0100
-+++ xorg-server-1.4/hw/xfree86/dri/dri.c	2008-01-14 19:25:41.000000000 +0100
-@@ -74,7 +74,7 @@
- 
- #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
- 
--#if !defined(PANORAMIX)
-+#ifdef PANORAMIX
- extern Bool noPanoramiXExtension;
- #endif
- 
-@@ -308,7 +308,6 @@
-     drm_context_t *       reserved;
-     int                 reserved_count;
-     int                 i;
--    Bool                xineramaInCore = FALSE;
-     DRIEntPrivPtr       pDRIEntPriv;
-     ScrnInfoPtr         pScrn = xf86Screens[pScreen->myNum];
-     DRIContextFlags	flags    = 0;
-@@ -321,21 +320,18 @@
- 	return FALSE;
-     }
- 
-+#ifdef PANORAMIX
-     /*
-      * If Xinerama is on, don't allow DRI to initialise.  It won't be usable
-      * anyway.
-      */
--    if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
--	xineramaInCore = TRUE;
--
--    if (xineramaInCore) {
--	if (!noPanoramiXExtension) {
--	    DRIDrvMsg(pScreen->myNum, X_WARNING,
-+    if (!noPanoramiXExtension) {
-+      DRIDrvMsg(pScreen->myNum, X_WARNING, 
- 		"Direct rendering is not supported when Xinerama is enabled\n");
- 	    return FALSE;
- 	}
--    }
--
-+#endif /* PANORAMIX */
-+    
-     if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
- 			  pDRIInfo->busIdString,
- 			  pDRIInfo->drmDriverName))
diff --git a/packages/x11/xserver/xorg-server/url b/packages/x11/xserver/xorg-server/url
index 98d982eedd..965b926bcd 100644
--- a/packages/x11/xserver/xorg-server/url
+++ b/packages/x11/xserver/xorg-server/url
@@ -1 +1 @@
-http://sources.openelec.tv/svn/xorg-server-20090814.tar.bz2
+http://sources.openelec.tv/svn/xorg-server-20090828.tar.bz2