Update to 1.6.1. meta-pkgs/modular-xorg still builds.

1.6.1:

Major bugs fixed:
- wrong button and mask copy (doesn't just affect OS X, despite the commit
  log)
- raw event sourceid is now set


Chase Douglas (1):
      Destroy extension record after last display is removed

Peter Hutterer (5):
      Fix wrong button label and mask copy on OS X
      Move version comparison into a helper function.
      Set the RawEvent sourceid (#34240)
      man: update XIQueryVersion for current server behaviour
      libXi 1.6.1

1.6.0:
The main fix that libXi 1.6 brings is support for XI 2.2 multitouch events
and the matching protocol changes.

Chase Douglas (1):
      Fix XIScrollClass increment value on 32-bit machines

Cyril Brulebois (1):
      configure.ac: Fix a typo in comments.

Michał Masłowski (1):
      Fix bus error on MIPS N32 for bug #38331.

Peter Hutterer (8):
      Bump to 1.5.99.1
      Implement support for XI 2.2
      libXi 1.5.99.2
      man: fix typo Mappiing → Mapping
      Force class alignment to a multiple of sizeof(XID).
      Handle new XIAllowEvent request size
      libXi 1.5.99.3
      libXi 1.6.0

1.5.0:
libXi 1.5.0 is an interim version of libXi that includes the smooth
scrolling support that XI 2.1 brings. Note that no servers released by X.Org
currently supports smooth scrolling, this feature is still limited to the
1.12 development versions.


In addition to the smooth scrolling support, this release brings a number of
cleanups, bugfixes (most of which were on 1.4.5) and a set of man page
improvements.

Alan Coopersmith (3):
      Move Xinput server API documentation from libXi to xserver
      Fix the FIXME output in man page .TH macros generated by asciidoc
      Make shadow man pages generated by asciidoc work with Solaris man

Gaetan Nadon (13):
      Documentation: add Docbook external references support
      make: remove unneeded AM_V_GEN silent rule directive.
      make: use AM_V_at rather than AM_V_GEN to prefix the mv command
      Install target dbs alongside generated documents
      Install xml versions of specs even if HAVE_XMLTO is false
      docbook.am: global maintenance update - entities, images and olinking
      docbook.am: embed css styles inside the HTML HEAD element
      docs: remove <productnumber> which is not used by default
      docs: use the &fullrelvers; entity to set X11 release information
      inputlib: fix copyright statements
      inputlib: prefix 1.0 with the word Version
      inputlib: restore original title "X Input Device Extension Library"
      specs: refactor and complete copyright legal text

Jeremy Huddleston (1):
      Use AM_CPPFLAGS to use in tree headers before installed headers

Matt Dew (2):
      Add id attributes to funcsynopsis to allow other docs to olink to them.
      1 - fix the capitalization of the ID attriutes to match either the

Matthieu Herrb (1):
      Fix XISelectEvents on 64 bits, strict alignement architectures.

Peter Hutterer (34):
      Allocate enough memory for raw events + extra data.
      XIChangeHierarchy: Return Success early if no actual changes are
requested.
      Remove a few unused assignments.
      man: fix typo, layout in XGetExtensionVersion.man
      Silence compiler warning in XListDProp.c
      Silence compiler warning due to differnent event conversion procs
      man: fix missing comma in XIGrabEnter man page
      Use Data, not Data32 in XIPassiveGrabDevice
      man: Fix wrong event names in XIGrabButton.
      man: Fix typo in XIChangeProperty
      Bump to 1.4.99
      man: Fix formatting in XGetFeedbackControl
      Add XI2 library-internal array offsets to XIint.h
      Don't use the protocol defines for 2.0 versioning.
      Handle unknown device classes.
      man: fix typo in XIQueryDevice man page
      man: update property and grab man pages for new constants
      Handle unknown device classes.
      man: fix typo in XIQueryDevice man page
      man: update property and grab man pages for new constants
      Require inputproto 2.0.99.1 or later
      Support XI 2.1 internally
      Support XI 2.1 XIScrollClass
      Use a separate nclasses variable in XIQueryDevice
      Remove superfluous assignment of lib->classes in XIQueryDevices.
      Bump to 1.4.99.1
      man: fix #include for XIGrabButton
      man: XIGrabButton returns error codes, not status codes
      man: passive grabs return the number of failed modifier combinations
      Fix duplicate sizeof in copy_classes
      Stop unnecessary calls to size_classes
      Include config.h from source files
      man: minor formatting fix in XIGrabButton
      libXi 1.5.0

1.4.5:
libXi 1.4.4 caused requests to fail if the library was built against 2.1 or
2.2 protocol headers.

Instead of requiring 2.0 for XI2 requests, the library required the protocol
version (2.1 or 2.2 depending on the proto) and failed if the server did not
support that version. This again caused virtually all XI2 requests to fail
if you didn't happen to run an X server from git.

The patch below hardcodes 2.0 for those requests that require 2.0,
regardless of the protocol version. You are strongly enocuraged to update.

This issue is not visible when built against inputproto 2.0.x

Peter Hutterer (2):
      Don't use the protocol defines for 2.0 versioning.
      libXi 1.4.5

1.4.4:
libXi 1.4.4 comes with two memory fixes that can cause crashes in clients.
Commit "Handle unknown device classes" can only be triggered when libXi
1.4.x runs against the git X server. If the XIQueryDevice() reply contained
classes unknown to libXi, we didn't allocate memory for these classes and
ended up overwriting valid ones.

Commit "Fix duplicate sizeof in copy_classes" fixes a typo, instead of
malloc(X * sizeof(Y)) the code called malloc(sizeof(X * sizeof(Y))). This
could lead to memory corruption.

Peter Hutterer (8):
      man: Fix formatting in XGetFeedbackControl
      man: fix typo in XIQueryDevice man page
      Handle unknown device classes.
      man: fix #include for XIGrabButton
      man: XIGrabButton returns error codes, not status codes
      man: passive grabs return the number of failed modifier combinations
      Fix duplicate sizeof in copy_classes
      libXi 1.4.4

3 files changed, 12 insertions, 14 deletions

diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 48f569440ee..ce78686374f 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2012/05/31 21:29:40 mlelstv Exp $
+# $NetBSD: Makefile,v 1.17 2012/07/13 15:14:42 wiz Exp $
 #
 
-DISTNAME=		libXi-1.4.3
-PKGREVISION=		1
+DISTNAME=		libXi-1.6.1
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
@@ -33,8 +32,8 @@ SUBST_SED.sosubdir=	-e 's|\.so X|.so manlibmansuffix/X|'
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .endif
 
-BUILDLINK_API_DEPENDS.inputproto+=	inputproto>=2.0
-BUILDLINK_API_DEPENDS.libX11+=		libX11>=1.3
+BUILDLINK_API_DEPENDS.inputproto+=	inputproto>=2.2
+BUILDLINK_API_DEPENDS.libX11+=		libX11>=1.5
 BUILDLINK_API_DEPENDS.libXext+=		libXext>=1.1
 BUILDLINK_API_DEPENDS.xextproto+=	xextproto>=7.0.3
 BUILDLINK_API_DEPENDS.xproto+=		xproto>=7.0.13
diff --git a/x11/libXi/PLIST b/x11/libXi/PLIST
index 38b53701967..043f064c888 100644
--- a/x11/libXi/PLIST
+++ b/x11/libXi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2011/06/12 00:21:53 dholland Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/07/13 15:14:42 wiz Exp $
 include/X11/extensions/XInput.h
 include/X11/extensions/XInput2.h
 lib/libXi.la
@@ -72,7 +72,6 @@ man/man3/XSetDeviceValuators.3
 man/man3/XUngrabDevice.3
 man/man3/XUngrabDeviceButton.3
 man/man3/XUngrabDeviceKey.3
-share/doc/libXi/doc/porting.xml
-share/doc/libXi/specs/encoding.xml
-share/doc/libXi/specs/inputlib.xml
-share/doc/libXi/specs/library.xml
+share/doc/libXi/encoding.xml
+share/doc/libXi/inputlib.xml
+share/doc/libXi/library.xml
diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo
index 38682cb6eb7..459a9e40ae7 100644
--- a/x11/libXi/distinfo
+++ b/x11/libXi/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2011/06/12 00:21:53 dholland Exp $
+$NetBSD: distinfo,v 1.15 2012/07/13 15:14:42 wiz Exp $
 
-SHA1 (libXi-1.4.3.tar.bz2) = c66cfdee74e8d169a7992b5f257395e653ca761b
-RMD160 (libXi-1.4.3.tar.bz2) = 142d44e8e13abbb8a41826b7005f8ede1807e3ff
-Size (libXi-1.4.3.tar.bz2) = 422637 bytes
+SHA1 (libXi-1.6.1.tar.bz2) = 4b53b41fdaa3acc86606c696c68d5eed11454612
+RMD160 (libXi-1.6.1.tar.bz2) = 2e368991d370d5696f55ef4bfa25306a5b44c214
+Size (libXi-1.6.1.tar.bz2) = 427062 bytes