[vlc-devel] [PATCH] qt: Prefer XCB over Wayland

Rémi Denis-Courmont remi at remlab.net
Wed Jun 28 14:10:21 CEST 2017


Le 23 juin 2017 17:30:09 GMT+03:00, Martin Briza <mbriza at redhat.com> a écrit :
>Wayland users now have no choice (except setting WAYLAND_DISPLAY to '')
>how to avoid getting VLC under Wayland which may not be optimal yet.
>
>This patch ensures the XCB backend is preferred. This means the
>developers who want to work on Wayland support will have to clear their
>DISPLAY variable instead.
>
>Related to https://trac.videolan.org/vlc/ticket/18383 .
>---
> modules/gui/qt/qt.cpp | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
>index 2ad68eb..3224361 100644
>--- a/modules/gui/qt/qt.cpp
>+++ b/modules/gui/qt/qt.cpp
>@@ -411,16 +411,16 @@ static int Open( vlc_object_t *p_this, bool
>isDialogProvider )
>     intf_thread_t *p_intf = (intf_thread_t *)p_this;
>     void *(*thread)(void *) = Thread;
> 
>-#ifdef QT5_HAS_WAYLAND
>-    if( HasWayland() )
>-        thread = ThreadWayland;
>-    else
>-#endif
> #ifdef QT5_HAS_X11
>     if( HasX11( p_this ) )
>         thread = ThreadXCB;
>     else
> #endif
>+#ifdef QT5_HAS_WAYLAND
>+    if( HasWayland() )
>+        thread = ThreadWayland;
>+    else
>+#endif
> #if defined (QT5_HAS_X11) || defined (QT5_HAS_WAYLAND)
>         return VLC_EGENERIC;
> #endif
>-- 
>2.13.0
>
>_______________________________________________
>vlc-devel mailing list
>To unsubscribe or modify your subscription options:
>https://mailman.videolan.org/listinfo/vlc-devel

I don't see any rationale why Xlib should have priority over Wayland. Normally, if you have both, you want the later.

The referenced bug alleges Qt bugs in the version of Qt shipped by Fedora. That's not a rationale in the context of this upstream VLC repository.
-- 
Rémi Denis-Courmont
Typed on an inconvenient virtual keyboard
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20170628/fcb04c78/attachment.html>


More information about the vlc-devel mailing list