libxrender: Changes to 'upstream-unstable'
.gitignore | 73 +++++++++++++++++++++++++++++++++++++++++++++++++----------
COPYING | 18 ++++++++++++++
INSTALL | 8 ------
Makefile.am | 13 +++++-----
configure.ac | 14 +++++++----
src/Filter.c | 1
6 files changed, 96 insertions(+), 31 deletions(-)
New commits:
commit d3d20437ceee1c225cd189fdeb6378552e206337
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jun 8 19:23:04 2010 -0700
libXrender 0.9.6
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 1934614..57ae66e 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 Xrender version l.n.m corresponds to protocol version l.n
dnl
-AC_INIT(libXrender, 0.9.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrender)
+AC_INIT(libXrender,
+ 0.9.6,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ libXrender)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 0dcf5c152a6463342897375c71e4f76476d285d2
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri Apr 9 17:26:52 2010 -0700
Always call SyncHandle after issuing an X request.
diff --git a/src/Filter.c b/src/Filter.c
index 76c8cfa..3ac660a 100644
--- a/src/Filter.c
+++ b/src/Filter.c
@@ -123,6 +123,7 @@ XRenderQueryFilters (Display *dpy, Drawable drawable)
_XEatData (dpy, 4 - (i & 3));
UnlockDisplay (dpy);
+ SyncHandle ();
return filters;
}
commit b138debfd03e096a0af998495441ac262733dfc9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 14:53:49 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 27c9e33..01ef172 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,6 @@ pkgconfig_DATA = xrender.pc
dist_doc_DATA = doc/libXrender.txt
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xrender.pc.in
.PHONY: ChangeLog INSTALL
commit 1380d975d1b85decd2b0a6e8a7e629b1bdd1d1ad
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 14 09:43:56 2010 -0500
COPYING: add missing copyright notices
Refer to: Composite.c
Copyright © 2000 SuSE, Inc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index e506314..0d548e5 100644
--- a/COPYING
+++ b/COPYING
@@ -19,3 +19,21 @@ 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.
+Copyright © 2000 SuSE, Inc.
+
+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 SuSE not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission. SuSE makes no representations about the
+suitability of this software for any purpose. It is provided "as is"
+without express or implied warranty.
+
+SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+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.
commit fc8b02894452ad93101b35fec41cb1baf72e746a
Author: Rémi Cardona <remi@gentoo.org>
Date: Thu Dec 17 08:30:04 2009 +0100
require autoconf 2.60 because of $(docdir) use
Signed-off-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
diff --git a/configure.ac b/configure.ac
index ffacb45..1934614 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 Render version. XRenderQueryVersion
commit f662ae0e47a6f8fe47457a0b38f72f9598f37c96
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 2477e56..27c9e33 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,7 @@ pkgconfig_DATA = xrender.pc
dist_doc_DATA = doc/libXrender.txt
+MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = xrender.pc.in
.PHONY: ChangeLog INSTALL
commit 83a3fd787f3058284d8b903ac190de54ba1f0e6d
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 835f608..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-Xrender 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 f06239b..2477e56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,12 @@ dist_doc_DATA = doc/libXrender.txt
EXTRA_DIST = xrender.pc.in
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
commit cf8a7c4463eba5ef3c63186ad539c201df3770f9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Oct 27 15:07:26 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 439d9e5..ffacb45 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 render configuration, strip extra digits from package version to
# find the required protocol version
commit f58f2bf44c35ca82ecd9f022a494af0fbcd0a537
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 22:08:43 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 4df32ed..f06239b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,8 +26,7 @@ pkgconfig_DATA = xrender.pc
dist_doc_DATA = doc/libXrender.txt
-EXTRA_DIST = xrender.pc.in ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+EXTRA_DIST = xrender.pc.in
.PHONY: ChangeLog
commit 47051786b209039488dfca6b644db3f67ca96426
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 09a9259..9ba386e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,29 +1,78 @@
-.deps
-.libs
+#
+# 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
-MakeOut
+mdate-sh
missing
mkinstalldirs
-stamp-h1
-xrender.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
-libXrender-*.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 libXrender
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
commit 1da8c1bfbb17750e5ba51321961aaf39b8cf98f7
Author: Tomáš Chvátal <scarabeus@gentoo.org>
Date: Sun Nov 29 13:38:42 2009 +0100
Make libXrender use docdir for documentation placement.
Signed-off-by: Tomáš Chvátal <scarabeus@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/Makefile.am b/Makefile.am
index a15b64d..4df32ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,8 +24,7 @@ SUBDIRS = src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xrender.pc
-renderdocdir = $(datadir)/doc/$(PACKAGE)
-dist_renderdoc_DATA = doc/libXrender.txt
+dist_doc_DATA = doc/libXrender.txt
EXTRA_DIST = xrender.pc.in ChangeLog
MAINTAINERCLEANFILES = ChangeLog
commit a5ab173b0b19e6acefc897492b21fc6e6c296282
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 21 12:47:26 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 9219452..439d9e5 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 Xrender version l.n.m corresponds to protocol version l.n
dnl
AC_INIT(libXrender, 0.9.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrender)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
Reply to: