[Xorg-commit] xc/config/cf OpenBSDLib.tmpl,1.1.4.1,1.1.4.2 X11.tmpl,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/config/cf
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/config/cf

Modified Files:
      Tag: XORG-CURRENT
	OpenBSDLib.tmpl X11.tmpl 
Log Message:
First pass at "Standard" Xinerama.
The sources for this came from Heather Lanigan's xinerama tree on 
Sourceforge.Net. 
No attempt has been made to handle previous, non-standard versions of 
the protocol. Nor has any attempt been made to preserve the ABI of 
previous versions -- that part will be added at a later time, and 
then probably only on systems that have nice object/linker semantics, 
e.g. ELF systems with weak symbols.



Index: OpenBSDLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/OpenBSDLib.tmpl,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- OpenBSDLib.tmpl	26 Nov 2003 22:48:15 -0000	1.1.4.1
+++ OpenBSDLib.tmpl	18 Dec 2003 19:29:11 -0000	1.1.4.2
@@ -1,3 +1,4 @@
+XCOMM platform:	$XdotOrg$
 XCOMM platform:	$OpenBSD: OpenBSDLib.tmpl,v 1.6 2003/04/04 19:48:58 matthieu Exp $
 XCOMM platform: $XFree86: xc/config/cf/OpenBSDLib.tmpl,v 1.8 2003/10/15 21:23:37 herrb Exp $
 XCOMM
@@ -37,7 +38,7 @@
 #  define SharedXvMCRev 2.0
 # endif
 # ifndef SharedXineramaRev
-#  define SharedXineramaRev 2.0
+#  define SharedXineramaRev 3.0
 # endif
 # ifndef SharedDpsRev
 #  define SharedDpsRev 2.0

Index: X11.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- X11.tmpl	26 Nov 2003 22:48:15 -0000	1.1.4.2
+++ X11.tmpl	18 Dec 2003 19:29:11 -0000	1.1.4.3
@@ -1,5 +1,6 @@
 XCOMM ----------------------------------------------------------------------
 XCOMM X Window System Build Parameters and Rules
+XCOMM $XdotOrg$
 XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
 XCOMM
 XCOMM
@@ -897,7 +898,7 @@
 #endif
 #ifndef XineramaDefines
 #if BuildXinerama
-#define XineramaDefines -DPANORAMIX
+#define XineramaDefines -DXINERAMA
 #else
 #define XineramaDefines /**/
 #endif
@@ -2334,7 +2335,7 @@
     XINERAMALIBSRC = $(LIBSRC)/Xinerama
 #if SharedLibXinerama
 #ifndef SharedXineramaRev
-#define SharedXineramaRev 1.0
+#define SharedXineramaRev 2.0
 #endif
 SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev)
 #else