[vlc-commits] xcb: deduplicate vout helpers and fix missing symbols

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Aug 25 15:42:23 2016 +0300| [6cd08a1a967919e21d35e5b07f4519710dccef2f] | committer: Rémi Denis-Courmont

xcb: deduplicate vout helpers and fix missing symbols

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

 modules/video_output/Makefile.am  | 9 ++++++---
 modules/video_output/xcb/events.c | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 963047b..6f9b183 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -62,8 +62,11 @@ libvlc_xcb_events_la_SOURCES = \
 	video_output/xcb/events.c video_output/xcb/events.h
 libvlc_xcb_events_la_CPPFLAGS = -DMODULE_STRING=\"xcb\"
 libvlc_xcb_events_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
-libvlc_xcb_events_la_LDFLAGS = -static
-libvlc_xcb_events_la_LIBADD = $(XCB_LIBS)
+libvlc_xcb_events_la_LDFLAGS = \
+	-no-undefined \
+	-export-symbols-regex ^vlc_xcb_ \
+	-version-info 0:0:0
+libvlc_xcb_events_la_LIBADD = $(XCB_LIBS) $(LTLIBVLCCORE)
 
 libxcb_x11_plugin_la_SOURCES = \
 	video_output/xcb/pictures.c video_output/xcb/pictures.h \
@@ -108,7 +111,7 @@ libglx_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
 libglx_plugin_la_LIBADD = $(GL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
 
 if HAVE_XCB
-noinst_LTLIBRARIES += libvlc_xcb_events.la
+pkglib_LTLIBRARIES += libvlc_xcb_events.la
 vout_LTLIBRARIES += libxcb_x11_plugin.la libxcb_window_plugin.la
 if HAVE_XCB_KEYSYMS
 libxcb_window_plugin_la_CFLAGS += -DHAVE_XCB_KEYSYMS
diff --git a/modules/video_output/xcb/events.c b/modules/video_output/xcb/events.c
index ffb96bd..6b2bb73 100644
--- a/modules/video_output/xcb/events.c
+++ b/modules/video_output/xcb/events.c
@@ -34,6 +34,8 @@
 
 #include "events.h"
 
+#pragma GCC visibility push(default)
+
 int vlc_xcb_error_Check(vout_display_t *vd, xcb_connection_t *conn,
                         const char *str, xcb_void_cookie_t ck)
 {