xorg: maintenance updates of a few modules

(cherry picked from bd96a4bb43351067f47ac6a150ce7fcdd966463f)