Changeset 39813 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 19, 2012 6:10:07 PM (13 years ago)

Author:

vboxsync

Message:

Additions/Solaris: fix X.org 1.3.0 with correct xorg.conf handling.

Location:

trunk/src/VBox/Additions/solaris

Files:

• Installer/postinstall.sh (modified) (2 diffs)
• Makefile.kmk (modified) (2 diffs)

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

@@ -154 +154 @@
     case "$xorgversion" in
         1.3.* )
-            vboxmouse_src="vboxmouse_drv_71.so"
+            vboxmouse_src="vboxmouse_drv_13.so"
             vboxvideo_src="vboxvideo_drv_13.so"
             ;;
@@ -295 +295 @@
                 rm -f $vboxadditions_path/$xorgconf_unfit
             fi
-            case "$xorgversion" in
-                7.1.* | 7.2.* | 6.9.* | 7.0.* | 1.3.* )
-                    $vboxadditions_path/x11config.pl
-                    ;;
-                1.4.* | 1.5.* | 1.6.* | 1.7.* | 1.8.* | 1.9.* | 1.10.*)
-                    $vboxadditions_path/x11config15sol.pl
-                    ;;
-            esac
+
+            # Adjust xorg.conf with mouse and video driver sections
+            $vboxadditions_path/x11config15sol.pl
         fi
     fi

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

@@ -201 +201 @@
 SOLARIS_ADD_COMMON_BINS = \
         vboxguest.sh \
-        x11config.pl \
         x11config15sol.pl \
         x11restore.pl \
@@ -274 +273 @@
                 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/VBox.sh \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient \
-                $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15sol.pl \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11restore.pl \