autogen.sh | 4 +++- configure.ac | 5 +++-- include/X11/extensions/XInput2.h | 2 +- src/Makefile.am | 1 + src/XExtInt.c | 3 +++ xi.pc.in | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-)
New commits: commit 26cb4573cbb8808ce9d5c75c16bd613b2f03a368 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Fri Apr 5 09:34:48 2013 +1000 libXi 1.7.1 Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/configure.ac b/configure.ac index c2897d2..8dbca38 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXi], [1.7], +AC_INIT([libXi], [1.7.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([src/config.h]) commit 0358bb20384b759d6d41dc44f3aed30583689d53 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Tue Mar 26 14:46:06 2013 +1000 Require XFixes for PointerBarrier, remove duplicate typedef The PointerBarrier typedef is duplicate if a client includes both Xfixes.h and XInput2.h. gcc 4.6 won't complain about that, but earlier versions do: http://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=ce3765bf44e49ef0568a1ad4a0b7f807591d6412 gcc 4.6 with -pedantic-errors shows: /opt/xorg/include/X11/extensions/XInput2.h:172:13: error: redefinition of typedef ‘PointerBarrier’ [-pedantic] In file included from test.c:1:0: /opt/xorg/include/X11/extensions/Xfixes.h:255:13: note: previous declaration of ‘PointerBarrier’ was here Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Julien Cristau <jcris...@debian.org> diff --git a/configure.ac b/configure.ac index ab8a63c..c2897d2 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,8 @@ XORG_CHECK_MALLOC_ZERO # Obtain compiler/linker options for dependencies PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.4.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 2.2.99.1]) +# CFLAGS only for PointerBarrier typedef +PKG_CHECK_MODULES(XFIXES, [xfixes >= 5]) # Check for xmlto and asciidoc for man page conversion # (only needed by people building tarballs) diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h index a746012..33670eb 100644 --- a/include/X11/extensions/XInput2.h +++ b/include/X11/extensions/XInput2.h @@ -30,6 +30,7 @@ #include <X11/Xlib.h> #include <X11/extensions/XI2.h> #include <X11/extensions/Xge.h> +#include <X11/extensions/Xfixes.h> /* PointerBarrier */ /******************************************************************* * @@ -169,7 +170,6 @@ typedef struct int status; } XIGrabModifiers; -typedef XID PointerBarrier; typedef unsigned int BarrierEventID; typedef struct diff --git a/src/Makefile.am b/src/Makefile.am index ee40753..fbbca45 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -70,6 +70,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/include/X11/extensions AM_CFLAGS = $(XI_CFLAGS) \ + $(XFIXES_CFLAGS) \ $(MALLOC_ZERO_CFLAGS) \ $(CWARNFLAGS) diff --git a/xi.pc.in b/xi.pc.in index 3f05dd8..d97db20 100644 --- a/xi.pc.in +++ b/xi.pc.in @@ -7,6 +7,6 @@ Name: Xi Description: X Input Extension Library Version: @VERSION@ Requires: inputproto -Requires.private: x11 xext +Requires.private: x11 xext xfixes Cflags: -I${includedir} Libs: -L${libdir} -lXi commit 081e06492c0ffd003d4a0c34418c882332e58ac3 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Thu Mar 7 11:16:02 2013 +1000 libXi 1.7 Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/configure.ac b/configure.ac index 0396aaf..ab8a63c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXi], [1.6.99.1], +AC_INIT([libXi], [1.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([src/config.h]) commit 9b26b81477cf3486e5aa0ef8d81af68a0f04df1b Author: Colin Walters <walt...@verbum.org> Date: Wed Jan 4 17:37:06 2012 -0500 autogen.sh: Implement GNOME Build API http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson <a...@redhat.com> diff --git a/autogen.sh b/autogen.sh index 904cd67..fc34bd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +if test -z "$NOCONFIGURE"; then + $srcdir/configure "$@" +fi commit fb67e7c99b8e95fa667b90837d312a98fa0a8a64 Author: Adam Jackson <a...@redhat.com> Date: Tue Jan 15 14:28:48 2013 -0500 configure: Remove AM_MAINTAINER_MODE Signed-off-by: Adam Jackson <a...@redhat.com> diff --git a/configure.ac b/configure.ac index d2af70f..0396aaf 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,6 @@ AC_CONFIG_HEADERS([src/config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Initialize libtool AC_PROG_LIBTOOL commit 236be512c81b76dad711bec481e2139584006c4c Author: Benjamin Tissoires <benjamin.tissoi...@gmail.com> Date: Mon Jan 14 18:32:05 2013 +0100 Add missing XI_RawTouch* in XInputCopyCookie Looks like XI_RawTouch* events are missing in the big switch in this function. When running XIT tests for multitouch devices, several following errors appears: XInputCopyCookie: Failed to copy evtype 22 XInputCopyCookie: Failed to copy evtype 23 XInputCopyCookie: Failed to copy evtype 24 Signed-off-by: Benjamin Tissoires <benjamin.tissoi...@gmail.com> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/src/XExtInt.c b/src/XExtInt.c index 57d071d..507573b 100644 --- a/src/XExtInt.c +++ b/src/XExtInt.c @@ -1484,6 +1484,9 @@ XInputCopyCookie(Display *dpy, XGenericEventCookie *in, XGenericEventCookie *out case XI_RawButtonPress: case XI_RawButtonRelease: case XI_RawMotion: + case XI_RawTouchBegin: + case XI_RawTouchUpdate: + case XI_RawTouchEnd: ret = copyRawEvent(in, out); break; case XI_BarrierHit: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1uftft-0000lg...@vasks.debian.org