VAAPI-X11: link to xcb library

Fixup: 2c233f96

configure.ac

@@ -3180,6 +3180,14 @@ AS_IF([test "${enable_xcb}" != "no"], [
   ], [
     AC_MSG_WARN([libxcb-keysyms (0.3.4 or later) not found. Hotkeys will not work.])
   ])
+
+  dnl avcodec (vaapi-x11)
+  AS_IF([test "${enable_libva}" != "no"], [
+    AS_IF([test "${have_avcodec}" != "no"], [
+      VLC_ADD_CFLAGS([avcodec], [${XCB_CFLAGS}])
+      VLC_ADD_LIBS([avcodec], [${XCB_LIBS}])
+    ])
+  ])
 ])
 AM_CONDITIONAL([HAVE_XCB], [test "${have_xcb}" = "yes"])
 

modules/codec/avcodec/Modules.am

@@ -11,15 +11,21 @@ libavcodec_plugin_la_SOURCES = \
 	chroma.c \
 	vaapi.h \
 	vaapi.c \
-	vaapi_x11.c \
 	dxva2.c \
 	copy.c \
 	copy.h \
 	va.c \
 	va.h \
-	../../video_output/xcb/events.c \
-	../../video_output/xcb/xcb_events_vlc.h \
 	$(NULL)
+
+if HAVE_XCB
+libavcodec_plugin_la_SOURCES += \
+    vaapi_x11.c \
+    ../../video_output/xcb/events.c \
+    ../../video_output/xcb/xcb_events_vlc.h \
+    $(NULL)
+endif
+
 if ENABLE_SOUT
 libavcodec_plugin_la_SOURCES += \
 	encoder.c

modules/codec/avcodec/avcodec.c

@@ -212,7 +212,7 @@ vlc_module_begin ()
         AVIO_MODULE
 #endif
 
-#if defined(HAVE_AVCODEC_VAAPI)
+#if defined(HAVE_AVCODEC_VAAPI) && defined(HAVE_XCB)
     /* vaapi_x11 submodule */
     add_submodule()
     set_description (N_("VAAPI X11 video output"))

modules/codec/avcodec/vaapi_x11.c

@@ -38,7 +38,7 @@
 
 #include <vlc_arrays.h>
 
-#ifdef HAVE_AVCODEC_VAAPI
+#if defined(HAVE_AVCODEC_VAAPI) && defined(HAVE_XCB)
 
 #ifdef HAVE_LIBAVCODEC_AVCODEC_H
 #   include <libavcodec/avcodec.h>