Do not assume that merge.sh has the 'x' bit set.
Link libIntelXvMC.so to pthread-stubs, not pthreads.
Needed by future matthew@ patch.
Remove  -Wredundant-decls gcc warning option. It causes lots of
noise in OpenBSD system headers. requested by espie@, ok guenther@.

Note that this will only take effect once configure scripts and
Makefile.in are re-generated. This will happen in a not too
short future.
Update to xf86-input-synaptics 1.6.2

ok matthieu@, mpi@
sync
re-implement atom handing; makes for a normalized and more consistent
separation between cwm and ewmh.  seen by a few.
fix missing atom (WM_PROTOCOLS) wrt new style handing; without this, the
window manager didn't know if a client supported CLIENT_PROTO_DELETE and
thus used a hammer, XKillClient.

behaviour reported by Tim van der Molen.
use the screen ctx since we already have it assigned.
assign and use screen ctx where appropriate and consistently.
the display's width and height are updated after an XRandR event so we
don't need to pass down the new values to screen_update_geometry(); so
just read the width/height values directly for both uses of
screen_update_geometry().  prep for further changes in this area.
Add a couple examples of keybindings using keysyms, as discussed
with okan@ and sthen@.

OK okan@, sthen@
querying for Xinerama should be done per display, not per screen, so
move chuck to display init; allows some shuffling to occur limiting
screen_init_xinerama()'s scope while keeping order intact.
Don't enable INTEL_swap_event unconditionally and wait forever for an
event that's not coming.

This unbreak clutter/cogl and probably other toolkits.

Upstream commit 25620eb1d277c6b80edb136eaeca12532fcfd3ce by Adam Jackson

ok ajacoutot@, jasper@, robert@
Unbreak GLX1.3 ctors with software dri, this makes clutter/cogl works with
software accleration.

Upstream commit d44f821213d7ed67fed18d6ea6c34b61a665c89e by Adam Jackson

ok ajacoutot@, jasper@, robert@
Update to freetype-2.4.10.

With help and ok matthieu@
remove a redundant assignment and another one up.
fix atom for retrieving WM_STATE between re-exec's.
fix atom for setting WM_STATE.
Brown paperbag commit.

Prodded by espie@ I reviewed the history of
OpenBSD local changes carefully and found a number of merge errors
accumulated over the complicated CVS history of this driver.

This the 6.14.4 code + OpenBSD local fixes as it should be.
Cleanup and uniform style. No functional changes.