merge xorg-serer 21.1.3.

merge xorg-server 1.20.13.

merge xorg-server 1.20.12 and xkeyboard-config 2.33.

Avoid dup inconsistent definitions.

merge xorg-server 1.20.3.

first merge of netbsd changes. not tested yet.

Remove some redundant function redeclarations, as noted in
http://mail-index.netbsd.org/tech-x11/2015/01/09/msg001452.html

The changes come from upstream in commits:

* xserver:
ecf62755 Define prototypes for hw/xfree86/modes/xf86Modes.c only in xf86Modes.h.
- didn't add xf86SaveModeContents which isn't defined in our version

0bc41d5f Remove redundant redeclarations of functions in the same header file

5595e7ce randr: Remove redundant declaration.

471e5373 Remove duplicate declaration of xf86ValidateModesFlags in xf86Modes.h

9ef53e22 include: GetClientResolutions is declared in font.h

8b6a7500 Fix gcc warnings about redundant declarations of fallback functions
- just took ffs() #ifdef defense, so most not applied


* xf86-video-nv:
49ee1c26 Include xf86Modes.h to use functions from hw/xfree86/modes/xf86Modes.c.

* xf86-video-savage:
2e9217bb Include xf86Modes.h to use functions from hw/xfree86/modes/xf86Modes.c.

Add RRSetChanged from more recent versions of xorg-server.

initial import of xorg-server 1.10.3. highlights include:
- fixes xorg bugs 29969, 30367, 30527, 30267, 30260, 29046,
30260, 31548, 28672, 24887, 32115, 21457, 32436, 21827,
28414, 24703, 32803, 16318, 33449, 33324, 33929, 35082,
35209, 36146, 36119
- many additional NULL checks
- adjustments related to input ABI 12
- *lots* of dead code removal
- vga arbitrator fixes
- GL fixes
- EDID fixes
- conversion to using asprintf() in many places
- many fixes from valgrind, compiler warnings

see these for more details:
http://lists.freedesktop.org/archives/xorg-announce/2011-February/001612.html
http://lists.freedesktop.org/archives/xorg-announce/2011-April/001646.html
http://lists.freedesktop.org/archives/xorg-announce/2011-May/001675.html
http://lists.freedesktop.org/archives/xorg-announce/2011-July/001710.html

import xorg-server 1.9.2. important changes since 1.6.5 include:

- built-in symbol visibility, default not export
- fixes for various crashes
- many fixes for XI2, EXA, dix, render, glx, xkb, EDID, randr, Xv,
resource handling, Xext, vfb, xfree86 / vga and composite support.
- fixes several memory leaks
- many many documentation updates
- record extension enabled
- no longer looks for XF86Config files

initial import of xorg-server-1.6.1.901

initial import of xorg-server-1.4.2