libxi: Changes to 'upstream-experimental'

2008-12-03 Thread Timo Aaltonen
 .gitignore|1 
 configure.ac  |4 
 man/Makefile.am   |   15 ++-
 man/XGetDeviceProperty.man|  191 ++
 man/XGrabDeviceKey.man|1 
 man/XListDeviceProperties.man |   95 
 man/XListInputDevices.man |5 -
 src/Makefile.am   |4 
 src/XChDProp.c|  106 +++
 src/XChgDCtl.c|   13 ++
 src/XDelDProp.c   |   64 ++
 src/XExtInt.c |   21 
 src/XGMotion.c|2 
 src/XGetDCtl.c|   12 +-
 src/XGetDProp.c   |  139 ++
 src/XGtSelect.c   |4 
 src/XListDProp.c  |   84 ++
 src/XStFocus.c|2 
 18 files changed, 749 insertions(+), 14 deletions(-)

New commits:
commit 2d586065649304b2864afddee6f6225a4a61a0c9
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Wed Dec 3 12:50:45 2008 +1000

libXi 1.2.0

Requires inputproto 1.5.0 or later.

diff --git a/configure.ac b/configure.ac
index b02c5e8..aded614 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
 
-AC_INIT(libXi, 1.1.99.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
+AC_INIT(libXi, 1.2.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
@@ -15,7 +15,7 @@ AC_PROG_CC
 AC_PROG_LIBTOOL
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XI, xproto x11 xextproto xext inputproto = 1.4)
+PKG_CHECK_MODULES(XI, xproto x11 xextproto xext inputproto = 1.5)
 AC_SUBST(XI_CFLAGS)
 AC_SUBST(XI_LIBS)
 

commit 305d356e43462834a2fdd2cf59d47b055c2416fd
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Mon Nov 17 11:50:06 2008 +1000

Add support for XI 1.5 device properties.

This is a manual merge from master onto libXi 1.1.4. The branches have
diverged too much to make cherry-picking reasonable and readable.

This patch includes the property support provided by the combination of the
following patches:
- 7d5bb99ffce3200f82420c5a5ebac3b445aac633
- 0211e3e8277c590349903989f1676f6af4baa44b
- bfd2e08f3530091fbcd8c078f684e9aab9057df0
- bec02767629ed795582ba3f645299d7036093511
- f9a5371d43b2c6023745f766d0e8ceff2acdff60
- e179b124aac13387c6f730197b8852c1f69eb9e3

Man pages are copied from the parsed docbook output from master.

diff --git a/man/Makefile.am b/man/Makefile.am
index 9efc88c..c8c7624 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -51,7 +51,9 @@ libman_PRE = \
XSetDeviceButtonMapping.man \
XSetDeviceFocus.man \
XSetDeviceMode.man \
-   XSetDeviceValuators.man
+   XSetDeviceValuators.man \
+   XListDeviceProperties.man \
+   XGetDeviceProperty.man
 
 BUILT_SOURCES = shadows.DONE
 
@@ -89,7 +91,8 @@ all_shadows =\
 $(XOpenDevice_shadows)   \
 $(XSetDeviceButtonMapping_shadows)   \
 $(XSetDeviceFocus_shadows)   \
-$(XSelectExtensionEvent_shadows)
+$(XSelectExtensionEvent_shadows) \
+$(XGetDeviceProperty_shadows)
 
 
 XGetDeviceControl_shadows = \
@@ -134,6 +137,10 @@ XSetDeviceFocus_shadows =   \
 XSelectExtensionEvent_shadows = \
 XGetSelectedExtensionEvents
 
+XGetDeviceProperty_shadows =\
+XDeleteDeviceProperty \
+XChangeDeviceProperty
+
 shadows.DONE:
-rm -f $(all_shadows:[EMAIL PROTECTED]@)
(for i in $(XGetDeviceControl_shadows:[EMAIL PROTECTED]@) ; do \
@@ -178,3 +185,6 @@ shadows.DONE:
(for i in $(XSelectExtensionEvent_shadows:[EMAIL PROTECTED]@) ; do \
 echo .so 
man$(LIB_MAN_DIR_SUFFIX)/XSelectExtensionEvent.$(LIB_MAN_SUFFIX)  $$i; \
 done)
+   (for i in $(XGetDeviceProperty_shadows:[EMAIL PROTECTED]@) ; do \
+echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetDeviceProperty.$(LIB_MAN_SUFFIX) 
 $$i; \
+done)
diff --git a/man/XGetDeviceProperty.man b/man/XGetDeviceProperty.man
new file mode 100644
index 000..6944457
--- /dev/null
+++ b/man/XGetDeviceProperty.man
@@ -0,0 +1,191 @@
+.\ Title: XGetDeviceProperty
+.\Author: Peter Hutterer
+.\ Generator: DocBook XSL Stylesheets v1.73.2 http://docbook.sf.net/
+.\  Date: pubdateJuly 9, 2008/pubdate
+.\Manual: XINPUT FUNCTIONS
+.\Source: __xorgversion__
+.\
+.TH XGETDEVICEPROPERTY __libmansuffix__ pubdateJuly 9, 2008/pubdate 
__xorgversion__ XINPUT FUNCTIONS
+.\ disable hyphenation
+.nh
+.\ disable justification (adjust text to left margin only)
+.ad l
+.SH NAME
+XGetDeviceProperty, XChangeDeviceProperty, XDeleteDeviceProperty - Get, change 
or delete a device's property.
+.SH SYNTAX
+.sp
+.ft B
+.nf
+#include 

libxi: Changes to 'debian-experimental'

2008-12-03 Thread Timo Aaltonen
 .gitignore   |1 
 ChangeLog|  104 
 INSTALL  |  236 
 Makefile.in  |  668 -
 aclocal.m4   | 7884 --
 config.guess | 1500 --
 config.sub   | 1608 --
 configure|20985 ---
 configure.ac |4 
 debian/changelog |   54 
 debian/control   |   27 
 debian/copyright |3 
 debian/rules |   24 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 
 debian/xsfbs/xsfbs.mk|  168 
 debian/xsfbs/xsfbs.sh|  396 
 depcomp  |  530 
 install-sh   |  323 
 ltmain.sh| 6871 
 man/Makefile.am  |   15 
 man/Makefile.in  |  544 -
 man/XGetDeviceProperty.man   |  191 
 man/XGrabDeviceKey.man   |1 
 man/XListDeviceProperties.man|   95 
 man/XListInputDevices.man|5 
 missing  |  360 
 mkinstalldirs|  158 
 src/Makefile.am  |4 
 src/Makefile.in  |  587 -
 src/XChDProp.c   |  106 
 src/XChgDCtl.c   |   13 
 src/XDelDProp.c  |   64 
 src/XExtInt.c|   21 
 src/XGMotion.c   |2 
 src/XGetDCtl.c   |   12 
 src/XGetDProp.c  |  139 
 src/XGtSelect.c  |4 
 src/XListDProp.c |   84 
 src/XStFocus.c   |2 
 src/config.h.in  |9 
 40 files changed, 1215 insertions(+), 42737 deletions(-)

New commits:
commit bf1a000c4ba7ff907b5b0fe7ec55fcfa75aebebc
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed Dec 3 10:10:37 2008 +0200

Bump x11proto-input-dev build-dep to 1.5.

diff --git a/debian/changelog b/debian/changelog
index b793af0..1272ec1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libxi (2:1.2.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/control:
+- Bump x11proto-input-dev build-dep to 1.5.
+
+ -- Timo Aaltonen [EMAIL PROTECTED]  Wed, 03 Dec 2008 10:09:00 +0200
+
 libxi (2:1.1.4-2) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index bda63f4..c4a14bb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (= 5.0.0),
  libx11-dev (= 1:0.99.2),
  libxext-dev (= 1:0.99.1),
- x11proto-input-dev (= 1.4),
+ x11proto-input-dev (= 1.5),
  pkg-config,
  quilt,
  xutils-dev,

commit 2d586065649304b2864afddee6f6225a4a61a0c9
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Wed Dec 3 12:50:45 2008 +1000

libXi 1.2.0

Requires inputproto 1.5.0 or later.

diff --git a/configure.ac b/configure.ac
index b02c5e8..aded614 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
 
-AC_INIT(libXi, 1.1.99.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
+AC_INIT(libXi, 1.2.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
@@ -15,7 +15,7 @@ AC_PROG_CC
 AC_PROG_LIBTOOL
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XI, xproto x11 xextproto xext inputproto = 1.4)
+PKG_CHECK_MODULES(XI, xproto x11 xextproto xext inputproto = 1.5)
 AC_SUBST(XI_CFLAGS)
 AC_SUBST(XI_LIBS)
 

commit 1b8337e4e0d702341fb45338740c0da216aa766b
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Nov 17 03:38:33 2008 +0100

run autoreconf at build time, and allow parallel builds

Build-depend on automake and libtool, run autoreconf on build,
and allow parallel builds using DEB_BUILD_OPTIONS='parallel=N'

diff --git a/debian/changelog b/debian/changelog
index f82e332..b793af0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ libxi (2:1.1.4-2) UNRELEASED; urgency=low
   * Drop the XS- prefix from Vcs-* control fields.
   * libxi6{,-dbg} don't need to depend on x11-common.
   * Wrap build-deps in debian/control.
+  * Build-depend on automake and libtool, run autoreconf on build, and allow
+parallel builds.
 
   [ Brice Goglin ]
   * Add a link to www.X.org in the long description.
diff --git a/debian/control b/debian/control
index 148d6c9..bda63f4 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,9 @@ Build-Depends:
  x11proto-input-dev (= 1.4),
  pkg-config,
  quilt,
- xutils-dev
+ xutils-dev,
+ automake,
+ libtool
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxi
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxi.git
diff --git a/debian/rules b/debian/rules
index 7e38d55..b65f619 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,13 +13,14 @@ 

x11proto-dri2: Changes to 'debian-unstable'

2008-12-03 Thread Timo Aaltonen
 Makefile.am  |2 
 configure.ac |2 
 debian/changelog |6 
 dri2proto.h  |   84 +
 dri2proto.txt|  493 +++
 dri2tokens.h |   48 +
 6 files changed, 602 insertions(+), 33 deletions(-)

New commits:
commit 6889fcb79fac23920d35dfd53dc779d26f2f14a9
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed Dec 3 11:05:38 2008 +0200

Update the changelog.

diff --git a/debian/changelog b/debian/changelog
index 5f23650..4de562e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-dri2 (1.99.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen [EMAIL PROTECTED]  Wed, 03 Dec 2008 11:04:41 +0200
+
 x11proto-dri2 (1.1-1) unstable; urgency=low
 
   * Initial release.

commit 65c7097d549ada25d11738b15996b18c9e57a847
Author: Kristian Høgsberg [EMAIL PROTECTED]
Date:   Mon Dec 1 20:57:40 2008 -0500

Bump to 1.99.3 and back out the value bitmask from the CopyRegion request.

diff --git a/configure.ac b/configure.ac
index 0a04a0d..e68ec63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([DRI2Proto], [1.99.2], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [1.99.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION
diff --git a/dri2proto.h b/dri2proto.h
index 827b358..dc3f2d1 100644
--- a/dri2proto.h
+++ b/dri2proto.h
@@ -173,21 +173,20 @@ typedef struct {
 CARD32  region B32;
 CARD32  dest B32;
 CARD32  src B32;
-CARD32  bitmask B32;
 } xDRI2CopyRegionReq;
-#define sz_xDRI2CopyRegionReq   24
+#define sz_xDRI2CopyRegionReq   20
 
 typedef struct {
 BYTEtype;   /* X_Reply */
 BYTEpad1;
 CARD16  sequenceNumber B16;
 CARD32  length B32;
-CARD32  bitmask B32;
 CARD32  pad2 B32;
 CARD32  pad3 B32;
 CARD32  pad4 B32;
 CARD32  pad5 B32;
 CARD32  pad6 B32;
+CARD32  pad7 B32;
 } xDRI2CopyRegionReply;
 #define sz_xDRI2CopyRegionReply32
 
diff --git a/dri2proto.txt b/dri2proto.txt
index e8db139..106f8d8 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -269,22 +269,16 @@ The name of this extension is DRI2.
region: REGION
source: DRI2ATTACHMENT
destination: DRI2ATTACHMENT
-   value-mask: CARD32
-   value-list: LISTofVALUE
   ▶
-   value-mask: CARD32
-   value-list: LISTofVALUE
 └───
Errors: Window, Value
 
Schedule a copy from one DRI2 buffer to another.
 
-   The value-mask and value-list specify optional attributes of
-   the copy operation.  This initial revision of the DRI2
-   protocol doesn't specify any optional attributes, but it is
-   anticipated that buffer flips and various types of vertical
-   retrace synchronization will require extra arguments to be
-   provided and returned.
+   The DRICopyRegion request has a reply but it is empty.  The
+   reply is there to let the direct rendering client wait until
+   the server has seen the request before proceeding with
+   rendering the next frame.
 
 
 ⚙ ⚙ ⚙  ⚙ ⚙ ⚙
@@ -309,6 +303,9 @@ The DRI2 extension has undergone a number of revisions 
before
support different driver types and to send the
authentication group.
 
+   1.99.3: Drop the bitmask argument intended to indicate
+   presence of optional arguments for CopyRegion.
+
2.0: Awesomeness!
 
 Compatibility up to 2.0 is not preserved, but was also never released.
@@ -469,26 +466,14 @@ A.2 Protocol Requests
4   REGION  region
4   DRI2ATTACHMENT  source
4   DRI2ATTACHMENT  destination
-   4   BITMASK value-mask (has n bits set to 1)
-   no bits specified, must be 0
   ▶
1   1   Reply
 1  unused
2   CARD16  sequence number
4   0   reply length
-   4   BITMASK value-mask (has n bits set to 1)
-   no bits specified, must be 0
-   20  unused  
+   24  unused  
 └───
 
-   With BITMASK and LISTofVALUE defined as in the X11 protocol
-   encoding document.  Specifically, the most significant bit of
-   value-mask is reserved to allow for chained bitmasks.  The
-   sizes of the individual values depend on the values, but is
-   known.  In case of differing DRI2 versions on client and
-   server, either side must not send values the other side does
-   not know about.
-
 
 A.3 Protocol Events
 

commit f7b737bef90df4430ac491d65accc7742bc6ca38
Author: Kristian Høgsberg [EMAIL PROTECTED]
Date:   Mon Dec 1 14:01:42 

x11proto-dri2: Changes to 'upstream-unstable'

2008-12-03 Thread Timo Aaltonen
 Makefile.am   |2 
 configure.ac  |2 
 dri2proto.h   |   84 ++---
 dri2proto.txt |  493 ++
 dri2tokens.h  |   48 +
 5 files changed, 596 insertions(+), 33 deletions(-)

New commits:
commit 65c7097d549ada25d11738b15996b18c9e57a847
Author: Kristian Høgsberg [EMAIL PROTECTED]
Date:   Mon Dec 1 20:57:40 2008 -0500

Bump to 1.99.3 and back out the value bitmask from the CopyRegion request.

diff --git a/configure.ac b/configure.ac
index 0a04a0d..e68ec63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([DRI2Proto], [1.99.2], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [1.99.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION
diff --git a/dri2proto.h b/dri2proto.h
index 827b358..dc3f2d1 100644
--- a/dri2proto.h
+++ b/dri2proto.h
@@ -173,21 +173,20 @@ typedef struct {
 CARD32  region B32;
 CARD32  dest B32;
 CARD32  src B32;
-CARD32  bitmask B32;
 } xDRI2CopyRegionReq;
-#define sz_xDRI2CopyRegionReq   24
+#define sz_xDRI2CopyRegionReq   20
 
 typedef struct {
 BYTEtype;   /* X_Reply */
 BYTEpad1;
 CARD16  sequenceNumber B16;
 CARD32  length B32;
-CARD32  bitmask B32;
 CARD32  pad2 B32;
 CARD32  pad3 B32;
 CARD32  pad4 B32;
 CARD32  pad5 B32;
 CARD32  pad6 B32;
+CARD32  pad7 B32;
 } xDRI2CopyRegionReply;
 #define sz_xDRI2CopyRegionReply32
 
diff --git a/dri2proto.txt b/dri2proto.txt
index e8db139..106f8d8 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -269,22 +269,16 @@ The name of this extension is DRI2.
region: REGION
source: DRI2ATTACHMENT
destination: DRI2ATTACHMENT
-   value-mask: CARD32
-   value-list: LISTofVALUE
   ▶
-   value-mask: CARD32
-   value-list: LISTofVALUE
 └───
Errors: Window, Value
 
Schedule a copy from one DRI2 buffer to another.
 
-   The value-mask and value-list specify optional attributes of
-   the copy operation.  This initial revision of the DRI2
-   protocol doesn't specify any optional attributes, but it is
-   anticipated that buffer flips and various types of vertical
-   retrace synchronization will require extra arguments to be
-   provided and returned.
+   The DRICopyRegion request has a reply but it is empty.  The
+   reply is there to let the direct rendering client wait until
+   the server has seen the request before proceeding with
+   rendering the next frame.
 
 
 ⚙ ⚙ ⚙  ⚙ ⚙ ⚙
@@ -309,6 +303,9 @@ The DRI2 extension has undergone a number of revisions 
before
support different driver types and to send the
authentication group.
 
+   1.99.3: Drop the bitmask argument intended to indicate
+   presence of optional arguments for CopyRegion.
+
2.0: Awesomeness!
 
 Compatibility up to 2.0 is not preserved, but was also never released.
@@ -469,26 +466,14 @@ A.2 Protocol Requests
4   REGION  region
4   DRI2ATTACHMENT  source
4   DRI2ATTACHMENT  destination
-   4   BITMASK value-mask (has n bits set to 1)
-   no bits specified, must be 0
   ▶
1   1   Reply
 1  unused
2   CARD16  sequence number
4   0   reply length
-   4   BITMASK value-mask (has n bits set to 1)
-   no bits specified, must be 0
-   20  unused  
+   24  unused  
 └───
 
-   With BITMASK and LISTofVALUE defined as in the X11 protocol
-   encoding document.  Specifically, the most significant bit of
-   value-mask is reserved to allow for chained bitmasks.  The
-   sizes of the individual values depend on the values, but is
-   known.  In case of differing DRI2 versions on client and
-   server, either side must not send values the other side does
-   not know about.
-
 
 A.3 Protocol Events
 

commit f7b737bef90df4430ac491d65accc7742bc6ca38
Author: Kristian Høgsberg [EMAIL PROTECTED]
Date:   Mon Dec 1 14:01:42 2008 -0500

Bump version to 1.99.2.

diff --git a/configure.ac b/configure.ac
index 833686b..0a04a0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([DRI2Proto], [1.99.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [1.99.2], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION

commit 8cab3f0e6f551220bd11074779f4ccec1e948e00
Author: Kristian Høgsberg [EMAIL PROTECTED]
Date:   Tue Oct 14 23:19:15 2008 

x11proto-randr: Changes to 'upstream-experimental'

2008-12-03 Thread Timo Aaltonen
 Makefile.am|   10 ++
 configure.ac   |2 
 randr.h|   15 +++
 randrproto.h   |   82 -
 randrproto.txt |  218 ++---
 5 files changed, 296 insertions(+), 31 deletions(-)

New commits:
commit 10bff0be50cf5cf314960bb85c472f1c63d37755
Author: Keith Packard [EMAIL PROTECTED]
Date:   Wed Nov 26 09:24:36 2008 -0800

Update to version 1.2.99.1

diff --git a/configure.ac b/configure.ac
index 7a3c61c..d4aeffb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT([RandrProto], [1.2.2], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RandrProto], [1.2.99.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION

commit 8793429f3d9d7cdf16be118ce05a68af6531568e
Author: Keith Packard [EMAIL PROTECTED]
Date:   Mon Nov 24 16:01:55 2008 -0800

Describe projective transform additions in Introduction

Signed-off-by: Keith Packard [EMAIL PROTECTED]

diff --git a/randrproto.txt b/randrproto.txt
index eac79c7..b77753a 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -113,10 +113,14 @@ resolution screen on the first.
 1.3 Introduction to version 1.3 of the extension
 
 Version 1.3 builds on the changes made with version 1.2 and adds some new
-capabilities without fundmentally changing the extension again. This version
-adds 'panning regions' and projective transforms, plus defines some standard
-output properties to help clients describe the systme more accurately.
-
+capabilities without fundmentally changing the extension again. The
+following features are added in this version:
+
+   • Projective Transforms. The implementation work for general rotation
+ support made it trivial to add full projective transformations. These
+ can be used to scale the screen up/down as well as perform projector
+ keystone correct or other effects.
+ 
 1.1 Acknowledgements
 
 Our thanks to the contributors to the design found on the xpert mailing

commit c998b4658d735e5b2d7aa6983d732d40cc802823
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Mon Nov 24 16:29:58 2008 -0500

GSRC added in 1.3, not 1.2

diff --git a/randrproto.txt b/randrproto.txt
index fa3b1e2..b3bd8b2 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -1718,7 +1718,7 @@ A.2.1 Protocol Requests added with version 1.2
p   unused, p=pad(6n)
 └───
 
-A.2.2 Protocol Requests added with version 1.2
+A.2.2 Protocol Requests added with version 1.3
 
 ┌───
 RRGetScreenResourcesCurrent

commit 0d334c880396b9ef67ed899ad228cc693aad6a28
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Mon Nov 24 16:19:43 2008 -0500

Fix RRNumberRequests

diff --git a/randr.h b/randr.h
index c7794fc..74a780c 100644
--- a/randr.h
+++ b/randr.h
@@ -44,7 +44,7 @@ typedef unsigned long XRandrModeFlags;
 
 #define RRNumberErrors 3
 #define RRNumberEvents 2
-#define RRNumberRequests   25
+#define RRNumberRequests   26
 
 #define X_RRQueryVersion   0
 /* we skip 1 to make old clients fail pretty immediately */

commit 2c0635eed5ae418ca278d99e044f583d54273097
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Mon Nov 24 15:54:09 2008 -0500

Add GetScreenResourcesCurrent

diff --git a/randr.h b/randr.h
index 17e6ef9..c7794fc 100644
--- a/randr.h
+++ b/randr.h
@@ -2,6 +2,7 @@
  * Copyright © 2000 Compaq Computer Corporation
  * Copyright © 2002 Hewlett Packard Company
  * Copyright © 2006 Intel Corporation
+ * Copyright © 2008 Red Hat, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -77,6 +78,9 @@ typedef unsigned long XRandrModeFlags;
 #define X_RRGetCrtcGamma   23
 #define X_RRSetCrtcGamma   24
 
+/* V1.3 additions */
+#define X_RRGetScreenResourcesCurrent  25
+
 /* Event selection bits */
 #define RRScreenChangeNotifyMask  (1L  0)
 /* V1.2 additions */
diff --git a/randrproto.h b/randrproto.h
index 3fb2e45..6d3303a 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -2,6 +2,7 @@
  * Copyright © 2000 Compaq Computer Corporation
  * Copyright © 2002 Hewlett-Packard Company
  * Copyright © 2006 Intel Corporation
+ * Copyright © 2008 Red Hat, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -562,6 +563,34 @@ typedef struct {
 #define sz_xRRSetCrtcGammaReq  12
 
 /*
+ * Additions for V1.3
+ */
+
+typedef struct {
+CARD8   reqType;
+CARD8   randrReqType;
+CARD16  length B16;
+Window  window B32;
+} xRRGetScreenResourcesCurrentReq;
+#define sz_xRRGetScreenResourcesCurrentReq 8
+
+typedef struct {
+BYTE   type;
+CARD8  pad;
+CARD16 

x11proto-randr: Changes to 'debian-experimental'

2008-12-03 Thread Timo Aaltonen
 ChangeLog|   36 
 Makefile.am  |   10 
 Makefile.in  |  514 --
 aclocal.m4   |  585 ---
 configure| 3157 ---
 configure.ac |2 
 debian/changelog |   29 
 debian/compat|2 
 debian/control   |   18 
 debian/copyright |3 
 debian/rules |   22 
 debian/xsfbs/xsfbs-autoreconf.mk |2 
 debian/xsfbs/xsfbs.mk|   28 
 debian/xsfbs/xsfbs.sh|2 
 install-sh   |  323 ---
 missing  |  360 
 mkinstalldirs|  158 -
 randr.h  |   15 
 randrproto.h |   82 -
 randrproto.txt   |  218 ++
 20 files changed, 421 insertions(+), 5145 deletions(-)

New commits:
commit 333c9ddc6e4b4c667adb242f60521c6a8f4ddf65
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed Dec 3 12:03:29 2008 +0200

Run autoreconf on build.

update the changelog and remove generated files.

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 8570eb5..000
--- a/Makefile.in
+++ /dev/null
@@ -1,546 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
[EMAIL PROTECTED]@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = .
-DIST_COMMON = $(am__configure_deps) $(randr_HEADERS) \
-   $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-   $(srcdir)/randrproto.pc.in $(top_srcdir)/configure COPYING \
-   ChangeLog install-sh missing mkinstalldirs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-   $(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = randrproto.pc
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo $(srcdir) | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-$(srcdir)/*) f=`echo $$p | sed s|^$$srcdirstrip/||`;; \
-*) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = $(DESTDIR)$(pkgconfigdir) \
-   $(DESTDIR)$(randrdocdir) $(DESTDIR)$(randrdir)
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-randrdocDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pkgconfig_DATA) $(randrdoc_DATA)
-randrHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(randr_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-|| { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-  rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@

Processed: reassign 507626 to xserver-xorg-video-mach64

2008-12-03 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

 reassign 507626 xserver-xorg-video-mach64
Bug#507626: unknown event or program causes xorg to lock up and flash 
herringbone pattern
Bug reassigned from package `xorg' to `xserver-xorg-video-mach64'.


End of message, stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



reassign 507626 to xserver-xorg-video-mach64

2008-12-03 Thread Julien Cristau
reassign 507626 xserver-xorg-video-mach64 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



mesa: Changes to 'ubuntu'

2008-12-03 Thread Timo Aaltonen
 debian/changelog   |8 +
 debian/patches/103_fix-crash-in-i830_emit_state.dpatch |   23 +
 debian/patches/series  |1 
 3 files changed, 32 insertions(+)

New commits:
commit 998b8d31768efa907000d072660c82fd3d7059fa
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Fri Nov 28 16:01:10 2008 +0200

Add a missing commit

debian/patches/103_fix-crash-in-i830_emit_state.dpatch:
- Apply upstream commit to fix a crash in i830_emit_state
  (LP: #277709)

diff --git a/debian/changelog b/debian/changelog
index a78d662..b367052 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (7.2-1ubuntu2) intrepid; urgency=low
+
+  * debian/patches/103_fix-crash-in-i830_emit_state.dpatch:
+- Apply upstream commit to fix a crash in i830_emit_state
+  (LP: #277709)
+
+ -- Chris Coulson [EMAIL PROTECTED]  Tue, 21 Oct 2008 17:55:10 +0100
+
 mesa (7.2-1ubuntu1) intrepid; urgency=low
 
   * Merge from Debian experimental.
diff --git a/debian/patches/103_fix-crash-in-i830_emit_state.dpatch 
b/debian/patches/103_fix-crash-in-i830_emit_state.dpatch
new file mode 100644
index 000..736cdf0
--- /dev/null
+++ b/debian/patches/103_fix-crash-in-i830_emit_state.dpatch
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 103_fix-crash-in-i830_emit_state.dpatch by Chris Coulson [EMAIL PROTECTED]
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch fixes a crash in i830_emit_state. 
+## DP: Upstream commit - 48c29b60a899877c76d643b9cd06d5277cd97b9c
+## DP: Upstream bug report - https://bugs.freedesktop.org/show_bug.cgi?id=17766
+## DP: Ubuntu bug report - 
https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/277709
+
[EMAIL PROTECTED]@
+diff -urNad mesa-7.2~/src/mesa/drivers/dri/i915/i830_vtbl.c 
mesa-7.2/src/mesa/drivers/dri/i915/i830_vtbl.c
+--- mesa-7.2~/src/mesa/drivers/dri/i915/i830_vtbl.c2008-08-25 
15:49:40.0 +0100
 mesa-7.2/src/mesa/drivers/dri/i915/i830_vtbl.c 2008-10-21 
17:43:44.0 +0100
+@@ -444,7 +444,8 @@
+ret = 0;
+if (dirty  I830_UPLOAD_BUFFERS) {
+  ret |= dri_bufmgr_check_aperture_space(state-draw_region-buffer);
+- ret |= dri_bufmgr_check_aperture_space(state-depth_region-buffer);
++ if (state-depth_region)
++  ret |= dri_bufmgr_check_aperture_space(state-depth_region-buffer);
+}
+
+for (i = 0; i  I830_TEX_UNITS; i++)
diff --git a/debian/patches/series b/debian/patches/series
index 617197e..a4f71e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 04_osmesa_version.diff
 101_ubuntu_hidden_glname.patch
 102_dont_vblank.patch
+103_fix-crash-in-i830_emit_state.dpatch


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



x11proto-input: Changes to 'debian-experimental'

2008-12-03 Thread Timo Aaltonen
 Makefile.am  |1 
 XI.h |   68 --
 XInput.h | 1273 +++
 XIproto.h|  481 
 configure.ac |2 
 debian/changelog |4 
 6 files changed, 1300 insertions(+), 529 deletions(-)

New commits:
commit b302fa2a312ec0f8a938d84a6c6c6a50e6c7695f
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed Dec 3 17:15:30 2008 +0200

Update the changelog

go back to 1.5.

diff --git a/debian/changelog b/debian/changelog
index 74b5d60..a239675 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-input (1.9.99.4-1) UNRELEASED; urgency=low
+x11proto-input (1.5.0-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
@@ -8,7 +8,7 @@ x11proto-input (1.9.99.4-1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * debian/rules: allow parallel builds.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Fri, 15 Aug 2008 15:27:35 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED]  Wed, 03 Dec 2008 17:15:02 +0200
 
 x11proto-input (1.4.3-2) unstable; urgency=low
 

commit d38e79ca3ddd6031ca4a335eb2faf99294a6731f
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Wed Nov 26 21:37:06 2008 +1000

inputproto 1.5.0

diff --git a/configure.ac b/configure.ac
index b343465..56b9bc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4.4], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.5.0], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION

commit 5829370cafb112e488156e7ac1dd7902cfd1659a
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Mon Nov 17 10:58:31 2008 +1000

Remove Configure/QueryDeviceProperty.
(cherry picked from commit 18ef04f8a2026cca5d2d2b796ec2ea1c949bad36)

Removing Configure/QueryDevice property from XInput.h as well.
Not cherry-picked as XInput.h is moved to libXi in master.

Conflicts:

XIproto.h

diff --git a/XI.h b/XI.h
index 878ba0f..7c8c111 100644
--- a/XI.h
+++ b/XI.h
@@ -108,9 +108,6 @@ SOFTWARE.
 #define sz_xChangeDeviceControlReply   32
 #define sz_xListDevicePropertiesReq 8
 #define sz_xListDevicePropertiesReply   32
-#define sz_xQueryDevicePropertyReq  12
-#define sz_xQueryDevicePropertyReply32
-#define sz_xConfigureDevicePropertyReq  12
 #define sz_xChangeDevicePropertyReq 20
 #define sz_xDeleteDevicePropertyReq 12
 #define sz_xGetDevicePropertyReq24
diff --git a/XInput.h b/XInput.h
index 34fbb33..702706d 100644
--- a/XInput.h
+++ b/XInput.h
@@ -1244,23 +1244,6 @@ extern void XChangeDeviceProperty(
 int /* nelements */
 );
 
-extern XIPropertyInfo* XQueryDeviceProperty(
-Display*/* dpy */,
-XDevice*/* dev */,
-Atom/* property */
-);
-
-extern void
-XConfigureDeviceProperty(
-Display*/* dpy */,
-XDevice*/* dev */,
-Atom/* property */,
-Bool/* pending */,
-Bool/* range */,
-int /* num_values */,
-long*   /* values */
-);
-
 extern void
 XDeleteDeviceProperty(
 Display*/* dpy */,
@@ -1276,7 +1259,6 @@ XGetDeviceProperty(
  long   /* offset*/,
  long   /* length*/,
  Bool   /* delete*/,
- Bool   /* pending*/,
  Atom   /* req_type*/,
  Atom*  /* actual_type*/,
  int*   /* actual_format*/,
diff --git a/XIproto.h b/XIproto.h
index c84fe39..eef3ee8 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -159,11 +159,9 @@ struct tmask
 #define X_ChangeDeviceControl  35
 /* XI 1.5 */
 #define X_ListDeviceProperties  36
-#define X_QueryDeviceProperty   37
-#define X_ConfigureDeviceProperty   38
-#define X_ChangeDeviceProperty  39
-#define X_DeleteDeviceProperty  40
-#define X_GetDeviceProperty 41
+#define X_ChangeDeviceProperty  37
+#define X_DeleteDeviceProperty  38
+#define X_GetDeviceProperty 39
 
 /*
  *
@@ -1454,55 +1452,6 @@ typedef struct {
 
 /*
  *
- * QueryDeviceProperty.
- *
- */
-
-typedef struct {
-CARD8   reqType;/* input extension major opcode */
-CARD8   ReqType;/* always X_QueryDeviceProperty */
-CARD16  length B16;
-Atomproperty B32;
-CARD8   deviceid;
-CARD8   pad0;
-CARD16  pad1 B16;
-} xQueryDevicePropertyReq;
-
-typedef struct {
-CARD8   repType;/* X_Reply*/
-CARD8   RepType;/* always X_QueryDeviceProperty */
-CARD16  

x11proto-input: Changes to 'upstream-experimental'

2008-12-03 Thread Timo Aaltonen
 .gitignore   |1 
 ChangeLog|4 -
 Makefile.am  |   10 
 XI.h |   30 
 XInput.h |   73 +
 XIproto.h|  145 ---
 configure.ac |2 
 7 files changed, 246 insertions(+), 19 deletions(-)

New commits:
commit d38e79ca3ddd6031ca4a335eb2faf99294a6731f
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Wed Nov 26 21:37:06 2008 +1000

inputproto 1.5.0

diff --git a/configure.ac b/configure.ac
index b343465..56b9bc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4.4], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.5.0], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION

commit 5829370cafb112e488156e7ac1dd7902cfd1659a
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Mon Nov 17 10:58:31 2008 +1000

Remove Configure/QueryDeviceProperty.
(cherry picked from commit 18ef04f8a2026cca5d2d2b796ec2ea1c949bad36)

Removing Configure/QueryDevice property from XInput.h as well.
Not cherry-picked as XInput.h is moved to libXi in master.

Conflicts:

XIproto.h

diff --git a/XI.h b/XI.h
index 878ba0f..7c8c111 100644
--- a/XI.h
+++ b/XI.h
@@ -108,9 +108,6 @@ SOFTWARE.
 #define sz_xChangeDeviceControlReply   32
 #define sz_xListDevicePropertiesReq 8
 #define sz_xListDevicePropertiesReply   32
-#define sz_xQueryDevicePropertyReq  12
-#define sz_xQueryDevicePropertyReply32
-#define sz_xConfigureDevicePropertyReq  12
 #define sz_xChangeDevicePropertyReq 20
 #define sz_xDeleteDevicePropertyReq 12
 #define sz_xGetDevicePropertyReq24
diff --git a/XInput.h b/XInput.h
index 34fbb33..702706d 100644
--- a/XInput.h
+++ b/XInput.h
@@ -1244,23 +1244,6 @@ extern void XChangeDeviceProperty(
 int /* nelements */
 );
 
-extern XIPropertyInfo* XQueryDeviceProperty(
-Display*/* dpy */,
-XDevice*/* dev */,
-Atom/* property */
-);
-
-extern void
-XConfigureDeviceProperty(
-Display*/* dpy */,
-XDevice*/* dev */,
-Atom/* property */,
-Bool/* pending */,
-Bool/* range */,
-int /* num_values */,
-long*   /* values */
-);
-
 extern void
 XDeleteDeviceProperty(
 Display*/* dpy */,
@@ -1276,7 +1259,6 @@ XGetDeviceProperty(
  long   /* offset*/,
  long   /* length*/,
  Bool   /* delete*/,
- Bool   /* pending*/,
  Atom   /* req_type*/,
  Atom*  /* actual_type*/,
  int*   /* actual_format*/,
diff --git a/XIproto.h b/XIproto.h
index c84fe39..eef3ee8 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -159,11 +159,9 @@ struct tmask
 #define X_ChangeDeviceControl  35
 /* XI 1.5 */
 #define X_ListDeviceProperties  36
-#define X_QueryDeviceProperty   37
-#define X_ConfigureDeviceProperty   38
-#define X_ChangeDeviceProperty  39
-#define X_DeleteDeviceProperty  40
-#define X_GetDeviceProperty 41
+#define X_ChangeDeviceProperty  37
+#define X_DeleteDeviceProperty  38
+#define X_GetDeviceProperty 39
 
 /*
  *
@@ -1454,55 +1452,6 @@ typedef struct {
 
 /*
  *
- * QueryDeviceProperty.
- *
- */
-
-typedef struct {
-CARD8   reqType;/* input extension major opcode */
-CARD8   ReqType;/* always X_QueryDeviceProperty */
-CARD16  length B16;
-Atomproperty B32;
-CARD8   deviceid;
-CARD8   pad0;
-CARD16  pad1 B16;
-} xQueryDevicePropertyReq;
-
-typedef struct {
-CARD8   repType;/* X_Reply*/
-CARD8   RepType;/* always X_QueryDeviceProperty */
-CARD16  sequenceNumber B16;
-CARD32  length B32;
-BOOLpending;
-BOOLrange;
-BOOLimmutable;
-BOOLfromClient; /* TRUE if allocated by client */
-CARD32  pad2 B32;
-CARD32  pad3 B32;
-CARD32  pad4 B32;
-CARD32  pad5 B32;
-CARD32  pad6 B32;
-} xQueryDevicePropertyReply;
-
-/*
- *
- * ConfigureDeviceProperty.
- *
- */
-
-typedef struct {
-CARD8   reqType;/* input extension major opcode */
-CARD8   ReqType;/* always X_ConfigureDeviceProperty */
-CARD16  length B16;
-Atomproperty B32;
-CARD8   deviceid;
-BOOLpending;
-BOOLrange;
-CARD8 

Processed: closing 505588

2008-12-03 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

 close 505588
Bug#505588: xserver-xorg-input-evdev: Middle click is send when changing from 
console to X
'close' is deprecated; see http://www.debian.org/Bugs/Developer#closing.
Bug closed, send any further explanations to Robert Grimm [EMAIL PROTECTED]


End of message, stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#507683: mutouch: y-axis is inverted with mutouch 1.2.0 running on debian

2008-12-03 Thread Matthias Endres
Package: xserver-xorg-input-mutouch
Version: 1:1.2.0-2
Severity: important
File: mutouch

I installed mutouch-driver on lenny successfull, but the Y-axis is 
inverted; so if i touched on the top of the screen the coursor appear
on the bottom of the screen. Try to configure SwapY in xorg.conf
without success. I found i bugfix here 
http://archive.netbsd.se/?ml=xorg-teama=2008-09m=8617359
quote:
It's line 746 in xf86MuTouch.c I changed from

cur_y = WORD_ASSEMBLY(start_ptr[3], start_ptr[4]);

to

cur_y = (priv-max_y + priv-min_y) - WORD_ASSEMBLY(start_ptr[3],
start_ptr[4]);

end quote.




-- Package-specific info:
Contents of /var/lib/x11/X.roster:
xserver-xorg

/var/lib/x11/X.md5sum does not exist.

X server symlink status:
lrwxrwxrwx 1 root root 13 21. Okt 17:14 /etc/X11/X - /usr/bin/Xorg
-rwxr-xr-x 1 root root 1901104 15. Nov 20:08 /usr/bin/Xorg

Contents of /var/lib/x11/xorg.conf.roster:
xserver-xorg

VGA-compatible devices on PCI bus:
0d:0c.0 VGA compatible controller: ATI Technologies Inc ES1000 (rev 02)

/etc/X11/xorg.conf does not match checksum in /var/lib/x11/xorg.conf.md5sum.

Xorg X server configuration file status:
-rw-r--r-- 1 root root 1597  1. Nov 22:08 /etc/X11/xorg.conf

Contents of /etc/X11/xorg.conf:
# xorg.conf (X.Org X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database.
#
# Edit this file with caution, and see the xorg.conf manual page.
# (Type man xorg.conf at the shell prompt.)
#
# This file is automatically updated on xserver-xorg package upgrades *only*
# if it has not been modified since the last upgrade of the xserver-xorg
# package.
#
# If you have edited this file but would like it to be automatically updated
# again, run the following command:
#   sudo dpkg-reconfigure -phigh xserver-xorg

Section InputDevice
Identifier  Generic Keyboard
Driver  kbd
Option  XkbRules  xorg
Option  XkbModel  pc105
Option  XkbLayout de
Option  XkbVariantnodeadkeys
EndSection

Section InputDevice
Identifier  Configured Mouse
Driver  mouse
EndSection

Section InputDevice
Identifier touch
Driver mutouch
Option Device /dev/ttyS0
Option Type Finger
Option MinX 3148
Option MaxX 14153
Option MinY 3100 
Option MaxY 14620
Option HistorySize 256
Option SendCoreEvents 
Option SwapY 1
EndSection


Section Device
Identifier  Configured Video Device
EndSection

Section Monitor
Identifier  Configured Monitor
EndSection

Section Screen
Identifier  Default Screen
Monitor Configured Monitor
EndSection 

Section ServerLayout
Identifier  Dafault Layout
Screen  Default Screen
InputDevice Generic Keyboard
InputDevice Configured Mouse
InputDevice touch SendCoreEvents
EndSection


Xorg X server log files on system:
-rw-r--r-- 1 root root 50924 29. Okt 10:29 /var/log/Xorg.20.log
-rw-r--r-- 1 root root 50471  3. Dez 16:19 /var/log/Xorg.0.log

Contents of most recent Xorg X server log file
/var/log/Xorg.0.log:

X.Org X Server 1.4.2
Release Date: 11 June 2008
X Protocol Version 11, Revision 0
Build Operating System: Linux Debian (xorg-server 2:1.4.2-7)
Current Operating System: Linux zorg 2.6.26-1-amd64 #1 SMP Thu Oct 9 14:16:53 
UTC 2008 x86_64
Build Date: 30 September 2008  03:57:43PM
 
Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
Module Loader present
Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
(==) Log file: /var/log/Xorg.0.log, Time: Mon Nov 17 11:29:33 2008
(==) Using config file: /etc/X11/xorg.conf
(==) ServerLayout Dafault Layout
(**) |--Screen Default Screen (0)
(**) |   |--Monitor Configured Monitor
(==) No device specified for screen Default Screen.
Using the first device section listed.
(**) |   |--Device Configured Video Device
(**) |--Input Device Generic Keyboard
(**) |--Input Device Configured Mouse
(**) |--Input Device touch
(==) Automatically adding devices
(==) Automatically enabling devices
(==) No FontPath specified.  Using compiled-in default.
(WW) The directory /usr/share/fonts/X11/cyrillic does not exist.
Entry deleted from font path.
(WW) The directory /usr/share/fonts/X11/100dpi/ does not exist.
Entry deleted from font path.
(WW) The directory /usr/share/fonts/X11/75dpi/ does not exist.
Entry deleted from font path.
(WW) The directory /usr/share/fonts/X11/100dpi does not exist.
Entry deleted from font path.
(WW) The directory /usr/share/fonts/X11/75dpi does not exist.
Entry deleted from font 

Bug#507683: mutouch: y-axis is inverted with mutouch 1.2.0 running on debian

2008-12-03 Thread Julien Cristau
On Wed, Dec  3, 2008 at 16:43:29 +0100, Matthias Endres wrote:

 I installed mutouch-driver on lenny successfull, but the Y-axis is 
 inverted; so if i touched on the top of the screen the coursor appear
 on the bottom of the screen. Try to configure SwapY in xorg.conf
 without success. I found i bugfix here 
 http://archive.netbsd.se/?ml=xorg-teama=2008-09m=8617359
 quote:
 It's line 746 in xf86MuTouch.c I changed from
 
 cur_y = WORD_ASSEMBLY(start_ptr[3], start_ptr[4]);
 
 to
 
 cur_y = (priv-max_y + priv-min_y) - WORD_ASSEMBLY(start_ptr[3],
 start_ptr[4]);
 
 end quote.

Thanks for your report.

 Section InputDevice
   Identifier touch
   Driver mutouch
   Option Device /dev/ttyS0
   Option Type Finger
   Option MinX 3148
   Option MaxX 14153
   Option MinY 3100 
   Option MaxY 14620
   Option HistorySize 256
   Option SendCoreEvents 
   Option SwapY 1
 EndSection
 
If you switch the values of MinY and MaxY in the above config file
section, do things work as expected?

Cheers,
Julien



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



libxi: Changes to 'debian-experimental'

2008-12-03 Thread Timo Aaltonen
 debian/changelog |4 +++-
 debian/rules |2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 9c1742d7ac84548b50d184d46e59f392b7ac4acf
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed Dec 3 19:21:54 2008 +0200

Bump the shlibs for libxi6.

diff --git a/debian/changelog b/debian/changelog
index 1272ec1..accfb98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ libxi (2:1.2.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * debian/control:
 - Bump x11proto-input-dev build-dep to 1.5.
+  * debian/rules:
+- Bump the shlibs for libxi6.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Wed, 03 Dec 2008 10:09:00 +0200
+ -- Timo Aaltonen [EMAIL PROTECTED]  Wed, 03 Dec 2008 19:21:26 +0200
 
 libxi (2:1.1.4-2) UNRELEASED; urgency=low
 
diff --git a/debian/rules b/debian/rules
index b65f619..493e832 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,7 +87,7 @@ binary-arch: build install
dh_strip --dbg-package=$(PACKAGE)-dbg
dh_compress
dh_fixperms
-   dh_makeshlibs
+   dh_makeshlibs -V'libxi6 (= 2:1.2.0)'
dh_shlibdeps
dh_installdeb
dh_gencontrol


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Processed: Re: Bug#486507: libx11-6: VMWare Server sees X responses out of order

2008-12-03 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

 tag 486507 moreinfo
Bug#486507: libx11-6: VMWare Server sees X responses out of order
There were no tags set.
Bug#493000: VMware Server 1.05 fails to start with version 2:1.1.4-2 of libx11-6
Tags added: moreinfo

 kthxbye
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#486507: libx11-6: VMWare Server sees X responses out of order

2008-12-03 Thread Julien Cristau
tag 486507 moreinfo
kthxbye

On Sat, Oct  4, 2008 at 13:25:17 -0700, Jamey Sharp wrote:

 The locking assertion failures and their associated backtraces should be
 looked into, but may be unrelated to the assertion failure that's
 actually causing VMWare Server to abort():
 
 vmware: ../../src/xcb_lock.c:77: _XGetXCBBuffer: assertion  `((int) 
 ((xcb_req) - (dpy-request)) = 0)' failed 
 
 First: Could somebody who has encountered this bug please get a stack
 trace from the actual assert?
 
 Does anybody know if VMWare Server is calling Xlib from multiple threads
 concurrently? A `thread apply all bt full` in GDB when the assertion
 triggers might be informative, especially with libx11-6-dbg installed.
 
 I suspect this problem would be fixed by the socket handoff work that
 Josh and I have been trying to finish for months. If you're willing to
 recompile XCB and Xlib yourself, you might try the v2 handoff patch set:
   http://lists.freedesktop.org/archives/xcb/2008-March/003392.html
 There are some known bugs in that version, but you're unlikely to
 encounter them until your app has been running for hours. Unfortunately
 the XCB patches don't apply to current upstream git, so you might need
 to apply them against commit 7a74ba3d0212f9bfe021d6da9070f71cbc53f85b.
 
It would be nice to get some feedback on this from the people who can
reproduce the issue.  This means either getting a backtrace from the
failing assert(), with debug packages for libxcb and libx11 installed,
or upgrading libx11-6 to the version in experimental, which uses the
work mentioned above.

Cheers,
Julien



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#505033: Error on every kdm log in

2008-12-03 Thread tuXXer
I'm getting the message on every KDM log in.

In kdm.log the full message looks like:
The XKEYBOARD keymap compiler (xkbcomp) reports:
 Warning:  Duplicate shape name 
   Using last definition
...
 Error:Section defined without a name
   Definition ignored
...
 Warning:  Multiple doodads named 
   Using first definition
...
Errors from xkbcomp are not fatal to the X server
(EE) Error compiling keymap (server-0)
(EE) XKB: Couldn't compile keymap

The messages in Xorg.0.log:
(II) evaluating device (Cherry eVolution STREAM)
(II) XINPUT: Adding extended input device Cherry eVolution STREAM (type: 
KEYBOARD)
(II) evaluating device (Logitech TrackMan Wheel)
(II) XINPUT: Adding extended input device Logitech TrackMan Wheel (type: 
MOUSE)
(II) Logitech TrackMan Wheel: ps2EnableDataReporting: succeeded
(EE) Error compiling keymap (server-0)
(EE) XKB: Couldn't compile keymap
(EE) Error compiling keymap (server-0)
(EE) XKB: Couldn't compile keymap
(EE) Error compiling keymap (server-0)
(EE) XKB: Couldn't compile keymap

According to 
http://www.nabble.com/xkbcomp-broken---(EE)-XKB:-Couldn%27t-compile-keymap-td19406704.html
 it seems to me that this is a problem with Null values used with strdump in 
xkbcomp, which where fixed upstream. Or am I complete wrong and it's something 
complete different?
-- 
Sensationsangebot verlängert: GMX FreeDSL - Telefonanschluss + DSL 
für nur 16,37 Euro/mtl.!* http://dsl.gmx.de/?ac=OM.AD.PD003K1308T4569a



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#486507: libx11-6: VMWare Server sees X responses out of order

2008-12-03 Thread David L. Anselmi

Julien Cristau wrote:

It would be nice to get some feedback on this from the people who can
reproduce the issue.  This means either getting a backtrace from the
failing assert(), with debug packages for libxcb and libx11 installed,
or upgrading libx11-6 to the version in experimental, which uses the
work mentioned above.


I think I can reproduce it.  I think I can install the debug packages 
for libxcb and libx11.


What are the steps to get the right backtrace?

Dave



--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]