libxext: Changes to 'upstream-unstable'
.gitignore | 10 +
Makefile.am | 4
README | 29 ++
configure.ac | 17 -
include/X11/extensions/MITMisc.h | 56 +++++
include/X11/extensions/XEVI.h | 63 ++++++
include/X11/extensions/XLbx.h | 52 +++++
include/X11/extensions/XShm.h | 136 +++++++++++++
include/X11/extensions/Xag.h | 92 +++++++++
include/X11/extensions/Xcup.h | 60 ++++++
include/X11/extensions/Xdbe.h | 140 ++++++++++++++
include/X11/extensions/Xext.h | 55 +++++
include/X11/extensions/Xge.h | 57 +++++
include/X11/extensions/dpms.h | 53 +++++
include/X11/extensions/extutil.h | 192 +++++++++++++++++++
include/X11/extensions/lbxbuf.h | 51 +++++
include/X11/extensions/lbxbufstr.h | 45 ++++
include/X11/extensions/lbximage.h | 151 +++++++++++++++
include/X11/extensions/multibuf.h | 216 +++++++++++++++++++++
include/X11/extensions/security.h | 79 +++++++
include/X11/extensions/shape.h | 155 +++++++++++++++
include/X11/extensions/sync.h | 338 +++++++++++++++++++++++++++++++++
include/X11/extensions/xtestext1.h | 85 ++++++++
man/.gitignore | 3
man/Makefile.am | 41 ++--
man/XShm.man | 5
src/.gitignore | 6
src/DPMS.c | 2
src/MITMisc.c | 2
src/Makefile.am | 27 ++
src/XAppgroup.c | 3
src/XEVI.c | 2
src/XLbx.c | 2
src/XMultibuf.c | 5
src/XSecurity.c | 3
src/XShape.c | 3
src/XShm.c | 5
src/XSync.c | 29 --
src/XTestExt1.c | 1
src/Xcup.c | 3
src/Xdbe.c | 2
src/Xge.c | 368 +++++++++++++++++++++++++++++++++++++
src/extutil.c | 21 +-
src/globals.c | 3
xext.pc.in | 2
45 files changed, 2584 insertions(+), 90 deletions(-)
New commits:
commit ed7bbe65222286828fa42f3c264ed5c4190fe58c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Oct 21 20:13:24 2009 -0700
libXext 1.1.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index d0a3d2f..8c674a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libXext],
- 1.1,
+ 1.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXext)
commit 341bddfc6eddef77e57dd64a084b69fd24bba152
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Oct 21 20:12:49 2009 -0700
Use $(AM_V_GEN) to silence makefile generation rules
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 20f333c..f3447bd 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -48,25 +48,26 @@ EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA)
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-BUILT_SOURCES = shadows.DONE
-
-shadows.DONE:
- -rm -f $(all_aliases:=.@LIB_MAN_SUFFIX@)
- (for i in $(XShape_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/XShape.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XShm_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/XShm.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(Xmbuf_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/Xmbuf.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(Xevi_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/Xevi.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- touch shadows.DONE
-
-CLEANFILES += shadows.DONE
+
+XShape_shadowmen = $(XShape_man_aliases:=.@LIB_MAN_SUFFIX@)
+
+$(XShape_shadowmen):
+ $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XShape.$(LIB_MAN_SUFFIX) > $@
+
+XShm_shadowmen = $(XShm_man_aliases:=.@LIB_MAN_SUFFIX@)
+
+$(XShm_shadowmen):
+ $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XShm.$(LIB_MAN_SUFFIX) > $@
+
+Xmbuf_shadowmen = $(Xmbuf_man_aliases:=.@LIB_MAN_SUFFIX@)
+
+$(Xmbuf_shadowmen):
+ $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xmbuf.$(LIB_MAN_SUFFIX) > $@
+
+Xevi_shadowmen = $(Xevi_man_aliases:=.@LIB_MAN_SUFFIX@)
+
+$(Xevi_shadowmen):
+ $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xevi.$(LIB_MAN_SUFFIX) > $@
# Rules for generating files using the C pre-processor
# (Replaces CppFileTarget from Imake)
@@ -106,5 +107,5 @@ MANDEFS = \
-D__projectroot__=$(prefix)
.man.$(LIB_MAN_SUFFIX):
- $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
commit 38c351f2f49d44944958e9b4d003a74bd6d8d683
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 21 12:47:25 2009 -0700
This is not a GNU project, so declare it foreign.
On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
> On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
> > I noticed an INSTALL file in xlsclients and libXvMC today, and it
> > was quite annoying to work around since 'autoreconf -fvi' replaces
> > it and git wants to commit it. Should these files even be in git?
> > Can I nuke them for the betterment of humanity and since they get
> > created by autoreconf anyways?
>
> See https://bugs.freedesktop.org/show_bug.cgi?id=24206
As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
of the INSTALL file. It is also part of the 24206 solution.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
diff --git a/configure.ac b/configure.ac
index ebbf113..d0a3d2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_INIT([libXext],
libXext)
AC_CONFIG_SRCDIR([Makefile.am])
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 956fd30e1046e5779ac0b6c07ec4f0e87250869a
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 7 19:31:21 2009 -0700
XAllocID must only be called with the Display lock held.
This patch makes XShmAttach follow the same XID allocation pattern used in
other stubs, such as XShmCreatePixmap.
Reported-by: <fdsteve@ihug.co.nz>
Signed-off-by: Jamey Sharp <jamey@minilop.net>
diff --git a/src/XShm.c b/src/XShm.c
index 922b4cb..38efa9f 100644
--- a/src/XShm.c
+++ b/src/XShm.c
@@ -235,12 +235,11 @@ Status XShmAttach(Display *dpy, XShmSegmentInfo *shminfo)
ShmCheckExtension (dpy, info, 0);
- shminfo->shmseg = XAllocID(dpy);
LockDisplay(dpy);
GetReq(ShmAttach, req);
req->reqType = info->codes->major_opcode;
req->shmReqType = X_ShmAttach;
- req->shmseg = shminfo->shmseg;
+ req->shmseg = shminfo->shmseg = XAllocID(dpy);
req->shmid = shminfo->shmid;
req->readOnly = shminfo->readOnly ? xTrue : xFalse;
UnlockDisplay(dpy);
commit 927e3260bcf1ad020228e8f2dce0176269982b4f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 2 10:52:13 2009 +1000
libXext 1.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index d19b087..ebbf113 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libXext],
- 1.0.99.4,
+ 1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXext)
commit 003e2eb714c39984b3c054e0fc637cdb051dcdf3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 2 10:43:14 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 38bdc93..d19b087 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,9 +12,9 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT
+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([config.h])
# Determine .so library version per platform
@@ -32,7 +32,7 @@ AC_SUBST(XEXT_SOREV)
# Checks for programs.
AC_PROG_LIBTOOL
AC_PROG_CC
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.0.99.2])
@@ -46,12 +46,9 @@ AC_SUBST(XEXT_LIBS)
AC_HEADER_STDC
XORG_CHECK_MALLOC_ZERO
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
# Man page processing requirements
XORG_PROG_RAWCPP
-XORG_MANPAGE_SECTIONS
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
commit e29cd70df7d5abdccb6b7ed973611044d02241d0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 21 13:38:01 2009 +1000
Bump to 1.0.99.4
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 0234d53..38bdc93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libXext],
- 1.0.99.3,
+ 1.0.99.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXext)
commit c3dc01ce05b26ec389eb2fbfc8633e3e0955572f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jul 20 22:49:15 2009 +0100
Rename mitmisc.h to mitmiscconst.h to avoid a collision with MITMisc.h on case-insensitive filesystems
Requires xextproto 7.0.99.2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index bf7168c..0234d53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ AC_PROG_CC
XORG_CWARNFLAGS
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.0.99.1])
+PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.0.99.2])
XEXT_CFLAGS="$CWARNFLAGS $XEXT_CFLAGS"
AC_SUBST(XEXT_CFLAGS)
AC_SUBST(XEXT_LIBS)
diff --git a/include/X11/extensions/MITMisc.h b/include/X11/extensions/MITMisc.h
index acb6850..5b9713e 100644
--- a/include/X11/extensions/MITMisc.h
+++ b/include/X11/extensions/MITMisc.h
@@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group.
#define _XMITMISC_H_
#include <X11/Xfuncproto.h>
-#include <X11/extensions/mitmisc.h>
+#include <X11/extensions/mitmiscconst.h>
_XFUNCPROTOBEGIN
commit dbc6ca9306f0f683419aca737e0d98243475bc0d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 20 13:19:04 2009 +1000
Remove XTest header, belongs to libXtst.
All prototypes declared in XTest.h are defined in libXtst/src/XTest.c, not
here.
This removes the circular dependency between libXi and libXext.
Reported-by: Colin Guthrie
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/include/X11/extensions/XTest.h b/include/X11/extensions/XTest.h
deleted file mode 100644
index f27407a..0000000
--- a/include/X11/extensions/XTest.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* $Xorg: XTest.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */
-/*
-
-Copyright 1992, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/include/extensions/XTest.h,v 3.3 2001/12/14 19:53:28 dawes Exp $ */
-
-#ifndef _XTEST_H_
-#define _XTEST_H_
-
-#include <X11/Xfuncproto.h>
-#include <X11/extensions/xtest.h>
-#include <X11/extensions/XInput.h>
-
-_XFUNCPROTOBEGIN
-
-Bool XTestQueryExtension(
- Display* /* dpy */,
- int* /* event_basep */,
- int* /* error_basep */,
- int* /* majorp */,
- int* /* minorp */
-);
-
-Bool XTestCompareCursorWithWindow(
- Display* /* dpy */,
- Window /* window */,
- Cursor /* cursor */
-);
-
-Bool XTestCompareCurrentCursorWithWindow(
- Display* /* dpy */,
- Window /* window */
-);
-
-extern int XTestFakeKeyEvent(
- Display* /* dpy */,
- unsigned int /* keycode */,
- Bool /* is_press */,
- unsigned long /* delay */
-);
-
-extern int XTestFakeButtonEvent(
- Display* /* dpy */,
- unsigned int /* button */,
- Bool /* is_press */,
- unsigned long /* delay */
-);
-
-extern int XTestFakeMotionEvent(
- Display* /* dpy */,
- int /* screen */,
- int /* x */,
- int /* y */,
- unsigned long /* delay */
-);
-
-extern int XTestFakeRelativeMotionEvent(
- Display* /* dpy */,
- int /* x */,
- int /* y */,
- unsigned long /* delay */
-);
-
-extern int XTestFakeDeviceKeyEvent(
- Display* /* dpy */,
- XDevice* /* dev */,
- unsigned int /* keycode */,
- Bool /* is_press */,
- int* /* axes */,
- int /* n_axes */,
- unsigned long /* delay */
-);
-
-extern int XTestFakeDeviceButtonEvent(
- Display* /* dpy */,
- XDevice* /* dev */,
- unsigned int /* button */,
- Bool /* is_press */,
- int* /* axes */,
- int /* n_axes */,
- unsigned long /* delay */
-);
-
-extern int XTestFakeProximityEvent(
- Display* /* dpy */,
- XDevice* /* dev */,
- Bool /* in_prox */,
- int* /* axes */,
- int /* n_axes */,
- unsigned long /* delay */
-);
-
-extern int XTestFakeDeviceMotionEvent(
- Display* /* dpy */,
- XDevice* /* dev */,
- Bool /* is_relative */,
- int /* first_axis */,
- int* /* axes */,
- int /* n_axes */,
- unsigned long /* delay */
-);
-
-extern int XTestGrabControl(
- Display* /* dpy */,
- Bool /* impervious */
-);
-
-void XTestSetGContextOfGC(
- GC /* gc */,
- GContext /* gid */
-);
-
-void XTestSetVisualIDOfVisual(
- Visual* /* visual */,
- VisualID /* visualid */
-);
-
-Status XTestDiscard(
- Display* /* dpy */
-);
-
-_XFUNCPROTOEND
-
-#endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 27b29aa..6a7d379 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,7 +46,6 @@ libXextinclude_HEADERS = $(top_srcdir)/include/X11/extensions/dpms.h \
$(top_srcdir)/include/X11/extensions/Xge.h \
$(top_srcdir)/include/X11/extensions/XLbx.h \
$(top_srcdir)/include/X11/extensions/XShm.h \
- $(top_srcdir)/include/X11/extensions/XTest.h \
$(top_srcdir)/include/X11/extensions/xtestext1.h
if LINT
diff --git a/src/XTestExt1.c b/src/XTestExt1.c
index 993837a..c9d48d7 100644
--- a/src/XTestExt1.c
+++ b/src/XTestExt1.c
@@ -68,7 +68,6 @@ University of California.
#include <X11/Xlibint.h>
#include <X11/extensions/xtestext1.h>
#include <X11/extensions/xtestext1proto.h>
-#include <X11/extensions/XTest.h>
/******************************************************************************
* variables
commit 1d1860f31f673f9cf2efb6dc59fdcf8fe625736f
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 16 11:13:02 2009 +0100
Prevent shape.h being included in the server
fixesproto includes shape.h, but doesn't want client side headers. This
needs to be fixed there, but work around this in shape.h anyway so we
don't break older xfixesproto.h.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/include/X11/extensions/shape.h b/include/X11/extensions/shape.h
index 6fa83d9..7992f7a 100644
--- a/include/X11/extensions/shape.h
+++ b/include/X11/extensions/shape.h
@@ -33,6 +33,7 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xfuncproto.h>
#include <X11/extensions/shapeconst.h>
+#ifndef _SHAPE_SERVER_
#include <X11/Xutil.h>
typedef struct {
@@ -149,4 +150,6 @@ extern XRectangle *XShapeGetRectangles (
_XFUNCPROTOEND
+#endif /* !_SHAPE_SERVER_ */
+
#endif /* _SHAPE_H_ */
commit dae2e0478eef5aa8a80288b417e1f8282dc0329c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 17 08:40:42 2009 +1000
Bump to 1.0.99.3
diff --git a/configure.ac b/configure.ac
index 243096e..bf7168c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libXext],
- 1.0.99.2,
+ 1.0.99.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXext)
commit 391b5844b13f5bc0f030a2ef8dd415f41f92f84c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 17:25:51 2009 -0400
Fix DPMS/MBUF/SECURITY for new header names
diff --git a/src/DPMS.c b/src/DPMS.c
index 35b21b4..92a7f61 100644
--- a/src/DPMS.c
+++ b/src/DPMS.c
@@ -38,7 +38,7 @@ Equipment Corporation.
#endif
#include <X11/Xlibint.h>
#include <X11/extensions/dpms.h>
-#include <X11/extensions/dpmsstr.h>
+#include <X11/extensions/dpmsproto.h>
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
#include <stdio.h>
diff --git a/src/XMultibuf.c b/src/XMultibuf.c
index d6f34b7..edb5fa7 100644
--- a/src/XMultibuf.c
+++ b/src/XMultibuf.c
@@ -36,7 +36,7 @@ in this Software without prior written authorization from The Open Group.
#include <stdio.h>
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
-#include <X11/extensions/multibufst.h>
+#include <X11/extensions/multibufproto.h>
#include <X11/extensions/multibuf.h>
static XExtensionInfo _multibuf_info_data;
diff --git a/src/XSecurity.c b/src/XSecurity.c
index 9f81ece..478b062 100644
--- a/src/XSecurity.c
+++ b/src/XSecurity.c
@@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group.
#include <stdio.h>
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
-#include <X11/extensions/securstr.h>
+#include <X11/extensions/securproto.h>
#include <X11/extensions/security.h>
static XExtensionInfo _Security_info_data;
commit 02efa0486b7272e9e395d36774ee782f48bcb4ec
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 13:33:08 2009 +1000
Bump to 1.0.99.2
diff --git a/configure.ac b/configure.ac
index 5ebf523..243096e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libXext],
- 1.0.99.1,
+ 1.0.99.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXext)
commit 1772c991ec6370fcf1bad79b00a87a02c5b484cc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 25 15:36:39 2009 +1000
Move libXext library headers from xextproto to libXext.
All library headers (or parts thereof) from xextproto are moved to
include/X11/extensions/. Including build fixes to include and build with the
new header locations and names.
Requires xextproto 7.0.99.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index e663848..5ebf523 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ AC_PROG_CC
XORG_CWARNFLAGS
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.0.5])
+PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.0.99.1])
XEXT_CFLAGS="$CWARNFLAGS $XEXT_CFLAGS"
AC_SUBST(XEXT_CFLAGS)
AC_SUBST(XEXT_LIBS)
diff --git a/include/X11/extensions/MITMisc.h b/include/X11/extensions/MITMisc.h
new file mode 100644
index 0000000..acb6850
--- /dev/null
+++ b/include/X11/extensions/MITMisc.h
@@ -0,0 +1,56 @@
+/************************************************************
+
+Copyright 1989, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+********************************************************/
+
+/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */
+
+/* $Xorg: MITMisc.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
+
+#ifndef _XMITMISC_H_
+#define _XMITMISC_H_
+
+#include <X11/Xfuncproto.h>
+#include <X11/extensions/mitmisc.h>
+
+_XFUNCPROTOBEGIN
+
+Bool XMITMiscQueryExtension(
+ Display* /* dpy */,
+ int* /* event_basep */,
+ int* /* error_basep */
+);
+
+Status XMITMiscSetBugMode(
+ Display* /* dpy */,
+ Bool /* onOff */
+);
+
+Bool XMITMiscGetBugMode(
+ Display* /* dpy */
+);
+
+_XFUNCPROTOEND
+
+#endif
diff --git a/include/X11/extensions/XEVI.h b/include/X11/extensions/XEVI.h
new file mode 100644
index 0000000..5fb53c4
--- /dev/null
+++ b/include/X11/extensions/XEVI.h
@@ -0,0 +1,63 @@
+/* $Xorg: XEVI.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
+/************************************************************
+Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+********************************************************/
+/* $XFree86$ */
+
+#ifndef _XEVI_H_
+#define _XEVI_H_
+#include <X11/Xfuncproto.h>
+#include <X11/extensions/EVI.h>
+
+typedef struct {
+ VisualID core_visual_id;
+ int screen;
+ int level;
+ unsigned int transparency_type;
+ unsigned int transparency_value;
+ unsigned int min_hw_colormaps;
+ unsigned int max_hw_colormaps;
+ unsigned int num_colormap_conflicts;
+ VisualID* colormap_conflicts;
+} ExtendedVisualInfo;
+
+_XFUNCPROTOBEGIN
+
+Bool XeviQueryExtension(
+ Display* /* dpy */
+);
+Status XeviQueryVersion(
+ Display* /* dpy */,
+ int* /* majorVersion */,
+ int* /* minorVersion */
+);
+Status XeviGetVisualInfo(
+ Display* /* dpy */,
+ VisualID* /* visual_query */,
+ int /* nVisual_query */,
+ ExtendedVisualInfo** /* extendedVisualInfo_return */,
+ int* /* nInfo_return */
+);
+
+_XFUNCPROTOEND
+
+#endif
diff --git a/include/X11/extensions/XLbx.h b/include/X11/extensions/XLbx.h
new file mode 100644
index 0000000..54d9dd9
--- /dev/null
+++ b/include/X11/extensions/XLbx.h
@@ -0,0 +1,52 @@
+/* $Xorg: XLbx.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
+/*
+ * Copyright 1992 Network Computing Devices
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of NCD. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. NCD. makes no representations about the
+ * suitability of this software for any purpose. It is provided "as is"
+ * without express or implied warranty.
+ *
+ * NCD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+/* $XFree86: xc/include/extensions/XLbx.h,v 1.3 2002/10/16 01:59:55 dawes Exp $ */
+
+#ifndef _XLBX_H_
+#define _XLBX_H_
+
+#include <X11/Xfuncproto.h>
+#include <X11/Xdefs.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/lbx.h>
+
+_XFUNCPROTOBEGIN
+
+Bool XLbxQueryExtension(
+ Display* /* dpy */,
+ int* /* requestp */,
+ int* /* event_basep */,
+ int* /* error_basep */
+);
+
+Bool XLbxQueryVersion(
+ Display* /* dpy */,
+ int* /* majorVersion */,
+ int* /* minorVersion */
+);
+
+int XLbxGetEventBase(Display *dpy);
+
+_XFUNCPROTOEND
+
+#endif
diff --git a/include/X11/extensions/XShm.h b/include/X11/extensions/XShm.h
new file mode 100644
index 0000000..b58ca63
--- /dev/null
+++ b/include/X11/extensions/XShm.h
@@ -0,0 +1,136 @@
+/* $XFree86: xc/include/extensions/XShm.h,v 1.11 2003/04/03 15:11:07 dawes Exp $ */
+/************************************************************
+
+Copyright 1989, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+********************************************************/
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
+
+/* $Xorg: XShm.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
+
+#ifndef _XSHM_H_
+#define _XSHM_H_
+
+#include <X11/Xfuncproto.h>
+#include <X11/extensions/shm.h>
+
+typedef unsigned long ShmSeg;
+
+typedef struct {
+ int type; /* of event */
+ unsigned long serial; /* # of last request processed by server */
+ Bool send_event; /* true if this came frome a SendEvent request */
+ Display *display; /* Display the event was read from */
+ Drawable drawable; /* drawable of request */
+ int major_code; /* ShmReqCode */
+ int minor_code; /* X_ShmPutImage */
+ ShmSeg shmseg; /* the ShmSeg used in the request */
+ unsigned long offset; /* the offset into ShmSeg used in the request */
+} XShmCompletionEvent;
+
+typedef struct {
+ ShmSeg shmseg; /* resource id */
+ int shmid; /* kernel id */
+ char *shmaddr; /* address in client */
+ Bool readOnly; /* how the server should attach it */
+} XShmSegmentInfo;
+
+_XFUNCPROTOBEGIN
+
+Bool XShmQueryExtension(
+ Display* /* dpy */
+);
+
+int XShmGetEventBase(
+ Display* /* dpy */
+);
+
+Bool XShmQueryVersion(
+ Display* /* dpy */,
+ int* /* majorVersion */,
+ int* /* minorVersion */,
+ Bool* /* sharedPixmaps */
+);
+
+int XShmPixmapFormat(
+ Display* /* dpy */
+);
+
+Status XShmAttach(
+ Display* /* dpy */,
+ XShmSegmentInfo* /* shminfo */
+);
+
+Status XShmDetach(
+ Display* /* dpy */,
+ XShmSegmentInfo* /* shminfo */
+);
+
+Status XShmPutImage(
+ Display* /* dpy */,
+ Drawable /* d */,
+ GC /* gc */,
+ XImage* /* image */,
+ int /* src_x */,
+ int /* src_y */,
+ int /* dst_x */,
+ int /* dst_y */,
+ unsigned int /* src_width */,
+ unsigned int /* src_height */,
+ Bool /* send_event */
+);
+
+Status XShmGetImage(
+ Display* /* dpy */,
+ Drawable /* d */,
+ XImage* /* image */,
+ int /* x */,
+ int /* y */,
+ unsigned long /* plane_mask */
+);
+
+XImage *XShmCreateImage(
+ Display* /* dpy */,
+ Visual* /* visual */,
+ unsigned int /* depth */,
+ int /* format */,
+ char* /* data */,
+ XShmSegmentInfo* /* shminfo */,
+ unsigned int /* width */,
+ unsigned int /* height */
+);
+
+Pixmap XShmCreatePixmap(
+ Display* /* dpy */,
+ Drawable /* d */,
+ char* /* data */,
+ XShmSegmentInfo* /* shminfo */,
+ unsigned int /* width */,
+ unsigned int /* height */,
+ unsigned int /* depth */
+);
+
+_XFUNCPROTOEND
+
+#endif
diff --git a/include/X11/extensions/XTest.h b/include/X11/extensions/XTest.h
Reply to: