libxxf86dga: Changes to 'debian-unstable'
.gitignore | 12 ++
ChangeLog | 107 +++++++++++++++++++++++
Makefile.am | 10 +-
README | 25 +++++
configure.ac | 11 +-
debian/changelog | 8 +
debian/control | 2
include/X11/extensions/Xxf86dga.h | 176 ++++++++++++++++++++++++++++++++++++++
include/X11/extensions/xf86dga1.h | 115 ++++++++++++++++++++++++
man/.gitignore | 3
man/Makefile.am | 1
src/.gitignore | 9 -
src/Makefile.am | 8 +
src/XF86DGA.c | 5 -
src/XF86DGA2.c | 5 -
15 files changed, 469 insertions(+), 28 deletions(-)
New commits:
commit 3238d68a89883f768e1cd01223c02a639300915e
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Nov 24 12:12:47 2009 +0200
Bump the build-dep on xutils-dev (>= 1:7.5~1).
diff --git a/debian/changelog b/debian/changelog
index eca5d59..e13952b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ libxxf86dga (2:1.1.1-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release.
+ * Bump the build-dep on xutils-dev (>= 1:7.5~1).
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 24 Nov 2009 12:07:19 +0200
diff --git a/debian/control b/debian/control
index 934a69c..e9ee1b1 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
quilt,
automake,
libtool,
- xutils-dev (>= 1:7.4+4)
+ xutils-dev (>= 1:7.5~1)
Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxxf86dga
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxxf86dga.git
commit 6789b9389df4ac6ed90a12394272aa2db0e531ad
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Nov 24 12:12:17 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 1758c26..b2c9b03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,110 @@
+commit 990b19154368d9a1733636367d6a99d863d558ee
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Oct 6 16:14:45 2009 +1000
+
+ libXxf86dga 1.1.1
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 3cfcfc6246fb213bb0edf529b4f2b40907e5161c
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Oct 6 15:38:27 2009 +1000
+
+ Include Xxf86dga.h, not xf86dga.
+
+ f78f3ed3571ab0bd75753a7ab388120a383d894a removed xf86dga.h and instead
+ provided Xxf86dga.h. Let's use it!
+
+ Also, remove two superfluous includes, including it once per file is enough.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 0bd51760a0d92181faedbd52e7d7249c8179f95d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Oct 6 15:34:22 2009 +1000
+
+ Actually use XORG_DEFAULT_OPTIONS
+
+ For some reason, this part didn't make it into
+ 8eab9123467b047f2b4ddec7df48a679c9254ca1.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 5bf5c3c78963cec3cd22e445c62cc7cfd2a37df2
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Oct 1 22:34:39 2009 +1000
+
+ libXxf86dga 1.1
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 8eab9123467b047f2b4ddec7df48a679c9254ca1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Oct 1 22:33:10 2009 +1000
+
+ Require macros 1.3 for XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 9be294d7455ce5799b09bc6bb06c18bea80287be
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Sep 21 10:16:25 2009 +1000
+
+ Bump to 1.0.99.2
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f78f3ed3571ab0bd75753a7ab388120a383d894a
+Author: Carl Worth <cworth@cworth.org>
+Date: Wed Sep 16 17:08:17 2009 -0700
+
+ Rename xf86dga.h to Xxf86dga.h
+
+ 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.
+
+commit fd90936abab52caf163c83d114a22980adcc3ee0
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Aug 27 10:56:55 2009 +1000
+
+ Bump to 1.0.99.1
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit e28cffbe48279a622b19cab1c83ab0a97e60ccef
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Aug 26 16:41:04 2009 +1000
+
+ Move Xlib headers from xf86dgaproto to here.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 66abdd3e52ef3071c7d89313cc95935a4ee7ba52
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Feb 2 20:34:37 2009 -0800
+
+ Add README with pointers to mailing list, bugzilla & git repos
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 11ff34f811737514ded5231b73407d63a1baf68d
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Mon Feb 2 14:22:44 2009 -0200
+
+ Janitor: make distcheck and .gitignore.
+
+commit d5bcd25affa9df2d937f57fac914de4b6f740ae6
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sun Mar 9 08:47:58 2008 +0100
+
+ nuke RCS Ids
+
+commit 7acb8e34e19ca4ac3347cd42c31adf877397f23b
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Dec 6 16:38:43 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
commit 5968e0f1e992db63b003f2389657cd527a806efd
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 5 10:17:57 2007 -0700
diff --git a/debian/changelog b/debian/changelog
index 621eaf0..eca5d59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxxf86dga (2:1.0.2-2) UNRELEASED; urgency=low
+libxxf86dga (2:1.1.1-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Sync debian/control 'Section' fields with the override.
@@ -15,7 +15,10 @@ libxxf86dga (2:1.0.2-2) UNRELEASED; urgency=low
* Run autoreconf on build; add build-deps on automake, libtool, xutils-dev.
* Handle parallel builds.
- -- Brice Goglin <bgoglin@debian.org> Sun, 02 Aug 2009 23:28:37 +0200
+ [ Timo Aaltonen ]
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 24 Nov 2009 12:07:19 +0200
libxxf86dga (2:1.0.2-1) unstable; urgency=low
commit 990b19154368d9a1733636367d6a99d863d558ee
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 6 16:14:45 2009 +1000
libXxf86dga 1.1.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index f34bf25..0e1341e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.57])
-AC_INIT(libXxf86dga, 1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
+AC_INIT(libXxf86dga, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 3cfcfc6246fb213bb0edf529b4f2b40907e5161c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 6 15:38:27 2009 +1000
Include Xxf86dga.h, not xf86dga.
f78f3ed3571ab0bd75753a7ab388120a383d894a removed xf86dga.h and instead
provided Xxf86dga.h. Let's use it!
Also, remove two superfluous includes, including it once per file is enough.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/XF86DGA.c b/src/XF86DGA.c
index 4fedd12..a6e66a4 100644
--- a/src/XF86DGA.c
+++ b/src/XF86DGA.c
@@ -62,7 +62,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
#define NEED_EVENTS
#define NEED_REPLIES
#include <X11/Xlibint.h>
-#include <X11/extensions/xf86dga.h>
+#include <X11/extensions/Xxf86dga.h>
#include <X11/extensions/xf86dgaproto.h>
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
@@ -342,7 +342,6 @@ Bool XF86DGAViewPortChanged(
/* Helper functions */
#include <X11/Xmd.h>
-#include <X11/extensions/xf86dga.h>
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
index 5eb5aad..8425faa 100644
--- a/src/XF86DGA2.c
+++ b/src/XF86DGA2.c
@@ -18,7 +18,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
#define NEED_EVENTS
#define NEED_REPLIES
#include <X11/Xlibint.h>
-#include <X11/extensions/xf86dga.h>
+#include <X11/extensions/Xxf86dga.h>
#include <X11/extensions/xf86dgaproto.h>
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
@@ -710,7 +710,6 @@ void XDGAKeyEventToXKeyEvent(
}
#include <X11/Xmd.h>
-#include <X11/extensions/xf86dga.h>
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
commit 0bd51760a0d92181faedbd52e7d7249c8179f95d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 6 15:34:22 2009 +1000
Actually use XORG_DEFAULT_OPTIONS
For some reason, this part didn't make it into
8eab9123467b047f2b4ddec7df48a679c9254ca1.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 57821ef..f34bf25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(libXxf86dga, 1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xo
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+# 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)
AM_CONFIG_HEADER(src/config.h)
@@ -12,16 +12,13 @@ AM_CONFIG_HEADER(src/config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >= 2.0.99.2])
XXF86DGA_CFLAGS="$CWARNFLAGS $XXF86DGA_CFLAGS"
XORG_CHECK_MALLOC_ZERO
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
commit 5bf5c3c78963cec3cd22e445c62cc7cfd2a37df2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 1 22:34:39 2009 +1000
libXxf86dga 1.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index fee26a2..57821ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.57])
-AC_INIT(libXxf86dga, 1.0.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
+AC_INIT(libXxf86dga, 1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 8eab9123467b047f2b4ddec7df48a679c9254ca1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 1 22:33:10 2009 +1000
Require macros 1.3 for XORG_DEFAULT_OPTIONS
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index a828c71..fee26a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,8 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER(src/config.h)
# Check for progs
commit 9be294d7455ce5799b09bc6bb06c18bea80287be
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 21 10:16:25 2009 +1000
Bump to 1.0.99.2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index ed44772..a828c71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.57])
-AC_INIT(libXxf86dga, 1.0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
+AC_INIT(libXxf86dga, 1.0.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit f78f3ed3571ab0bd75753a7ab388120a383d894a
Author: Carl Worth <cworth@cworth.org>
Date: Wed Sep 16 17:08:17 2009 -0700
Rename xf86dga.h to Xxf86dga.h
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.
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
commit fd90936abab52caf163c83d114a22980adcc3ee0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 27 10:56:55 2009 +1000
Bump to 1.0.99.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 1d2062f..a24af12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.57])
-AC_INIT(libXxf86dga, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
+AC_INIT(libXxf86dga, 1.0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit e28cffbe48279a622b19cab1c83ab0a97e60ccef
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 26 16:41:04 2009 +1000
Move Xlib headers from xf86dgaproto to here.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index c72affe..1d2062f 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.3])
+PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >= 2.0.99.1])
XXF86DGA_CFLAGS="$CWARNFLAGS $XXF86DGA_CFLAGS"
XORG_CHECK_MALLOC_ZERO
diff --git a/include/X11/extensions/xf86dga.h b/include/X11/extensions/xf86dga.h
new file mode 100644
index 0000000..3b14ff3
--- /dev/null
+++ b/include/X11/extensions/xf86dga.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);
+
+
Reply to: