XCB/GLX: initial GLX 1.2 support

This requires libx11-xcb, since the higher layers of GLX are not
available for pure X11 C Bindings currently.

TBD: resizing and GLX 1.3

configure.ac

@@ -3733,6 +3733,17 @@ AS_IF([test "${enable_xcb}" != "no"], [
   VLC_ADD_PLUGIN([xdg_screensaver])
 ])
 
+AC_ARG_ENABLE(glx,
+  [  --enable-glx            X11 OpenGL (GLX) support (default enabled)],, [
+  enable_glx="$enable_xcb"
+])
+AS_IF([test "${enable_glx}" != "no"], [
+  PKG_CHECK_MODULES(XLIB_XCB, [x11-xcb])
+  PKG_CHECK_MODULES(GLU, [glu])
+
+  VLC_ADD_PLUGIN([xcb_glx])
+])
+
 
 dnl
 dnl  OpenGL module

modules/video_output/Modules.am

@@ -43,6 +43,16 @@ libxcb_xv_plugin_la_LIBADD = $(AM_LIBADD) \
 	$(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_XV_LIBS)
 libxcb_xv_plugin_la_DEPENDENCIES =
 
+libxcb_glx_plugin_la_SOURCES = \
+	xcb/xcb_vlc.h \
+	xcb/glx.c \
+	xcb/events.c
+libxcb_glx_plugin_la_CFLAGS = $(AM_CFLAGS) \
+	$(XLIB_XCB_CFLAGS) $(GLU_CFLAGS)
+libxcb_glx_plugin_la_LIBADD = $(AM_LIBADD) \
+	$(XLIB_XCB_LIBS) $(GLU_LIBS)
+libxcb_glx_plugin_la_DEPENDENCIES =
+
 libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c
 libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
 	$(XPROTO_CFLAGS) \
@@ -57,10 +67,12 @@ libxcb_window_plugin_la_DEPENDENCIES =
 EXTRA_LTLIBRARIES += \
 	libxcb_x11_plugin.la \
 	libxcb_xv_plugin.la \
+	libxcb_glx_plugin.la \
 	libxcb_window_plugin.la
 libvlc_LTLIBRARIES += \
 	$(LTLIBxcb_x11) \
 	$(LTLIBxcb_xv) \
+	$(LTLIBxcb_glx) \
 	$(LTLIBxcb_window)
 
 # XXX: do we need yet another modules/ subdirectory?