ChangeLog | 55 +++++++++++++++++++++++++++++++
Makefile.am | 6 +--
configure.ac | 93 ++++++++++++++++++++++++++---------------------------
debian/changelog | 10 +++++
debian/compat | 2 -
debian/control | 5 ++
debian/rules | 19 +++-------
man/Xcomposite.xml | 84 +++++++++++++++++++++++------------------------
src/Makefile.am | 8 ++--
src/Xcomposite.c | 26 +++++++-------
10 files changed, 185 insertions(+), 123 deletions(-)
New commits:
commit 91250ac59d537b90d96904785d8b5a2c50d8f89c
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 16 21:07:55 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index b8a60a7..ceccf9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxcomposite (1:0.4.4-1) UNRELEASED; urgency=low
+libxcomposite (1:0.4.4-1) unstable; urgency=low
* New upstream release.
* Bump debhelper compat level to 7.
@@ -6,7 +6,7 @@ libxcomposite (1:0.4.4-1) UNRELEASED; urgency=low
* Disable silent rules.
* Use dh_prep instead of dh_clean -k.
- -- Julien Cristau <jcris...@debian.org> Sun, 16 Jun 2013 20:50:08 +0200
+ -- Julien Cristau <jcris...@debian.org> Sun, 16 Jun 2013 21:06:22 +0200
libxcomposite (1:0.4.3-2) unstable; urgency=low
commit 063cad8a7017b3a9aea74ec085c01d9e27dd8906
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 16 21:06:13 2013 +0200
Use dh_prep instead of dh_clean -k.
diff --git a/debian/changelog b/debian/changelog
index 7ea884d..b8a60a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxcomposite (1:0.4.4-1) UNRELEASED; urgency=low
* Bump debhelper compat level to 7.
* Use dpkg-buildflags.
* Disable silent rules.
+ * Use dh_prep instead of dh_clean -k.
-- Julien Cristau <jcris...@debian.org> Sun, 16 Jun 2013 20:50:08 +0200
diff --git a/debian/rules b/debian/rules
index fe738da..fa8a227 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,7 @@ clean:
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
commit 5a3bc7b92c6956c93da46f56aa33c278bfd0b50e
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 16 21:03:40 2013 +0200
Disable silent rules.
diff --git a/debian/changelog b/debian/changelog
index b8a7741..7ea884d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxcomposite (1:0.4.4-1) UNRELEASED; urgency=low
* New upstream release.
* Bump debhelper compat level to 7.
* Use dpkg-buildflags.
+ * Disable silent rules.
-- Julien Cristau <jcris...@debian.org> Sun, 16 Jun 2013 20:50:08 +0200
diff --git a/debian/rules b/debian/rules
index 660114d..fe738da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,7 @@ build-stamp:
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--infodir=\$${prefix}/share/info \
+ --disable-silent-rules \
$(confflags)
cd build && $(MAKE)
>$@
commit 3ca8a6c5aee347eb808b31d8a54140da461930f6
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 16 21:00:06 2013 +0200
Use dpkg-buildflags.
diff --git a/debian/changelog b/debian/changelog
index 88dc3f9..b8a7741 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxcomposite (1:0.4.4-1) UNRELEASED; urgency=low
* New upstream release.
* Bump debhelper compat level to 7.
+ * Use dpkg-buildflags.
-- Julien Cristau <jcris...@debian.org> Sun, 16 Jun 2013 20:50:08 +0200
diff --git a/debian/control b/debian/control
index d76c568..c99c1a4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,10 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <k...@debian.org>
Build-Depends:
+# multiarch
debhelper (>= 8.1.3),
+# dpkg-buildflags --export=configure
+ dpkg-dev (>= 1.16.1),
libx11-dev (>= 1:0.99.2),
libxfixes-dev (>= 1:3.0.0-4),
x11proto-composite-dev (>= 1:0.4),
diff --git a/debian/rules b/debian/rules
index 31f9fbf..660114d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,6 @@ PACKAGE = libxcomposite1
include debian/xsfbs/xsfbs.mk
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
@@ -32,7 +26,7 @@ ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
-
+confflags += $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags
--export=configure)
build: build-arch build-indep
build-indep:
@@ -45,8 +39,8 @@ build-stamp:
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
- --infodir=\$${prefix}/share/info $(confflags) \
- CFLAGS="$(CFLAGS)"
+ --infodir=\$${prefix}/share/info \
+ $(confflags)
cd build && $(MAKE)
>$@
commit 34bc5adb0d204ce851bad184aca5d9ffa436b11b
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 16 20:58:00 2013 +0200
Bump debhelper compat level to 7.
diff --git a/debian/changelog b/debian/changelog
index e9984c0..88dc3f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxcomposite (1:0.4.4-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump debhelper compat level to 7.
-- Julien Cristau <jcris...@debian.org> Sun, 16 Jun 2013 20:50:08 +0200
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index b3b3354..d76c568 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <k...@debian.org>
Build-Depends:
- debhelper (>= 8.1.2ubuntu2),
+ debhelper (>= 8.1.3),
libx11-dev (>= 1:0.99.2),
libxfixes-dev (>= 1:3.0.0-4),
x11proto-composite-dev (>= 1:0.4),
diff --git a/debian/rules b/debian/rules
index 9d1e37b..31f9fbf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,8 +80,8 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing
- dh_installchangelogs ChangeLog
+ dh_install --list-missing
+ dh_installchangelogs
dh_link
dh_installman
dh_strip --dbg-package=$(PACKAGE)-dbg
commit cc57a8c9d981886aeddaa0f44cf1fefb3447972b
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 16 20:50:41 2013 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 54a0d93..3890b26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+commit 0db73ea70c690eabe581c7293f77ec2be18e1f41
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Wed Jan 2 23:29:00 2013 -0800
+
+ libXcomposite 0.4.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit b1e3db243eb118b4b2eb483df4a9ad19dcee17d0
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Fri Sep 16 22:15:10 2011 -0700
+
+ Strip trailing whitespace
+
+ Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
+ git diff -w & git diff -b show no diffs from this change
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit db1ae0c545b4b359204c33488104d214c91f12bb
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Feb 2 11:43:41 2011 -0500
+
+ config: comment, minor upgrade, quote and layout configure.ac
+
+ Group statements per section as per Autoconf standard layout
+ Quote statements where appropriate.
+ Autoconf recommends not using dnl instead of # for comments
+
+ Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
+ Add AC_CONFIG_SRCDIR([Makefile.am])
+
+ This helps automated maintenance and release activities.
+ Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
+
+commit f6dcd194f87fb7009b8afa482326de044d0e9c24
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Fri Jan 28 19:41:37 2011 -0500
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 0e1e69c7b71700c50f71b55f74cd12b8569fa966
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Thu Jan 27 18:50:14 2011 -0500
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
commit 8898782b98457292057d249ab9e40cfc2fed7d8d
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Wed Oct 27 22:40:32 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 515f1dd..e9984c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxcomposite (1:0.4.4-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcris...@debian.org> Sun, 16 Jun 2013 20:50:08 +0200
+
libxcomposite (1:0.4.3-2) unstable; urgency=low
* Team upload.
commit 0db73ea70c690eabe581c7293f77ec2be18e1f41
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Wed Jan 2 23:29:00 2013 -0800
libXcomposite 0.4.4
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index f9bf215..8dc4135 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_PREREQ([2.60])
# that 'revision' number appears in Xcomposite.h and has to be manually
# synchronized.
#
-AC_INIT(libXcomposite, [0.4.3],
+AC_INIT(libXcomposite, [0.4.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[libXcomposite])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit b1e3db243eb118b4b2eb483df4a9ad19dcee17d0
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Fri Sep 16 22:15:10 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/Makefile.am b/Makefile.am
index f794763..6fd7a30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-#
+#
# Copyright © 2003 Keith Packard, Noah Levitt
-#
+#
# 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
@@ -10,7 +10,7 @@
# specific, written prior permission. Keith Packard makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
-#
+#
# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/man/Xcomposite.xml b/man/Xcomposite.xml
index a1ef1c9..9ba9ec5 100644
--- a/man/Xcomposite.xml
+++ b/man/Xcomposite.xml
@@ -192,7 +192,7 @@ contents of all descendants.
<varlistentry>
<term><parameter>display</parameter></term>
<listitem><para>
- Pointer to the <type>Display</type> structure returned from
+ Pointer to the <type>Display</type> structure returned from
<function>XOpenDisplay</function> for the connection to the X server.
</para></listitem>
</varlistentry>
@@ -246,11 +246,11 @@ contents of all descendants.
<varlistentry>
<term><function>XCompositeQueryExtension</function></term>
<listitem><para>
- <function>XCompositeQueryExtension</function> determines if the
- Composite Extension is available on the given display. It returns
- <constant>True</constant> if the extension is supported, otherwise
- <constant>False</constant>. If the extension is present, the base
- values for events and errors are returned, and can be used to
+ <function>XCompositeQueryExtension</function> determines if the
+ Composite Extension is available on the given display. It returns
+ <constant>True</constant> if the extension is supported, otherwise
+ <constant>False</constant>. If the extension is present, the base
+ values for events and errors are returned, and can be used to
decode incoming event and error values.
</para></listitem>
</varlistentry>
@@ -258,12 +258,12 @@ contents of all descendants.
<term><function>XCompositeQueryVersion</function></term>
<listitem><para>
<function>XCompositeQueryVersion</function> determines if the X Server
- supports a version of the X Composite Extension which is compatible
+ supports a version of the X Composite Extension which is compatible
with the client library. A non-zero Status is returned if a compatible
version of the extension is supported, otherwise a zero Status is returned.
- If the extension is supported, the major and minor version numbers are
+ If the extension is supported, the major and minor version numbers are
returned to indicate the level of Composite Extension support.
- No other XComposite functions (except XCompositeQueryExtension) may be
+ No other XComposite functions (except XCompositeQueryExtension) may be
called before this function. If a client violates this rule, the
effects of all subsequent XComposite calls that it makes are undefined.
</para></listitem>
@@ -271,7 +271,7 @@ contents of all descendants.
<varlistentry>
<term><function>XCompositeVersion</function></term>
<listitem><para>
- <function>XCompositeVersion</function> returns the version of the
+ <function>XCompositeVersion</function> returns the version of the
X Composite library. The version number is encoded as:
<blockquote><para><code language="C">
(major * 10000) + (minor * 100) + revision
@@ -284,18 +284,18 @@ contents of all descendants.
<varlistentry>
<term><function>XCompositeRedirectWindow</function></term>
<listitem><para>
- <function>XCompositeRedirectWindow</function> requests the X server
- to direct the hierarchy starting at <parameter>window</parameter> to
- off-screen storage.
- The <parameter>update</parameter> argument specifies whether
+ <function>XCompositeRedirectWindow</function> requests the X server
+ to direct the hierarchy starting at <parameter>window</parameter> to
+ off-screen storage.
+ The <parameter>update</parameter> argument specifies whether
the contents are mirrored to the parent window automatically or not.
- Only one client at a time may specify an update type of
- <constant>CompositeRedirectManual</constant>, another attempt will
- result in a <errorname>BadAccess</errorname> error. When all clients
+ Only one client at a time may specify an update type of
+ <constant>CompositeRedirectManual</constant>, another attempt will
+ result in a <errorname>BadAccess</errorname> error. When all clients
enabling redirection terminate, the redirection will automatically be
disabled.
</para><para>
- The root window may not be redirected. Doing so results in a
+ The root window may not be redirected. Doing so results in a
<errorname>BadMatch</errorname> error. Specifying an invalid
window id will result in a <errorname>BadWindow</errorname> error.
</para></listitem>
@@ -303,20 +303,20 @@ contents of all descendants.
<varlistentry>
<term><function>XCompositeRedirectSubwindows</function></term>
<listitem><para>
- <function>XCompositeRedirectSubwindows</function> requests the X
- server to redirect hierarchies starting at all current and future
- children of <parameter>window</parameter> as in
- <function>XCompositeRedirectWindow</function>.
- If <parameter>update</parameter> is
- <constant>CompositeRedirectManual</constant>, then painting of the
- window background during window manipulation and ClearArea requests
+ <function>XCompositeRedirectSubwindows</function> requests the X
+ server to redirect hierarchies starting at all current and future
+ children of <parameter>window</parameter> as in
+ <function>XCompositeRedirectWindow</function>.
+ If <parameter>update</parameter> is
+ <constant>CompositeRedirectManual</constant>, then painting of the
+ window background during window manipulation and ClearArea requests
is inhibited.
</para></listitem>
</varlistentry>
<varlistentry>
<term><function>XCompositeUnredirectWindow</function></term>
<listitem><para>
- <function>XCompositeUnredirectWindow</function> requests the X
+ <function>XCompositeUnredirectWindow</function> requests the X
server to terminate redirection of <parameter>window</parameter>.
If the specified window was not selected for redirection by the
current client, a <errorname>BadValue</errorname> error results.
@@ -325,7 +325,7 @@ contents of all descendants.
<varlistentry>
<term><function>XCompositeUnredirectSubwindows</function></term>
<listitem><para>
- <function>XCompositeUnredirectWindow</function> requests the X
+ <function>XCompositeUnredirectWindow</function> requests the X
server to terminate redirection of all children of
<parameter>window</parameter>.
If the specified window was not selected for sub-redirection by the
@@ -349,12 +349,12 @@ contents of all descendants.
<listitem><para>
<function>XCompositeNameWindowPixmap</function> creates and returns
a pixmap id that serves as a reference to the off-screen storage for
- <parameter>window</parameter>. This pixmap will remain allocated
- until freed, even if the window is unmapped, reconfigured or
- destroyed. However, the window will get a new pixmap allocated each
- time it is mapped or resized, so this function will need to be
+ <parameter>window</parameter>. This pixmap will remain allocated
+ until freed, even if the window is unmapped, reconfigured or
+ destroyed. However, the window will get a new pixmap allocated each
+ time it is mapped or resized, so this function will need to be
reinvoked for the client to continue to refer to the storage holding
- the current window contents. Generates a
+ the current window contents. Generates a
<errorname>BadMatch</errorname> error if <parameter>window</parameter>
is not redirected or is not visible.
</para><para>
@@ -366,15 +366,15 @@ contents of all descendants.
<term><function>XCompositeGetOverlayWindow</function></term>
<listitem><para>
<function>XCompositeGetOverlayWindow</function> returns the window ID
- of the Composite Overlay Window for
- the screen specified by the argument <parameter>window</parameter>.
- This function notifies the X server that the client wishes to use
- the Composite Overlay Window of this screen. If this
- Composite Overlay Window has not yet been mapped, it is mapped by this
+ of the Composite Overlay Window for
+ the screen specified by the argument <parameter>window</parameter>.
+ This function notifies the X server that the client wishes to use
+ the Composite Overlay Window of this screen. If this
+ Composite Overlay Window has not yet been mapped, it is mapped by this
request.
</para><para>
- The Composite Overlay Window for a particular screen will be
- unmapped when all clients who have called this function have
+ The Composite Overlay Window for a particular screen will be
+ unmapped when all clients who have called this function have
either called <function>XCompositeReleaseOverlayWindow</function>
for that screen, or terminated their connection to the X server.
</para><para>
@@ -385,9 +385,9 @@ contents of all descendants.
<varlistentry>
<term><function>XCompositeReleaseOverlayWindow</function></term>
<listitem><para>
- This request specifies that the client is no longer using the
- Composite Overlay Window on the screen specified by the
- argument <parameter>window</parameter>. A screen's Composite
+ This request specifies that the client is no longer using the
+ Composite Overlay Window on the screen specified by the
+ argument <parameter>window</parameter>. A screen's Composite
Overlay Window is unmapped when there are no longer any clients using it.
</para><para>
The X server must support at least version 0.3 of the Composite
diff --git a/src/Makefile.am b/src/Makefile.am
index 456bb88..0efe173 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
-#
+#
# Copyright © 2003 Keith Packard, Noah Levitt
-#
+#
# 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
@@ -10,7 +10,7 @@
# specific, written prior permission. Keith Packard makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
-#
+#
# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -33,4 +33,4 @@ libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS)
libXcomposite_la_LDFLAGS = -version-number 1:0:0 -no-undefined
libXcompositeincludedir = $(includedir)/X11/extensions
-libXcompositeinclude_HEADERS =
$(top_srcdir)/include/X11/extensions/Xcomposite.h
+libXcompositeinclude_HEADERS =
$(top_srcdir)/include/X11/extensions/Xcomposite.h
diff --git a/src/Xcomposite.c b/src/Xcomposite.c
index eaa1790..9402339 100644
--- a/src/Xcomposite.c
+++ b/src/Xcomposite.c
@@ -52,7 +52,7 @@ const char XCompositeExtensionName[] = COMPOSITE_NAME;
* XCompositeExtRemoveDisplay - remove the indicated display from the
* extension object. (Replaces XextRemoveDisplay.)
*/
-static int
+static int
XCompositeExtRemoveDisplay (XCompositeExtInfo *extinfo, Display *dpy)
{
XCompositeExtDisplayInfo *info, *prev;
@@ -111,13 +111,13 @@ XCompositeExtAddDisplay (XCompositeExtInfo
*extinfo,
info->codes = XInitExtension (dpy, ext_name);
/*
- * if the server has the extension, then we can initialize the
+ * if the server has the extension, then we can initialize the
* appropriate function vectors
*/
if (info->codes) {
xCompositeQueryVersionReply rep;
xCompositeQueryVersionReq *req;
- XESetCloseDisplay (dpy, info->codes->extension,
+ XESetCloseDisplay (dpy, info->codes->extension,
XCompositeCloseDisplay);
/*
* Get the version info
@@ -128,7 +128,7 @@ XCompositeExtAddDisplay (XCompositeExtInfo *extinfo,
req->compositeReqType = X_CompositeQueryVersion;
req->majorVersion = COMPOSITE_MAJOR;
req->minorVersion = COMPOSITE_MINOR;
- if (!_XReply (dpy, (xReply *) &rep, 0, xTrue))
+ if (!_XReply (dpy, (xReply *) &rep, 0, xTrue))
{
UnlockDisplay (dpy);
SyncHandle ();
@@ -171,7 +171,7 @@ XCompositeExtAddDisplay (XCompositeExtInfo *extinfo,
* XextFindDisplay.)
*/
static XCompositeExtDisplayInfo *
-XCompositeExtFindDisplay (XCompositeExtInfo *extinfo,
+XCompositeExtFindDisplay (XCompositeExtInfo *extinfo,
Display *dpy)
{
XCompositeExtDisplayInfo *info;
@@ -179,7 +179,7 @@ XCompositeExtFindDisplay (XCompositeExtInfo *extinfo,
/*
* see if this was the most recently accessed display
*/
- if ((info = extinfo->cur) && info->display == dpy)
+ if ((info = extinfo->cur) && info->display == dpy)
return info;
/*
@@ -205,30 +205,30 @@ XCompositeFindDisplay (Display *dpy)
info = XCompositeExtFindDisplay (&XCompositeExtensionInfo, dpy);
if (!info)
- info = XCompositeExtAddDisplay (&XCompositeExtensionInfo, dpy,
+ info = XCompositeExtAddDisplay (&XCompositeExtensionInfo, dpy,
XCompositeExtensionName);
return info;
}
-
-Bool
+
+Bool
XCompositeQueryExtension (Display *dpy,
int *event_base_return,
int *error_base_return)
{
XCompositeExtDisplayInfo *info = XCompositeFindDisplay (dpy);
- if (XCompositeHasExtension(info))
+ if (XCompositeHasExtension(info))
{
*event_base_return = info->codes->first_event;
*error_base_return = info->codes->first_error;
return True;
- }
+ }
else
return False;
}
-Status
+Status
XCompositeQueryVersion (Display *dpy,
int *major_version_return,
int *minor_version_return)
@@ -372,7 +372,7 @@ XCompositeGetOverlayWindow (Display *dpy, Window window)
SyncHandle ();
return 0;
}
-
+
UnlockDisplay (dpy);
SyncHandle ();
commit db1ae0c545b4b359204c33488104d214c91f12bb
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Wed Feb 2 11:43:41 2011 -0500
config: comment, minor upgrade, quote and layout configure.ac
Group statements per section as per Autoconf standard layout
Quote statements where appropriate.
Autoconf recommends not using dnl instead of # for comments
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
Add AC_CONFIG_SRCDIR([Makefile.am])
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
diff --git a/configure.ac b/configure.ac
index fbd72ce..f9bf215 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,53 +1,52 @@
-dnl
-dnl Copyright © 2003 Keith Packard, Noah Levitt
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and
its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation, and that the name of Keith Packard not be used in
-dnl advertising or publicity pertaining to distribution of the software
without
-dnl specific, written prior permission. Keith Packard makes no
-dnl representations about the suitability of this software for any purpose.
It
-dnl is provided "as is" without express or implied warranty.
-dnl
-dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
USE,
-dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-dnl PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Process this file with autoconf to create configure.
+#
+# Copyright © 2003 Keith Packard, Noah Levitt
+#
+# 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 Keith Packard not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission. Keith Packard makes no
+# representations about the suitability of this software for any purpose. It
+# is provided "as is" without express or implied warranty.
+#
+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL KEITH PACKARD 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.
+#
+# Initialize Autoconf
AC_PREREQ([2.60])
+#
+# Version should match the current XComposite version. XCompositeQueryVersion
+# returns the version from xcompositewire.h, NOT the version we set here.
+# But we try to keep these the same. Note that the library has an extra
+# digit in the version number to track changes which don't affect the
+# protocol, so Xcomposite version l.n.m corresponds to protocol version l.n
+# that 'revision' number appears in Xcomposite.h and has to be manually
+# synchronized.
+#
+AC_INIT(libXcomposite, [0.4.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[libXcomposite])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
-dnl
-dnl Version should match the current XComposite version. XCompositeQueryVersion
-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.3],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- libXcomposite)
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Initialize libtool
+AC_PROG_LIBTOOL
+
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running
autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
-AC_CONFIG_HEADERS(config.h)
-
-# Check for progs
-AC_PROG_LIBTOOL
-
XORG_DEFAULT_OPTIONS
XORG_WITH_XMLTO(0.0.20)
@@ -58,17 +57,18 @@ AM_CONDITIONAL([INSTALL_MANPAGES],
# Check compositeext configuration, strip extra digits from package version to
# find the required protocol version
-
if test "$VERSION" = "" ; then
VERSION=$PACKAGE_VERSION;
fi
COMPOSITEEXT_VERSION=[`echo $VERSION | sed
's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(COMPOSITEEXT_VERSION)
+
+# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11)
PKG_CHECK_MODULES(XFIXES, xfixes)
-AC_OUTPUT([Makefile
- src/Makefile
- man/Makefile
- xcomposite.pc])
-
+AC_CONFIG_FILES([Makefile
+ src/Makefile
+ man/Makefile
+ xcomposite.pc])
+AC_OUTPUT
commit f6dcd194f87fb7009b8afa482326de044d0e9c24
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Fri Jan 28 19:41:37 2011 -0500
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/configure.ac b/configure.ac
index a5a823e..fbd72ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ AM_MAINTAINER_MODE
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running
autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
# Check for progs
AC_PROG_LIBTOOL
commit 0e1e69c7b71700c50f71b55f74cd12b8569fa966
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Thu Jan 27 18:50:14 2011 -0500
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/configure.ac b/configure.ac
index cd3f60a..a5a823e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,6 @@ XORG_MACROS_VERSION(1.8)
AM_CONFIG_HEADER(config.h)
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
XORG_DEFAULT_OPTIONS
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uoisa-0003uc...@vasks.debian.org
