vbox的更動 62551 路徑 trunk/src/VBox/Additions

時間撮記:

2016-7-25 下午06:44:22 (8 年 以前)

作者:

vboxsync

訊息:

bugref:8087: Additions/x11: support non-root X server: simplify loading of 3D library. I hope that this will not cause any regressions, but I also hope it will prevent non-obvious failures.

位置:

trunk/src/VBox/Additions

檔案:

• common/crOpenGL/load.c (修改) (1 筆差異)
• linux/installer/vboxadd.sh (修改) (1 筆差異)

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. */
-#ifndef RTLD_DEEPBIND
-# define RTLD_DEEPBIND 0x8
-#endif
-
-void __attribute__ ((constructor)) checkServerGLX(void)
-{
-    char *pszDisplay = getenv("DISPLAY");
-
-    if (!pszDisplay || !*pszDisplay)
-    {
-        dlopen("/var/lib/VBoxGuestAdditions/lib/system/libGL.so.1", RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND);
-        dlopen("/var/lib/VBoxGuestAdditions/lib/system/libEGL.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/installer/vboxadd.sh

@@ -228 +228 @@
     # multi-architecture installations
     rm -f /etc/ld.so.conf.d/00vboxvideo.conf
-    ldconfig
     if /usr/bin/VBoxClient --check3d 2>/dev/null; then
-        rm -f /var/lib/VBoxGuestAdditions/lib/system/tmp.so
-        mkdir -m 0755 -p /var/lib/VBoxGuestAdditions/lib/system
-        ldconfig -p | while read -r line; do
-            case "${line}" in "libGL.so.1 ${ldconfig_arch} => "*)
-                ln -s "${line#libGL.so.1 ${ldconfig_arch} => }" /var/lib/VBoxGuestAdditions/lib/system/tmp.so
-                mv /var/lib/VBoxGuestAdditions/lib/system/tmp.so /var/lib/VBoxGuestAdditions/lib/system/libGL.so.1
-                break
-            esac
-        done
-        ldconfig -p | while read -r line; do
-            case "${line}" in "libEGL.so.1 ${ldconfig_arch} => "*)
-                ln -s "${line#libEGL.so.1 ${ldconfig_arch} => }" /var/lib/VBoxGuestAdditions/lib/system/tmp.so
-                mv /var/lib/VBoxGuestAdditions/lib/system/tmp.so /var/lib/VBoxGuestAdditions/lib/system/libEGL.so.1
-                break
-            esac
-        done
+        mkdir -p /var/lib/VBoxGuestAdditions/lib
         ln -sf "${INSTALL_DIR}/lib/VBoxOGL.so" /var/lib/VBoxGuestAdditions/lib/libGL.so.1
         ln -sf "${INSTALL_DIR}/lib/VBoxEGL.so" /var/lib/VBoxGuestAdditions/lib/libEGL.so.1