Changeset 59180 in vbox

Timestamp:

Dec 18, 2015 11:17:06 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

104797

Message:

bugref:8087: Additions/x11: support non-root X server: switch our method of loading our GL library to simply overriding the system one. If our 3D library is loaded by the X server (we check this by seeing if the DISPLAY environment variable is unset; we cannot do anything useful in this case anyway), we load the original system library using deep binding, as the default X server GLX module is tied to the Mesa GL implementation.

Location:

trunk/src/VBox/Additions

Files:

• common/crOpenGL/load.c (modified) (1 diff)
• linux/Makefile.kmk (modified) (1 diff)
• linux/installer/vboxadd.sh (modified) (3 diffs)

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -1123 +1123 @@
     return bRc;
 }
+
+#if defined(Linux) && !defined(VBOXOGL_FAKEDRI)
+# include <dlfcn.h>
+/* We only support being used by GLX clients.  If the X server GLX extension
+ * tries to use our OpenGL library it will fail, as it is written specifically
+ * against Mesa.  So we detect this with the assumption that the server will
+ * not have the DISPLAY variable set, and a client will do or we can't do much
+ * with it anyway.  This is only needed on Linux, as Solaris lets us replace
+ * the client library only.  To avoid complications with iprt initialisation
+ * we use native system/C library APIs.
+ * We do this in a very naive way, not even checking for failure (not much we
+ * can do, better for GLX to fail than the whole X server).  To keep things as
+ * simple and fail-safe as possible, we use a fixed path to the system GL
+ * library. */
+void __attribute__ ((constructor)) checkServerGLX(void)
+{
+    char *pszDisplay = getenv("DISPLAY");
+
+    if (!pszDisplay || !*pszDisplay)
+    {
+        dlopen("/tmp/VBoxOGL/system/libGL.so.1", RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND);
+    }
+}
+#endif
 
 /* Sigh -- we can't do initialization at load time, since Windows forbids

trunk/src/VBox/Additions/linux/Makefile.kmk

@@ -134 +134 @@
         VBoxOGLpackspu.so \
         VBoxOGLpassthroughspu.so \
-        VBoxOGL.so
+        VBoxOGL.so \
+        VBoxEGL.so
 endif
 

trunk/src/VBox/Additions/linux/installer/vboxadd.sh

@@ -45 +45 @@
   i[3456789]86|x86)
     cpu="x86"
+    ldconfig_arch="(libc6)"
     lib_candidates="/usr/lib/i386-linux-gnu /usr/lib /lib"
     ;;
   x86_64|amd64)
     cpu="amd64"
+    ldconfig_arch="(libc6,x86-64)"
     lib_candidates="/usr/lib/x86_64-linux-gnu /usr/lib64 /usr/lib /lib64 /lib"
     ;;
@@ -209 +211 @@
     # This is needed as X.Org Server 1.13 does not auto-load the module.
     running_vboxvideo || $MODPROBE vboxvideo > /dev/null 2>&1
+    rm -rf /etc/ld.so.conf.d/00vboxvideo.conf
+    ldconfig
+    if /usr/bin/VBoxClient --check3d; then
+        rm -r /tmp/VBoxOGL
+        mkdir -m 0755 /tmp/VBoxOGL
+        mkdir -m 0755 /tmp/VBoxOGL/system
+        ldconfig -p | while read -r line; do
+            case "${line}" in "libGL.so.1 ${ldconfig_arch} => "*)
+                ln -s "${line#libGL.so.1 ${ldconfig_arch} => }" /tmp/VBoxOGL/system/libGL.so.1
+                break
+            esac
+        done
+        echo "/tmp/VBoxOGL" > /etc/ld.so.conf.d/00vboxvideo.conf
+        ln -s "${INSTALL_DIR}/lib/VBoxOGL.so" /tmp/VBoxOGL/libGL.so.1
+        ln -s "${INSTALL_DIR}/lib/VBoxEGL.so" /tmp/VBoxOGL/libEGL.so.1
+        ldconfig
+    fi
 
     # Mount all shared folders from /etc/fstab. Normally this is done by some
@@ -222 +241 @@
 {
     begin "Stopping VirtualBox Additions" console;
+    if test -r /etc/ld.so.conf.d/00vboxvideo.conf; then
+        rm /etc/ld.so.conf.d/00vboxvideo.conf
+        ldconfig
+    fi
     if ! umount -a -t vboxsf 2>/dev/null; then
         fail "Cannot unmount vboxsf folders"