Merge branch 'testing'
Conflicts:
srcpkgs/glamor-egl/template
srcpkgs/virtualbox-ose/template
srcpkgs/xf86-input-evdev/template
srcpkgs/xf86-input-joystick/template
srcpkgs/xf86-input-synaptics/template
srcpkgs/xf86-input-vmmouse/template
srcpkgs/xf86-input-wacom/template
srcpkgs/xf86-video-ati/template
srcpkgs/xf86-video-cirrus/template
srcpkgs/xf86-video-fbdev/template
srcpkgs/xf86-video-geode/template
srcpkgs/xf86-video-intel/template
srcpkgs/xf86-video-modesetting/template
srcpkgs/xf86-video-nouveau/template
srcpkgs/xf86-video-openchrome/template
srcpkgs/xf86-video-sisusb/template
srcpkgs/xf86-video-vesa/template
srcpkgs/xf86-video-vmware/template
srcpkgs/xorg-server/template
This brings xorg-server 1.15 with related bumps for new ABI extensions.
034086e25c