[vlc-devel] [vlc-commits] qt: remove stray flags

[Thomas Guillem]

On Thu, Dec 1, 2016, at 18:23, Rémi Denis-Courmont wrote:
> vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Dec  1
> 19:23:36 2016 +0200| [f59a3272f50ebae0cdc4dbebbd52539da09f3b4d] |
> committer: Rémi Denis-Courmont
> 
> qt: remove stray flags
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f59a3272f50ebae0cdc4dbebbd52539da09f3b4d
> ---
> 
>  modules/gui/qt/Makefile.am | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
> index feef2e9..d0cdc07 100644
> --- a/modules/gui/qt/Makefile.am
> +++ b/modules/gui/qt/Makefile.am
> @@ -30,10 +30,6 @@ libqt_plugin_la_LIBADD += $(WAYLAND_CLIENT_LIBS)
>  endif
>  if HAVE_WIN32
>  libqt_plugin_la_LIBADD += $(LIBCOM) -lcomctl32 -luuid
> -else
> -if !HAVE_OS2
> -libqt_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB) -lX11
> -endif
>  endif
>  

clean build fail with this patch:

.libs/libqt_plugin_la-qt.o: In function `vlc_xlib_init':
/home/tom/work/git/vlc/build-linux/modules/gui/qt/../../../../include/vlc_xlib.h:40:
undefined reference to `_Xglobal_lock'
/home/tom/work/git/vlc/build-linux/modules/gui/qt/../../../../include/vlc_xlib.h:47:
undefined reference to `XInitThreads'
.libs/libqt_plugin_la-qt.o: In function `HasX11':
/home/tom/work/git/vlc/build-linux/modules/gui/qt/../../../../modules/gui/qt/qt.cpp:361:
undefined reference to `XOpenDisplay'
/home/tom/work/git/vlc/build-linux/modules/gui/qt/../../../../modules/gui/qt/qt.cpp:365:
undefined reference to `XCloseDisplay'
.libs/libqt_plugin_la-qt.o: In function `vlc_xlib_init':
/home/tom/work/git/vlc/build-linux/modules/gui/qt/../../../../include/vlc_xlib.h:40:
undefined reference to `_XErrorFunction'
components/.libs/libqt_plugin_la-interface_widgets.o: In function
`VideoWidget::sync()':
/home/tom/work/git/vlc/build-linux/modules/gui/qt/../../../../modules/gui/qt/components/interface_widgets.cpp:96:
undefined reference to `XSync'

but jenkins seems happy...

>  gui_LTLIBRARIES =  $(LTLIBqt)
> 
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> https://mailman.videolan.org/listinfo/vlc-commits