Fix the issues with vboxvideo on 10.x.

By disabling AIGLX specifically, the vboxvideo driver works again. I have added
checks to our Xorg startup routine, which will probe if running in VirtualBox and copy
the necessary xorg.conf file to /etc/X11/xorg.conf

overlays/install-overlay/root/cardDetect/XF86Config.virtualbox

@@ -1,11 +1,53 @@
+# Xorg.conf file generated for PC-BSD
+
+Section "ServerLayout"
+    Identifier     "XFree86 Configured"
+    Screen      0  "Screen0" 0 0
+    InputDevice    "Mouse0" "CorePointer"
+    InputDevice    "Keyboard0" "CoreKeyboard"
+    Option	   "Clone" "off"
+    Option	   "AIGLX" "false"
+EndSection
+
+Section "Module"
+    Load           "ddc"
+    Load           "dbe"
+    Load	   "dri"
+    Load	   "dri2"
+    Load           "extmod"
+    Load	   "glx"
+EndSection
+
+Section "InputDevice"
+    Identifier     "Keyboard0"
+    Driver         "keyboard"
+    Option         "XkbModel" "pc105"
+    Option         "XkbLayout" "us"
+    Option         "XkbVariant" ""
+EndSection
+
+Section "InputDevice"
+    Identifier     "Mouse0"
+    Driver	   "vboxmouse"
+EndSection
+
 Section "Monitor"
-	Identifier	"Monitor0"
-	HorizSync	30 - 60
-	VertRefresh	50.0 - 100.0
-	Option		"DPMS"
+    Identifier     "Monitor0"
+    VendorName     "Generic Monitor"
+    ModelName      "Generic"
+
+EndSection
+
+Section "Screen"
+	Identifier "Screen0"
+	Device     "Card0"
+	Monitor    "Monitor0"
 EndSection
 
 Section "Device"
 	Identifier	"Card0"
-	Driver		"vesa"
+	Driver		"vboxvideo"
+	VendorName "InnoTek Systemberatung GmbG"
+	BoardName "VirtualBox Graphics Adapter"
+	BusID "PCI:0:2:0"
 EndSection

overlays/install-overlay/root/cardDetect/xorg.conf.virtualbox

@@ -0,0 +1,53 @@
+# Xorg.conf file generated for PC-BSD
+
+Section "ServerLayout"
+    Identifier     "XFree86 Configured"
+    Screen      0  "Screen0" 0 0
+    InputDevice    "Mouse0" "CorePointer"
+    InputDevice    "Keyboard0" "CoreKeyboard"
+    Option	   "Clone" "off"
+    Option	   "AIGLX" "false"
+EndSection
+
+Section "Module"
+    Load           "ddc"
+    Load           "dbe"
+    Load	   "dri"
+    Load	   "dri2"
+    Load           "extmod"
+    Load	   "glx"
+EndSection
+
+Section "InputDevice"
+    Identifier     "Keyboard0"
+    Driver         "keyboard"
+    Option         "XkbModel" "pc105"
+    Option         "XkbLayout" "us"
+    Option         "XkbVariant" ""
+EndSection
+
+Section "InputDevice"
+    Identifier     "Mouse0"
+    Driver	   "vboxmouse"
+EndSection
+
+Section "Monitor"
+    Identifier     "Monitor0"
+    VendorName     "Generic Monitor"
+    ModelName      "Generic"
+
+EndSection
+
+Section "Screen"
+	Identifier "Screen0"
+	Device     "Card0"
+	Monitor    "Monitor0"
+EndSection
+
+Section "Device"
+	Identifier	"Card0"
+	Driver		"vboxvideo"
+	VendorName "InnoTek Systemberatung GmbG"
+	BoardName "VirtualBox Graphics Adapter"
+	BusID "PCI:0:2:0"
+EndSection

overlays/install-overlay/root/functions.sh

@@ -75,6 +75,10 @@ EndSection
 
 start_xorg()
 {
+  # First check if we are running as a VirtualBox guest
+  pciconf -lv | grep -q "VirtualBox"
+  if [ $? -eq 0 ] ; then cp /root/cardDetect/xorg.conf.virtualbox /etc/X11/xorg.conf; fi
+
   # Run X Now
   startx
   if [ ! -e "/tmp/.xstarted" ]

src-qt4/pc-xgui/resources/bin/rundetect.sh

@@ -147,6 +147,11 @@ do
   AUTORES="NO"
 
   if [ "${ATTEMPT}" = "0" ] ; then
+
+    # First check if we are running as a VirtualBox guest
+    pciconf -lv | grep -q "VirtualBox"
+    if [ $? -eq 0 ] ; then cp ${PROGDIR}/cardDetect/xorg.conf.virtualbox /etc/X11/xorg.conf; fi
+
     # Check if we are supposed to run in vesa mode
     xvesa="NO"
     v=`kenv xvesa`

src-qt4/pc-xgui/resources/cardDetect/xorg.conf.virtualbox

@@ -0,0 +1,53 @@
+# Xorg.conf file generated for PC-BSD
+
+Section "ServerLayout"
+    Identifier     "XFree86 Configured"
+    Screen      0  "Screen0" 0 0
+    InputDevice    "Mouse0" "CorePointer"
+    InputDevice    "Keyboard0" "CoreKeyboard"
+    Option	   "Clone" "off"
+    Option	   "AIGLX" "false"
+EndSection
+
+Section "Module"
+    Load           "ddc"
+    Load           "dbe"
+    Load	   "dri"
+    Load	   "dri2"
+    Load           "extmod"
+    Load	   "glx"
+EndSection
+
+Section "InputDevice"
+    Identifier     "Keyboard0"
+    Driver         "keyboard"
+    Option         "XkbModel" "pc105"
+    Option         "XkbLayout" "us"
+    Option         "XkbVariant" ""
+EndSection
+
+Section "InputDevice"
+    Identifier     "Mouse0"
+    Driver	   "vboxmouse"
+EndSection
+
+Section "Monitor"
+    Identifier     "Monitor0"
+    VendorName     "Generic Monitor"
+    ModelName      "Generic"
+
+EndSection
+
+Section "Screen"
+	Identifier "Screen0"
+	Device     "Card0"
+	Monitor    "Monitor0"
+EndSection
+
+Section "Device"
+	Identifier	"Card0"
+	Driver		"vboxvideo"
+	VendorName "InnoTek Systemberatung GmbG"
+	BoardName "VirtualBox Graphics Adapter"
+	BusID "PCI:0:2:0"
+EndSection

src-qt4/port-files/pkg-plist

@@ -410,6 +410,7 @@ share/pcbsd/xorg-gui/cardDetect/XF86Config.compat
 share/pcbsd/xorg-gui/cardDetect/XF86Config.default
 share/pcbsd/xorg-gui/cardDetect/XF86Config.intel
 share/pcbsd/xorg-gui/cardDetect/XF86Config.vmware
+share/pcbsd/xorg-gui/cardDetect/xorg.conf.virtualbox
 share/pcbsd/xorg-gui/conf/xorg.conf.basic
 share/pcbsd/xorg-gui/conf/.fluxbox/init
 share/pcbsd/xorg-gui/conf/.fluxbox/keys