Changeset 75428 in vbox

Timestamp:

Nov 13, 2018 5:03:46 PM (6 years ago)

Author:

vboxsync

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

126579

Message:

Additions/linux/installer: only enable 3D for X.Org Server 1.19 or earlier.
bugref:9281: 3D acceleration reported broken on Ubuntu 18.10...
We previously tried to fix this by disabling 3D if Xwayland was found, except
for Ubuntu 18.04 where we wanted to keep 3D enabled. This was a bad idea
because EL7.6 has X.Org Server 1.20 without Wayland. So just do the simple
thing and enable 3D if an X server older than 1.20 is found, and only then.

Location:

trunk/src/VBox/Additions/linux/installer

Files:

• vboxadd-x11.sh (modified) (2 diffs)
• vboxadd.sh (modified) (1 diff)

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

@@ -149 +149 @@
     stop && start
     return 0
+}
+
+setup_opengl()
+{
+    # Install the guest OpenGL drivers.  For now we don't support
+    # multi-architecture installations
+    rm -f /etc/ld.so.conf.d/00vboxvideo.conf
+    rm -Rf /var/lib/VBoxGuestAdditions/lib
+    if /usr/bin/VBoxClient --check3d 2>/dev/null; then
+        mkdir -p /var/lib/VBoxGuestAdditions/lib
+        ln -sf "${INSTALL_DIR}/lib/VBoxOGL.so" /var/lib/VBoxGuestAdditions/lib/libGL.so.1
+        # SELinux for the OpenGL libraries, so that gdm can load them during the
+        # acceleration support check.  This prevents an "Oh no, something has gone
+        # wrong!" error when starting EL7 guests.
+        if test -e /etc/selinux/config; then
+            if command -v semanage > /dev/null; then
+                semanage fcontext -a -t lib_t "/var/lib/VBoxGuestAdditions/lib/libGL.so.1"
+            fi
+            chcon -h  -t lib_t "/var/lib/VBoxGuestAdditions/lib/libGL.so.1"
+        fi
+        echo "/var/lib/VBoxGuestAdditions/lib" > /etc/ld.so.conf.d/00vboxvideo.conf
+    fi
+    ldconfig
 }
 
@@ -456 +479 @@
         fail "Failed to set up VBoxClient to start automatically."
     ln -s "${lib_dir}/98vboxadd-xclient" /usr/bin/VBoxClient-all 2>/dev/null
+    case "${x_version}" in 4.* | 6.* | 7.* | 1.?.* | 1.1* )
+        setup_opengl
+    esac 
 }
 

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

@@ -263 +263 @@
 
     # Put the X.Org driver in place.  This is harmless if it is not needed.
+    # Also set up the OpenGL library.
     myerr=`"${INSTALL_DIR}/init/vboxadd-x11" setup 2>&1`
     test -z "${myerr}" || log "${myerr}"
-    # Install the guest OpenGL drivers.  For now we don't support
-    # multi-architecture installations
-    rm -f /etc/ld.so.conf.d/00vboxvideo.conf
-    rm -Rf /var/lib/VBoxGuestAdditions/lib
-    if /usr/bin/VBoxClient --check3d 2>/dev/null; then
-        setup_gl=true;
-    else
-        unset setup_gl
-    fi
-    # Disable 3D if Xwayland is found, except on Ubuntu 18.04.
-    if type Xwayland >/dev/null 2>&1; then
-        unset PRETTY_NAME
-        . /etc/os-release 2>/dev/null
-        case "${PRETTY_NAME}" in
-            "Ubuntu 18.04"*) ;;
-            *) unset setup_gl ;;
-        esac
-    fi
-    if test -n "${setup_gl}"; then
-        mkdir -p /var/lib/VBoxGuestAdditions/lib
-        ln -sf "${INSTALL_DIR}/lib/VBoxOGL.so" /var/lib/VBoxGuestAdditions/lib/libGL.so.1
-        # SELinux for the OpenGL libraries, so that gdm can load them during the
-        # acceleration support check.  This prevents an "Oh no, something has gone
-        # wrong!" error when starting EL7 guests.
-        if test -e /etc/selinux/config; then
-            if command -v semanage > /dev/null; then
-                semanage fcontext -a -t lib_t "/var/lib/VBoxGuestAdditions/lib/libGL.so.1"
-            fi
-            chcon -h  -t lib_t "/var/lib/VBoxGuestAdditions/lib/libGL.so.1"
-        fi
-        echo "/var/lib/VBoxGuestAdditions/lib" > /etc/ld.so.conf.d/00vboxvideo.conf
-    fi
-    ldconfig
 
     # Mount all shared folders from /etc/fstab. Normally this is done by some