Update to xf86dgaproto 2.1

13 files changed, 946 insertions, 960 deletions

diff --git a/proto/xf86dgaproto/ChangeLog b/proto/xf86dgaproto/ChangeLog
index c722b519a..21f677799 100644
--- a/proto/xf86dgaproto/ChangeLog
+++ b/proto/xf86dgaproto/ChangeLog
@@ -1,4 +1,235 @@
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 743fb528f6ef9d29edcb841fc0effbbf9a4837c4
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Oct 1 19:51:43 2009 +1000
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    xf86dgaproto 2.1
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 647fbb2493d16248d37fbd864ae48a4f18c01644
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Oct 1 19:48:07 2009 +1000
+
+    Require macros 1.3 for XORG_DEFAULT_OPTIONS
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit db4cb300dec74c9198a4f04aafd20042fe2d1fd9
+Author: Carl Worth <cworth@cworth.org>
+Date:   Wed Sep 16 17:03:30 2009 -0700
+
+    Change xf86dga.h to only conditionally include server's header file.
+    
+    The recent re-addition of the xf86dga.h file introduced an
+    incompatibility with a recent, but unreleased version of libXxf86dga
+    which also wanted to install a file of the same name. Instead, we
+    allow the proto package to own this file, and include the library's
+    version (now to be named Xxf86dga.h) unless we're building an old
+    server (indicated by _XF86DGA_SERVER_).
+
+commit 047a1ebbbcea3ad78a06f0fa8450fa8ba38be43d
+Author: Carl Worth <cworth@cworth.org>
+Date:   Wed Sep 16 15:40:02 2009 -0700
+
+    Add back xf86dga.h (simply including the newly named xf86dgaconst.h)
+    
+    This maintains compatibility so that previous X servers, (such as
+    xserver 1.6 can still be built).
+
+commit f3cfa9e3aa654305a702d97014f726ae5d900a46
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Aug 27 10:54:30 2009 +1000
+
+    Bump version to 2.0.99.1
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a111c2e7826df36c937b83639e929dfb50179873
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Aug 27 14:13:46 2009 +1000
+
+    Include the *const.h files from the proto files.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit e02a56a6a62b03ae646937638c07fd33ac98d3ed
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Aug 26 16:33:48 2009 +1000
+
+    Rename xf86dga(1)str.h to xf86dga(1)proto.h for consistency with other modules
+    
+    Stub *str.h headers provided to avoid breaking clients.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d3d698ab760db96088d8a0e19799b0d18a44c201
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Aug 26 16:30:56 2009 +1000
+
+    Remove Xlib headers from xf86dga.h and xf86dga1.h
+    
+    Renamed to *const.h for consistency with other modules.
+    Xlib headers moved to libXxf86dga.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 63372e881d5c4da5f08aaff1a8355775ac05a0d5
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Aug 26 16:26:55 2009 +1000
+
+    Remove RCS tags.
+
+commit fd255432b925aacdc212899b51e783894bfe4942
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Tue Jan 27 20:06:28 2009 -0200
+
+    Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit 738f1a26dcabaddc4178a54efddd7fefa1880624
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Dec 6 16:39:11 2007 -0500
+
+    Replace static ChangeLog with dist-hook to generate from git log
+
+commit 53ab87dc609be976eec50ed77e3f4fd77a7852e9
+Author: Eric Anholt <eric@anholt.net>
+Date:   Wed Sep 5 10:11:35 2007 -0700
+
+    Bump version to 2.0.3.
+
+commit d6cb2298d6eac2c15640d5b6348335a47969a761
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:54:27 2007 -0400
+
+    Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 2d2ceea793a6046e088fa86644fdb887265b71e3
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date:   Wed Apr 18 09:39:46 2007 +0800
+
+    Fix sign extension bug on x86_64 system
+    
+    Noted in libXxf86dga commit. Force base addr to be unsigned int.
+
+commit 916408f263882ec4d171ca07d995c5a22a562179
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jul 14 18:56:44 2006 -0700
+
+    renamed: .cvsignore -> .gitignore
+
+commit 8195ad9051084354d18557392e530499fdaf6469
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:39 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 036a69f9b489da6665bd640805ffc3f2cd97d7ee
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:48:16 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit d0948444d0caa72552bd827c042de44f005b9a61
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Tue Aug 2 19:19:40 2005 +0000
+
+    Add basic .cvsignore files for proto modules.
+
+commit 0435cd1826d3cf391a8ef46f637ce5f40f43303d
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:57 2005 +0000
+
+    Various changes preparing packages for RC0:
+    - Verify and update package version numbers as needed
+    - Implement versioning scheme
+    - Change bug address to point to bugzilla bug entry form
+    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+        reenable it)
+    - Fix makedepend to use pkgconfig and pass distcheck
+    - Update build script to build macros first
+    - Update modular Xorg version
+
+commit 360c8aaee7d7811828c1f1fcc5355d5c332491b2
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sat May 21 04:55:25 2005 +0000
+
+    Set version to 2.0.
+
+commit c93dae6529f9f9b0521c93e409330208e0522fd3
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu May 19 00:22:41 2005 +0000
+
+    revert last change, didn't do right thing at all, sorry for the noise
+
+commit 572918a46cb939d1bb0e05232ed3f3ca46c2ca74
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu May 19 00:10:20 2005 +0000
+
+    Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit cfaf18291b9e3e17778ec5d81121c132f0eda238
+Author: Josh Triplett <josh@speakeasy.net>
+Date:   Wed May 18 07:38:55 2005 +0000
+
+    Add COPYING file for XF86DGA; assumed to be under the XFree86 catch-all
+        license.
+
+commit 7d1c8247ea48d32fb205d630c16bb0db1266fd98
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Mon May 9 18:20:07 2005 +0000
+
+    Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 3372bb6c3a4b6178abf371bcfccf7d9d65b5ffb1
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri May 6 01:46:32 2005 +0000
+
+    Initial build system files for proto module.
+
+commit ba45fc53d65ccf3938a4d59410b6d6090f48b70c
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 18:43:06 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit c6b9b513109b46e5c0e0dcb918006f7095c0a897
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:31:36 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit ba0f2b42c3f5ae2bac56cb4fa4676653e506e8b1
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:10:54 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 0200f8001e0dc769453a92169a1123fac4a138d5
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:35:14 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit 75bd04bb7d5ed54bb1b70f215af35bfef7b77f8b
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:22:28 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit b267ad4481aa9ae534891e2ca3ad9388db7bd481
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Tue Nov 25 19:28:02 2003 +0000
+
+    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit a0c654996517a63b13956e4ff5cfb1d68e657edc
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:43 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 04c61054bbc924d0cdd1ded8aa4e028f0955f426
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:43 2003 +0000
+
+    Initial revision
diff --git a/proto/xf86dgaproto/Makefile b/proto/xf86dgaproto/Makefile
index 6c36c1089..d488395ad 100644
--- a/proto/xf86dgaproto/Makefile
+++ b/proto/xf86dgaproto/Makefile
@@ -1,7 +1,9 @@
-# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+# $OpenBSD: Makefile,v 1.2 2010/04/27 19:58:25 matthieu Exp $
 
 HEADERS_SUBDIR=	X11/extensions/
-HEADERS=	xf86dga1.h xf86dga1str.h xf86dga.h xf86dgastr.h
+HEADERS=	xf86dga.h xf86dgastr.h xf86dga1const.h xf86dga1str.h \
+		xf86dga1proto.h xf86dgaconst.h xf86dgaproto.h
+
 PKGCONFIG=	xf86dgaproto.pc
 
 .include <bsd.xorg.mk>
diff --git a/proto/xf86dgaproto/Makefile.am b/proto/xf86dgaproto/Makefile.am
index e3dbffb65..babced449 100644
--- a/proto/xf86dgaproto/Makefile.am
+++ b/proto/xf86dgaproto/Makefile.am
@@ -1,11 +1,24 @@
 xf86dgadir = $(includedir)/X11/extensions
 xf86dga_HEADERS = \
-	xf86dga1.h \
-	xf86dga1str.h \
 	xf86dga.h \
+	xf86dga1const.h \
+	xf86dga1str.h \
+	xf86dga1proto.h \
+	xf86dgaconst.h \
+	xf86dgaproto.h \
 	xf86dgastr.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xf86dgaproto.pc
 
-EXTRA_DIST = autogen.sh xf86dgaproto.pc.in
+EXTRA_DIST = xf86dgaproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/proto/xf86dgaproto/autogen.sh b/proto/xf86dgaproto/autogen.sh
deleted file mode 100644
index 904cd6746..000000000
--- a/proto/xf86dgaproto/autogen.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/proto/xf86dgaproto/configure.ac b/proto/xf86dgaproto/configure.ac
index 681617517..eb7504654 100644
--- a/proto/xf86dgaproto/configure.ac
+++ b/proto/xf86dgaproto/configure.ac
@@ -1,8 +1,12 @@
 AC_PREREQ([2.57])
-AC_INIT([XF86DGAProto], [2.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XF86DGAProto], [2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
-XORG_RELEASE_VERSION
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+
+XORG_DEFAULT_OPTIONS
 
 AC_OUTPUT([Makefile
            xf86dgaproto.pc])
diff --git a/proto/xf86dgaproto/xf86dga.h b/proto/xf86dgaproto/xf86dga.h
index 720118842..7b5d635f9 100644
--- a/proto/xf86dgaproto/xf86dga.h
+++ b/proto/xf86dgaproto/xf86dga.h
@@ -1,264 +1,13 @@
-/*
-   Copyright (c) 1999  XFree86 Inc
-*/
-/* $XFree86: xc/include/extensions/xf86dga.h,v 3.20 1999/10/13 04:20:48 dawes Exp $ */
+#ifdef _XF86DGA_SERVER_
 
-#ifndef _XF86DGA_H_
-#define _XF86DGA_H_
+#warning "xf86dga.h is obsolete and may be removed in the future."
+#warning "include <X11/extensions/xf86dgaconst.h> instead."
+#include <X11/extensions/xf86dgaconst.h>
 
-#include <X11/Xfuncproto.h>
-#include <X11/extensions/xf86dga1.h>
+#else
 
-#define X_XDGAQueryVersion		0
+#warning "xf86dga.h is obsolete and may be removed in the future."
+#warning "include <X11/extensions/Xxf86dga.h> instead."
+#include <X11/extensions/Xxf86dga.h>
 
-/* 1 through 9 are in xf86dga1.h */
-
-/* 10 and 11 are reserved to avoid conflicts with rogue DGA extensions */
-
-#define X_XDGAQueryModes		12
-#define X_XDGASetMode			13
-#define X_XDGASetViewport		14
-#define X_XDGAInstallColormap		15
-#define X_XDGASelectInput		16
-#define X_XDGAFillRectangle		17
-#define X_XDGACopyArea			18
-#define X_XDGACopyTransparentArea	19
-#define X_XDGAGetViewportStatus		20
-#define X_XDGASync			21
-#define X_XDGAOpenFramebuffer		22
-#define X_XDGACloseFramebuffer		23
-#define X_XDGASetClientVersion		24
-#define X_XDGAChangePixmapMode		25
-#define X_XDGACreateColormap		26
-
-
-#define XDGAConcurrentAccess	0x00000001
-#define XDGASolidFillRect	0x00000002
-#define XDGABlitRect		0x00000004
-#define XDGABlitTransRect	0x00000008
-#define XDGAPixmap    		0x00000010
-
-#define XDGAInterlaced          0x00010000
-#define XDGADoublescan          0x00020000
-
-#define XDGAFlipImmediate	0x00000001
-#define XDGAFlipRetrace		0x00000002
-
-#define XDGANeedRoot		0x00000001
-
-#define XF86DGANumberEvents		7
-
-#define XDGAPixmapModeLarge		0
-#define XDGAPixmapModeSmall		1
-
-#define XF86DGAClientNotLocal		0
-#define XF86DGANoDirectVideoMode	1
-#define XF86DGAScreenNotActive		2
-#define XF86DGADirectNotActivated	3
-#define XF86DGAOperationNotSupported	4
-#define XF86DGANumberErrors		(XF86DGAOperationNotSupported + 1)
-
-
-typedef struct {
-   int num;		/* A unique identifier for the mode (num > 0) */
-   char *name;		/* name of mode given in the XF86Config */
-   float verticalRefresh;
-   int flags;		/* DGA_CONCURRENT_ACCESS, etc... */
-   int imageWidth;	/* linear accessible portion (pixels) */
-   int imageHeight;
-   int pixmapWidth;	/* Xlib accessible portion (pixels) */
-   int pixmapHeight;	/* both fields ignored if no concurrent access */
-   int bytesPerScanline; 
-   int byteOrder;	/* MSBFirst, LSBFirst */
-   int depth;		
-   int bitsPerPixel;
-   unsigned long redMask;
-   unsigned long greenMask;
-   unsigned long blueMask;
-   short visualClass;
-   int viewportWidth;
-   int viewportHeight;
-   int xViewportStep;	/* viewport position granularity */
-   int yViewportStep;
-   int maxViewportX;	/* max viewport origin */
-   int maxViewportY;
-   int viewportFlags;	/* types of page flipping possible */
-   int reserved1;
-   int reserved2;
-} XDGAMode;
-
-
-typedef struct {
-   XDGAMode mode;
-   unsigned char *data;
-   Pixmap pixmap;
-} XDGADevice;
-
-
-#ifndef _XF86DGA_SERVER_
-_XFUNCPROTOBEGIN
-
-typedef struct {
-   int type;
-   unsigned long serial;
-   Display *display;
-   int screen;
-   Time time;
-   unsigned int state;
-   unsigned int button;
-} XDGAButtonEvent;
-
-typedef struct {
-   int type;
-   unsigned long serial;
-   Display *display;
-   int screen;
-   Time time;
-   unsigned int state;
-   unsigned int keycode;
-} XDGAKeyEvent;
-
-typedef struct {
-   int type;
-   unsigned long serial;
-   Display *display;
-   int screen;
-   Time time;
-   unsigned int state;
-   int dx;
-   int dy;
-} XDGAMotionEvent;
-
-typedef union {
-  int type;
-  XDGAButtonEvent xbutton;
-  XDGAKeyEvent	  xkey;
-  XDGAMotionEvent xmotion;
-  long		  pad[24];
-} XDGAEvent;
-
-Bool XDGAQueryExtension(
-    Display 	*dpy,
-    int 	*eventBase,
-    int 	*erroBase
-);
-
-Bool XDGAQueryVersion(
-    Display 	*dpy,
-    int 	*majorVersion,
-    int 	*minorVersion
-);
-
-XDGAMode* XDGAQueryModes(
-    Display	*dpy,
-    int 	screen,
-    int		*num
-);
-
-XDGADevice* XDGASetMode(
-    Display	*dpy,
-    int		screen,
-    int		mode
-);
-
-Bool XDGAOpenFramebuffer(
-    Display	*dpy,
-    int 	screen
-);
-
-void XDGACloseFramebuffer(
-    Display	*dpy,
-    int		screen
-);
-
-void XDGASetViewport(
-    Display	*dpy,
-    int		screen,
-    int		x,
-    int		y,
-    int		flags
-);
-
-void XDGAInstallColormap(
-    Display	*dpy,
-    int		screen,
-    Colormap	cmap
-);
-
-Colormap XDGACreateColormap(
-    Display	*dpy,
-    int 	screen,
-    XDGADevice  *device,
-    int 	alloc
-);
-
-void XDGASelectInput(
-    Display	*dpy,
-    int		screen,
-    long	event_mask
-);
-
-void XDGAFillRectangle(
-    Display	*dpy,
-    int		screen,
-    int		x,
-    int		y,
-    unsigned int	width,
-    unsigned int	height,
-    unsigned long	color
-);
-
-
-void XDGACopyArea(
-    Display	*dpy,
-    int		screen,
-    int		srcx,
-    int		srcy,
-    unsigned int	width,
-    unsigned int	height,
-    int		dstx,
-    int		dsty
-);
-
-
-void XDGACopyTransparentArea(
-    Display	*dpy,
-    int		screen,
-    int		srcx,
-    int		srcy,
-    unsigned int	width,
-    unsigned int	height,
-    int		dstx,
-    int		dsty,
-    unsigned long key
-);
-
-int XDGAGetViewportStatus(
-    Display	*dpy,
-    int		screen
-);
-   
-void XDGASync(
-    Display	*dpy,
-    int		screen
-);
-
-Bool XDGASetClientVersion(
-    Display	*dpy
-);
-
-void XDGAChangePixmapMode(
-    Display 	*dpy,
-    int		screen,
-    int		*x,
-    int		*y,
-    int		mode
-);
-
-
-void XDGAKeyEventToXKeyEvent(XDGAKeyEvent* dk, XKeyEvent* xk);
-
-
-_XFUNCPROTOEND
-#endif /* _XF86DGA_SERVER_ */
-#endif /* _XF86DGA_H_ */
+#endif
diff --git a/proto/xf86dgaproto/xf86dga1.h b/proto/xf86dgaproto/xf86dga1.h
deleted file mode 100644
index 4f45e74b3..000000000
--- a/proto/xf86dgaproto/xf86dga1.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* $XFree86: xc/include/extensions/xf86dga1.h,v 1.2 1999/04/17 07:05:41 dawes Exp $ */
-/*
-
-Copyright (c) 1995  Jon Tombs
-Copyright (c) 1995  XFree86 Inc
-
-*/
-
-/************************************************************************
-
-   THIS IS THE OLD DGA API AND IS OBSOLETE.  PLEASE DO NOT USE IT ANYMORE
-
-************************************************************************/
-
-#ifndef _XF86DGA1_H_
-#define _XF86DGA1_H_
-
-#include <X11/Xfuncproto.h>
-
-#define X_XF86DGAQueryVersion		0
-#define X_XF86DGAGetVideoLL		1
-#define X_XF86DGADirectVideo		2
-#define X_XF86DGAGetViewPortSize	3
-#define X_XF86DGASetViewPort		4
-#define X_XF86DGAGetVidPage		5
-#define X_XF86DGASetVidPage		6
-#define X_XF86DGAInstallColormap	7
-#define X_XF86DGAQueryDirectVideo	8
-#define X_XF86DGAViewPortChanged	9
-
-#define XF86DGADirectPresent		0x0001
-#define XF86DGADirectGraphics		0x0002
-#define XF86DGADirectMouse		0x0004
-#define XF86DGADirectKeyb		0x0008
-#define XF86DGAHasColormap		0x0100
-#define XF86DGADirectColormap		0x0200
-
-
-
-
-#ifndef _XF86DGA_SERVER_
-
-_XFUNCPROTOBEGIN
-
-Bool XF86DGAQueryVersion(
-    Display*		/* dpy */,
-    int*		/* majorVersion */,
-    int*		/* minorVersion */
-);
-
-Bool XF86DGAQueryExtension(
-    Display*		/* dpy */,
-    int*		/* event_base */,
-    int*		/* error_base */
-);
-
-Status XF86DGAGetVideoLL(
-    Display*			/* dpy */,
-    int				/* screen */,
-    int *			/* base addr */,
-    int *			/* width */,
-    int *			/* bank_size */,
-    int *			/* ram_size */ 
-);
-
-Status XF86DGAGetVideo(
-    Display*			/* dpy */,
-    int				/* screen */,
-    char **			/* base addr */,
-    int *			/* width */,
-    int *			/* bank_size */,
-    int *			/* ram_size */
-);
-
-Status XF86DGADirectVideo(
-    Display*			/* dpy */,
-    int				/* screen */,
-    int 			/* enable */
-);
-
-Status XF86DGADirectVideoLL(
-    Display*			/* dpy */,
-    int				/* screen */,
-    int 			/* enable */
-);
-
-Status XF86DGAGetViewPortSize(
-    Display*			/* dpy */,
-    int				/* screen */,
-    int *			/* width */,
-    int *			/* height */
-);
-
-Status XF86DGASetViewPort(
-    Display*			/* dpy */,
-    int				/* screen */,
-    int x			/* X */,
-    int y			/* Y */
-);
-
-Status XF86DGAGetVidPage(
-    Display*			/* dpy */,
-    int				/* screen */,
-    int *			/* vid page */
-);
-
-Status XF86DGASetVidPage(
-    Display*			/* dpy */,
-    int				/* screen */,
-    int				/* vid page */
-);
-
-Status XF86DGAInstallColormap(
-    Display*			/* dpy */,
-    int				/* screen */,
-    Colormap			/*Colormap */
-);
-
-int XF86DGAForkApp(
-    int screen
-);
-
-Status XF86DGAQueryDirectVideo(
-    Display *		/* dpy */,
-    int			/* screen */,
-    int *		/* flags */
-);
-
-Bool XF86DGAViewPortChanged(
-    Display *		/* dpy */,
-    int			/* screen */,
-    int			/* n */
-);
-
-
-_XFUNCPROTOEND
-
-#endif /* _XF86DGA_SERVER_ */
-
-#endif /* _XF86DGA1_H_ */
diff --git a/proto/xf86dgaproto/xf86dga1const.h b/proto/xf86dgaproto/xf86dga1const.h
new file mode 100644
index 000000000..eca06f6af
--- /dev/null
+++ b/proto/xf86dgaproto/xf86dga1const.h
@@ -0,0 +1,36 @@
+/*
+
+Copyright (c) 1995  Jon Tombs
+Copyright (c) 1995  XFree86 Inc
+
+*/
+
+/************************************************************************
+
+   THIS IS THE OLD DGA API AND IS OBSOLETE.  PLEASE DO NOT USE IT ANYMORE
+
+************************************************************************/
+
+#ifndef _XF86DGA1CONST_H_
+#define _XF86DGA1CONST_H_
+
+#define X_XF86DGAQueryVersion		0
+#define X_XF86DGAGetVideoLL		1
+#define X_XF86DGADirectVideo		2
+#define X_XF86DGAGetViewPortSize	3
+#define X_XF86DGASetViewPort		4
+#define X_XF86DGAGetVidPage		5
+#define X_XF86DGASetVidPage		6
+#define X_XF86DGAInstallColormap	7
+#define X_XF86DGAQueryDirectVideo	8
+#define X_XF86DGAViewPortChanged	9
+
+#define XF86DGADirectPresent		0x0001
+#define XF86DGADirectGraphics		0x0002
+#define XF86DGADirectMouse		0x0004
+#define XF86DGADirectKeyb		0x0008
+#define XF86DGAHasColormap		0x0100
+#define XF86DGADirectColormap		0x0200
+
+
+#endif /* _XF86DGA1CONST_H_ */
diff --git a/proto/xf86dgaproto/xf86dga1proto.h b/proto/xf86dgaproto/xf86dga1proto.h
new file mode 100644
index 000000000..5c53cb218
--- /dev/null
+++ b/proto/xf86dgaproto/xf86dga1proto.h
@@ -0,0 +1,195 @@
+/*
+
+Copyright (c) 1995  Jon Tombs
+Copyright (c) 1995  XFree86 Inc.
+
+*/
+
+#ifndef _XF86DGAPROTO1_H_
+#define _XF86DGAPROTO1_H_
+
+#include <X11/extensions/xf86dga1const.h>
+
+typedef struct _XF86DGAQueryVersion {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
+    CARD16	length B16;
+} xXF86DGAQueryVersionReq;
+#define sz_xXF86DGAQueryVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of DGA protocol */
+    CARD16	minorVersion B16;	/* minor version of DGA protocol */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86DGAQueryVersionReply;
+#define sz_xXF86DGAQueryVersionReply	32
+
+typedef struct _XF86DGAGetVideoLL {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_XF86DGAGetVideoLL */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16      pad B16;
+} xXF86DGAGetVideoLLReq;
+#define sz_xXF86DGAGetVideoLLReq	8
+
+typedef struct _XF86DGAInstallColormap{
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad2; 
+    CARD32	id B32;  /* colormap. */
+} xXF86DGAInstallColormapReq;
+#define sz_xXF86DGAInstallColormapReq        12
+
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	offset B32;
+    CARD32	width B32;
+    CARD32	bank_size B32;
+    CARD32	ram_size B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86DGAGetVideoLLReply;
+#define sz_xXF86DGAGetVideoLLReply	32
+
+typedef struct _XF86DGADirectVideo {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_XF86DGADirectVideo */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	enable B16;
+} xXF86DGADirectVideoReq;
+#define sz_xXF86DGADirectVideoReq	8
+
+
+typedef struct _XF86DGAGetViewPortSize {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_XF86DGAGetViewPort */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16      pad B16;
+} xXF86DGAGetViewPortSizeReq;
+#define sz_xXF86DGAGetViewPortSizeReq	8
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	width B32;
+    CARD32	height B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86DGAGetViewPortSizeReply;
+#define sz_xXF86DGAGetViewPortSizeReply	32
+
+typedef struct _XF86DGASetViewPort {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_XF86DGASetViewPort */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+    CARD32      x B32;
+    CARD32	y B32;
+} xXF86DGASetViewPortReq;
+#define sz_xXF86DGASetViewPortReq	16
+
+typedef struct _XF86DGAGetVidPage {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_XF86DGAGetVidPage */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16      pad B16;
+} xXF86DGAGetVidPageReq;
+#define sz_xXF86DGAGetVidPageReq	8
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	vpage B32;
+    CARD32	pad B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86DGAGetVidPageReply;
+#define sz_xXF86DGAGetVidPageReply	32
+
+
+typedef struct _XF86DGASetVidPage {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_XF86DGASetVidPage */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16      vpage B16;
+} xXF86DGASetVidPageReq;
+#define sz_xXF86DGASetVidPageReq	8
+
+
+typedef struct _XF86DGAQueryDirectVideo {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16      pad B16;
+} xXF86DGAQueryDirectVideoReq;
+#define sz_xXF86DGAQueryDirectVideoReq	8
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	flags B32;
+    CARD32	pad B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86DGAQueryDirectVideoReply;
+#define sz_xXF86DGAQueryDirectVideoReply 32
+
+
+typedef struct _XF86DGAViewPortChanged {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16      n B16;
+} xXF86DGAViewPortChangedReq;
+#define sz_xXF86DGAViewPortChangedReq	8
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	result B32;
+    CARD32	pad B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86DGAViewPortChangedReply;
+#define sz_xXF86DGAViewPortChangedReply 32
+
+#endif /* _XF86DGAPROTO1_H_ */
+
diff --git a/proto/xf86dgaproto/xf86dga1str.h b/proto/xf86dgaproto/xf86dga1str.h
index 0dfde9bc2..d8e73e8ca 100644
--- a/proto/xf86dgaproto/xf86dga1str.h
+++ b/proto/xf86dgaproto/xf86dga1str.h
@@ -1,194 +1,3 @@
-/* $XFree86: xc/include/extensions/xf86dga1str.h,v 1.1 1999/03/28 15:31:33 dawes Exp $ */
-/*
-
-Copyright (c) 1995  Jon Tombs
-Copyright (c) 1995  XFree86 Inc.
-
-*/
-
-#ifndef _XF86DGASTR1_H_
-#define _XF86DGASTR1_H_
-
-typedef struct _XF86DGAQueryVersion {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
-    CARD16	length B16;
-} xXF86DGAQueryVersionReq;
-#define sz_xXF86DGAQueryVersionReq	4
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;	/* major version of DGA protocol */
-    CARD16	minorVersion B16;	/* minor version of DGA protocol */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXF86DGAQueryVersionReply;
-#define sz_xXF86DGAQueryVersionReply	32
-
-typedef struct _XF86DGAGetVideoLL {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_XF86DGAGetVideoLL */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16      pad B16;
-} xXF86DGAGetVideoLLReq;
-#define sz_xXF86DGAGetVideoLLReq	8
-
-typedef struct _XF86DGAInstallColormap{
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad2; 
-    CARD32	id B32;  /* colormap. */
-} xXF86DGAInstallColormapReq;
-#define sz_xXF86DGAInstallColormapReq        12
-
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	offset B32;
-    CARD32	width B32;
-    CARD32	bank_size B32;
-    CARD32	ram_size B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXF86DGAGetVideoLLReply;
-#define sz_xXF86DGAGetVideoLLReply	32
-
-typedef struct _XF86DGADirectVideo {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_XF86DGADirectVideo */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	enable B16;
-} xXF86DGADirectVideoReq;
-#define sz_xXF86DGADirectVideoReq	8
-
-
-typedef struct _XF86DGAGetViewPortSize {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_XF86DGAGetViewPort */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16      pad B16;
-} xXF86DGAGetViewPortSizeReq;
-#define sz_xXF86DGAGetViewPortSizeReq	8
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	width B32;
-    CARD32	height B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXF86DGAGetViewPortSizeReply;
-#define sz_xXF86DGAGetViewPortSizeReply	32
-
-typedef struct _XF86DGASetViewPort {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_XF86DGASetViewPort */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-    CARD32      x B32;
-    CARD32	y B32;
-} xXF86DGASetViewPortReq;
-#define sz_xXF86DGASetViewPortReq	16
-
-typedef struct _XF86DGAGetVidPage {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_XF86DGAGetVidPage */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16      pad B16;
-} xXF86DGAGetVidPageReq;
-#define sz_xXF86DGAGetVidPageReq	8
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	vpage B32;
-    CARD32	pad B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXF86DGAGetVidPageReply;
-#define sz_xXF86DGAGetVidPageReply	32
-
-
-typedef struct _XF86DGASetVidPage {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_XF86DGASetVidPage */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16      vpage B16;
-} xXF86DGASetVidPageReq;
-#define sz_xXF86DGASetVidPageReq	8
-
-
-typedef struct _XF86DGAQueryDirectVideo {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16      pad B16;
-} xXF86DGAQueryDirectVideoReq;
-#define sz_xXF86DGAQueryDirectVideoReq	8
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	flags B32;
-    CARD32	pad B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXF86DGAQueryDirectVideoReply;
-#define sz_xXF86DGAQueryDirectVideoReply 32
-
-
-typedef struct _XF86DGAViewPortChanged {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16      n B16;
-} xXF86DGAViewPortChangedReq;
-#define sz_xXF86DGAViewPortChangedReq	8
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	result B32;
-    CARD32	pad B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXF86DGAViewPortChangedReply;
-#define sz_xXF86DGAViewPortChangedReply 32
-
-#endif /* _XF86DGASTR1_H_ */
-
+#warning "xf86dga1str.h is obsolete and may be removed in the future."
+#warning "include <X11/extensions/xf86dga1proto.h> for the protocol defines."
+#include <X11/extensions/xf86dga1proto.h>
diff --git a/proto/xf86dgaproto/xf86dgaconst.h b/proto/xf86dgaproto/xf86dgaconst.h
new file mode 100644
index 000000000..63829bc42
--- /dev/null
+++ b/proto/xf86dgaproto/xf86dgaconst.h
@@ -0,0 +1,96 @@
+/*
+   Copyright (c) 1999  XFree86 Inc
+*/
+
+#ifndef _XF86DGACONST_H_
+#define _XF86DGACONST_H_
+
+#include <X11/extensions/xf86dga1const.h>
+
+#define X_XDGAQueryVersion		0
+
+/* 1 through 9 are in xf86dga1.h */
+
+/* 10 and 11 are reserved to avoid conflicts with rogue DGA extensions */
+
+#define X_XDGAQueryModes		12
+#define X_XDGASetMode			13
+#define X_XDGASetViewport		14
+#define X_XDGAInstallColormap		15
+#define X_XDGASelectInput		16
+#define X_XDGAFillRectangle		17
+#define X_XDGACopyArea			18
+#define X_XDGACopyTransparentArea	19
+#define X_XDGAGetViewportStatus		20
+#define X_XDGASync			21
+#define X_XDGAOpenFramebuffer		22
+#define X_XDGACloseFramebuffer		23
+#define X_XDGASetClientVersion		24
+#define X_XDGAChangePixmapMode		25
+#define X_XDGACreateColormap		26
+
+
+#define XDGAConcurrentAccess	0x00000001
+#define XDGASolidFillRect	0x00000002
+#define XDGABlitRect		0x00000004
+#define XDGABlitTransRect	0x00000008
+#define XDGAPixmap    		0x00000010
+
+#define XDGAInterlaced          0x00010000
+#define XDGADoublescan          0x00020000
+
+#define XDGAFlipImmediate	0x00000001
+#define XDGAFlipRetrace		0x00000002
+
+#define XDGANeedRoot		0x00000001
+
+#define XF86DGANumberEvents		7
+
+#define XDGAPixmapModeLarge		0
+#define XDGAPixmapModeSmall		1
+
+#define XF86DGAClientNotLocal		0
+#define XF86DGANoDirectVideoMode	1
+#define XF86DGAScreenNotActive		2
+#define XF86DGADirectNotActivated	3
+#define XF86DGAOperationNotSupported	4
+#define XF86DGANumberErrors		(XF86DGAOperationNotSupported + 1)
+
+
+typedef struct {
+   int num;		/* A unique identifier for the mode (num > 0) */
+   char *name;		/* name of mode given in the XF86Config */
+   float verticalRefresh;
+   int flags;		/* DGA_CONCURRENT_ACCESS, etc... */
+   int imageWidth;	/* linear accessible portion (pixels) */
+   int imageHeight;
+   int pixmapWidth;	/* Xlib accessible portion (pixels) */
+   int pixmapHeight;	/* both fields ignored if no concurrent access */
+   int bytesPerScanline; 
+   int byteOrder;	/* MSBFirst, LSBFirst */
+   int depth;		
+   int bitsPerPixel;
+   unsigned long redMask;
+   unsigned long greenMask;
+   unsigned long blueMask;
+   short visualClass;
+   int viewportWidth;
+   int viewportHeight;
+   int xViewportStep;	/* viewport position granularity */
+   int yViewportStep;
+   int maxViewportX;	/* max viewport origin */
+   int maxViewportY;
+   int viewportFlags;	/* types of page flipping possible */
+   int reserved1;
+   int reserved2;
+} XDGAMode;
+
+
+typedef struct {
+   XDGAMode mode;
+   unsigned char *data;
+   Pixmap pixmap;
+} XDGADevice;
+
+
+#endif /* _XF86DGACONST_H_ */
diff --git a/proto/xf86dgaproto/xf86dgaproto.h b/proto/xf86dgaproto/xf86dgaproto.h
new file mode 100644
index 000000000..8b7f13d28
--- /dev/null
+++ b/proto/xf86dgaproto/xf86dgaproto.h
@@ -0,0 +1,344 @@
+/*
+
+Copyright (c) 1995  Jon Tombs
+Copyright (c) 1995  XFree86 Inc.
+
+*/
+
+#ifndef _XF86DGAPROTO_H_
+#define _XF86DGAPROTO_H_
+
+#include <X11/extensions/xf86dga1proto.h>
+#include <X11/extensions/xf86dgaconst.h>
+
+#define XF86DGANAME "XFree86-DGA"
+
+#define XDGA_MAJOR_VERSION	2	/* current version numbers */
+#define XDGA_MINOR_VERSION	0
+
+
+typedef struct _XDGAQueryVersion {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
+    CARD16	length B16;
+} xXDGAQueryVersionReq;
+#define sz_xXDGAQueryVersionReq		4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of DGA protocol */
+    CARD16	minorVersion B16;	/* minor version of DGA protocol */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXDGAQueryVersionReply;
+#define sz_xXDGAQueryVersionReply	32
+
+typedef struct _XDGAQueryModes {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+} xXDGAQueryModesReq;
+#define sz_xXDGAQueryModesReq		8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	number B32;		/* number of modes available */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXDGAQueryModesReply;
+#define sz_xXDGAQueryModesReply	32
+
+
+typedef struct _XDGASetMode {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD32	mode B32;		/* mode number to init */
+    CARD32	pid B32;		/* Pixmap descriptor */
+} xXDGASetModeReq;
+#define sz_xXDGASetModeReq		16
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	offset B32;		/* offset into framebuffer map */
+    CARD32	flags B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXDGASetModeReply;
+#define sz_xXDGASetModeReply	32
+
+typedef struct {
+   CARD8	byte_order;
+   CARD8	depth;
+   CARD16 	num B16;
+   CARD16	bpp B16;
+   CARD16	name_size B16;
+   CARD32	vsync_num B32;
+   CARD32	vsync_den B32;
+   CARD32	flags B32;
+   CARD16	image_width B16;
+   CARD16	image_height B16;
+   CARD16	pixmap_width B16;
+   CARD16	pixmap_height B16;
+   CARD32	bytes_per_scanline B32;
+   CARD32	red_mask B32;
+   CARD32	green_mask B32;
+   CARD32	blue_mask B32;
+   CARD16	visual_class B16;
+   CARD16	pad1 B16;
+   CARD16	viewport_width B16;
+   CARD16	viewport_height B16;
+   CARD16	viewport_xstep B16;
+   CARD16	viewport_ystep B16;
+   CARD16	viewport_xmax B16;
+   CARD16	viewport_ymax B16;
+   CARD32	viewport_flags B32;
+   CARD32	reserved1 B32;
+   CARD32	reserved2 B32;
+} xXDGAModeInfo;
+#define sz_xXDGAModeInfo 72
+
+typedef struct _XDGAOpenFramebuffer {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+} xXDGAOpenFramebufferReq;
+#define sz_xXDGAOpenFramebufferReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;		/* device name size if there is one */
+    CARD32	mem1 B32;		/* physical memory */	
+    CARD32	mem2 B32;		/* spillover for _alpha_ */
+    CARD32	size B32;		/* size of map in bytes */
+    CARD32	offset B32;		/* optional offset into device */
+    CARD32	extra B32;		/* extra info associated with the map */
+    CARD32	pad2 B32;
+} xXDGAOpenFramebufferReply;
+#define sz_xXDGAOpenFramebufferReply	32
+
+
+typedef struct _XDGACloseFramebuffer {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+} xXDGACloseFramebufferReq;
+#define sz_xXDGACloseFramebufferReq	8
+
+
+typedef struct _XDGASetViewport {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD16	x B16;
+    CARD16	y B16;
+    CARD32	flags B32;
+} xXDGASetViewportReq;
+#define sz_xXDGASetViewportReq	16
+
+
+typedef struct _XDGAInstallColormap {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD32	cmap B32;
+} xXDGAInstallColormapReq;
+#define sz_xXDGAInstallColormapReq	12
+
+typedef struct _XDGASelectInput {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD32	mask B32;
+} xXDGASelectInputReq;
+#define sz_xXDGASelectInputReq	12
+
+typedef struct _XDGAFillRectangle {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD16	x B16;
+    CARD16	y B16;
+    CARD16	width B16;
+    CARD16	height B16;
+    CARD32	color B32;
+} xXDGAFillRectangleReq;
+#define sz_xXDGAFillRectangleReq	20
+
+
+typedef struct _XDGACopyArea {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD16	srcx B16;
+    CARD16	srcy B16;
+    CARD16	width B16;
+    CARD16	height B16;
+    CARD16	dstx B16;
+    CARD16	dsty B16;
+} xXDGACopyAreaReq;
+#define sz_xXDGACopyAreaReq	20
+
+typedef struct _XDGACopyTransparentArea {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD16	srcx B16;
+    CARD16	srcy B16;
+    CARD16	width B16;
+    CARD16	height B16;
+    CARD16	dstx B16;
+    CARD16	dsty B16;
+    CARD32	key B32;
+} xXDGACopyTransparentAreaReq;
+#define sz_xXDGACopyTransparentAreaReq	24
+
+
+typedef struct _XDGAGetViewportStatus {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+} xXDGAGetViewportStatusReq;
+#define sz_xXDGAGetViewportStatusReq	8
+
+typedef struct {
+    BYTE	type;			
+    BOOL	pad1;	
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	status B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXDGAGetViewportStatusReply;
+#define sz_xXDGAGetViewportStatusReply	32
+
+typedef struct _XDGASync {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+} xXDGASyncReq;
+#define sz_xXDGASyncReq	8
+
+typedef struct {
+    BYTE	type;			
+    BOOL	pad1;	
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+    CARD32	pad7 B32;
+} xXDGASyncReply;
+#define sz_xXDGASyncReply	32
+
+typedef struct _XDGASetClientVersion {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD16	major B16;
+    CARD16	minor B16;
+} xXDGASetClientVersionReq;
+#define sz_xXDGASetClientVersionReq	8
+
+
+typedef struct {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD16	x B16;
+    CARD16	y B16;
+    CARD32	flags B32;
+} xXDGAChangePixmapModeReq;
+#define sz_xXDGAChangePixmapModeReq	16
+
+typedef struct {
+    BYTE	type;			
+    BOOL	pad1;	
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	x B16;
+    CARD16	y B16;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+    CARD32	pad7 B32;
+} xXDGAChangePixmapModeReply;
+#define sz_xXDGAChangePixmapModeReply	32
+
+typedef struct _XDGACreateColormap {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD32	id B32;
+    CARD32	mode B32;
+    CARD8	alloc;
+    CARD8	pad1;
+    CARD16	pad2;
+} xXDGACreateColormapReq;
+#define sz_xXDGACreateColormapReq	20
+
+
+typedef struct {
+  union {
+    struct {
+      BYTE type;
+      BYTE detail;
+      CARD16 sequenceNumber B16;
+    } u;
+    struct {
+      CARD32 pad0 B32;
+      CARD32 time B32;
+      INT16 dx B16;
+      INT16 dy B16;
+      INT16 screen B16;
+      CARD16 state B16;
+      CARD32 pad1 B32;
+      CARD32 pad2 B32;
+      CARD32 pad3 B32;
+      CARD32 pad4 B32;
+    } event;
+  } u;
+} dgaEvent;
+
+
+#endif /* _XF86DGAPROTO_H_ */
+
diff --git a/proto/xf86dgaproto/xf86dgastr.h b/proto/xf86dgaproto/xf86dgastr.h
index 66dd354c8..f4809d1a5 100644
--- a/proto/xf86dgaproto/xf86dgastr.h
+++ b/proto/xf86dgaproto/xf86dgastr.h
@@ -1,344 +1,3 @@
-/* $XFree86: xc/include/extensions/xf86dgastr.h,v 3.13 2000/12/20 00:19:41 mvojkovi Exp $ */
-/*
-
-Copyright (c) 1995  Jon Tombs
-Copyright (c) 1995  XFree86 Inc.
-
-*/
-
-#ifndef _XF86DGASTR_H_
-#define _XF86DGASTR_H_
-
-#include <X11/extensions/xf86dga1str.h>
-
-#define XF86DGANAME "XFree86-DGA"
-
-#define XDGA_MAJOR_VERSION	2	/* current version numbers */
-#define XDGA_MINOR_VERSION	0
-
-
-typedef struct _XDGAQueryVersion {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
-    CARD16	length B16;
-} xXDGAQueryVersionReq;
-#define sz_xXDGAQueryVersionReq		4
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;	/* major version of DGA protocol */
-    CARD16	minorVersion B16;	/* minor version of DGA protocol */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXDGAQueryVersionReply;
-#define sz_xXDGAQueryVersionReply	32
-
-typedef struct _XDGAQueryModes {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-} xXDGAQueryModesReq;
-#define sz_xXDGAQueryModesReq		8
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	number B32;		/* number of modes available */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXDGAQueryModesReply;
-#define sz_xXDGAQueryModesReply	32
-
-
-typedef struct _XDGASetMode {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	mode B32;		/* mode number to init */
-    CARD32	pid B32;		/* Pixmap descriptor */
-} xXDGASetModeReq;
-#define sz_xXDGASetModeReq		16
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	offset B32;		/* offset into framebuffer map */
-    CARD32	flags B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXDGASetModeReply;
-#define sz_xXDGASetModeReply	32
-
-typedef struct {
-   CARD8	byte_order;
-   CARD8	depth;
-   CARD16 	num B16;
-   CARD16	bpp B16;
-   CARD16	name_size B16;
-   CARD32	vsync_num B32;
-   CARD32	vsync_den B32;
-   CARD32	flags B32;
-   CARD16	image_width B16;
-   CARD16	image_height B16;
-   CARD16	pixmap_width B16;
-   CARD16	pixmap_height B16;
-   CARD32	bytes_per_scanline B32;
-   CARD32	red_mask B32;
-   CARD32	green_mask B32;
-   CARD32	blue_mask B32;
-   CARD16	visual_class B16;
-   CARD16	pad1 B16;
-   CARD16	viewport_width B16;
-   CARD16	viewport_height B16;
-   CARD16	viewport_xstep B16;
-   CARD16	viewport_ystep B16;
-   CARD16	viewport_xmax B16;
-   CARD16	viewport_ymax B16;
-   CARD32	viewport_flags B32;
-   CARD32	reserved1 B32;
-   CARD32	reserved2 B32;
-} xXDGAModeInfo;
-#define sz_xXDGAModeInfo 72
-
-typedef struct _XDGAOpenFramebuffer {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-} xXDGAOpenFramebufferReq;
-#define sz_xXDGAOpenFramebufferReq	8
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;		/* device name size if there is one */
-    CARD32	mem1 B32;		/* physical memory */	
-    CARD32	mem2 B32;		/* spillover for _alpha_ */
-    CARD32	size B32;		/* size of map in bytes */
-    CARD32	offset B32;		/* optional offset into device */
-    CARD32	extra B32;		/* extra info associated with the map */
-    CARD32	pad2 B32;
-} xXDGAOpenFramebufferReply;
-#define sz_xXDGAOpenFramebufferReply	32
-
-
-typedef struct _XDGACloseFramebuffer {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-} xXDGACloseFramebufferReq;
-#define sz_xXDGACloseFramebufferReq	8
-
-
-typedef struct _XDGASetViewport {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD16	x B16;
-    CARD16	y B16;
-    CARD32	flags B32;
-} xXDGASetViewportReq;
-#define sz_xXDGASetViewportReq	16
-
-
-typedef struct _XDGAInstallColormap {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	cmap B32;
-} xXDGAInstallColormapReq;
-#define sz_xXDGAInstallColormapReq	12
-
-typedef struct _XDGASelectInput {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	mask B32;
-} xXDGASelectInputReq;
-#define sz_xXDGASelectInputReq	12
-
-typedef struct _XDGAFillRectangle {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD16	x B16;
-    CARD16	y B16;
-    CARD16	width B16;
-    CARD16	height B16;
-    CARD32	color B32;
-} xXDGAFillRectangleReq;
-#define sz_xXDGAFillRectangleReq	20
-
-
-typedef struct _XDGACopyArea {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD16	srcx B16;
-    CARD16	srcy B16;
-    CARD16	width B16;
-    CARD16	height B16;
-    CARD16	dstx B16;
-    CARD16	dsty B16;
-} xXDGACopyAreaReq;
-#define sz_xXDGACopyAreaReq	20
-
-typedef struct _XDGACopyTransparentArea {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD16	srcx B16;
-    CARD16	srcy B16;
-    CARD16	width B16;
-    CARD16	height B16;
-    CARD16	dstx B16;
-    CARD16	dsty B16;
-    CARD32	key B32;
-} xXDGACopyTransparentAreaReq;
-#define sz_xXDGACopyTransparentAreaReq	24
-
-
-typedef struct _XDGAGetViewportStatus {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-} xXDGAGetViewportStatusReq;
-#define sz_xXDGAGetViewportStatusReq	8
-
-typedef struct {
-    BYTE	type;			
-    BOOL	pad1;	
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	status B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXDGAGetViewportStatusReply;
-#define sz_xXDGAGetViewportStatusReply	32
-
-typedef struct _XDGASync {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-} xXDGASyncReq;
-#define sz_xXDGASyncReq	8
-
-typedef struct {
-    BYTE	type;			
-    BOOL	pad1;	
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-    CARD32	pad7 B32;
-} xXDGASyncReply;
-#define sz_xXDGASyncReply	32
-
-typedef struct _XDGASetClientVersion {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD16	major B16;
-    CARD16	minor B16;
-} xXDGASetClientVersionReq;
-#define sz_xXDGASetClientVersionReq	8
-
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD16	x B16;
-    CARD16	y B16;
-    CARD32	flags B32;
-} xXDGAChangePixmapModeReq;
-#define sz_xXDGAChangePixmapModeReq	16
-
-typedef struct {
-    BYTE	type;			
-    BOOL	pad1;	
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	x B16;
-    CARD16	y B16;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-    CARD32	pad7 B32;
-} xXDGAChangePixmapModeReply;
-#define sz_xXDGAChangePixmapModeReply	32
-
-typedef struct _XDGACreateColormap {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	id B32;
-    CARD32	mode B32;
-    CARD8	alloc;
-    CARD8	pad1;
-    CARD16	pad2;
-} xXDGACreateColormapReq;
-#define sz_xXDGACreateColormapReq	20
-
-
-typedef struct {
-  union {
-    struct {
-      BYTE type;
-      BYTE detail;
-      CARD16 sequenceNumber B16;
-    } u;
-    struct {
-      CARD32 pad0 B32;
-      CARD32 time B32;
-      INT16 dx B16;
-      INT16 dy B16;
-      INT16 screen B16;
-      CARD16 state B16;
-      CARD32 pad1 B32;
-      CARD32 pad2 B32;
-      CARD32 pad3 B32;
-      CARD32 pad4 B32;
-    } event;
-  } u;
-} dgaEvent;
-
-
-#endif /* _XF86DGASTR_H_ */
-
+#warning "xf86dgastr.h is obsolete and may be removed in the future."
+#warning "include <X11/extensions/xf86dgaproto.h> for the protocol defines."
+#include <X11/extensions/xf86dgaproto.h>