1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch
new file mode 100644
index 0000000000..db29da93ca
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch
@@ -0,0 +1,50 @@
+Index: xorg-server-1.5.0/hw/xfree86/dri/dri.c
+===================================================================
+--- xorg-server-1.5.0.orig/hw/xfree86/dri/dri.c 2008-09-24 17:43:04.000000000 +0100
+++ xorg-server-1.5.0/hw/xfree86/dri/dri.c      2008-09-24 17:46:38.000000000 +0100
+@@ -73,10 +73,6 @@
+ 
+ #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
+ 
+-#if !defined(PANORAMIX)
+-extern Bool noPanoramiXExtension;
+-#endif
+-
+ static int DRIEntPrivIndex = -1;
+ static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKey;
+ static DevPrivateKey DRIWindowPrivKey = &DRIWindowPrivKey;
+@@ -307,7 +303,6 @@
+     drm_context_t *       reserved;
+     int                 reserved_count;
+     int                 i;
+-    Bool                xineramaInCore = FALSE;
+     DRIEntPrivPtr       pDRIEntPriv;
+     ScrnInfoPtr         pScrn = xf86Screens[pScreen->myNum];
+     DRIContextFlags    flags    = 0;
+@@ -320,20 +315,13 @@
+        return FALSE;
+     }
+ 
+-    /*
+-     * 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,
+-               "Direct rendering is not supported when Xinerama is enabled\n");
+-           return FALSE;
+-       }
+#if defined(PANORAMIX)
+    if (!noPanoramiXExtension) {
+        DRIDrvMsg(pScreen->myNum, X_WARNING,
+            "Direct rendering is not supported when Xinerama is enabled\n");
+        return FALSE;
+     }
+#endif
+ 
+     if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
+                          pDRIInfo->busIdString,

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch new file mode 100644 index 0000000000..db29da93ca --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch
@@ -0,0 +1,50 @@
	1	Index: xorg-server-1.5.0/hw/xfree86/dri/dri.c
	2	===================================================================
	3	--- xorg-server-1.5.0.orig/hw/xfree86/dri/dri.c 2008-09-24 17:43:04.000000000 +0100
	4	+++ xorg-server-1.5.0/hw/xfree86/dri/dri.c 2008-09-24 17:46:38.000000000 +0100
	5	@@ -73,10 +73,6 @@
	6
	7	#define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
	8
	9	-#if !defined(PANORAMIX)
	10	-extern Bool noPanoramiXExtension;
	11	-#endif
	12	-
	13	static int DRIEntPrivIndex = -1;
	14	static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKey;
	15	static DevPrivateKey DRIWindowPrivKey = &DRIWindowPrivKey;
	16	@@ -307,7 +303,6 @@
	17	drm_context_t * reserved;
	18	int reserved_count;
	19	int i;
	20	- Bool xineramaInCore = FALSE;
	21	DRIEntPrivPtr pDRIEntPriv;
	22	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
	23	DRIContextFlags flags = 0;
	24	@@ -320,20 +315,13 @@
	25	return FALSE;
	26	}
	27
	28	- /*
	29	- * If Xinerama is on, don't allow DRI to initialise. It won't be usable
	30	- * anyway.
	31	- */
	32	- if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
	33	- xineramaInCore = TRUE;
	34	-
	35	- if (xineramaInCore) {
	36	- if (!noPanoramiXExtension) {
	37	- DRIDrvMsg(pScreen->myNum, X_WARNING,
	38	- "Direct rendering is not supported when Xinerama is enabled\n");
	39	- return FALSE;
	40	- }
	41	+#if defined(PANORAMIX)
	42	+ if (!noPanoramiXExtension) {
	43	+ DRIDrvMsg(pScreen->myNum, X_WARNING,
	44	+ "Direct rendering is not supported when Xinerama is enabled\n");
	45	+ return FALSE;
	46	}
	47	+#endif
	48
	49	if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
	50	pDRIInfo->busIdString,