ChangeLog | 71 ++++++++++++++++
autogen.sh | 4
configure.ac | 5 -
debian/changelog | 119 ++++------------------------
debian/control | 2
debian/patches/add-missing-xi_rawtouch.diff | 29 ------
debian/patches/series | 2
include/X11/extensions/XInput2.h | 2
src/Makefile.am | 1
src/XExtInt.c | 3
xi.pc.in | 2
11 files changed, 103 insertions(+), 137 deletions(-)
New commits:
commit 6d61acf42b73e3ce8a5b8ea2de64e70bbe5320a1
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu May 23 14:27:03 2013 +0300
release to saucy
diff --git a/debian/changelog b/debian/changelog
index fc9730f..8b03783 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxi (2:1.7.1-0ubuntu1) saucy; urgency=low
+
+ * Sync from unreleased debian git.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 23 May 2013 13:18:49 +0300
+
libxi (2:1.7.1-1) UNRELEASED; urgency=low
* New upstream release.
commit 517ac1a9130fa5a83ccbdc0605bf9fd91ec04612
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu May 23 13:18:28 2013 +0300
drop upstreamed patch
diff --git a/debian/changelog b/debian/changelog
index 2a6ba02..2b028c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,6 @@ libxi (2:1.7.1-1) UNRELEASED; urgency=low
* New upstream release.
* control: Bump policy to 3.9.4, no changes.
- * add-missing-xi_rawtouch.diff: Upstream commit to add XI_RawTouch in
- XInputCopyCookie.
* control: Bump x11proto-input-dev build-dep to 2.2.99.1.
* libxi6.symbols: Added new symbols.
* rules: Bump shlibs.
diff --git a/debian/patches/add-missing-xi_rawtouch.diff
b/debian/patches/add-missing-xi_rawtouch.diff
deleted file mode 100644
index 4ee049e..0000000
--- a/debian/patches/add-missing-xi_rawtouch.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-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:
diff --git a/debian/patches/series b/debian/patches/series
index 67f42a8..a82d1b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-add-missing-xi_rawtouch.diff
+#placeholder
commit a0e42ce397fc79d549f33cd95acea568112aff66
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu May 23 13:14:07 2013 +0300
fix the version
diff --git a/debian/changelog b/debian/changelog
index 52333eb..2a6ba02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxi (2:1.7.1.1-1) UNRELEASED; urgency=low
+libxi (2:1.7.1-1) UNRELEASED; urgency=low
* New upstream release.
* control: Bump policy to 3.9.4, no changes.
commit b01118776c622f478bee760127e41c87be8eb8c1
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu May 23 13:10:36 2013 +0300
control: Add libfixes-dev to build-deps and libxi-dev Depends.
diff --git a/debian/changelog b/debian/changelog
index a4659f6..52333eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libxi (2:1.7.1.1-1) UNRELEASED; urgency=low
* control: Bump x11proto-input-dev build-dep to 2.2.99.1.
* libxi6.symbols: Added new symbols.
* rules: Bump shlibs.
+ * control: Add libfixes-dev to build-deps and libxi-dev Depends.
-- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 06 Feb 2013 23:43:08 +0200
diff --git a/debian/control b/debian/control
index 6e7964f..3161890 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends:
x11proto-input-dev (>= 2.2.99.1),
libx11-dev (>= 2:1.4.99.1),
libxext-dev (>= 2:1.1.1-3),
+ libxfixes-dev (>= 5),
xmlto,
asciidoc (>= 8.4.5),
pkg-config,
@@ -86,6 +87,7 @@ Depends:
libxi6 (= ${binary:Version}),
libx11-dev,
libxext-dev,
+ libxfixes-dev,
x11proto-input-dev (>= 2.1.99.6),
xorg-sgml-doctools (>= 1:1.5),
Replaces:
commit f99893ef9882fad6a41bda08cf6fecc7a265c8b5
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu May 23 13:08:41 2013 +0300
update the changelogs
diff --git a/ChangeLog b/ChangeLog
index 40f5556..4e2a391 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,74 @@
+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>
+
+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>
+
+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>
+
+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>
+
+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>
+
+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>
+
commit db3b9ba3404f6d128e7826aa489a34fd206b20ea
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Wed Dec 26 15:29:43 2012 +1000
diff --git a/debian/changelog b/debian/changelog
index d2cbec0..a4659f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxi (2:1.6.99.1-1) UNRELEASED; urgency=low
+libxi (2:1.7.1.1-1) UNRELEASED; urgency=low
* New upstream release.
* control: Bump policy to 3.9.4, no changes.
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-0000lo...@vasks.debian.org
