[vlc-devel] commit: Rename "xcb" plugin to "xcb_x11" ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Sat Aug 29 14:03:41 2009 +0200| [27daf37c2d132db07f5d13a4f1c9823ad53b794e] | committer: Rafaël Carré 

Rename "xcb" plugin to "xcb_x11"

This reflects its real capabilities as opposed to "xcb_xv"

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=27daf37c2d132db07f5d13a4f1c9823ad53b794e
---

 configure.ac                    |    2 +-
 modules/video_output/Modules.am |   12 ++++++------
 modules/video_output/wrapper.c  |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3922ec6..b12a04a 100644
--- 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 69b00d7..c1bb623 100644
--- 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 44dddb6..c6ac359 100644
--- 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)