Rename "xcb" plugin to "xcb_x11"

This reflects its real capabilities as opposed to "xcb_xv"

diff --git a/configure.ac b/configure.ac
index 3922ec60f86396032a92bbdfbe99fa2acbe228c8..b12a04af7282f778db9b9d5c34ebe63e84660f2a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3546,7 +3546,7 @@ AS_IF([test "${enable_xcb}" != "no"], [
   dnl libxcb
   PKG_CHECK_MODULES(XCB, [xcb])
   PKG_CHECK_MODULES(XCB_SHM, [xcb-shm])
-  VLC_ADD_PLUGIN([xcb])
+  VLC_ADD_PLUGIN([xcb_x11])
   VLC_ADD_PLUGIN([xcb_screen])
 
   AS_IF([test "${enable_xvideo}" != "no"], [

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 69b00d75a55e7ea063e75bc4ef23a1975242a640..c1bb623e0a88aea0373274f4a65e6501567c6c76 100644 (file)
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -21,18 +21,18 @@ SOURCES_vmem = vmem.c
 SOURCES_yuv = yuv.c
 SOURCES_vout_wrapper = wrapper.c
 
-libxcb_plugin_la_SOURCES = \
+libxcb_x11_plugin_la_SOURCES = \
        xcb/xcb_vlc.h \
        xcb/x11.c \
        xcb/common.c \
        xcb/events.c
-libxcb_plugin_la_CFLAGS = $(AM_CFLAGS) \
+libxcb_x11_plugin_la_CFLAGS = $(AM_CFLAGS) \
        $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) \
        $(XPROTO_CFLAGS)
-libxcb_plugin_la_LIBADD = $(AM_LIBADD) \
+libxcb_x11_plugin_la_LIBADD = $(AM_LIBADD) \
        $(XCB_LIBS) $(XCB_SHM_LIBS) \
        $(XPROTO_LIBS)
-libxcb_plugin_la_DEPENDENCIES =
+libxcb_x11_plugin_la_DEPENDENCIES =
 
 libxcb_xv_plugin_la_SOURCES = \
        xcb/xcb_vlc.h \
@@ -57,11 +57,11 @@ libxcb_window_plugin_la_LIBADD = $(AM_LIBADD) \
 libxcb_window_plugin_la_DEPENDENCIES =
 
 EXTRA_LTLIBRARIES += \
-       libxcb_plugin.la \
+       libxcb_x11_plugin.la \
        libxcb_xv_plugin.la \
        libxcb_window_plugin.la
 libvlc_LTLIBRARIES += \
-       $(LTLIBxcb) \
+       $(LTLIBxcb_x11) \
        $(LTLIBxcb_xv) \
        $(LTLIBxcb_window)
 

diff --git a/modules/video_output/wrapper.c b/modules/video_output/wrapper.c
index 44dddb61b7b226fa24768c8d2d5d435dee499959..c6ac35974ef26fded9b2774ff41f146dab723ed1 100644 (file)
--- a/modules/video_output/wrapper.c
+++ b/modules/video_output/wrapper.c
@@ -48,7 +48,7 @@ static void Close(vlc_object_t *);
 DECLARE_OPEN(aalib);
 DECLARE_OPEN(caca);
 DECLARE_OPEN(sdl);
-DECLARE_OPEN(xcb);
+DECLARE_OPEN(xcb_x11);
 DECLARE_OPEN(xcb_xv);
 
 #undef DECLARE_OPEN
@@ -73,7 +73,7 @@ vlc_module_begin()
     DECLARE_MODULE(sdl, 60)
 
     add_submodule()
-    DECLARE_MODULE(xcb, 75)
+    DECLARE_MODULE(xcb_x11, 75)
 
     add_submodule()
     DECLARE_MODULE(xcb_xv, 155)