The xf86dgaproto package (as of 2.0.99.2) now provides an include file
named xf86dga.h for compatibility. We now depend on that version.
---
configure.ac | 2 +-
include/X11/extensions/Xxf86dga.h | 176 +++++++++++++++++++++++++++++++++++++
include/X11/extensions/xf86dga.h | 176 -------------------------------------
src/Makefile.am | 2 +-
4 files changed, 178 insertions(+), 178 deletions(-)
create mode 100644 include/X11/extensions/Xxf86dga.h
delete mode 100644 include/X11/extensions/xf86dga.h
diff --git a/configure.ac b/configure.ac
index a24af12..ed44772 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ AC_PROG_LIBTOOL
XORG_CWARNFLAGS
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >=
2.0.99.1])
+PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >=
2.0.99.2])
XXF86DGA_CFLAGS="$CWARNFLAGS $XXF86DGA_CFLAGS"
XORG_CHECK_MALLOC_ZERO
diff --git a/include/X11/extensions/Xxf86dga.h
b/include/X11/extensions/Xxf86dga.h
new file mode 100644
index 0000000..3b14ff3
--- /dev/null
+++ b/include/X11/extensions/Xxf86dga.h
@@ -0,0 +1,176 @@
+/*
+ Copyright (c) 1999 XFree86 Inc
+*/
+
+#ifndef _XF86DGA_H_
+#define _XF86DGA_H_
+
+#include <X11/Xfuncproto.h>
+#include <X11/extensions/xf86dgaconst.h>
+#include <X11/extensions/xf86dga1.h>
+
+_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_H_ */
diff --git a/include/X11/extensions/xf86dga.h b/include/X11/extensions/xf86dga.h
deleted file mode 100644
index 3b14ff3..0000000
--- a/include/X11/extensions/xf86dga.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- Copyright (c) 1999 XFree86 Inc
-*/
-
-#ifndef _XF86DGA_H_
-#define _XF86DGA_H_
-
-#include <X11/Xfuncproto.h>
-#include <X11/extensions/xf86dgaconst.h>
-#include <X11/extensions/xf86dga1.h>
-
-_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_H_ */
diff --git a/src/Makefile.am b/src/Makefile.am
index dd159ef..f6517bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,5 +9,5 @@ libXxf86dga_la_LIBADD = $(XXF86DGA_LIBS)
libXxf86dga_la_LDFLAGS = -version-number 1:0:0
libXxf86dgaincludedir = $(includedir)/X11/extensions
-libXxf86dgainclude_HEADERS = $(top_srcdir)/include/X11/extensions/xf86dga.h \
+libXxf86dgainclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xxf86dga.h \
$(top_srcdir)/include/X11/extensions/xf86dga1.h
--
1.6.4.3
_______________________________________________
xorg-devel mailing list
[email protected]
http://lists.x.org/mailman/listinfo/xorg-devel
