x11proto-dri2: Changes to 'debian-unstable'
ChangeLog | 114 +++++++++++++++++++++++++++++++++++++++
Makefile.am | 3 -
configure.ac | 4 -
debian/changelog | 14 ++++
debian/compat | 2
debian/control | 8 +-
debian/patches/series | 1
debian/rules | 92 ++-----------------------------
debian/x11proto-dri2-dev.install | 1
dri2proto.h | 16 +++++
dri2proto.txt | 53 +++++++++++++++---
dri2tokens.h | 1
12 files changed, 207 insertions(+), 102 deletions(-)
New commits:
commit a3ab48d8eecefad0a97c354f1ccf76b0012888f1
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Jun 30 00:46:31 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 3852f2a..108f7ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-dri2 (2.6-1) UNRELEASED; urgency=low
+x11proto-dri2 (2.6-1) unstable; urgency=low
[ Julien Cristau ]
* Remove Brice from Uploaders.
@@ -14,7 +14,7 @@ x11proto-dri2 (2.6-1) UNRELEASED; urgency=low
- Add placeholder quilt series file.
* Bump Standards-Version to 3.9.2 (no changes).
- -- Cyril Brulebois <kibi@debian.org> Thu, 30 Jun 2011 00:37:11 +0200
+ -- Cyril Brulebois <kibi@debian.org> Thu, 30 Jun 2011 00:46:28 +0200
x11proto-dri2 (2.3-1) unstable; urgency=low
commit 24dc4d271f1f6a4ab65832f4873cd6a657f19214
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Jun 30 00:45:59 2011 +0200
Bump Standards-Version to 3.9.2 (no changes).
diff --git a/debian/changelog b/debian/changelog
index 01cfc40..3852f2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x11proto-dri2 (2.6-1) UNRELEASED; urgency=low
- Use dh-autoreconf and quilt sequences, rewrite rules file.
- Ship dri2proto.txt through dh_install.
- Add placeholder quilt series file.
+ * Bump Standards-Version to 3.9.2 (no changes).
-- Cyril Brulebois <kibi@debian.org> Thu, 30 Jun 2011 00:37:11 +0200
diff --git a/debian/control b/debian/control
index 5678dff..ecd054c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
quilt,
xutils-dev (>= 1:7.5~1),
pkg-config,
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-dri2
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-dri2.git
commit 929345bf9669c44dfa304de9a28b81bb6214219c
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Jun 30 00:45:32 2011 +0200
Switch to dh.
diff --git a/debian/changelog b/debian/changelog
index fae4236..01cfc40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ x11proto-dri2 (2.6-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstream release.
+ * Switch to dh:
+ - Bump debhelper build-dep and compat to 8.
+ - Use dh-autoreconf and quilt sequences, rewrite rules file.
+ - Ship dri2proto.txt through dh_install.
+ - Add placeholder quilt series file.
-- Cyril Brulebois <kibi@debian.org> Thu, 30 Jun 2011 00:37:11 +0200
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8
diff --git a/debian/control b/debian/control
index fbb904b..5678dff 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 5),
- autoconf,
- automake,
+ debhelper (>= 8),
+ dh-autoreconf,
+ quilt,
xutils-dev (>= 1:7.5~1),
pkg-config,
Standards-Version: 3.8.4
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fdffa2a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# placeholder
diff --git a/debian/rules b/debian/rules
index 768fcd4..f97f5fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,88 +1,12 @@
#!/usr/bin/make -f
-# debian/rules for the Debian x11proto-dri2 package.
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
-# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
-# Copyright © 2005 David Nusinow <dnusinow@debian.org>
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# Install in debian/tmp to retain control through dh_install:
+override_dh_auto_install:
+ dh_auto_install --destdir=debian/tmp
-PACKAGE = x11proto-dri2-dev
+# Forget no-one:
+override_dh_install:
+ dh_install --fail-missing
-.PHONY: autogen
-autogen: autogen-stamp
-autogen-stamp:
- dh_testdir
-
- autoreconf -vfi
- touch autogen-stamp
-
-.PHONY: configure
-configure: configure-stamp
-configure-stamp: autogen-stamp
- dh_testdir
-
- test -d build || mkdir build
- cd build && \
- ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --disable-shared \
- $(confflags) CFLAGS="$(CFLAGS)"
- touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
-
- cd build && $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f *-stamp
-
- rm -f config.cache config.log config.status
- rm -f */config.cache */config.log */config.status
- rm -f conftest* */conftest*
- rm -rf autom4te.cache */autom4te.cache
- rm -rf build
- rm -f aclocal.m4 configure install-sh missing
- rm -f config.guess config.sub
- rm -f Makefile.in
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
-
- dh_installdocs dri2proto.txt
- dh_installman
- dh_install --sourcedir=debian/tmp --list-missing
- dh_installchangelogs ChangeLog
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# Nothing to do
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+ dh $@ --with quilt,autoreconf --builddirectory=build/
diff --git a/debian/x11proto-dri2-dev.install b/debian/x11proto-dri2-dev.install
index d75d93f..061d9c7 100644
--- a/debian/x11proto-dri2-dev.install
+++ b/debian/x11proto-dri2-dev.install
@@ -1,2 +1,3 @@
usr/include/X11/extensions/*
usr/lib/pkgconfig/dri2proto.pc
+usr/share/doc/dri2proto/dri2proto.txt usr/share/doc/x11proto-dri2-dev
commit 7dad35af8474598e0f9770d599ed841d4f996954
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Jun 30 00:37:34 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 403f4e9..258b9b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,117 @@
+commit 7fd18b15646a62bd82a4eb0eca60a34c1731813d
+Author: Chad Versace <chad@chad-versace.us>
+Date: Wed May 11 12:50:11 2011 -0700
+
+ Add attachment token DRI2BufferHiz
+
+ ... and bump version to 2.6.
+
+ CC: Eric Anholt <eric@anholt.net>
+ CC: Ian Romanick <idr@freedesktop.org>
+ CC: Kristian Høgsberg <krh@bitplanet.net
+ Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
+ Signed-off-by: Chad Versace <chad@chad-versace.us>
+
+commit 005096937e1da6f65f8ece77662a8db6102d933d
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Thu May 5 13:11:22 2011 -0700
+
+ dri2proto: add a new DRI2BufferSwapComplete struct that matches the spec
+
+ Just add a new struct to remain compatible with existing code.
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit f3c211e1ae183dab5c7529814c9f42af2c29fc6c
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Thu May 5 09:22:39 2011 -0700
+
+ Revert "dri2proto: make DRI2 swap event match GLX spec"
+
+ This reverts commit 0ca3778de195a82087d0f07415a1cf8fc94f5b0a.
+
+ This broke compatibility by renaming existing struct fields. So revert
+ in favor of a new struct.
+
+commit 0ca3778de195a82087d0f07415a1cf8fc94f5b0a
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Tue May 3 12:14:58 2011 -0700
+
+ dri2proto: make DRI2 swap event match GLX spec
+
+ We only spec a 32 bit sbc count, so drop the high bits. Also make the
+ padding explicit.
+
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit 2af5884ab0797f2872028a90fffd4155109cdc4d
+Author: Marcin Kościelnicki <koriakin@0x04.net>
+Date: Thu May 13 21:05:56 2010 +0000
+
+ Fix DRI2Connect line encoding to match existing code
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit c34ce137fdb21fc9a52bb8d5a0c25e3c5d79e687
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Mar 28 19:25:52 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1c1456e1517d28ffbd844b00090596c21d9a9d9b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Mar 28 19:00:30 2010 -0400
+
+ config: remove the pkgconfig pc.in file from EXTRA_DIST
+
+ Automake always includes it in the tarball.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 70e5dee9a600e67057c55ab9b1b975f20a68682d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Mar 28 17:35:44 2010 -0400
+
+ config: install and distribute dri2proto.txt
+
+ It will now be installed in $docdir in addition
+ to being distributed in the tarball.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 3e6dc6d72844bbc8e8752e2ac2e781cb7d0172f1
+Author: Mike Stroyan <mike@LunarG.com>
+Date: Tue Feb 16 14:51:43 2010 -0700
+
+ Fix typo and obsolete reference in dri2proto.txt
+
+commit 1911ee62a552fae34c82c91b4deef523380fbfe1
+Author: Mike Stroyan <mike@LunarG.com>
+Date: Tue Feb 16 14:47:21 2010 -0700
+
+ Add more info about dri2proto events
+
+commit 41045095bddfe460a76fb560e1d087430d8fd76f
+Author: Francisco Jerez <currojerez@riseup.net>
+Date: Mon Feb 8 19:24:37 2010 +0100
+
+ Define an event to notify clients about the validity of their buffers.
+
+ Bumps the protocol and package versions.
+
+ Signed-off-by: Francisco Jerez <currojerez@riseup.net>
+
commit bd6f2584d3d55746bb56bf923b35e85adfd0dc3b
Merge: 84eac7f 9c1a8f1
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
diff --git a/debian/changelog b/debian/changelog
index f8a9900..fae4236 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-x11proto-dri2 (2.3-2) UNRELEASED; urgency=low
+x11proto-dri2 (2.6-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Remove Brice from Uploaders.
* Wrap the Build-Depends control field.
* Drop unnecessary Pre-Depends on x11-common.
- -- Julien Cristau <jcristau@debian.org> Thu, 28 Apr 2011 14:33:38 +0200
+ [ Cyril Brulebois ]
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Thu, 30 Jun 2011 00:37:11 +0200
x11proto-dri2 (2.3-1) unstable; urgency=low
commit 7fd18b15646a62bd82a4eb0eca60a34c1731813d
Author: Chad Versace <chad@chad-versace.us>
Date: Wed May 11 12:50:11 2011 -0700
Add attachment token DRI2BufferHiz
... and bump version to 2.6.
CC: Eric Anholt <eric@anholt.net>
CC: Ian Romanick <idr@freedesktop.org>
CC: Kristian Høgsberg <krh@bitplanet.net
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Chad Versace <chad@chad-versace.us>
diff --git a/configure.ac b/configure.ac
index 297be0e..d671f5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([DRI2Proto], [2.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [2.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
diff --git a/dri2proto.txt b/dri2proto.txt
index dc46e58..df763c7 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -178,7 +178,8 @@ DRI2ATTACHMENT { DRI2BufferFrontLeft
DRI2BufferAccum
DRI2BufferFakeFrontLeft
DRI2BufferFakeFrontRight
- DRI2BufferDepthStencil }
+ DRI2BufferDepthStencil
+ DRI2BufferHiz }
These values describe various attachment points for DRI2
buffers.
@@ -509,6 +510,8 @@ The DRI2 extension has undergone a number of revisions before
2.3: Added the DRI2InvalidateBuffers event.
+ 2.6: Enlightenment attained. Added the DRI2BufferHiz attachment.
+
Compatibility up to 2.0 is not preserved, but was also never released.
@@ -569,6 +572,7 @@ A.1 Common Types
0x7 DRI2BufferFakeFrontLeft
0x8 DRI2BufferFakeFrontRight
0x9 DRI2BufferDepthStencil
+ 0xa DRI2BufferHiz
└───
Used to encode the possible attachment points. The attachment
DRI2BufferDepthStencil is only available with protocol version 1.1 or
diff --git a/dri2tokens.h b/dri2tokens.h
index 7804e4d..16c9008 100644
--- a/dri2tokens.h
+++ b/dri2tokens.h
@@ -43,6 +43,7 @@
#define DRI2BufferFakeFrontLeft 7
#define DRI2BufferFakeFrontRight 8
#define DRI2BufferDepthStencil 9
+#define DRI2BufferHiz 10
#define DRI2DriverDRI 0
#define DRI2DriverVDPAU 1
commit 005096937e1da6f65f8ece77662a8db6102d933d
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu May 5 13:11:22 2011 -0700
dri2proto: add a new DRI2BufferSwapComplete struct that matches the spec
Just add a new struct to remain compatible with existing code.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
diff --git a/configure.ac b/configure.ac
index 9505f56..297be0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([DRI2Proto], [2.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [2.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
diff --git a/dri2proto.h b/dri2proto.h
index 9708a4a..cd82afb 100644
--- a/dri2proto.h
+++ b/dri2proto.h
@@ -290,6 +290,7 @@ typedef struct {
CARD8 pad;
CARD16 sequenceNumber B16;
CARD16 event_type B16;
+ CARD16 pad2;
CARD32 drawable B32;
CARD32 ust_hi B32;
CARD32 ust_lo B32;
@@ -304,6 +305,21 @@ typedef struct {
CARD8 type;
CARD8 pad;
CARD16 sequenceNumber B16;
+ CARD16 event_type B16;
+ CARD16 pad2;
+ CARD32 drawable B32;
+ CARD32 ust_hi B32;
+ CARD32 ust_lo B32;
+ CARD32 msc_hi B32;
+ CARD32 msc_lo B32;
+ CARD32 sbc B32;
+} xDRI2BufferSwapComplete2;
+#define sz_xDRI2BufferSwapComplete2 32
+
+typedef struct {
+ CARD8 type;
+ CARD8 pad;
+ CARD16 sequenceNumber B16;
CARD32 drawable B32;
CARD32 pad1 B32;
CARD32 pad2 B32;
commit f3c211e1ae183dab5c7529814c9f42af2c29fc6c
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu May 5 09:22:39 2011 -0700
Revert "dri2proto: make DRI2 swap event match GLX spec"
This reverts commit 0ca3778de195a82087d0f07415a1cf8fc94f5b0a.
This broke compatibility by renaming existing struct fields. So revert
in favor of a new struct.
diff --git a/dri2proto.h b/dri2proto.h
index ff76355..9708a4a 100644
--- a/dri2proto.h
+++ b/dri2proto.h
@@ -290,13 +290,13 @@ typedef struct {
CARD8 pad;
CARD16 sequenceNumber B16;
CARD16 event_type B16;
- CARD16 pad2;
CARD32 drawable B32;
CARD32 ust_hi B32;
CARD32 ust_lo B32;
CARD32 msc_hi B32;
CARD32 msc_lo B32;
- CARD32 sbc B32;
+ CARD32 sbc_hi B32;
+ CARD32 sbc_lo B32;
} xDRI2BufferSwapComplete;
#define sz_xDRI2BufferSwapComplete 32
commit 0ca3778de195a82087d0f07415a1cf8fc94f5b0a
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue May 3 12:14:58 2011 -0700
dri2proto: make DRI2 swap event match GLX spec
We only spec a 32 bit sbc count, so drop the high bits. Also make the
padding explicit.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
diff --git a/configure.ac b/configure.ac
index 5b78d6b..9505f56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([DRI2Proto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [2.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
diff --git a/dri2proto.h b/dri2proto.h
index 9708a4a..ff76355 100644
--- a/dri2proto.h
+++ b/dri2proto.h
@@ -290,13 +290,13 @@ typedef struct {
CARD8 pad;
CARD16 sequenceNumber B16;
CARD16 event_type B16;
+ CARD16 pad2;
CARD32 drawable B32;
CARD32 ust_hi B32;
CARD32 ust_lo B32;
CARD32 msc_hi B32;
CARD32 msc_lo B32;
- CARD32 sbc_hi B32;
- CARD32 sbc_lo B32;
+ CARD32 sbc B32;
} xDRI2BufferSwapComplete;
#define sz_xDRI2BufferSwapComplete 32
commit 2af5884ab0797f2872028a90fffd4155109cdc4d
Author: Marcin Kościelnicki <koriakin@0x04.net>
Date: Thu May 13 21:05:56 2010 +0000
Fix DRI2Connect line encoding to match existing code
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/dri2proto.txt b/dri2proto.txt
index f74792e..dc46e58 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -618,20 +618,21 @@ A.2 Protocol Requests
DRI2Connect
1 CARD8 major opcode
1 1 DRI2 opcode
- 2 3+(n+p)/4 length
+ 2 3 length
4 WINDOW window
4 CARD32 driver type
▶
1 1 Reply
1 unused
2 CARD16 sequence number
- 4 (n+m+p)/4 reply length
+ 4 (n+m+p+q)/4 reply length
4 n driver name length
4 m device name length
16 unused
n CARD8 driver name
+ p unused, p=pad(n)
m CARD8 device name
- p unused, p=pad(n+m)
+ q unused, q=pad(m)
└───
┌───
commit c34ce137fdb21fc9a52bb8d5a0c25e3c5d79e687
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Mar 28 19:25:52 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index c5affe3..5b78d6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT([DRI2Proto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 1c1456e1517d28ffbd844b00090596c21d9a9d9b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Mar 28 19:00:30 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 2440162..5990273 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@ pkgconfig_DATA = dri2proto.pc
dist_doc_DATA = dri2proto.txt
-EXTRA_DIST = dri2proto.pc.in
MAINTAINERCLEANFILES = ChangeLog INSTALL
commit 70e5dee9a600e67057c55ab9b1b975f20a68682d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Mar 28 17:35:44 2010 -0400
config: install and distribute dri2proto.txt
It will now be installed in $docdir in addition
to being distributed in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 153b422..2440162 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,9 @@ dri2_HEADERS = dri2proto.h dri2tokens.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dri2proto.pc
-EXTRA_DIST = dri2proto.pc.in dri2proto.txt
+dist_doc_DATA = dri2proto.txt
+
+EXTRA_DIST = dri2proto.pc.in
MAINTAINERCLEANFILES = ChangeLog INSTALL
commit 3e6dc6d72844bbc8e8752e2ac2e781cb7d0172f1
Author: Mike Stroyan <mike@LunarG.com>
Date: Tue Feb 16 14:51:43 2010 -0700
Fix typo and obsolete reference in dri2proto.txt
diff --git a/dri2proto.txt b/dri2proto.txt
index 9aa7578..f74792e 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -146,7 +146,7 @@ version 2 is used in the CopyRegion request.
4. Errors
-No errrors defined by the DRI2 extension.
+No errors are defined by the DRI2 extension.
⚙ ⚙ ⚙ ⚙ ⚙ ⚙
@@ -260,7 +260,7 @@ The name of this extension is "DRI2".
If the client is not local, or the request driver type is
unknown or not available, 'driver' and 'device' will be empty
- strings, 'group' will be '0'. We are not using an regular X
+ strings. We are not using an regular X
error here to indicate failure, which will allow the client
fall back to other options more easily.
commit 1911ee62a552fae34c82c91b4deef523380fbfe1
Author: Mike Stroyan <mike@LunarG.com>
Date: Tue Feb 16 14:47:21 2010 -0700
Add more info about dri2proto events
diff --git a/dri2proto.txt b/dri2proto.txt
index 3d3eec4..9aa7578 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -153,7 +153,8 @@ No errrors defined by the DRI2 extension.
5. Events
-The only event provided by DRI2 is DRI2_BufferSwapComplete.
+The only events provided by DRI2 are DRI2_BufferSwapComplete
+and DRI2InvalidateBuffers.
⚙ ⚙ ⚙ ⚙ ⚙ ⚙
@@ -826,7 +827,38 @@ A.2 Protocol Requests
A.3 Protocol Events
-The DRI2 extension specifies no events.
+The DRI2 extension specifies DRI2_BufferSwapComplete and
+DRI2_InvalidateBuffers events.
+
+┌───
+ DRI2_BufferSwapComplete
+ 1 CARD8 type
+ 1 CARD8 extension
+ 2 CARD16 sequenceNumber
+ 2 CARD16 event_type
+ 4 DRAWABLE drawable
+ 4 CARD32 ust_hi
+ 4 CARD32 ust_lo
+ 4 CARD32 msc_hi
+ 4 CARD32 msc_lo
+ 4 CARD32 sbc_hi
+ 4 CARD32 sbc_lo
+└───
+
+
+┌───
+ DRI2_InvalidateBuffers
+ 1 CARD8 type
+ 1 CARD8 extension
+ 2 CARD16 sequenceNumber
+ 4 DRAWABLE drawable
+ 4 CARD32 unused
+ 4 CARD32 unused
+ 4 CARD32 unused
+ 4 CARD32 unused
+ 4 CARD32 unused
+ 4 CARD32 unused
+└───
A.4 Protocol Errors
Reply to: