Updates for XCB. Bug 8560.

diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index d61cc7f20cbaee67ce4dc8355ac223b0c3f5ecf3..cb327fa60f9e023f5c2da983ddedee82f1e820ec 100644 (file)
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -24,7 +24,7 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
        -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
        -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN
 
-X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I xcb-glx`
+X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`
 
 CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
        $(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math 
@@ -41,7 +41,7 @@ LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
-                $(LIBDRM_LIB) `pkg-config --libs xcb` `pkg-config --libs xcb-glx`
+                $(LIBDRM_LIB) `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`
 
 
 # This is now 0 by default since it seems to confuse the hell out of people

diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index 7e9327b59ee9953550025918a9d7627b5c2d88c2..f47caae43df20d476815f68a91ab672afdfa01db 100644 (file)
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -64,7 +64,7 @@
 #endif
 
 #ifdef USE_XCB
-#include <X11/xcl.h>
+#include <X11/Xlib-xcb.h>
 #include <xcb/xcb.h>
 #include <xcb/glx.h>
 #endif

diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c
index 4f615baa17f06a3001725883c2174e76e08ad4bd..80b6011bdd61f26b6a19cf94acf17a4e3a390deb 100644 (file)
--- a/src/glx/x11/indirect.c
+++ b/src/glx/x11/indirect.c
@@ -32,7 +32,7 @@
 #include "indirect_size.h"
 #include <GL/glxproto.h>
 #ifdef USE_XCB
-#include <X11/xcl.h>
+#include <X11/Xlib-xcb.h>
 #include <xcb/xcb.h>
 #include <xcb/glx.h>
 #endif /* USE_XCB */