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

時間撮記:

2015-12-21 下午02:40:35 (9 年 以前)

作者:

vboxsync

訊息:

bugref:8087: Additions/x11: support non-root X server: when we load the system OpenGL library we should load the system EGL library too, as the X server uses EGL when the modesetting driver is in use.

位置:

trunk/src/VBox/Additions/linux/installer

檔案:

• vboxadd-x11.sh (修改) (4 筆差異)
• vboxadd.sh (修改) (1 筆差異)

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

@@ -34 +34 @@
 CONFIG="config"
 SCRIPTNAME=vboxadd-x11.sh
+MODPROBE=/sbin/modprobe
+
+if $MODPROBE -c 2>/dev/null | grep -q '^allow_unsupported_modules  *0'; then
+  MODPROBE="$MODPROBE --allow-unsupported-modules"
+fi
 
 # Check architecture
@@ -254 +259 @@
     fi
     case $x_version in
-        1.17.99.902* )
-            # special case for Fedora 23 :-/
-            x_version_short="1.18"
-            xserver_version="X.Org Server ${x_version_short}"
-            vboxvideo_src=vboxvideo_drv_`echo ${x_version_short} | sed 's/\.//'`.so
-            setupxorgconf=""
-            test -f "${lib_dir}/${vboxvideo_src}" ||
-            {
-                echo "Warning: unknown version of the X Window System installed.  Not installing"
-                echo "X Window System drivers."
-                dox11config=""
-                vboxvideo_src=""
-            }
-            ;;
         1.*.99.* )
             echo "Warning: unsupported pre-release version of X.Org Server installed.  Not"
@@ -367 +358 @@
             esac
             ;;
-        * )
-            # Anything else, including all X server versions as of 1.12.
+        1.12.* | 1.13.* | 1.14.* | 1.15.* | 1.16.* )
             xserver_version="X.Org Server ${x_version_short}"
             vboxvideo_src=vboxvideo_drv_`echo ${x_version_short} | sed 's/\.//'`.so
@@ -379 +369 @@
                 vboxvideo_src=""
             }
+            ;;
+        * )
+            # For anything else, assume kernel drivers.
+            dox11config=""
+            $MODPROBE vboxvideo ||
+                echo "Warning: failed to set up the X Window System display integration."
             ;;
     esac

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

@@ -222 +222 @@
             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
+        ldconfig -p | while read -r line; do
+            case "${line}" in "libEGL.so.1 ${ldconfig_arch} => "*)
+                ln -s "${line#libEGL.so.1 ${ldconfig_arch} => }" /tmp/VBoxOGL/system/libEGL.so.1
                 break
             esac