Changeset 48495 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 16, 2013 3:49:56 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: do not call XInitThreads with older libX11 versions.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/main.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -175 +175 @@
 # Necessary for the hdd backend enumeration
 VirtualBox_LIBS = $(LIB_DDU)
+
+if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd)
+ VirtualBox_LIBS += dl
+endif
 
 # This library is required for multi-monitor support

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -46 +46 @@
 #ifdef Q_WS_X11
 # include <X11/Xlib.h>
+# include <dlfcn.h>
 #endif
 
@@ -292 +293 @@
 }
 
+#ifdef Q_WS_X11
+/** This is a workaround for a bug on old libX11 versions, fixed in commit
+ *      941f02ede63baa46f93ed8abccebe76fb29c0789 and released in version 1.1. */
+Status VBoxXInitThreads(void)
+{
+    void *pvProcess = dlopen(NULL, RTLD_GLOBAL | RTLD_LAZY);
+    Status rc = 1;
+    if (pvProcess && dlsym(pvProcess, "xcb_connect"))
+        rc = XInitThreads();
+    if (pvProcess)
+        dlclose(pvProcess);
+    return rc;
+}
+#endif
+
 extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char ** /*envp*/)
 {
@@ -301 +317 @@
 
 #ifdef Q_WS_X11
-    if (!XInitThreads())
+    if (!VBoxXInitThreads())
         return 1;
 #endif
@@ -543 +559 @@
     bool fInitSUPLib = false;
 #ifdef Q_WS_X11
-    if (!XInitThreads())
+    if (!VBoxXInitThreads())
         return 1;
 #endif