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

Timestamp:

Feb 3, 2011 3:59:03 PM (14 years ago)

Author:

vboxsync

Message:

Additions/installer/linux: install the X.Org Server 1.10 drivers

Location:

trunk/src/VBox/Additions/linux

Files:

• Makefile.kmk (modified) (2 diffs)
• installer/vboxadd-x11.sh (modified) (1 diff)

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

@@ -136 +136 @@
         vboxmouse_drv_18.so \
         vboxmouse_drv_19.so \
+        vboxmouse_drv_110.so \
         vboxvideo_drv_70.so \
         vboxvideo_drv_71.so \
@@ -145 +146 @@
         vboxvideo_drv_18.so \
         vboxvideo_drv_19.so \
+        vboxvideo_drv_110.so \
         pam_vbox.so \
         mount.vboxsf

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

@@ -320 +320 @@
     fi
     case $x_version in
-        1.9.99.* )
+        1.10.99.* )
             echo "Warning: unsupported pre-release version of X.Org Server installed.  Not"
             echo "installing the X.Org drivers."
             dox11config=""
+            ;;
+        1.9.99.* | 1.10.* )
+            begin "Installing X.Org Server 1.10 modules"
+            vboxvideo_src=vboxvideo_drv_110.so
+            vboxmouse_src=vboxmouse_drv_110.so
+            doxorgconfd="true"
+            # Does Fedora still ship without vboxvideo detection?
+            # test "$system" = "redhat" || setupxorgconf=""
             ;;
         1.8.99.* | 1.9.* )