fix merge botch.

merge xf86-input-elographics 1.4.4, xf86-video-chips 1.5.0,
xf86-video-nv 2.1.23, xf86-video-savage 2.4.1,
xf86-video-siliconmotion 1.7.10, xf86-video-vboxvideo 1.0.1.

initial import of xf86-video-savage-2.4.1

merge xf86-video-geode 2.11.21, xf86-video-i128 1.4.1,
xf86-video-neomagic 1.3.1, and xf86-video-savage 2.4.0.

initial import of xf86-video-savage-2.4.0

more xf86SetModeDefaultName( after xf86CVTMode()

mostly fix amd64 xorg-server 1.20 builds:

- avoid bswap_16 etc defines for now. ends up with code-in-decl
- more ABI_VERSION 23 fixes (BlockHandler/WakeHandler) including re-fix
from previous
- more Notify API
- more shadowUpdatePackedWeak() removal
- remove fd_set handling from intel driver (part of ABI_VERSION 23)
- cope better with PixMap/Drawable separation in new server
- remove support for maxHValue and maxVValue (XXX?)
- hide drmmode_udev_notify() when not building udev
- comment out nouveau 'wfb' support, xorg-server 1.20 only supplies
either 'wfb' or 'fb' interface, not both, and we choose 'fb'
- define 'pointer' in nv_proto.h rather than relying upon Xdefs.h
- normalise the value of _XTYPEDEF_POINTER
- EGL is broken (missing) in xsrc currently

various updates for xorg-server 1.20. some of these are work-in-progress,
the xsrc build is broken for most ports currently.

- xf86DisableRandR() is gone
- use HAVE_NOTIFY_FD like other modern drivers in compat-api.h
- pRotatedPixmap is done
- some PixmanPtr is now DrawablePtr (this one is all over problem with many
consumers, and perhaps the major breakage point currently.)

initial import of xf86-video-savage-2.3.9

remove xorg-server.h from all the places we added it recently, as this
problem is now fixed more generally and globally.

include xorg-server.h which is normally included by config.h.

(this change isn't a candidate for upstream.)

merge xf86-video- ast 1.0.1, cirrus 1.5.3, geode 2.11.17, mach64 6.9.5,
savage 2.3.8 and siliconmotion 1.7.8.

initial import of xf86-video-savage-2.3.8

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.

- avoid casting from int to a pointer.
- call miPointerSetPosition() correctly for this ABI.

merge xf86-video-ast 0.98.0, xf86-video-mga 1.6.3, xf86-video-neomagic
1.2.8, xf86-video-r128 6.9.2, and xf86-video-savage 2.3.7.

initial import of xf86-video-savage-2.3.7

move comapt-api.h include so it is always present

merge xf86-video-s3 0.6.5, xf86-video-s3virge 1.10.6, xf86-video-savage 2.3.6,
xf86-video-siliconmotion 1.7.7, xf86-video-sis 0.10.7.

initial import of xf86-video-savage-2.3.6

initial import of xf86-video-savage-2.3.2

initial import of xf86-video-savage-2.3.1

merge xf86-video-savage 2.3.0.

initial import of xf86-video-savage-2.3.0

apply some (uintptr_t) to appease gcc

avoid a bunch of int/ptr warnings.

initial import of xf86-video-savage-2.2.1

initial import of xf86-video-savage-2.1.3