qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update to libXrender 0.9.5

Browse Source
This commit is contained in:
matthieu 2009-10-31 18:41:19 +00:00
parent 139377e246
commit e03850b02d
15 changed files with 7305 additions and 5240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libXrender/COPYING
View File

@ -1,4 +1,3 @@
$Id: COPYING,v 1.1.1.1 2006/11/25 17:55:16 matthieu Exp $
Copyright © 2001,2003 Keith Packard

656
lib/libXrender/ChangeLog
View File

@ -1,532 +1,298 @@
2006-04-26 Adam Jackson <ajax@freedesktop.org>
commit 5865c457191da7f7357b7c7cdfb1a6e695e630df
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 1 22:34:19 2009 -0700
* configure.ac:
Bump to 0.9.1
libXrender 0.9.5
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2006-04-02 Adam Jackson <ajax@freedesktop.org>
commit cb8df63ef0a8a70dfff21eef02f9d50095854ec0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 1 22:28:05 2009 -0700
* src/Xrender.c:
Coverity #428: Fix a potential NULL chase.
Coverity #930: Verify that a malloc succeeds.
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 394342d73472c3921eb941bf5f07c24237d89b1a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 1 22:15:30 2009 -0700
* configure.ac:
Update package version number for final X11R7 release candidate.
Move libXrender documentation from xorg-docs
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit cc94fadacb4be63f8577c3c4de65dacaee531776
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 20:34:36 2009 -0800
* configure.ac:
Update package version number for X11R7 RC3 release.
Add README with pointers to mailing list, bugzilla & git repos
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2005-12-02 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 3747f97f133b5fe8dea0d1991d68c4693d488aae
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Jan 30 16:49:59 2009 -0200
* configure.ac:
* src/Makefile.am:
Add check and cflags for malloc(0) returning NULL.
Janitor: make distcheck, compiler warnings, .gitignore.
2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit f6f784c0f98c28915bd26d04e4d8839806e29877
Author: Pierre-Loup Griffais <pgriffais@nvidia.com>
Date: Fri Apr 18 17:32:32 2008 -0700
* xrender.pc.in:
Update pkgconfig files to separate library build-time dependencies
from application build-time dependencies.
* configure.ac:
Update dependencies to work with separate build roots.
Use Data instead of Data32 to avoid truncating the filter parameters on 64-bit systems.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
2005-07-08 Keith Packard <keithp@keithp.com>
commit 5653231fcde636e4215c70b1e436554e1ffe07a7
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 08:39:12 2008 +0100
* .cvsignore:
* src/.cvsignore:
Add .cvsignore files
nuke RCS Ids
2005-06-09 Alexander Gottwald <ago@freedesktop.org>
commit e1333b82c0f6e7b9acdbae19d18377a0ed65bddb
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:43 2007 -0500
* src/Makefile.am:
Use $(top_srcdir)/... instead of $(top_builddir)/... in INCLUDES
Added $(top_srcdir) to INCLUDES
Replace static ChangeLog with dist-hook to generate from git log
2004-11-22 Carl Worth <cworth@cworth.org>
commit e10d5cbe4c5ed98ae1856e20a0e9d31321330d53
Merge: 497dda5... 9d3f9fd...
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 5 08:25:12 2007 -0700
* configure.ac: Remove AC_CONFIG_AUX_DIR (it was in the wrong
place for automake-1.9, and it was set to the default value
anyway).
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/lib/libXrender
2004-10-18 Noah Levitt <nlevitt@columbia.edu>
commit 497dda5615d0484d34f3a0a580353ac10ceaced5
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 5 08:20:33 2007 -0700
* configure.ac: Export RENDER_CFLAGS.
Bump version to 0.9.4.
2004-09-05 Keith Packard <keithp@keithp.com>
commit 89bc96e2c10c3902b82d74da95608bb48319ad29
Author: Paul Bender <pebender@san.rr.com>
Date: Wed Sep 5 08:19:55 2007 -0700
* configure.ac:
Move AC_CONFIG_AUX_DIR above AM_INIT_AUTOMAKE to make
automake 1.9 happy
Reorder render.h include so that XID has been picked up by then.
While libXrender built fine. some software requiring libXrender didn't include
Xlib.h beforehand.
2004-07-29 Keith Packard <keithp@keithp.com>
commit 9d3f9fd3f6f37112fecb2e96e9b25eb860a4b67d
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:53:49 2007 -0400
* Makefile.am:
* Xrender.h:
* configure.ac:
Update to protocol 0.9 which includes RenderAddTraps request
Add *~ to .gitignore to skip patch/emacs droppings
2004-04-10 Keith Packard <keithp@keithp.com>
commit 3fcca95b2628167be4c908a9a315f070eb195660
Author: David Reveman <davidr@novell.com>
Date: Mon Aug 20 14:40:44 2007 -0400
reviewed by: Mark Ashley <mark@ibiblio.org>
Bump to 0.9.3
* Xrenderint.h:
Solaris appears to need <string.h> included to compile
this library. Who knows. It seems harmless enough,
and the configure script already detected it's presence,
so we just included it whenever available.
commit 5b38b2d9b981d425587a4eb440acb2f0d6b0db13
Author: David Reveman <davidr@novell.com>
Date: Mon Aug 20 14:38:33 2007 -0400
2004-02-03 Jim Gettys <jg@freedesktop.org>
Properly set length field in gradient requests (bug 9526).
* AUTHORS: Get a author's list going.
commit 9fc870a4b68c2e7f5a7bcaca72d96fe105737bb5
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Fri Oct 13 16:26:35 2006 -0400
2004-01-15 Daniel Stone <daniel@fooishbar.org>
* Tag release 0.8.4 for first freedesktop.org clientside lib release.
Bump to 0.9.2
2004-01-15 Harold L Hunt II <huntharo@msu.edu>
* Makefile.am: Pass -no-undefined to libtool via LDFLAGS.
commit f7f2d491eff707d6087dcdec1d8a1bbd733b5f14
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat Sep 16 20:26:02 2006 +0200
2003-12-12 Keith Packard <keithp@keithp.com>
Const-ified the filter argument to XRenderSetPictureFilter().
* configure.ac:
* xrender.pc.in:
Use Requires: in xrender.pc when x11.pc exists
commit 28600498df66dd0d7cc25cb1dd48648ae8ba0d30
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jul 13 14:59:06 2006 -0700
2003-06-08 10:56 keithp
renamed: .cvsignore -> .gitignore
* Filter.c, Makefile.am, Xrender.c, Xrenderint.h, configure.ac:
Bail on bogus Xsun servers, compile with -DXTHREADS if necessary,
get rid of unecessary cast to XRenderInfo *
commit c4bfb815c36911e7b7b752fd3273b09ab246068d
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Apr 27 00:21:27 2006 +0000
2003-05-06 09:05 branden
Bump to 0.9.1
* ChangeLog: Huh. Did Keith tag xrender-0_8_2 *before* running
cvs2cl? Running it again.
commit 9779025f33c917b74349200e6018d0c94d6ff0ab
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 01:10:02 2006 +0000
2003-05-05 20:56 keithp
Coverity #428: Fix a potential NULL chase. Coverity #930: Verify that a
malloc succeeds.
* ChangeLog: Update ChangeLog with spiffy cvs2cl script (thanks
Branden)
commit ab1b6bdbce1c83c53ef9ea610466a7c813ab643d
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:34 2005 +0000
2003-05-05 20:49 keithp
Update package version number for final X11R7 release candidate.
* configure.ac: Update version to 0.8.2, add some version-related
comments
commit 94a90971fed66cf636f466b6fdd08a485042c38f
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:45 2005 +0000
2003-05-05 20:18 branden
Update package version number for X11R7 RC3 release.
* debian/: changelog, compat, control, copyright,
libxrender-dev.install, libxrender-dev.postrm,
libxrender-dev.preinst, libxrender1-dbg.install,
libxrender1-dbg.postrm, libxrender1-dbg.preinst,
libxrender1.install, libxrender1.postrm, libxrender1.preinst,
rules: Check in Debian packaging infrastructure per Keith's
request. This is the stuff that corresponds to Debian's xrender
0.8.1-1 package.
commit 874af611e76e4edadfb53479b80ddbd021052aae
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 04:41:50 2005 +0000
2003-05-05 19:06 keithp
Add check and cflags for malloc(0) returning NULL.
* Xrenderint.h, configure.ac: Remove bogus Xext.h include. Fix
Render version comparison
commit c2874804715f99c6c735079cc018db77494ba0cd
Author: Kevin E Martin <kem@kem.org>
Date: Sat Nov 19 07:15:43 2005 +0000
2003-05-03 13:00 keithp
Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work
with separate build roots.
* Makefile.am, configure.ac: Bump to version 0.8.1, library version
1.2.2 after extutil was removed
commit 438e7bc5783ae00c200ef239cb0ebbe828cdb900
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:52 2005 +0000
2003-04-26 08:52 nlevitt
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
* Xrenderint.h: Get rid of reference to XMissingExtension. It's in
libXext, which we don't link, and we don't want to print an error
message anyway.
commit bd4ccfc68aba1bfd75350311b70c0c84c20f3137
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 23 18:09:40 2005 +0000
2003-04-23 20:29 nlevitt
Modify modular libs to use Xregion.h instead of region.h
* ChangeLog, Composite.c, Cursor.c, FillRect.c, FillRects.c,
Filter.c, Glyph.c, Makefile.am, Picture.c, Trap.c, Tri.c,
Xrender.c, Xrenderint.h, configure.ac, extutil.h, xrender.pc.in:
Get rid of libXext dependency.
commit 9fc7ab9a00f99088432529af9129c5e4702e7c6f
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 23 18:06:16 2005 +0000
2003-04-22 09:59 nlevitt
lib/Xrender/Picture.c Change region.h to Xregion.h and modify internal
references to include <X11/Xregion.h>.
* .cvsignore: Testing syncmail.
commit 27962f426c54ee19d648601825485c2ca2b50832
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 19 04:53:20 2005 +0000
2003-04-21 23:41 nlevitt
Use correct path to region.h.
* xrender.pc.in: Xrender.h #includes render.h, so it needs the
Render CFLAGS.
commit 62c6d0bf4b5d5e27f586bb8a1beccc27bab4ef4c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 9 06:48:50 2005 +0000
2003-04-21 23:12 nlevitt
Add .cvsignore files
* xrender.pc.in: s/@PACKAGE_VERSION@/@VERSION@/ (Jeff Waugh, bug
#71)
commit b1051c48a51a9731bce10dd4951485f5554ca605
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 07:00:57 2005 +0000
2003-04-21 21:46 nlevitt
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
* Makefile.am, Xrenderint.h, configure.ac: Use local extutil.h if
not installed on the system.
commit 9359b40d8c41901844924060a864a854dac4adbf
Author: Lars Knoll <lars@trolltech.com>
Date: Fri Jul 1 10:04:51 2005 +0000
2003-04-21 10:36 keithp
Add support for gradients and solid fills to Render.
* COPYING, ChangeLog, INSTALL, configure.ac: Fix render header
version check to use VERSION, eliminate duplicate version numbers
from configure.ac
commit 60cc17fd8fac9b28363e0979d6b0443be6838613
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Jun 9 13:49:06 2005 +0000
2003-04-21 10:22 keithp
Use $(top_srcdir)/... instead of $(top_builddir)/... in INCLUDES Added
$(top_srcdir) to INCLUDES
* Color.c, Composite.c, Cursor.c, FillRects.c, Filter.c, Glyph.c,
Picture.c, Poly.c, Trap.c, Tri.c, Xrender-def.cpp, Xrender.h,
Xrenderint.h, extutil.h: Switch CVS id tags so regular CVS can cope
commit 8f765c413911d355dd95a312e31deaf1166206f9
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu May 19 20:33:55 2005 +0000
2003-04-21 09:47 keithp
Add forgotten region.h
* Makefile.am: Xrender .so is 1.2. switch order of dependent
libraries
commit 65cb00ad3da0cdaad1429ac5cb01e12d7f4a6d0d
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu May 19 19:58:24 2005 +0000
2003-04-20 23:49 nlevitt
- Add Xrender build system
* FillRect.c: Testing syncmail again.
commit 99a8286d49152c45ebead33df9f32bf6b7799bee
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu May 19 19:26:35 2005 +0000
2003-04-20 23:44 nlevitt
- Conditionally include config.h in xc/lib/Xrender/*.c
- Add Xrender to symlink.sh
* Xrender.c: Testing syncmail.
commit f11802cdcd65d4e50c7ed8eadf5c907af40b544c
Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
Date: Sat Dec 4 00:42:48 2004 +0000
2003-04-19 16:02 nlevitt
Encoding of numerous files changed to UTF-8
* xrender.pc.in: Add X libs to pkg-config --libs.
commit 87e1ae59ec19eeeee70978c922c43e1b219699d5
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 7 00:40:40 2004 +0000
2003-04-19 11:32 nlevitt
Update to version 0.9 of Xrender (includes XRenderAddTraps)
* Makefile.am: Link with -lX11 -lXext.
commit a8302c03f1810fe30aea90f3d42a77663e5cd8a0
Author: Egbert Eich <eich@suse.de>
Date: Mon May 24 19:05:01 2004 +0000
2003-04-19 11:21 nlevitt
Muffle compiler warnings.
fix option name in log message.
improve debugging messages.
* Makefile.am, Xrenderint.h, configure.ac: Use installed
<X11/extenstions/extutil.h>. (Thanks, jdub). Make sure X is found
at ./configure time. Bump .so version to 1.1.1.
commit 7faeec0e653838dc78d8df0c1eb10b833ff0c816
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 18:43:50 2004 +0000
2003-04-17 17:43 nlevitt
Merging XORG-CURRENT into trunk
* configure.ac: Xrender version is the same as Render.
commit 3cdb1c4406d51f671f60f530c557ebfca81bfd3c
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:32:25 2004 +0000
2003-04-17 16:41 nlevitt
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
* .cvsignore: Quiet, please.
commit cb66a1ca643b1756d61bc8bfe6cfef2885791d66
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:11:30 2004 +0000
2003-04-17 15:53 nlevitt
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
* xrender.pc.in: Fix typo
commit 88d1d0b4e14be414a5afb16bcf83ac2e6b5ea7a6
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:35:33 2004 +0000
2003-04-17 15:49 nlevitt
readding XFree86's cvs IDs
* Imakefile, Makefile.am, Xrenderint.h, autogen.sh, configure.ac,
extutil.h, region.h, xrender.pc.in: Initial automake support.
commit 48b8124dfef71e9302e9b1404870c23a07d799ae
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:22:44 2004 +0000
2003-03-24 20:18 dawes
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
* Xrender-def.cpp: 26. Updates for building on OS/2 (#5650, Frank
Giessler).
commit 4d0650c66361abac955cf0583291fa12f61137ac
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:49 2003 +0000
2002-11-24 13:46 tsi
XFree86 4.3.0.1
* Cursor.c: Warning fix
2002-11-22 18:34 keithp
* Cursor.c, Xrender.h: Add animate cursor support, client side
2002-11-21 18:10 keithp
* Xrender.c: Skip unexpected data in QueryFormats. Deal with
broken X servers a bit better
2002-11-14 13:01 tsi
* Imakefile: First pass at imake warnings. + some ATI driver
formatting changes.
Please ensure these changes are reflected in DRI's CVS.
2002-11-06 14:47 keithp
* Xrender.c, Xrender.h: XRenderQueryPictIndexValues support (from
Olivier Chapuis). Bump Render version to 0.7
2002-11-05 15:22 keithp
* Glyph.c, Trap.c, Tri.c, Xrenderint.h: Render uses int for 32
bits, Xlib uses long. This matters on alpha
2002-10-17 18:13 keithp
* Glyph.c: Miscomputing request length for String16 and String32
2002-10-01 07:31 alanh
* Xrender-def.cpp: 358. Enable version controlled .dll's on
Cygwin/XFree86 (Alexander Gottwald).
357. Some build fixes for Cygwin/XFree86 (Alan Hourihane).
2002-09-29 16:39 keithp
* Xrender.c, Xrender.h: Update RandR to 1.0 (library version 2.0)
2002-09-27 09:40 keithp
* Trap.c: Obey max request length even with BIG-REQUESTS
2002-09-25 19:56 keithp
* Filter.c, Imakefile, Picture.c, Xrender.c, Xrender.h,
Xrenderint.h: Add image transformation and sub-pixel ordering to
Render
2002-08-31 11:15 keithp
* Glyph.c: Remember not to write code at 1am.
CompositeText{8,16,32} werent switching glyphsets at the right
time.
2002-08-30 23:52 keithp
* Glyph.c: CompositeGlyphs functions were re-using overwritten data
and trashing the output buffer
2002-08-22 22:48 keithp
* Cursor.c, Imakefile, Xrender.h: Add CreateCursor request to
Render
2002-07-24 08:26 tsi
* Imakefile: Make libXrender buildable in non-XFree86 environments.
2002-06-07 11:04 keithp
* Imakefile: Get Xrender to build out of the XFree86 environment
2002-06-04 16:22 keithp
* Poly.c: Free edges structure after drawing Render polygons
2002-05-30 23:38 keithp
* Imakefile: Fix up support for building Xft1, Xrender and
fontconfig out of the tree
2002-05-21 13:39 keithp
* Poly.c: Xrender library didnt render some concave polygons right
2002-05-17 16:54 keithp
* Xrender.c: standard 1-bit render format had incorrect depth in
spec
2002-05-17 15:34 keithp
* Color.c, Imakefile, Xrender.h: Add Render color parse routine for
rgba colorspace
2002-05-16 23:54 keithp
* Poly.c: Another tesselation fix for Rendered polygons
2002-05-16 08:28 tsi
* Poly.c: Warning fix
2002-05-14 23:43 keithp
* Tri.c: Fix up triangle request encodings
2002-05-14 23:42 keithp
* Xrender.c, Xrender.h: Add XRenderFindStandardFormat
2002-05-14 23:39 keithp
* Poly.c: Redo tesselation to match foley and vanDam
2002-05-13 00:21 keithp
* Poly.c: Make tesselation function do something reasonable
2002-05-12 22:21 keithp
* Imakefile, Xrender.h, Poly.c, Trap.c, Tri.c: Update render
extension to include trapezoids
2002-02-11 23:17 keithp
* Glyph.c: XRenderFreeGlyphs wasnt sending the glyphset
2002-01-02 11:57 tsi
* Glyph.c, Xrender.h: Resync with today's trunk.
2001-12-26 17:16 keithp
* Glyph.c, Xrender.h: Add Render equivalents of XPolyText*
2001-12-18 09:08 tsi
* FillRect.c, FillRects.c, Glyph.c, Picture.c, Xrender.c,
Xrender.h: Another resync with HEAD branch.
2001-12-16 10:27 keithp
* FillRect.c, FillRects.c, Glyph.c, Picture.c, Xrender.c,
Xrender.h: lib/Xrender: add a bunch of _Xconst to make c++ happier
2001-10-10 20:26 keithp
* Xrender.c: Check malloc return for Xrender query reply temp data
2001-09-05 13:13 mvojkovi
* Xrender.c:
Missing SyncHandle() in XRenderQueryFormats.
2001-07-31 17:44 tsi
* Xrender.h: 168. Fix 16bpp colour maps on Mach64's (Marc La
France).
167. Fix Mach64 DPMS bug (Marc La France).
166. Fix bug that prevented hardware cursors on Mach64 CT's (Marc
La France).
165. Document what a ChipAdjustFrame() function should to to
prevent moving
of hardware cursors during mode switches (Marc La France).
164. -Wimplicit warning cleanup [`make World` >required<] (Marc La
France).
163. Ensure installed headers can find the headers they, in turn,
#include
(Marc La France).
162. Make imake pass its -W* flags to cpp (Marc La France).
161. More accomodations for newer GCC's (Mike A. Harris).
2001-07-06 13:46 keithp
* Xrender.c: Fix a couple of locking bugs in Xrender library
2001-05-16 03:33 keithp
* Xrender.c: Clean up memory leaks in Xrender library
2001-02-13 11:19 dawes
* Xrender-def.cpp: 135. Updates for Cygwin support (#4433, Suhaib
M. Siddiqi).
134. Fix a bug in the fonts.sgml doc (#4432, Juliusz Chroboczek).
133. Fix the xdpyinfo so that it will build when the XKB extension
isn't
defined (#4422, Jim Gettys).
132. Fix the xdm greeter so that it will build when the XKB
extension isn't
defined (#4421, Jim Gettys).
131. Only build setxkbmap when building the XKB lib support (based
on #4420,
Jim Gettys).
130. Improve the mga driver messages when the HAL module isn't
available
(#4451, David Woodhouse).
129. Add G450 support to the mga driver (#4416, Luugi Marsan
(Matrox),
4449, David Woodhouse).
128. Mga driver updates, including HAL cleanups, add a Crtc2Ram
option,
and merge with Matrox beta4 source (#4415, Antii Tapaninen,
#4423,
Simon Hosie).
127. Fix a rounding problem in the wacom driver that was causing
some
position instability (#4417, Hannes Eriksson).
2000-12-07 15:55 keithp
* Picture.c: Xrender: missing mask field in ChangePictureAttributes
request encoding
2000-12-04 23:42 keithp
* Picture.c: Xft,Xrender: make clip rectangles actually work
2000-12-04 19:13 keithp
* Picture.c, Xrender.h: Xft,Xrender,Render: c++ support, clip
rectangles, warnings
2000-12-04 13:01 dawes
* Xrender-def.cpp: missing ident lines
2000-12-04 10:49 dawes
* Xrender-def.cpp: 1085. Updates for Hurd support (#A.209, Marcus
Brinkmann). 1084. Bump the minor revisions of libXmu (UTF8_STRING)
and libX11 (Xutf8LookupString). 1083. Fixes for all known
bugs in the CompoundText parser and generator, (#4333, Bruno
Haible). 1082. Fix documentation for XSetOMValues() (#4332, Bruno
Haible). 1081. Fix namespace polution in <X11/Xlib.h> introduced
with patch #4293 (#4331, Bruno Haible). 1080. Fix a bug in
the newly introduced Xutf8LookupString() function that loses
input not representable in the locale encoding (#4330, Bruno
Haible). 1079. Avoid four new gcc warnings about const in lcUTF8.c
introduced by patch #4293 (#4329, Bruno Haible). 1078. Fix
some additional cases of confusing local typedef for wchar_t
(#4328, Bruno Haible). 1077. Fix some round-trip conversion errors
in COMPOUND_TEXT -> UTF8_STRING -> COMPOUND_TEXT due to wrong
tables introduced by patches #4214, 4215 (#4327, Pablo
Saratxaga). 1076. Cygwin update for building Xrender DLL (#4326,
Suhaib M. Siddiqi). 1075. Fix an undefined SUBDIRS in
xc/lib/GL/mesa/src/drv/Imakefile when compiling on something
other than x86, alpha or sparc (#4325, Brian Paul). 1074.
Don't have the neomagic driver disable stretching when a mode that
fills the panel is selected (#4324, Andrew C. Aitchison).
1073. Fix a bug in Xlib's _XimLocalMbLookupString() that causes a
crash when a zero keycode keypress event is received (#4322,
HIBINO Kei).
2000-12-03 15:41 keithp
* Xrender.h: Xrender: prototype using "template" collides with
reserved c++ word
2000-12-02 01:38 keithp
* Glyph.c: Xrender: 16/32 bit glyph functions using wrong minor
request code
2000-12-01 13:31 keithp
* Glyph.c, Picture.c, Xrender.c, Xrender.h: Xrender/Xft: handle
long strings, use unsigned int for 32-bit glyphs
2000-11-29 00:25 keithp
* Glyph.c, Xrender.h: add 16/32 bit glyph rendering to Xrender
library
2000-11-19 23:13 keithp
* FillRect.c, FillRects.c, Imakefile, Picture.c, Xrender.h: Add
component alpha to Render extension
2000-08-27 19:43 tsi
* Composite.c, Glyph.c, Picture.c, Xrender.c, Xrender.h,
Xrenderint.h: Ident lines
2000-08-26 09:37 keithp
* Imakefile: Get render library to actually build and install
correctly
2000-08-25 17:38 keithp
* Composite.c, Glyph.c, Imakefile, Picture.c, Xrender.c, Xrender.h,
Xrenderint.h: Add Xrender library
commit 35a608915a0512ca419fb0d4f3116fd68d2d8bc5
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:49 2003 +0000
Initial revision

14
lib/libXrender/Makefile.am
View File

@ -1,6 +1,4 @@
#
# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:55:16 matthieu Exp $
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
@ -26,5 +24,15 @@ SUBDIRS = src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xrender.pc
EXTRA_DIST = xrender.pc.in autogen.sh
renderdocdir = $(datadir)/doc/$(PACKAGE)
dist_renderdoc_DATA = doc/libXrender.txt
EXTRA_DIST = xrender.pc.in ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog

115
lib/libXrender/Makefile.in
View File

@ -14,8 +14,6 @@
@SET_MAKE@
#
# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:55:16 matthieu Exp $
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
@ -59,11 +57,11 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/xrender.pc.in $(top_srcdir)/configure AUTHORS \
COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
install-sh ltmain.sh missing
DIST_COMMON = README $(am__configure_deps) $(dist_renderdoc_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(srcdir)/xrender.pc.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
config.guess config.sub depcomp install-sh ltmain.sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@ -88,9 +86,11 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
am__installdirs = "$(DESTDIR)$(renderdocdir)" \
"$(DESTDIR)$(pkgconfigdir)"
dist_renderdocDATA_INSTALL = $(INSTALL_DATA)
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
DATA = $(pkgconfig_DATA)
DATA = $(dist_renderdoc_DATA) $(pkgconfig_DATA)
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@ -104,11 +104,14 @@ am__remove_distdir = \
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@ -117,8 +120,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -126,6 +131,9 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@ -134,6 +142,9 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -142,6 +153,8 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@ -149,6 +162,9 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -162,24 +178,16 @@ RANLIB = @RANLIB@
RENDER_CFLAGS = @RENDER_CFLAGS@
RENDER_LIBS = @RENDER_LIBS@
RENDER_VERSION = @RENDER_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_NON_PKG_CFLAGS = @X_NON_PKG_CFLAGS@
X_NON_PKG_LIBS = @X_NON_PKG_LIBS@
X_REQUIRES = @X_REQUIRES@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -196,23 +204,31 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@ -220,7 +236,10 @@ target_alias = @target_alias@
SUBDIRS = src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xrender.pc
EXTRA_DIST = xrender.pc.in autogen.sh
renderdocdir = $(datadir)/doc/$(PACKAGE)
dist_renderdoc_DATA = doc/libXrender.txt
EXTRA_DIST = xrender.pc.in ChangeLog
MAINTAINERCLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -287,6 +306,23 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
install-dist_renderdocDATA: $(dist_renderdoc_DATA)
@$(NORMAL_INSTALL)
test -z "$(renderdocdir)" || $(mkdir_p) "$(DESTDIR)$(renderdocdir)"
@list='$(dist_renderdoc_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(dist_renderdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(renderdocdir)/$$f'"; \
$(dist_renderdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(renderdocdir)/$$f"; \
done
uninstall-dist_renderdocDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_renderdoc_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(renderdocdir)/$$f'"; \
rm -f "$(DESTDIR)$(renderdocdir)/$$f"; \
done
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
@ -440,7 +476,7 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
$(mkdir_p) $(distdir)/.
$(mkdir_p) $(distdir)/. $(distdir)/doc
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@ -482,6 +518,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@ -584,7 +623,7 @@ check: check-recursive
all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
for dir in "$(DESTDIR)$(renderdocdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
@ -611,6 +650,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
@ -631,7 +671,7 @@ info: info-recursive
info-am:
install-data-am: install-pkgconfigDATA
install-data-am: install-dist_renderdocDATA install-pkgconfigDATA
install-exec-am:
@ -659,27 +699,36 @@ ps: ps-recursive
ps-am:
uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
uninstall-am: uninstall-dist_renderdocDATA uninstall-info-am \
uninstall-pkgconfigDATA
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am clean clean-generic clean-libtool clean-recursive \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
dist-shar dist-tarZ dist-zip distcheck distclean \
dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
install-pkgconfigDATA install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic maintainer-clean-recursive \
mostlyclean mostlyclean-generic mostlyclean-libtool \
mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am uninstall-info-am \
install install-am install-data install-data-am \
install-dist_renderdocDATA install-exec install-exec-am \
install-info install-info-am install-man install-pkgconfigDATA \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-generic \
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am \
uninstall-dist_renderdocDATA uninstall-info-am \
uninstall-pkgconfigDATA
.PHONY: ChangeLog
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

25
lib/libXrender/README
View File

@ -0,0 +1,25 @@
libXrender - library for the Render Extension to the X11 protocol
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/libXrender
http://cgit.freedesktop.org/xorg/lib/libXrender
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

863
lib/libXrender/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

10470
lib/libXrender/configure vendored
View File

File diff suppressed because it is too large Load Diff

23
lib/libXrender/configure.ac
View File

@ -1,6 +1,4 @@
dnl
dnl $Id: configure.ac,v 1.1.1.2 2007/09/30 07:47:05 matthieu Exp $
dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@ -32,26 +30,19 @@ 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.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrender)
AC_INIT(libXrender, 0.9.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrender)
AM_INIT_AUTOMAKE([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])])
XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
# Check for X
PKG_CHECK_MODULES(X, x11)
X_REQUIRES="x11"
X_NON_PKG_CFLAGS=""
X_NON_PKG_LIBS=""
AC_SUBST(X_REQUIRES)
AC_SUBST(X_NON_PKG_CFLAGS)
AC_SUBST(X_NON_PKG_LIBS)
XORG_DEFAULT_OPTIONS
# Check render configuration, strip extra digits from package version to
# find the required protocol version
@ -61,12 +52,10 @@ if test "$VERSION" = "" ; then
fi
RENDER_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(RENDER_VERSION)
PKG_CHECK_MODULES(RENDER, renderproto >= $RENDER_VERSION)
PKG_CHECK_MODULES(RENDER, x11 renderproto >= $RENDER_VERSION)
AC_SUBST(RENDER_CFLAGS)
XORG_CHECK_MALLOC_ZERO
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
src/Makefile

286
lib/libXrender/ltmain.sh
View File

@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
# 2007, 2008 Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
# This program is free software; you can redistribute it and/or modify
@ -43,14 +43,22 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
VERSION=1.5.26
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# See if we are running on zsh, and set the options which allow our
# commands through without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
@ -105,11 +113,19 @@ esac
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
if test "${LC_ALL+set}" = set; then
save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
fi
if test "${LANG+set}" = set; then
save_LANG="$LANG"; LANG=C; export LANG
lt_env=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
eval "if test \"\${$lt_var+set}\" = set; then
save_$lt_var=\$$lt_var
lt_env=\"$lt_var=\$$lt_var \$lt_env\"
$lt_var=C
export $lt_var
fi"
done
if test -n "$lt_env"; then
lt_env="env $lt_env"
fi
# Make sure IFS has a sensible default
@ -136,6 +152,8 @@ duplicate_deps=no
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
extracted_archives=
extracted_serial=0
#####################################
# Shell function definitions:
@ -196,7 +214,13 @@ func_win32_libid ()
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
win32_nmres=`eval $NM -f posix -A $1 | \
$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
$SED -n -e '1,100{
/ I /{
s,.*,import,
p
q
}
}'`
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
@ -327,7 +351,17 @@ func_extract_archives ()
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
my_xdir="$my_gentop/$my_xlib"
my_xlib_u=$my_xlib
while :; do
case " $extracted_archives " in
*" $my_xlib_u "*)
extracted_serial=`expr $extracted_serial + 1`
my_xlib_u=lt$extracted_serial-$my_xlib ;;
*) break ;;
esac
done
extracted_archives="$extracted_archives $my_xlib_u"
my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@ -454,11 +488,12 @@ do
;;
--version)
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
$echo
$echo "Copyright (C) 2005 Free Software Foundation, Inc."
$echo "This is free software; see the source for copying conditions. There is NO"
$echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
echo "\
$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
Copyright (C) 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
exit $?
;;
@ -755,9 +790,11 @@ if test -z "$show_help"; then
*.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
*.f90) xform=f90 ;;
*.[fF][09]?) xform=[fF][09]. ;;
*.for) xform=for ;;
*.java) xform=java ;;
*.obj) xform=obj ;;
*.sx) xform=sx ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@ -926,7 +963,7 @@ EOF
$run $rm "$lobj" "$output_obj"
$show "$command"
if $run eval "$command"; then :
if $run eval $lt_env "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
exit $EXIT_FAILURE
@ -998,7 +1035,7 @@ EOF
command="$command$suppress_output"
$run $rm "$obj" "$output_obj"
$show "$command"
if $run eval "$command"; then :
if $run eval $lt_env "$command"; then :
else
$run $rm $removelist
exit $EXIT_FAILURE
@ -1131,6 +1168,7 @@ EOF
thread_safe=no
vinfo=
vinfo_number=no
single_module="${wl}-single_module"
func_infer_tag $base_compile
@ -1138,8 +1176,9 @@ EOF
for arg
do
case $arg in
-all-static | -static)
if test "X$arg" = "X-all-static"; then
-all-static | -static | -static-libtool-libs)
case $arg in
-all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
@ -1147,12 +1186,20 @@ EOF
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
else
;;
-static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
fi
;;
-static-libtool-libs)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
;;
esac
build_libtool_libs=no
build_old_libs=yes
break
@ -1600,7 +1647,7 @@ EOF
continue
;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@ -1608,6 +1655,11 @@ EOF
continue
;;
-multi_module)
single_module="${wl}-multi_module"
continue
;;
-module)
module=yes
continue
@ -1621,10 +1673,11 @@ EOF
# -m* pass through architecture-specific compiler args for GCC
# -m*, -t[45]*, -txscale* pass through architecture-specific
# compiler args for GCC
# -pg pass through profiling flag for GCC
# -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
# -F/path gives path to uninstalled frameworks, gcc on darwin
# @file GCC response files
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-t[45]*|-txscale*|@*)
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
@ -1652,9 +1705,9 @@ EOF
-no-install)
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
# The PATH hackery in wrapper scripts is required on Windows
# in order for the loader to find any dlls it needs.
# and Darwin in order for the loader to find any dlls it needs.
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
fast_install=no
@ -1713,7 +1766,7 @@ EOF
continue
;;
-static)
-static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@ -2074,17 +2127,6 @@ EOF
;;
esac
for pass in $passes; do
# The preopen pass in lib mode reverses $deplibs; put it back here
# so that -L comes before libs that need it for instance...
if test "$linkmode,$pass" = "lib,link"; then
## FIXME: Find the place where the list is rebuilt in the wrong
## order, and fix it there properly
tmp_deplibs=
for deplib in $deplibs; do
tmp_deplibs="$deplib $tmp_deplibs"
done
deplibs="$tmp_deplibs"
fi
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan"; then
libs="$deplibs"
@ -2106,7 +2148,7 @@ EOF
lib=
found=no
case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
@ -2122,7 +2164,12 @@ EOF
continue
fi
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
if test "$linkmode" = lib; then
searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
else
searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
fi
for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
@ -2503,7 +2550,9 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
{ { test "$prefer_static_libs" = no ||
test "$prefer_static_libs,$installed" = "built,yes"; } ||
test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
@ -2916,12 +2965,18 @@ EOF
# we do not want to link against static libs,
# but need to link against shared
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
depdepl=$tmp
done
if test -f "$path/$depdepl" ; then
if test -f "$deplibdir/$depdepl" ; then
depdepl="$deplibdir/$depdepl"
elif test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
else
# Can't find it, oh well...
depdepl=
fi
# do not add paths which are already there
case " $newlib_search_path " in
@ -3069,9 +3124,10 @@ EOF
case $linkmode in
oldlib)
if test -n "$deplibs"; then
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
fi
case " $deplibs" in
*\ -l* | *\ -L*)
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@ -3199,7 +3255,7 @@ EOF
# which has an extra 1 added just for fun
#
case $version_type in
darwin|linux|osf|windows)
darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@ -3210,9 +3266,10 @@ EOF
age="0"
;;
irix|nonstopux)
current=`expr $number_major + $number_minor - 1`
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_minor"
lt_irix_increment=no
;;
esac
;;
@ -3271,7 +3328,8 @@ EOF
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
;;
freebsd-aout)
@ -3285,8 +3343,11 @@ EOF
;;
irix | nonstopux)
major=`expr $current - $age + 1`
if test "X$lt_irix_increment" = "Xno"; then
major=`expr $current - $age`
else
major=`expr $current - $age + 1`
fi
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
@ -3437,11 +3498,11 @@ EOF
fi
# Eliminate all temporary directories.
for path in $notinst_path; do
lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
done
#for path in $notinst_path; do
# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
#done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@ -3542,13 +3603,12 @@ EOF
int main() { return 0; }
EOF
$rm conftest
$LTCC $LTCFLAGS -o conftest conftest.c $deplibs
if test "$?" -eq 0 ; then
if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" -ne "0"; then
if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@ -3587,9 +3647,7 @@ EOF
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
$LTCC $LTCFLAGS -o conftest conftest.c $i
# Did it work?
if test "$?" -eq 0 ; then
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@ -3621,7 +3679,7 @@ EOF
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
$echo "*** make it link in! You will probably need to install it or some"
$echo "*** make it link in! You will probably need to install it or some"
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
@ -3907,7 +3965,10 @@ EOF
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then
eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
case $archive_cmds in
*\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
*) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
esac
else
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi
@ -4217,9 +4278,10 @@ EOF
;;
obj)
if test -n "$deplibs"; then
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
fi
case " $deplibs" in
*\ -l* | *\ -L*)
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@ -4266,12 +4328,14 @@ EOF
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
# -Wl from whole_archive_flag_spec
# -Wl from whole_archive_flag_spec and hope we can get by with
# turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@ -4719,16 +4783,16 @@ static const void *lt_preloaded_setup() {
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
else
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi
;;
* )
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;;
esac
;;
@ -4743,13 +4807,13 @@ static const void *lt_preloaded_setup() {
# really was required.
# Nullify the symbol file.
compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@ -4836,7 +4900,7 @@ static const void *lt_preloaded_setup() {
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
else
# fast_install is set to needless
relink_command=
@ -4873,7 +4937,7 @@ static const void *lt_preloaded_setup() {
fi
done
relink_command="(cd `pwd`; $relink_command)"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@ -5280,6 +5344,20 @@ EOF
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
# is contrary to our usage. Disable this feature.
alias -g '\${1+\"\$@\"}'='\"\$@\"'
setopt NO_GLOB_SUBST
else
case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@ -5422,7 +5500,7 @@ else
;;
esac
$echo >> $output "\
\$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
\$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE
fi
else
@ -5608,7 +5686,7 @@ fi\
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@ -5957,9 +6035,9 @@ relink_command=\"$relink_command\""
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@ -6168,7 +6246,7 @@ relink_command=\"$relink_command\""
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command"
if $run eval "$relink_command"; then :
@ -6345,8 +6423,10 @@ relink_command=\"$relink_command\""
if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir"
else
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
exit $EXIT_FAILURE
if test ! -f "$dir/$dlname"; then
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
exit $EXIT_FAILURE
fi
fi
;;
@ -6410,12 +6490,12 @@ relink_command=\"$relink_command\""
fi
# Restore saved environment variables
if test "${save_LC_ALL+set}" = set; then
LC_ALL="$save_LC_ALL"; export LC_ALL
fi
if test "${save_LANG+set}" = set; then
LANG="$save_LANG"; export LANG
fi
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
eval "if test \"\${save_$lt_var+set}\" = set; then
$lt_var=\$save_$lt_var; export $lt_var
fi"
done
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@ -6772,9 +6852,9 @@ The following components of LINK-COMMAND are treated specially:
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
try to export only the symbols listed in SYMFILE
try to export only the symbols listed in SYMFILE
-export-symbols-regex REGEX
try to export only the symbols matching REGEX
try to export only the symbols matching REGEX
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
@ -6788,9 +6868,11 @@ The following components of LINK-COMMAND are treated specially:
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-static do not do any dynamic linking of libtool libraries
-static do not do any dynamic linking of uninstalled libtool libraries
-static-libtool-libs
do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
specify library version info [each variable defaults to 0]
All other options (arguments beginning with \`-') are ignored.

2
lib/libXrender/src/AddTrap.c
View File

@ -1,6 +1,4 @@
/*
* $Id: AddTrap.c,v 1.1.1.1 2006/11/25 17:55:17 matthieu Exp $
*
* Copyright © 2004 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its

12
lib/libXrender/src/Filter.c
View File

@ -40,14 +40,14 @@ XRenderQueryFilters (Display *dpy, Drawable drawable)
long nbytes, nbytesAlias, nbytesName;
if (!RenderHasExtension (info))
return 0;
return NULL;
if (!XRenderQueryFormats (dpy))
return 0;
return NULL;
xri = info->info;
if (xri->minor_version < 6)
return 0;
return NULL;
LockDisplay (dpy);
GetReq (RenderQueryFilters, req);
@ -58,7 +58,7 @@ XRenderQueryFilters (Display *dpy, Drawable drawable)
{
UnlockDisplay (dpy);
SyncHandle ();
return 0;
return NULL;
}
/*
* Compute total number of bytes for filter names
@ -82,7 +82,7 @@ XRenderQueryFilters (Display *dpy, Drawable drawable)
_XEatData (dpy, (unsigned long) rep.length << 2);
UnlockDisplay (dpy);
SyncHandle ();
return 0;
return NULL;
}
/*
@ -146,7 +146,7 @@ XRenderSetPictureFilter (Display *dpy,
req->nbytes = nbytes;
req->length += ((nbytes + 3) >> 2) + nparams;
Data (dpy, filter, nbytes);
Data32 (dpy, params, nparams << 2);
Data (dpy, (_Xconst char *)params, nparams << 2);
UnlockDisplay(dpy);
SyncHandle();
}

5
lib/libXrender/src/Makefile.am
View File

@ -1,4 +1,5 @@
AM_CFLAGS = $(RENDER_CFLAGS) $(X_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include/X11/extensions $(MALLOC_ZERO_CFLAGS)
AM_CFLAGS = $(CWARNFLAGS) $(RENDER_CFLAGS) $(MALLOC_ZERO_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include/X11/extensions
lib_LTLIBRARIES = libXrender.la
@ -17,7 +18,7 @@ libXrender_la_SOURCES = AddTrap.c \
Xrender.c \
Xrenderint.h
libXrender_la_LIBADD = @X_LIBS@ -lX11
libXrender_la_LIBADD = $(RENDER_LIBS)
# -version-number requires libtool >= 1.5
libXrender_la_LDFLAGS = -version-number 1:3:0 -no-undefined

43
lib/libXrender/src/Makefile.in
View File

@ -57,7 +57,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
"$(DESTDIR)$(libXrenderincludedir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libXrender_la_DEPENDENCIES =
am__DEPENDENCIES_1 =
libXrender_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libXrender_la_OBJECTS = AddTrap.lo Color.lo Composite.lo Cursor.lo \
FillRect.lo FillRects.lo Filter.lo Glyph.lo Picture.lo Poly.lo \
Trap.lo Tri.lo Xrender.lo
@ -81,9 +82,13 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@ -92,8 +97,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -101,6 +108,9 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@ -109,6 +119,9 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -117,6 +130,8 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@ -124,6 +139,9 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -137,24 +155,16 @@ RANLIB = @RANLIB@
RENDER_CFLAGS = @RENDER_CFLAGS@
RENDER_LIBS = @RENDER_LIBS@
RENDER_VERSION = @RENDER_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_NON_PKG_CFLAGS = @X_NON_PKG_CFLAGS@
X_NON_PKG_LIBS = @X_NON_PKG_LIBS@
X_REQUIRES = @X_REQUIRES@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -171,28 +181,37 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AM_CFLAGS = $(RENDER_CFLAGS) $(X_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include/X11/extensions $(MALLOC_ZERO_CFLAGS)
AM_CFLAGS = $(CWARNFLAGS) $(RENDER_CFLAGS) $(MALLOC_ZERO_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include/X11/extensions
lib_LTLIBRARIES = libXrender.la
libXrender_la_SOURCES = AddTrap.c \
Color.c \
@ -209,7 +228,7 @@ libXrender_la_SOURCES = AddTrap.c \
Xrender.c \
Xrenderint.h
libXrender_la_LIBADD = @X_LIBS@ -lX11
libXrender_la_LIBADD = $(RENDER_LIBS)
# -version-number requires libtool >= 1.5
libXrender_la_LDFLAGS = -version-number 1:3:0 -no-undefined

4
lib/libXrender/src/Poly.c
View File

@ -99,7 +99,7 @@ XRenderComputeTrapezoids (Edge *edges,
qsort (edges, nedges, sizeof (Edge), CompareEdge);
y = edges[0].edge.p1.y;
active = 0;
active = NULL;
inactive = 0;
while (active || inactive < nedges)
{
@ -112,7 +112,7 @@ XRenderComputeTrapezoids (Edge *edges,
/* move this edge into the active list */
inactive++;
e->next = active;
e->prev = 0;
e->prev = NULL;
if (active)
active->prev = e;
active = e;

26
lib/libXrender/src/Xrender.c
View File

@ -346,7 +346,7 @@ _XRenderFindFormat (XRenderInfo *xri, PictFormat format)
for (nf = 0; nf < xri->nformat; nf++)
if (xri->format[nf].id == format)
return &xri->format[nf];
return 0;
return NULL;
}
static Visual *
@ -601,15 +601,15 @@ XRenderFindVisualFormat (Display *dpy, _Xconst Visual *visual)
int nv;
XRenderInfo *xri;
XRenderVisual *xrv;
RenderCheckExtension (dpy, info, 0);
RenderCheckExtension (dpy, info, NULL);
if (!XRenderQueryFormats (dpy))
return 0;
return NULL;
xri = info->info;
for (nv = 0, xrv = xri->visual; nv < xri->nvisual; nv++, xrv++)
if (xrv->visual == visual)
return xrv->format;
return 0;
return NULL;
}
XRenderPictFormat *
@ -621,10 +621,10 @@ XRenderFindFormat (Display *dpy,
XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy);
int nf;
XRenderInfo *xri;
RenderCheckExtension (dpy, info, 0);
RenderCheckExtension (dpy, info, NULL);
if (!XRenderQueryFormats (dpy))
return 0;
return NULL;
xri = info->info;
for (nf = 0; nf < xri->nformat; nf++)
{
@ -667,7 +667,7 @@ XRenderFindFormat (Display *dpy,
if (count-- == 0)
return &xri->format[nf];
}
return 0;
return NULL;
}
XRenderPictFormat *
@ -820,7 +820,7 @@ XRenderFindStandardFormat (Display *dpy,
standardFormats[format].mask,
&standardFormats[format].templ,
0);
return 0;
return NULL;
}
XIndexValue *
@ -834,7 +834,7 @@ XRenderQueryPictIndexValues(Display *dpy,
XIndexValue *values;
int nbytes, nread, rlength, i;
RenderCheckExtension (dpy, info, 0);
RenderCheckExtension (dpy, info, NULL);
LockDisplay (dpy);
GetReq (RenderQueryPictIndexValues, req);
@ -845,7 +845,7 @@ XRenderQueryPictIndexValues(Display *dpy,
{
UnlockDisplay (dpy);
SyncHandle ();
return 0;
return NULL;
}
/* request data length */
@ -862,7 +862,7 @@ XRenderQueryPictIndexValues(Display *dpy,
_XEatData (dpy, nbytes);
UnlockDisplay (dpy);
SyncHandle ();
return 0;
return NULL;
}
/* read the values one at a time and convert */