libxdamage: Changes to 'upstream-unstable'
.gitignore | 69 +++++++++++++++++++++++++++++++++------
COPYING | 1
INSTALL | 8 ----
Makefile.am | 12 ++----
configure.ac | 14 +++++--
include/X11/extensions/Xdamage.h | 2 -
src/.gitignore | 6 ---
src/Xdamage.c | 3 -
src/xdamageint.h | 2 -
9 files changed, 75 insertions(+), 42 deletions(-)
New commits:
commit 8abc1c8e920821f5ed68e639d3fb71a4ad90a102
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jun 8 18:50:45 2010 -0700
libXdamage 1.1.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 24c3670..9382ec5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,10 @@ 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.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXdamage)
+AC_INIT(libXdamage,
+ 1.1.3,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ libXdamage)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 0b0b68a2a06f01ad3e185aafb2e9665779bc0084
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 07:56:45 2008 +0100
nuke RCS Ids
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/COPYING b/COPYING
index 373d979..8eaae9d 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,3 @@
-$Id$
Copyright © 2001,2003 Keith Packard
Copyright © 2007 Eric Anholt
diff --git a/Makefile.am b/Makefile.am
index e683ffa..0e317a5 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/include/X11/extensions/Xdamage.h b/include/X11/extensions/Xdamage.h
index 5ec636d..5ecf035 100644
--- a/include/X11/extensions/Xdamage.h
+++ b/include/X11/extensions/Xdamage.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/Xdamage.c b/src/Xdamage.c
index e98bdf7..3a368d2 100644
--- a/src/Xdamage.c
+++ b/src/Xdamage.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
* Copyright © 2007 Eric Anholt
*
diff --git a/src/xdamageint.h b/src/xdamageint.h
index 8c64ca2..6430a41 100644
--- a/src/xdamageint.h
+++ b/src/xdamageint.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
commit 5a77a5e402ab245f2de08886e5fb2934a6c54571
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri Apr 9 17:26:07 2010 -0700
Always call SyncHandle after issuing an X request.
diff --git a/src/Xdamage.c b/src/Xdamage.c
index 174bb09..e98bdf7 100644
--- a/src/Xdamage.c
+++ b/src/Xdamage.c
@@ -94,6 +94,7 @@ XDamageExtAddDisplay (XDamageExtInfo *extinfo,
info->major_version = rep.majorVersion;
info->minor_version = rep.minorVersion;
UnlockDisplay (dpy);
+ SyncHandle ();
} else {
/* The server doesn't have this extension.
* Use a private Xlib-internal extension to hang the close_display
commit a414d85a9da3f5b23975a64c351ad00138092107
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 16:50:34 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 08690d0..24c3670 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
dnl
dnl Version should match the current XDamage version. XDamageQueryVersion
commit f8914c5dba4c6514b83c7d8f5c550a2603e4da66
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 14:53:48 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index d985f88..e683ffa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,8 +29,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xdamage.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xdamage.pc.in
-
.PHONY: ChangeLog INSTALL
commit 5dd2b14345ba9b8b88d11dc027dc71625fbf15bc
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Nov 27 20:56:04 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index 5e00219..d985f88 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,7 @@ INCLUDES = $(top_srcdir)/include/
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xdamage.pc
+MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = xdamage.pc.in
commit 98333e9afea1c5dfb0f4b90c10f25e6b77e72817
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:10 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 1c5b4b5..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-libXdamage is built with the traditional configure script:
-
- $ ./configure --prefix=/usr/X11R6
-
-This should generate valid Makefiles, then:
-
- $ make
- $ make install
diff --git a/Makefile.am b/Makefile.am
index 5985ba9..5e00219 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,9 +31,12 @@ pkgconfig_DATA = xdamage.pc
EXTRA_DIST = xdamage.pc.in
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
commit 62d595bc01c0219254560b72978faa3327959eee
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Oct 27 15:07:25 2009 -0400
Deploy the new XORG_DEFAULT_OPTIONS #24242
This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
diff --git a/configure.ac b/configure.ac
index 5a29963..08690d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,14 +35,15 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# 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])])
+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)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_DEFAULT_OPTIONS
# Check damageext configuration, strip extra digits from package version to
# find the required protocol version
commit 6852db03b187cfce5a41cc8addbc734091e6b725
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 22:08:42 2009 -0400
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
ChangeLog filename is known to Automake and requires no further
coding in the makefile.
diff --git a/Makefile.am b/Makefile.am
index 035894a..5985ba9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,8 +30,6 @@ pkgconfig_DATA = xdamage.pc
EXTRA_DIST = xdamage.pc.in
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
commit ef9fad1a1f327c1f19009d4206c67762ef0d436a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 13:10:20 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index ecf74f1..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-libXdamage.la
-*.lo
-Makefile
-Makefile.in
commit d9ff5ede9989b0312416fd68fc3dd866c551aad9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:19 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/.gitignore b/.gitignore
index 759edb3..568d511 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,78 @@
+#
+# X.Org module default exclusion patterns
+# The next section if for module specific patterns
+#
+# Do not edit the following section
+# GNU Build System (Autotools)
aclocal.m4
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
compile
config.guess
config.h
config.h.in
config.log
+config-ml.in
+config.py
config.status
+config.status.lineno
config.sub
configure
+configure.scan
depcomp
+.deps/
+INSTALL
install-sh
+.libs/
libtool
+libtool.m4
ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
Makefile
Makefile.in
+mdate-sh
missing
mkinstalldirs
-stamp-h1
-xdamage.pc
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
-*.o
-*.la
-*.lo
-libXdamage-*.tar.*
-ChangeLog
-tags
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+# Add & Override patterns for libXdamage
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
commit 8a02e2cfe8cfcaa791b81b47e44304f326a0dcb8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 21 12:47:24 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 845023e..5a29963 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ 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.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXdamage)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
Reply to: