Changeset 59018 in vbox for trunk/src/VBox/Additions/solaris

Timestamp:

Dec 7, 2015 12:10:10 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8153: vboxvideo: ABI issues / software rendering on Linux guest: try using the built-in Solaris OpenGL selection mechanism to put our OpenGL pass-through library in place. We rely on Mesa support being installed. At system start time, when asked to identify ourselves, we check whether pass-through is currently enabled, and if so claim support for the console type as reported by the constype command. To install ourselves, we first run Mesa selection then replace the user library component. On Additions removal we simply re-run Solaris OpenGL automatic selection to restore the system state.

Location:

trunk/src/VBox/Additions/solaris

Files:

• Installer/postinstall.sh (modified) (1 diff)
• Installer/preremove.sh (modified) (1 diff)
• Installer/vbox_vendor_select (added)
• Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Additions/solaris/Installer/postinstall.sh

@@ -335 +335 @@
 groupadd vboxsf >/dev/null 2>&1
 
-# install openGL extensions for X.Org
-if test ! -z "$xorgbin"; then
-    # 32-bit crogl opengl library replacement
-    if test -f "/usr/lib/VBoxOGL.so"; then
-        cp -f /usr/X11/lib/mesa/libGL.so.1 /usr/X11/lib/mesa/libGL_original_.so.1
-        ln -sf /usr/lib/VBoxOGL.so /usr/X11/lib/mesa/libGL.so.1
-    fi
-
-    # 64-bit crogl opengl library replacement
-    if test -f "/usr/lib/amd64/VBoxOGL.so"; then
-        cp -f /usr/X11/lib/mesa/amd64/libGL.so.1 /usr/X11/lib/mesa/amd64/libGL_original_.so.1
-        ln -sf /usr/lib/amd64/VBoxOGL.so /usr/X11/lib/mesa/amd64/libGL.so.1
-    fi
-fi
+# Set up our OpenGL pass-through library.
+ln -sf $vboxadditions_path/vbox_vendor_select /lib/opengl/ogl_select
+/lib/svc/method/ogl-select start
 
 # Move the pointer integration module to kernel/drv & remove the unused module name from pkg and file from disk

trunk/src/VBox/Additions/solaris/Installer/preremove.sh

@@ -65 +65 @@
 /opt/VirtualBoxAdditions/x11restore.pl
 
-# Restore crogl symlink mess
-# 32-bit crogl opengl library replacement
-if test -f "/usr/lib/VBoxOGL.so" && test -f "/usr/X11/lib/mesa/libGL_original_.so.1"; then
-    mv -f /usr/X11/lib/mesa/libGL_original_.so.1 /usr/X11/lib/mesa/libGL.so.1
-fi
-
-# 64-bit crogl opengl library replacement
-if test -f "/usr/lib/amd64/VBoxOGL.so" && test -f "/usr/X11/lib/mesa/amd64/libGL_original_.so.1"; then
-    mv -f /usr/X11/lib/mesa/amd64/libGL_original_.so.1 /usr/X11/lib/mesa/amd64/libGL.so.1
-fi
+# Revert set-up of our OpenGL library.
+rm -f /lib/opengl/ogl_select/vbox_vendor_select
+/lib/svc/method/ogl-select start
 
 

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

@@ -121 +121 @@
         $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg.conf \
         $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg_modeless.conf \
+        $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vbox_vendor_select \
         $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/VBox.sh
 
@@ -208 +209 @@
         VBox.sh \
         1099.vboxclient \
+        vbox_vendor_select \
         VBoxISAExec
 
@@ -287 +289 @@
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg.conf \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg_modeless.conf \
+                $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vbox_vendor_select \
                 $(VBOX_BRAND_LICENSE_TXT) \
                 $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf \