Changeset 32166 in vbox

Timestamp:

Aug 31, 2010 11:06:03 PM (14 years ago)

Author:

vboxsync

Message:

Additions/linux: install the X.Org Server 1.9 Additions by default

Location:

trunk/src/VBox/Additions/linux

Files:

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

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

@@ -133 +133 @@
         vboxmouse_drv_17.so \
         vboxmouse_drv_18.so \
+        vboxmouse_drv_19.so \
         vboxvideo_drv_70.so \
         vboxvideo_drv_71.so \
@@ -141 +142 @@
         vboxvideo_drv_17.so \
         vboxvideo_drv_18.so \
+        vboxvideo_drv_19.so \
         pam_vbox.so \
         mount.vboxsf

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

@@ -313 +313 @@
     echo
     case $x_version in
-        1.8.99.* )
+        1.9.99.* )
             echo "Warning: unsupported pre-release version of X.Org Server installed.  Not"
             echo "installing the X.Org drivers."
             dox11config=""
+            ;;
+        1.8.99.* | 1.9.* )
+            begin "Installing X.Org Server 1.9 modules"
+            vboxvideo_src=vboxvideo_drv_19.so
+            vboxmouse_src=vboxmouse_drv_19.so
+            doxorgconfd="true"
+            # Fedora 14 looks likely to ship without vboxvideo detection
+            # test "$system" = "redhat" || setupxorgconf=""
             ;;
         1.7.99.* | 1.8.* )
@@ -323 +331 @@
             vboxmouse_src=vboxmouse_drv_18.so
             doxorgconfd="true"
-            # Fedora 13 looks likely to ship without vboxvideo detection
+            # Fedora 13 shipped without vboxvideo detection
             test "$system" = "redhat" || setupxorgconf=""
             ;;