ChangeLog | 68 +++++++++++++++++++++++++++
Makefile.am | 6 +-
configure.ac | 97 +++++++++++++++++++--------------------
debian/changelog | 11 ++++
debian/compat | 2
debian/control | 2
debian/rules | 29 ++++-------
include/X11/extensions/Xdamage.h | 2
src/Makefile.am | 2
src/Xdamage.c | 28 +++++------
src/xdamageint.h | 2
11 files changed, 161 insertions(+), 88 deletions(-)
New commits:
commit 8b5ab8dec8bbe62ebf681fa343f9fb0c13f68deb
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jun 24 10:18:37 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index ec06fe8..dd4e17c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxdamage (1:1.1.4-1) UNRELEASED; urgency=low
+libxdamage (1:1.1.4-1) unstable; urgency=low
* New upstream release.
* Bump debhelper compat level to 7.
@@ -7,7 +7,7 @@ libxdamage (1:1.1.4-1) UNRELEASED; urgency=low
* Replace dh_clean -k with dh_prep.
* Add build-{arch,indep} rules (same as build).
- -- Julien Cristau <jcris...@debian.org> Mon, 24 Jun 2013 09:55:23 +0200
+ -- Julien Cristau <jcris...@debian.org> Mon, 24 Jun 2013 10:18:30 +0200
libxdamage (1:1.1.3-2) unstable; urgency=low
commit 89494d8a41cb0891998ce21b1b6afb412c318c90
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jun 24 10:12:38 2013 +0200
Add build-{arch,indep} rules (same as build).
diff --git a/debian/changelog b/debian/changelog
index e9b2b21..ec06fe8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxdamage (1:1.1.4-1) UNRELEASED; urgency=low
* Use dpkg-buildflags.
* Disable silent rules.
* Replace dh_clean -k with dh_prep.
+ * Add build-{arch,indep} rules (same as build).
-- Julien Cristau <jcris...@debian.org> Mon, 24 Jun 2013 09:55:23 +0200
diff --git a/debian/rules b/debian/rules
index 587b8cc..17e8285 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,8 @@ else
endif
confflags += $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags
--export=configure)
-
+build-arch: build
+build-indep: build
build: build-stamp
build-stamp: $(STAMP_DIR)/patch
dh_testdir
@@ -88,3 +89,4 @@ binary-indep: build install
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build-indep build-arch
commit 0f191d5f3938ce99fbdf38064936169b32a5b183
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jun 24 10:10:59 2013 +0200
Fix build/patch rules dependency
diff --git a/debian/rules b/debian/rules
index 31652d6..587b8cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,8 +29,8 @@ endif
confflags += $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags
--export=configure)
-build: patch build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
mkdir -p build
@@ -47,7 +47,6 @@ clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
-
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
@@ -63,14 +62,12 @@ install: build
dh_testroot
dh_prep
dh_installdirs
-
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
-
dh_installdocs
dh_install --list-missing --exclude=libXdamage.la
dh_installchangelogs
commit 1b9573772b9e7516005900dea5bcc33f0e28bc91
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jun 24 10:07:54 2013 +0200
Replace dh_clean -k with dh_prep.
diff --git a/debian/changelog b/debian/changelog
index 86813cb..e9b2b21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxdamage (1:1.1.4-1) UNRELEASED; urgency=low
* Bump debhelper compat level to 7.
* Use dpkg-buildflags.
* Disable silent rules.
+ * Replace dh_clean -k with dh_prep.
-- Julien Cristau <jcris...@debian.org> Mon, 24 Jun 2013 09:55:23 +0200
diff --git a/debian/rules b/debian/rules
index 05d9e75..31652d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,7 @@ clean: xsfclean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
commit 7ac02516a3bfd186943ccb83454c1933e4622bb1
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jun 24 10:00:21 2013 +0200
Disable silent rules.
diff --git a/debian/changelog b/debian/changelog
index f29ebfa..86813cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxdamage (1:1.1.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> Mon, 24 Jun 2013 09:55:23 +0200
diff --git a/debian/rules b/debian/rules
index ab5dabe..05d9e75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,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 26aaecd3607ef742706200166c6171d52b457771
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jun 24 09:59:47 2013 +0200
Use dpkg-buildflags.
diff --git a/debian/changelog b/debian/changelog
index e344600..f29ebfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxdamage (1:1.1.4-1) UNRELEASED; urgency=low
* New upstream release.
* Bump debhelper compat level to 7.
+ * Use dpkg-buildflags.
-- Julien Cristau <jcris...@debian.org> Mon, 24 Jun 2013 09:55:23 +0200
diff --git a/debian/control b/debian/control
index 45dc1f9..cfe9f8f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,8 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Drew Parsons <dpars...@debian.org>
Build-Depends:
+# dpkg-buildflags --export=configure
+ dpkg-dev (>= 1.16.1),
debhelper (>= 8.1.3),
libx11-dev (>= 1:0.99.2),
libxfixes-dev (>= 1:3.0.0-4),
diff --git a/debian/rules b/debian/rules
index 5ae3a5b..ab5dabe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,6 @@ PACKAGE = libxdamage1
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,6 +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: patch build-stamp
@@ -42,8 +37,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 1f8e5d8a3611da3c07f7345b3824c46307fbf35d
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jun 24 09:57:52 2013 +0200
Bump debhelper compat level to 7.
diff --git a/debian/changelog b/debian/changelog
index e411d3c..e344600 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxdamage (1:1.1.4-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump debhelper compat level to 7.
-- Julien Cristau <jcris...@debian.org> Mon, 24 Jun 2013 09:55:23 +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/rules b/debian/rules
index 94e8b49..5ae3a5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,8 +76,8 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing --exclude=libXdamage.la
- dh_installchangelogs ChangeLog
+ dh_install --list-missing --exclude=libXdamage.la
+ dh_installchangelogs
dh_link
dh_strip --dbg-package=$(PACKAGE)-dbg
dh_compress
commit 770ece78aad8e9be166a77e8808cba16e4591c1d
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jun 24 09:56:03 2013 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index c2c9b3a..dee2193 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,71 @@
+commit 0c7f26ab7fb41873c2e68d8b136ef098ed663aff
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Wed Jan 2 21:45:11 2013 -0800
+
+ libXdamage 1.1.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 665c80d7af5fc7a73b76e0ddaee3536b37b029e9
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Fri Sep 16 22:16:01 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 45e9544d8202b76e20923f4d84667879a3d185ec
+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])
+ Remove redundant AC_SUBST(*_CFLAGS) and/or *_LIBS
+ Update minimum version of util-macros to at least 1.8.
+ No functional configuration changes
+
+ This helps automated maintenance and release activities.
+ Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
+
+commit 8de52f71322015a5d2bd9cef58f46b80052562a9
+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 b628ca236ee8d26358ea5075a89e6cc7d3497dbd
+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 a08053121ff1115689b3e5e5322e8b8aaa7cb5fc
+Author: Fernando Carrijo <fcarr...@yahoo.com.br>
+Date: Thu Jul 1 06:53:31 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo <fcarr...@yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vigna...@nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
commit 8abc1c8e920821f5ed68e639d3fb71a4ad90a102
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Tue Jun 8 18:50:45 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 1f94cfd..e411d3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxdamage (1:1.1.4-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcris...@debian.org> Mon, 24 Jun 2013 09:55:23 +0200
+
libxdamage (1:1.1.3-2) unstable; urgency=low
* Team upload.
commit 0c7f26ab7fb41873c2e68d8b136ef098ed663aff
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Wed Jan 2 21:45:11 2013 -0800
libXdamage 1.1.4
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index c274016..efe40ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_PREREQ([2.60])
# digit in the version number to track changes which don't affect the
# protocol, so Xdamage version l.n.m corresponds to protocol version l.n
#
-AC_INIT(libXdamage, [1.1.3],
+AC_INIT(libXdamage, [1.1.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXdamage])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 665c80d7af5fc7a73b76e0ddaee3536b37b029e9
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Fri Sep 16 22:16:01 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 0e317a5..b107025 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/include/X11/extensions/Xdamage.h b/include/X11/extensions/Xdamage.h
index 5ecf035..b3a5a06 100644
--- a/include/X11/extensions/Xdamage.h
+++ b/include/X11/extensions/Xdamage.h
@@ -62,7 +62,7 @@ void
XDamageDestroy (Display *dpy, Damage damage);
void
-XDamageSubtract (Display *dpy, Damage damage,
+XDamageSubtract (Display *dpy, Damage damage,
XserverRegion repair, XserverRegion parts);
void
diff --git a/src/Makefile.am b/src/Makefile.am
index 787fc04..0027895 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,4 +12,4 @@ INCLUDES = -I$(top_srcdir)/include/X11/extensions
libXdamage_la_LDFLAGS = -version-number 1:1:0 -no-undefined
libXdamageincludedir = $(includedir)/X11/extensions
-libXdamageinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xdamage.h
+libXdamageinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xdamage.h
diff --git a/src/Xdamage.c b/src/Xdamage.c
index 3a368d2..dc0044d 100644
--- a/src/Xdamage.c
+++ b/src/Xdamage.c
@@ -32,7 +32,7 @@ const char XDamageExtensionName[] = DAMAGE_NAME;
static int
XDamageCloseDisplay (Display *dpy, XExtCodes *codes);
-
+
static Bool
XDamageWireToEvent(Display *dpy, XEvent *event, xEvent *wire);
@@ -58,13 +58,13 @@ XDamageExtAddDisplay (XDamageExtInfo *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) {
xDamageQueryVersionReply rep;
xDamageQueryVersionReq *req;
- XESetCloseDisplay (dpy, info->codes->extension,
+ XESetCloseDisplay (dpy, info->codes->extension,
XDamageCloseDisplay);
for (ev = info->codes->first_event;
ev < info->codes->first_event + XDamageNumberEvents;
@@ -82,7 +82,7 @@ XDamageExtAddDisplay (XDamageExtInfo *extinfo,
req->damageReqType = X_DamageQueryVersion;
req->majorVersion = DAMAGE_MAJOR;
req->minorVersion = DAMAGE_MINOR;
- if (!_XReply (dpy, (xReply *) &rep, 0, xTrue))
+ if (!_XReply (dpy, (xReply *) &rep, 0, xTrue))
{
UnlockDisplay (dpy);
SyncHandle ();
@@ -124,7 +124,7 @@ XDamageExtAddDisplay (XDamageExtInfo *extinfo,
* XDamageExtRemoveDisplay - remove the indicated display from the
* extension object. (Replaces XextRemoveDisplay.)
*/
-static int
+static int
XDamageExtRemoveDisplay (XDamageExtInfo *extinfo, Display *dpy)
{
XDamageExtDisplayInfo *info, *prev;
@@ -165,7 +165,7 @@ XDamageExtRemoveDisplay (XDamageExtInfo *extinfo, Display
*dpy)
* XextFindDisplay.)
*/
static XDamageExtDisplayInfo *
-XDamageExtFindDisplay (XDamageExtInfo *extinfo,
+XDamageExtFindDisplay (XDamageExtInfo *extinfo,
Display *dpy)
{
XDamageExtDisplayInfo *info;
@@ -173,7 +173,7 @@ XDamageExtFindDisplay (XDamageExtInfo *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;
/*
@@ -199,11 +199,11 @@ XDamageFindDisplay (Display *dpy)
info = XDamageExtFindDisplay (&XDamageExtensionInfo, dpy);
if (!info)
- info = XDamageExtAddDisplay (&XDamageExtensionInfo, dpy,
+ info = XDamageExtAddDisplay (&XDamageExtensionInfo, dpy,
XDamageExtensionName);
return info;
}
-
+
static int
XDamageCloseDisplay (Display *dpy, XExtCodes *codes)
{
@@ -280,24 +280,24 @@ XDamageEventToWire(Display *dpy, XEvent *event, xEvent
*wire)
return False;
}
-Bool
+Bool
XDamageQueryExtension (Display *dpy,
int *event_base_return,
int *error_base_return)
{
XDamageExtDisplayInfo *info = XDamageFindDisplay (dpy);
- if (XDamageHasExtension(info))
+ if (XDamageHasExtension(info))
{
*event_base_return = info->codes->first_event;
*error_base_return = info->codes->first_error;
return True;
- }
+ }
else
return False;
}
-Status
+Status
XDamageQueryVersion (Display *dpy,
int *major_version_return,
int *minor_version_return)
@@ -348,7 +348,7 @@ XDamageDestroy (Display *dpy, Damage damage)
}
void
-XDamageSubtract (Display *dpy, Damage damage,
+XDamageSubtract (Display *dpy, Damage damage,
XserverRegion repair, XserverRegion parts)
{
XDamageExtDisplayInfo *info = XDamageFindDisplay (dpy);
commit 45e9544d8202b76e20923f4d84667879a3d185ec
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])
Remove redundant AC_SUBST(*_CFLAGS) and/or *_LIBS
Update minimum version of util-macros to at least 1.8.
No functional configuration changes
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 7e0aef6..c274016 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,61 +1,61 @@
-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])
-
-dnl
-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 Xdamage version l.n.m corresponds to protocol version l.n
-dnl
-AC_INIT(libXdamage,
- 1.1.3,
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- libXdamage)
+#
+# Version should match the current XDamage version. XDamageQueryVersion
+# returns the version from damagewire.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 Xdamage version l.n.m corresponds to protocol version l.n
+#
+AC_INIT(libXdamage, [1.1.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXdamage])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Initialize libtool
+AC_PROG_LIBTOOL
+
+# Require X.Org macros 1.8 or later
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running
autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running
autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AC_CONFIG_HEADERS(config.h)
-
-# Check for progs
-AC_PROG_LIBTOOL
# 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 x11)
-AC_SUBST(XDAMAGE_CFLAGS)
-AC_OUTPUT([Makefile
- src/Makefile
- xdamage.pc])
+# Obtain compiler/linker options for depedencies
+PKG_CHECK_MODULES(XDAMAGE, [damageproto >= $DAMAGEEXT_VERSION] xfixes
fixesproto xextproto x11)
+AC_CONFIG_FILES([Makefile
+ src/Makefile
+ xdamage.pc])
+AC_OUTPUT
commit 8de52f71322015a5d2bd9cef58f46b80052562a9
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 7aef94e..7e0aef6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.3 or later before running
autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
# Check for progs
AC_PROG_LIBTOOL
commit b628ca236ee8d26358ea5075a89e6cc7d3497dbd
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 9382ec5..7aef94e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,6 @@ XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
# Check damageext configuration, strip extra digits from package version to
commit a08053121ff1115689b3e5e5322e8b8aaa7cb5fc
Author: Fernando Carrijo <fcarr...@yahoo.com.br>
Date: Thu Jul 1 06:53:31 2010 -0300
Purge macros NEED_EVENTS and NEED_REPLIES
Signed-off-by: Fernando Carrijo <fcarr...@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vigna...@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/src/xdamageint.h b/src/xdamageint.h
index 6430a41..f833714 100644
--- a/src/xdamageint.h
+++ b/src/xdamageint.h
@@ -23,8 +23,6 @@
#ifndef _XDAMAGEINT_H_
#define _XDAMAGEINT_H_
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <stdio.h>
#include <X11/Xlib.h>
#include <X11/Xlibint.h>
--
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/e1ur2aj-0004cv...@vasks.debian.org
