libxcomposite: Changes to 'upstream-unstable'
.gitignore | 11 +++++++++++
COPYING | 1 -
Makefile.am | 8 ++++----
README | 31 +++++++++++++++++++++++--------
configure.ac | 17 +++++++++--------
include/X11/extensions/Xcomposite.h | 10 +++++-----
man/.gitignore | 6 ------
man/Makefile.am | 21 +++++++--------------
man/Xcomposite.xml | 16 ++++++++--------
src/.gitignore | 6 ------
src/Makefile.am | 5 ++---
src/Xcomposite.c | 18 ++++++++++--------
src/xcompositeint.h | 2 --
13 files changed, 79 insertions(+), 73 deletions(-)
New commits:
commit 90c243accfb2dc3d4d85dd57d8aca518dab98842
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 8 00:28:45 2009 -0700
libXcomposite 0.4.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index c944ea1..3567715 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,14 +25,14 @@ AC_PREREQ([2.57])
dnl
dnl Version should match the current XComposite version. XCompositeQueryVersion
-dnl returns the version from xcompositewire.h, NOT the version we set here. But we
-dnl try to keep these the same. Note that the library has an extra
+dnl returns the version from xcompositewire.h, NOT the version we set here.
+dnl But we 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 Xcomposite version l.n.m corresponds to protocol version l.n
dnl that 'revision' number appears in Xcomposite.h and has to be manually
dnl synchronized.
dnl
-AC_INIT(libXcomposite, 0.4.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXcomposite)
+AC_INIT(libXcomposite, 0.4.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXcomposite)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit c302ae79f7819f75628f798d15c980cbf42eec91
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 8 00:23:42 2009 -0700
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Also some changes to man/Makefile.am to make it work better with the
AM_SILENT_RULES option that's enabled in XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index d5c0791..c944ea1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,15 +36,17 @@ AC_INIT(libXcomposite, 0.4.0, [https://bugs.freedesktop.org/enter_bug.cgi?produc
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 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_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
AC_ARG_VAR([XMLTO], [Path to xmlto command])
AC_PATH_PROG([XMLTO], [xmlto])
@@ -62,14 +64,9 @@ fi
COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(COMPOSITEEXT_VERSION)
PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11 xfixes xext fixesproto)
-XCOMPOSITE_CFLAGS="$CWARNFLAGS $XCOMPOSITE_CFLAGS"
AC_SUBST(XCOMPOSITE_CFLAGS)
AC_SUBST(XCOMPOSITE_LIBS)
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
AC_OUTPUT([Makefile
src/Makefile
man/Makefile
diff --git a/man/Makefile.am b/man/Makefile.am
index 8ff4f37..13a75c5 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -19,8 +19,10 @@ Xcomposite_man_aliases = \
XCompositeGetOverlayWindow \
XCompositeReleaseOverlayWindow
+Xcomposite_shadowmen = $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
+
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
+ $(Xcomposite_shadowmen)
EXTRA_DIST = $(libman_PRE) $(libman_xml)
@@ -29,17 +31,8 @@ CLEANFILES = $(libman_DATA)
MAINTAINERCLEANFILES = $(libman_PRE)
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-
-BUILT_SOURCES = shadows.DONE
-
-shadows.DONE:
- -rm -f $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
- (for i in $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- touch shadows.DONE
-
-CLEANFILES += shadows.DONE
+$(Xcomposite_shadowmen):
+ $(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $@
# Substitute system-specific values in man pages
@@ -62,7 +55,7 @@ MAN_SUBSTS = \
SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml
.man.$(LIB_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@
# Generate nroff sources from DocBook/xml
@@ -70,7 +63,7 @@ dist-hook: $(libman_PRE)
if HAVE_XMLTO
.xml.man:
- $(XMLTO) man $< && mv $*.__libmansuffix__ $@
+ $(AM_V_GEN)$(XMLTO) man $< && mv $*.__libmansuffix__ $@
else
.xml.man:
@echo "WARNING: configure did not find xmlto, cannot create $@ without it"
diff --git a/src/Makefile.am b/src/Makefile.am
index a7d8269..e7b9db8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,8 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
+AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/include
lib_LTLIBRARIES = libXcomposite.la
commit 3418a26aa83fbba78ad5a214ca7db2984a44190b
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 9968c6b..b82ccd9 100644
--- a/README
+++ b/README
@@ -1,10 +1,25 @@
- RandR
- X RandR Extension
- Version 1.0
- 2002-10-4
+libXcomposite - client library for the Composite extension to the X11 protocol
-This package contains header files and documentation for the X RandR
-extension. Library and server implementations are separate.
+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/libXcomposite
+
+ http://cgit.freedesktop.org/xorg/lib/libXcomposite
+
+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
-Keith Packard
-keithp@keithp.com
commit c469e20fe52db54be01533b0e4748fa011d1ddc4
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Jan 29 15:27:52 2009 -0200
Janitor: Correct make distcheck
Remove extra .gitignore in subdirectories
Correct a sparse warning
diff --git a/.gitignore b/.gitignore
index 3bc459b..94779e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
Makefile
Makefile.in
aclocal.m4
@@ -16,6 +18,15 @@ libtool
ltmain.sh
missing
mkinstalldirs
+shadows.DONE
stamp-h1
xcomposite.pc
*~
+*.3
+Xcomposite.man
+*.o
+*.la
+*.lo
+libXcomposite-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index ab48e9c..28802ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,12 +24,12 @@ SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcomposite.pc
-EXTRA_DIST = xcomposite.pc.in autogen.sh ChangeLog
+EXTRA_DIST = xcomposite.pc.in 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 5cf5f74..d5c0791 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,11 +36,15 @@ AC_INIT(libXcomposite, 0.4.0, [https://bugs.freedesktop.org/enter_bug.cgi?produc
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
AC_ARG_VAR([XMLTO], [Path to xmlto command])
AC_PATH_PROG([XMLTO], [xmlto])
@@ -58,11 +62,13 @@ fi
COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(COMPOSITEEXT_VERSION)
PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11 xfixes xext fixesproto)
+XCOMPOSITE_CFLAGS="$CWARNFLAGS $XCOMPOSITE_CFLAGS"
AC_SUBST(XCOMPOSITE_CFLAGS)
AC_SUBST(XCOMPOSITE_LIBS)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 2dcc75c..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-shadows.DONE
-*.3
-*~
-Xcomposite.man
-Makefile
-Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 799fc97..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-*.lo
-*.la
-Makefile
-Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index f18cf12..a7d8269 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
+AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
lib_LTLIBRARIES = libXcomposite.la
diff --git a/src/Xcomposite.c b/src/Xcomposite.c
index 33b5727..b5637b0 100644
--- a/src/Xcomposite.c
+++ b/src/Xcomposite.c
@@ -133,7 +133,7 @@ XCompositeExtAddDisplay (XCompositeExtInfo *extinfo,
UnlockDisplay (dpy);
SyncHandle ();
Xfree(info);
- return 0;
+ return NULL;
}
info->major_version = rep.majorVersion;
info->minor_version = rep.minorVersion;
commit 16ae68423eb30639d880445c6bbe70d539e4b198
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 19 17:15:39 2008 +0930
Rename parameters to clarify QueryVersion/QueryExtension.
These parameters are not treated as input. Rename them to make the inner
workings slightly more obvious.
X.Org Bug 14511 <http://bugs.freedesktop.org/show_bug.cgi?id=14511>
diff --git a/include/X11/extensions/Xcomposite.h b/include/X11/extensions/Xcomposite.h
index 7c1e2ad..b97e390 100644
--- a/include/X11/extensions/Xcomposite.h
+++ b/include/X11/extensions/Xcomposite.h
@@ -58,11 +58,13 @@
_XFUNCPROTOBEGIN
-Bool XCompositeQueryExtension (Display *dpy, int *event_basep, int *error_basep);
+Bool XCompositeQueryExtension (Display *dpy,
+ int *event_base_return,
+ int *error_base_return);
Status XCompositeQueryVersion (Display *dpy,
- int *major_versionp,
- int *minor_versionp);
+ int *major_version_return,
+ int *minor_version_return);
int XCompositeVersion (void);
diff --git a/man/Xcomposite.xml b/man/Xcomposite.xml
index 939bc0f..d753776 100644
--- a/man/Xcomposite.xml
+++ b/man/Xcomposite.xml
@@ -66,14 +66,14 @@
<funcprototype>
<funcdef>Bool <function>XCompositeQueryExtension</function></funcdef>
<paramdef><type>Display *</type><parameter>dpy</parameter></paramdef>
- <paramdef>int *<parameter>event_basep</parameter></paramdef>
- <paramdef>int *<parameter>error_basep</parameter></paramdef>
+ <paramdef>int *<parameter>event_base_return</parameter></paramdef>
+ <paramdef>int *<parameter>error_base_return</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>Status <function>XCompositeQueryVersion</function></funcdef>
<paramdef>Display *<parameter>dpy</parameter></paramdef>
- <paramdef>int *<parameter>major_versionp</parameter></paramdef>
- <paramdef>int *<parameter>minor_versionp</parameter></paramdef>
+ <paramdef>int *<parameter>major_version_return</parameter></paramdef>
+ <paramdef>int *<parameter>minor_version_return</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>XCompositeVersion</function></funcdef>
@@ -203,28 +203,28 @@ contents of all descendants.
</para></listitem>
</varlistentry>
<varlistentry>
- <term><parameter>event_basep</parameter></term>
+ <term><parameter>event_base_return</parameter></term>
<listitem><para>
Pointer to integer where the base value for Composite Extension events
will be stored.
</para></listitem>
</varlistentry>
<varlistentry>
- <term><parameter>error_basep</parameter></term>
+ <term><parameter>error_base_return</parameter></term>
<listitem><para>
Pointer to integer where the base value for Composite Extension errors
will be stored.
</para></listitem>
</varlistentry>
<varlistentry>
- <term><parameter>major_versionp</parameter></term>
+ <term><parameter>major_version_return</parameter></term>
<listitem><para>
Pointer to integer where the major version of the Composite Extension
supported by the X server will be stored.
</para></listitem>
</varlistentry>
<varlistentry>
- <term><parameter>minor_versionp</parameter></term>
+ <term><parameter>minor_version_return</parameter></term>
<listitem><para>
Pointer to integer where the minor version of the Composite Extension
supported by the X server will be stored.
diff --git a/src/Xcomposite.c b/src/Xcomposite.c
index e7d576a..33b5727 100644
--- a/src/Xcomposite.c
+++ b/src/Xcomposite.c
@@ -211,14 +211,16 @@ XCompositeFindDisplay (Display *dpy)
Bool
-XCompositeQueryExtension (Display *dpy, int *event_basep, int *error_basep)
+XCompositeQueryExtension (Display *dpy,
+ int *event_base_return,
+ int *error_base_return)
{
XCompositeExtDisplayInfo *info = XCompositeFindDisplay (dpy);
if (XCompositeHasExtension(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
@@ -227,14 +229,14 @@ XCompositeQueryExtension (Display *dpy, int *event_basep, int *error_basep)
Status
XCompositeQueryVersion (Display *dpy,
- int *major_versionp,
- int *minor_versionp)
+ int *major_version_return,
+ int *minor_version_return)
{
XCompositeExtDisplayInfo *info = XCompositeFindDisplay (dpy);
XCompositeCheckExtension (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 e59817872ee6aec0544bd56ebb83ded9e4a5851c
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 00:30:40 2008 +0100
nuke RCS Ids
diff --git a/COPYING b/COPYING
index 4ee13ed..e506314 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,3 @@
-$Id$
Copyright © 2001,2003 Keith Packard
diff --git a/Makefile.am b/Makefile.am
index c653dab..ab48e9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/configure.ac b/configure.ac
index 19ee08b..5cf5f74 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
diff --git a/include/X11/extensions/Xcomposite.h b/include/X11/extensions/Xcomposite.h
index d37a691..7c1e2ad 100644
--- a/include/X11/extensions/Xcomposite.h
+++ b/include/X11/extensions/Xcomposite.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/Makefile.am b/src/Makefile.am
index 2e5abde..f18cf12 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xcompositeint.h b/src/xcompositeint.h
index 4ed633c..7f0f868 100644
--- a/src/xcompositeint.h
+++ b/src/xcompositeint.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its
commit 8c046523f304525615cb8c5391711fddb94fcc04
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 15:51:15 2007 -0500
Add missing PHONY line for automatic ChangeLog generation
diff --git a/Makefile.am b/Makefile.am
index 3219ccc..c653dab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,8 @@ pkgconfig_DATA = xcomposite.pc
EXTRA_DIST = xcomposite.pc.in autogen.sh 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)
Reply to: