From 0d9e8db8d031d22b02df2c9b226287b1ca489f5a Mon Sep 17 00:00:00 2001 From: Zhigang Gong Date: Fri, 8 Apr 2011 15:30:45 +0800 Subject: [PATCH] glamor: Fixed one linking error. As current glamor implementation depends on the glx library in the mesa package which is conflict with the version in xorg. We have to --disable-glx when build Xephyr. But this leads to the linking error here. We comment out the calling to ephyrHijackGLXExtension() now. Need revisit latter. --- hw/kdrive/ephyr/ephyr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index 1aacc5fe8..4bead1f36 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -669,7 +669,9 @@ ephyrInitScreen (ScreenPtr pScreen) } if (!ephyrNoDRI) { ephyrDRIExtensionInit (pScreen) ; +#if 0 ephyrHijackGLXExtension () ; +#endif } #endif