update to libXrender 0.9.5

6 files changed, 55 insertions, 37 deletions

diff --git a/lib/libXrender/src/AddTrap.c b/lib/libXrender/src/AddTrap.c
index e5822b693..421463def 100644
--- a/lib/libXrender/src/AddTrap.c
+++ b/lib/libXrender/src/AddTrap.c
@@ -1,6 +1,4 @@
 /*
- * $Id: AddTrap.c,v 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
diff --git a/lib/libXrender/src/Filter.c b/lib/libXrender/src/Filter.c
index 0ccc811cc..76c8cfab8 100644
--- a/lib/libXrender/src/Filter.c
+++ b/lib/libXrender/src/Filter.c
@@ -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();
 }
diff --git a/lib/libXrender/src/Makefile.am b/lib/libXrender/src/Makefile.am
index 19dab07dc..7474b43a8 100644
--- a/lib/libXrender/src/Makefile.am
+++ b/lib/libXrender/src/Makefile.am
@@ -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 
diff --git a/lib/libXrender/src/Makefile.in b/lib/libXrender/src/Makefile.in
index 1aa136ccb..36f1ed6f9 100644
--- a/lib/libXrender/src/Makefile.in
+++ b/lib/libXrender/src/Makefile.in
@@ -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 
diff --git a/lib/libXrender/src/Poly.c b/lib/libXrender/src/Poly.c
index ee461d7c5..16599b22e 100644
--- a/lib/libXrender/src/Poly.c
+++ b/lib/libXrender/src/Poly.c
@@ -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;
diff --git a/lib/libXrender/src/Xrender.c b/lib/libXrender/src/Xrender.c
index 3a51663f8..c7630766f 100644
--- a/lib/libXrender/src/Xrender.c
+++ b/lib/libXrender/src/Xrender.c
@@ -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 */