[Xr] small adjustments

[Trevor Woerner]

Hi,

I grabbed the code via CVS as detailed on the xr.xwin.org site. There
were a few small adjustments that were required in order to get it to
work on my machine. I scanned the mailing list and didn't see anything
posted to this effect. I guess there's a chance this only affects me.

Starting with a Red Hat 9 install, in order to get the xrtest
applications to compile and run:

1) i have upgraded my autotools to the latest available, therefore i had
to also upgrade pkgconfig to version 0.15.0. the ./configure script
failed for me with version 0.14.0.

2) i put all the stuff i built into $HOME/local (i.e. i did a
'./autogen.sh --prefix=$HOME/local' for each directory) therefore i
needed to do an 'export PKG_CONFIG_PATH=$HOME/local/lib/pkgconfig'

3) i also needed my own LD_LIBRARY_PATH (i.e. 'export
LD_LIBRARY_PATH=$HOME/local/lib')

4) i had to upgrade fontconfig (to 2.2.90) and Xft (to 2.1.2) which can
be found at http://fontconfig.org/release

5) the order for installing the libraries is:
	a) libpixregion
	b) libic
	c) Xc
	d) fontconfig
	e) Xft
	f) Xr

6) then i could build the test programs. the xr.xwin.org website's last
section is "Example Programs" and has the following CVS command:

	cvs -d :pserver:anoncvs at keithp.com:/local/src/CVS login

which isn't correct (of course), you need:

	cvs -d :pserver:anoncvs at keithp.com:/local/src/CVS co xrtest

i also needed the following diff:

Index: xrtest/Makefile
===================================================================
RCS file: /local/src/CVS/xrtest/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- xrtest/Makefile	25 Apr 2003 20:31:20 -0000	1.2
+++ xrtest/Makefile	7 Jul 2003 04:54:49 -0000
@@ -1,5 +1,5 @@
-CFLAGS=-g -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls `pkg-config --cflags Xr`
-LDFLAGS=`pkg-config --libs Xr`
+CFLAGS=-g -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls `pkg-config --cflags xr`
+LDFLAGS=`pkg-config --libs xr`
 
 PROGS=xrtest xrspline xrknockout xrfreq
 
Index: xrtest/xrknockout.c
===================================================================
RCS file: /local/src/CVS/xrtest/xrknockout.c,v
retrieving revision 1.8
diff -u -r1.8 xrknockout.c
--- xrtest/xrknockout.c	12 May 2003 16:50:04 -0000	1.8
+++ xrtest/xrknockout.c	7 Jul 2003 04:54:49 -0000
@@ -209,7 +209,7 @@
     XrRestore (r);
 
     XrSetOperator (r, XrOperatorOutReverse);
-    XrShowSurface (r, punch, 0, 0, width, height);
+    XrShowSurface (r, punch, width, height);
 
     /* Now draw the 3 circles in a subgroup again
      * at half intensity, and use OperatorAdd to join up
@@ -225,11 +225,11 @@
     XrRestore (r);
 
     XrSetOperator (r, XrOperatorAdd);
-    XrShowSurface (r, circles, 0, 0, width, height);
+    XrShowSurface (r, circles, width, height);
 
     XrRestore (r);
 
-    XrShowSurface (r, overlay, 0, 0, width, height);
+    XrShowSurface (r, overlay, width, height);
 
     XrSurfaceDestroy (overlay);
     XrSurfaceDestroy (punch);




Hope this helps,
	Trevor