xserver: Branch 'master'

[Michel Dänzer]

On 27.05.2016 03:00, Adam Jackson wrote:
> 
> commit 4fca18dc03669bada75175df289fbee41275208e
> Author: Adam Jackson <ajax at redhat.com>
> Date:   Mon May 9 13:28:08 2016 -0400
> 
>     xfree86: Add IndirectGLX server flag (v2)
>     
>     Not all display managers make it easy (or possible) to modify the
>     command line flags passed to the server, so add a way to get to it from
>     xorg.conf.
>     
>     v2: Fix the FlagOptions list to not have IGLX after the terminator (Alan
>     Coopersmith)
>     
>     Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
>     Signed-off-by: Adam Jackson <ajax at redhat.com>

As mentioned on IRC, this commit broke the +iglx command line flag for
me: In addition to +iglx no longer enabling indirect GLX, passing it on
the command line prevents Option "IndirectGLX" from enabling indirect
GLX as well.


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer