Add xserver-21.1 branch to CI build matrix

Also updates build container from Debian buster (10) to bullseye (11), which in turn requires working around glvnd shipping gl.pc with a much lower version number than Mesa had.

Does some extra work that wouldn't be necessary if we could build on bookworm (12) instead, but I couldn't get that to work here.