libxdamage: Changes to 'upstream-unstable'
.gitignore | 7 ++++
ChangeLog | 49 ---------------------------------
Makefile.am | 14 +++++++--
README | 24 ++++++++++++++++
configure.ac | 57 ++++++---------------------------------
include/X11/extensions/Xdamage.h | 8 +++--
src/Makefile.am | 4 +-
src/Xdamage.c | 24 ++++++++--------
8 files changed, 71 insertions(+), 116 deletions(-)
New commits:
commit 728ae9bda2e536897b630b149df522fa6286a1c5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 6 11:24:50 2009 -0700
libXdamage 1.1.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index b9dce62..845023e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ dnl try to keep these the same. Note that the library has an extra
dnl digit in the version number to track changes which don't affect the
dnl protocol, so Xdamage version l.n.m corresponds to protocol version l.n
dnl
-AC_INIT(libXdamage, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXdamage)
+AC_INIT(libXdamage, 1.1.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXdamage)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 229ebbc4acd3de3a4a118f53db013629691b6ce9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 6 11:18:39 2009 -0700
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index fcc1186..b9dce62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,15 +34,15 @@ AC_INIT(libXdamage, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=x
AM_INIT_AUTOMAKE([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)
+# 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(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
# Check damageext configuration, strip extra digits from package version to
# find the required protocol version
@@ -50,12 +50,8 @@ XORG_CWARNFLAGS
DAMAGEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(DAMAGEEXT_VERSION)
PKG_CHECK_MODULES(XDAMAGE, [damageproto >= $DAMAGEEXT_VERSION] xfixes fixesproto xextproto x11)
-XDAMAGE_CFLAGS="$CWARNFLAGS $XDAMAGE_CFLAGS"
AC_SUBST(XDAMAGE_CFLAGS)
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
AC_OUTPUT([Makefile
src/Makefile
xdamage.pc])
diff --git a/src/Makefile.am b/src/Makefile.am
index 0aa9f4f..787fc04 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,8 +4,8 @@ libXdamage_la_SOURCES = \
xdamageint.h \
Xdamage.c
-libXdamage_la_LIBADD = $(XDAMAGE_LIBS) $(X_LIBS)
-AM_CFLAGS = $(XDAMAGE_CFLAGS) $(X_CFLAGS)
+libXdamage_la_LIBADD = $(XDAMAGE_LIBS)
+AM_CFLAGS = $(CWARNFLAGS) $(XDAMAGE_CFLAGS)
INCLUDES = -I$(top_srcdir)/include/X11/extensions
commit eed319fd48299e49b2f6ae9ff452a5d6c64ea192
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 3 15:50:23 2009 +1000
Require pkg-config to find the packages, no funky x11 lookups.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/configure.ac b/configure.ac
index b07cf53..fcc1186 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,51 +44,12 @@ AC_PROG_CC
AC_PROG_LIBTOOL
XORG_CWARNFLAGS
-# Check for X
-PKG_CHECK_MODULES(X, x11,
- [x_found_with_pkgconfig=yes],
- [x_found_with_pkgconfig=no])
-
-if test "$x_found_with_pkgconfig" = "no"
-then
- AC_PATH_XTRA
- X_LIBS="$X_LIBS -lX11"
-
- if test "x$no_x" = "xyes"
- then
- AC_MSG_ERROR([X is required, but it was either disabled or not found.])
- fi
-
- save_LIBS="$LIBS"
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $X_CFLAGS"
- LIBS="$LIBS $X_LIBS"
-
- AC_MSG_CHECKING([for XTHREADS in Xlib])
- AC_RUN_IFELSE(
- [AC_LANG_PROGRAM([[#include <X11/Xlib.h>]],
- [[return XInitThreads() == 0 ? 0 : 1;]])],
- [xthreads=no],
- [xthreads=yes],
- [xthreads=yes])
-
- AC_MSG_RESULT($xthreads)
-
- LIBS="$save_LIBS"
- CFLAGS="$save_CFLAGS"
-
- if test "x$xthreads" = "xyes"
- then
- X_CFLAGS="$X_CFLAGS -DXTHREADS"
- fi
-fi
-
# Check damageext configuration, strip extra digits from package version to
# find the required protocol version
DAMAGEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(DAMAGEEXT_VERSION)
-PKG_CHECK_MODULES(XDAMAGE, [damageproto >= $DAMAGEEXT_VERSION] xfixes fixesproto xextproto)
+PKG_CHECK_MODULES(XDAMAGE, [damageproto >= $DAMAGEEXT_VERSION] xfixes fixesproto xextproto x11)
XDAMAGE_CFLAGS="$CWARNFLAGS $XDAMAGE_CFLAGS"
AC_SUBST(XDAMAGE_CFLAGS)
commit c3f08b7b0a0b1dd42dd00efe07ebc07f7085b433
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 3 15:50:18 2009 +1000
Fix a comment in configure.ac, this is libXdamage, not libXfixes
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index e83c4c0..b07cf53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,11 +24,11 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
dnl
-dnl Version should match the current XFixes version. XFixesQueryVersion
-dnl returns the version from xfixeswire.h, NOT the version we set here. But we
+dnl Version should match the current XDamage version. XDamageQueryVersion
+dnl returns the version from damagewire.h, NOT the version we set here. But we
dnl try to keep these the same. Note that the library has an extra
dnl digit in the version number to track changes which don't affect the
-dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
+dnl protocol, so Xdamage version l.n.m corresponds to protocol version l.n
dnl
AC_INIT(libXdamage, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXdamage)
AM_INIT_AUTOMAKE([dist-bzip2])
commit 02a61d40687f4ee358e2f7903ce0ceacf273e254
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 20:34:32 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/README b/README
index 9351437..de8625a 100644
--- a/README
+++ b/README
@@ -7,3 +7,27 @@ This package contains the library for the X Damage extension.
Keith Packard
keithp@keithp.com
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/lib/libXdamage
+
+ http://cgit.freedesktop.org/xorg/lib/libXdamage
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
commit 0a48e5c663bf2ec3f6870bf9e9cfa90dfddd6fe6
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Jan 29 15:41:23 2009 -0200
Janitor: Correct make distcheck and compiler warnings.
diff --git a/.gitignore b/.gitignore
index 2ac09fb..759edb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,9 @@ mkinstalldirs
stamp-h1
xdamage.pc
*~
+*.o
+*.la
+*.lo
+libXdamage-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 358e7f5..035894a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,6 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-AM_CFLAGS = $(XDAMAGE_CFLAGS) $(X_CFLAGS)
-
SUBDIRS = src
INCLUDES = $(top_srcdir)/include/
@@ -30,7 +28,7 @@ INCLUDES = $(top_srcdir)/include/
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xdamage.pc
-EXTRA_DIST = xdamage.pc.in autogen.sh
+EXTRA_DIST = xdamage.pc.in
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
@@ -38,6 +36,6 @@ MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 040eda2..e83c4c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,4 @@
dnl
-dnl $Id$
-dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@@ -36,11 +34,15 @@ AC_INIT(libXdamage, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=x
AM_INIT_AUTOMAKE([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)
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
# Check for X
PKG_CHECK_MODULES(X, x11,
@@ -87,9 +89,11 @@ fi
DAMAGEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(DAMAGEEXT_VERSION)
PKG_CHECK_MODULES(XDAMAGE, [damageproto >= $DAMAGEEXT_VERSION] xfixes fixesproto xextproto)
+XDAMAGE_CFLAGS="$CWARNFLAGS $XDAMAGE_CFLAGS"
AC_SUBST(XDAMAGE_CFLAGS)
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
diff --git a/src/Xdamage.c b/src/Xdamage.c
index a3966d6..174bb09 100644
--- a/src/Xdamage.c
+++ b/src/Xdamage.c
@@ -89,7 +89,7 @@ XDamageExtAddDisplay (XDamageExtInfo *extinfo,
UnlockDisplay (dpy);
SyncHandle ();
Xfree(info);
- return 0;
+ return NULL;
}
info->major_version = rep.majorVersion;
info->minor_version = rep.minorVersion;
@@ -372,7 +372,6 @@ XDamageAdd (Display *dpy, Drawable drawable, XserverRegion region)
{
XDamageExtDisplayInfo *info = XDamageFindDisplay (dpy);
xDamageAddReq *req;
- int len;
XDamageSimpleCheckExtension (dpy, info);
LockDisplay (dpy);
commit 0ca7d78aeb8035ef52c1415170e1257493d789fd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 19 17:24:04 2008 +0930
Change parameter names for QueryVersion/QueryExtension.
Simply to clarify the inner workings of the lib and that these parameters are
treated as return values only.
X.Org Bug 14511 <http://bugs.freedesktop.org/show_bug.cgi?id=14511>
diff --git a/include/X11/extensions/Xdamage.h b/include/X11/extensions/Xdamage.h
index b55da38..5ec636d 100644
--- a/include/X11/extensions/Xdamage.h
+++ b/include/X11/extensions/Xdamage.h
@@ -49,11 +49,13 @@ typedef struct {
_XFUNCPROTOBEGIN
-Bool XDamageQueryExtension (Display *dpy, int *event_basep, int *error_basep);
+Bool XDamageQueryExtension (Display *dpy,
+ int *event_base_return,
+ int *error_base_return);
Status XDamageQueryVersion (Display *dpy,
- int *major_versionp,
- int *minor_versionp);
+ int *major_version_return,
+ int *minor_version_return);
Damage
XDamageCreate (Display *dpy, Drawable drawable, int level);
diff --git a/src/Xdamage.c b/src/Xdamage.c
index c699a15..a3966d6 100644
--- a/src/Xdamage.c
+++ b/src/Xdamage.c
@@ -282,14 +282,16 @@ XDamageEventToWire(Display *dpy, XEvent *event, xEvent *wire)
}
Bool
-XDamageQueryExtension (Display *dpy, int *event_basep, int *error_basep)
+XDamageQueryExtension (Display *dpy,
+ int *event_base_return,
+ int *error_base_return)
{
XDamageExtDisplayInfo *info = XDamageFindDisplay (dpy);
if (XDamageHasExtension(info))
{
- *event_basep = info->codes->first_event;
- *error_basep = info->codes->first_error;
+ *event_base_return = info->codes->first_event;
+ *error_base_return = info->codes->first_error;
return True;
}
else
@@ -298,15 +300,15 @@ XDamageQueryExtension (Display *dpy, int *event_basep, int *error_basep)
Status
XDamageQueryVersion (Display *dpy,
- int *major_versionp,
- int *minor_versionp)
+ int *major_version_return,
+ int *minor_version_return)
{
XDamageExtDisplayInfo *info = XDamageFindDisplay (dpy);
XDamageCheckExtension (dpy, info, 0);
- *major_versionp = info->major_version;
- *minor_versionp = info->minor_version;
+ *major_version_return = info->major_version;
+ *minor_version_return = info->minor_version;
return 1;
}
commit 87ebfbc56abe16de6f84f559728a40f63d44006a
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:26 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 19e0f1d..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,49 +0,0 @@
-2006-04-26 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Bump to 1.0.3
-
-2006-04-02 Adam Jackson <ajax@freedesktop.org>
-
- * src/Xdamage.c:
- Coverity #574: Plug a leak on the error path.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * xdamage.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
- * configure.ac:
- Update dependencies to work with separate build roots.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
-
-2005-07-08 Keith Packard <keithp@keithp.com>
-
- * .cvsignore:
- * src/.cvsignore:
- * src/Makefile.am:
- Add .cvsignore files
- Switch _la_CFLAGS for AM_CFLAGS to clean up directory
-
-Tue May 17 12:39:30 2005 Søren Sandmann <sandmann@redhat.com>
-
- * Add build system
diff --git a/Makefile.am b/Makefile.am
index 3279789..358e7f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,3 +31,13 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xdamage.pc
EXTRA_DIST = xdamage.pc.in autogen.sh
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
commit d9714f03dde2d2b20fb29d46b44bb253e4954ee0
Author: Ryan Lortie <desrt@desrt.ca>
Date: Fri Sep 7 22:02:18 2007 -0700
libXdamage incorrectly encodes/decodes the 'More' field from the event.
The client library for xdamage currently fails to fill in the 'more'
field. As a result, you get whatever uninitialised junk was there
before.
The server sets the high bit of 'level' when there is
'more' (DamageNotifyMore = 0x80). A patch follows to fix the client
library.
diff --git a/src/Xdamage.c b/src/Xdamage.c
index 213834c..c699a15 100644
--- a/src/Xdamage.c
+++ b/src/Xdamage.c
@@ -231,7 +231,8 @@ XDamageWireToEvent(Display *dpy, XEvent *event, xEvent *wire)
aevent->display = dpy;
aevent->drawable = awire->drawable;
aevent->damage = awire->damage;
- aevent->level = awire->level;
+ aevent->level = awire->level & ~DamageNotifyMore;
+ aevent->more = (awire->level & DamageNotifyMore) ? True : False;
aevent->timestamp = awire->timestamp;
aevent->area.x = awire->area.x;
aevent->area.y = awire->area.y;
@@ -264,7 +265,7 @@ XDamageEventToWire(Display *dpy, XEvent *event, xEvent *wire)
awire->type = aevent->type | (aevent->send_event ? 0x80 : 0);
awire->drawable = aevent->drawable;
awire->damage = aevent->damage;
- awire->level = aevent->level;
+ awire->level = aevent->level | (aevent->more ? DamageNotifyMore : 0);
awire->timestamp = aevent->timestamp;
awire->area.x = aevent->area.x;
awire->area.y = aevent->area.y;
commit 7548981a458b091b29d74207884669214f63ee9f
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:53:36 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index 94fef40..2ac09fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ missing
mkinstalldirs
stamp-h1
xdamage.pc
+*~
Reply to: