These are in response to xorg/xserver!468 (merged) and require xorg/xserver!471 (merged) .
/cc @airlied