Commit baa9c56c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

XCB: use xproto for xcb_window, not xcb_x11 and xcb_xv

parent 2952a46d
......@@ -3650,8 +3650,6 @@ AC_ARG_ENABLE(xvideo,
need_xid_provider="no"
AS_IF([test "${enable_xcb}" != "no"], [
PKG_CHECK_MODULES(XPROTO, [xproto])
dnl libxcb
PKG_CHECK_MODULES(XCB, [xcb])
PKG_CHECK_MODULES(XCB_SHM, [xcb-shm])
......@@ -3690,6 +3688,7 @@ AS_IF([test "${enable_xcb}" != "no"], [
])
AS_IF([test "${have_xcb_keysyms}" = "yes"], [
PKG_CHECK_MODULES(XPROTO, [xproto])
VLC_ADD_PLUGIN([xcb_window])
VLC_ADD_PLUGIN([globalhotkeys])
VLC_ADD_CFLAGS([globalhotkeys], [${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}])
......
......@@ -27,11 +27,9 @@ libxcb_x11_plugin_la_SOURCES = \
xcb/common.c \
xcb/events.c
libxcb_x11_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) \
$(XPROTO_CFLAGS)
$(XCB_CFLAGS) $(XCB_SHM_CFLAGS)
libxcb_x11_plugin_la_LIBADD = $(AM_LIBADD) \
$(XCB_LIBS) $(XCB_SHM_LIBS) \
$(XPROTO_LIBS)
$(XCB_LIBS) $(XCB_SHM_LIBS)
libxcb_x11_plugin_la_DEPENDENCIES =
libxcb_xv_plugin_la_SOURCES = \
......@@ -40,18 +38,18 @@ libxcb_xv_plugin_la_SOURCES = \
xcb/common.c \
xcb/events.c
libxcb_xv_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_XV_CFLAGS) \
$(XPROTO_CFLAGS)
$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_XV_CFLAGS)
libxcb_xv_plugin_la_LIBADD = $(AM_LIBADD) \
$(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_XV_LIBS) \
$(XPROTO_LIBS)
$(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_XV_LIBS)
libxcb_xv_plugin_la_DEPENDENCIES =
libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c
libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XPROTO_CFLAGS) \
$(XCB_CFLAGS) \
$(XCB_KEYSYMS_CFLAGS)
libxcb_window_plugin_la_LIBADD = $(AM_LIBADD) \
$(XPROTO_LIBS) \
$(XCB_LIBS) \
$(XCB_KEYSYMS_LIBS)
libxcb_window_plugin_la_DEPENDENCIES =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment