[oe-commits] Martin Jansa : xserver: Fix dri building without panoramiXExtension

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: 66dd125acd2087f368b47ce31ff334d741cbe6eb
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=66dd125acd2087f368b47ce31ff334d741cbe6eb

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Mon Sep 21 13:52:49 2009 +0000

xserver: Fix dri building without panoramiXExtension

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 ...-4d6b20c25af5f590f19530b6c007e3648a8037c3.patch |   61 ++++++++++++++++++++
 recipes/xorg-xserver/xserver-xorg_1.6.99.901.bb    |    1 +
 2 files changed, 62 insertions(+), 0 deletions(-)

diff --git a/recipes/xorg-xserver/xserver-xorg/xserver-git-master-4d6b20c25af5f590f19530b6c007e3648a8037c3.patch b/recipes/xorg-xserver/xserver-xorg/xserver-git-master-4d6b20c25af5f590f19530b6c007e3648a8037c3.patch
new file mode 100644
index 0000000..f3f16d1
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg/xserver-git-master-4d6b20c25af5f590f19530b6c007e3648a8037c3.patch
@@ -0,0 +1,61 @@
+From 4d6b20c25af5f590f19530b6c007e3648a8037c3 Mon Sep 17 00:00:00 2001
+From: Shunichi Fuji <palglowr at gmail.com>
+Date: Wed, 16 Sep 2009 02:02:00 +0000
+Subject: dri: use noPanoramiXExtension directly.
+
+xf86LoaderCheckSymbol() is never useful if using externed variable directly.
+noPanoramiXExtension will be just used through dlopen() like other extension modules.
+
+Signed-off-by: Shunichi Fuji <palglowr at gmail.com>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
+index 3d7724d..faddfe6 100644
+--- a/hw/xfree86/dri/dri.c
++++ b/hw/xfree86/dri/dri.c
+@@ -73,10 +73,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
+ 
+-#if !defined(PANORAMIX)
+-extern Bool noPanoramiXExtension;
+-#endif
+-
+ static int DRIEntPrivIndex = -1;
+ static int DRIScreenPrivKeyIndex;
+ static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKeyIndex;
+@@ -321,7 +317,6 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
+     drm_context_t *       reserved;
+     int                 reserved_count;
+     int                 i;
+-    Bool                xineramaInCore = FALSE;
+     DRIEntPrivPtr       pDRIEntPriv;
+     ScrnInfoPtr         pScrn = xf86Screens[pScreen->myNum];
+     DRIContextFlags	flags    = 0;
+@@ -339,21 +334,18 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
+                   "Direct rendering is not supported when VGA arb is necessary for the device\n");
+ 	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,
+ 		"Direct rendering is not supported when Xinerama is enabled\n");
+ 	    return FALSE;
+ 	}
+-    }
++#endif
+ 
+     if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
+ 			  pDRIInfo->busIdString,
+--
+cgit v0.8.2
diff --git a/recipes/xorg-xserver/xserver-xorg_1.6.99.901.bb b/recipes/xorg-xserver/xserver-xorg_1.6.99.901.bb
index 52b25c6..e6f05db 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.6.99.901.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.6.99.901.bb
@@ -8,6 +8,7 @@ PR = "r1.75"
 
 SRC_URI += "file://sysroot_fix.patch;patch=1 \
             file://dolt-fix.patch;patch=1 \
+            file://xserver-git-master-4d6b20c25af5f590f19530b6c007e3648a8037c3.patch;patch=1 \
            "
 do_install_prepend() {
         mkdir -p ${D}/${libdir}/X11/fonts