summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-12-18 19:29:11 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-12-18 19:29:11 +0000
commit1730927cc8bd32debe4f4c67e231fb26f0d3c5a2 (patch)
treedb9577e0f3962e4db5ed227b16f5b1008caf5de3
parent4dae93e03da37e5c9f58f2bd3361c7c327d08156 (diff)
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.
-rw-r--r--OpenBSDLib.tmpl3
-rw-r--r--X11.tmpl5
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenBSDLib.tmpl b/OpenBSDLib.tmpl
index d49ecb5..b041ee3 100644
--- a/OpenBSDLib.tmpl
+++ b/OpenBSDLib.tmpl
@@ -1,3 +1,4 @@
+XCOMM platform: $XdotOrg: OpenBSDLib.tmpl,v 1.6 2003/04/04 19:48:58 matthieu Exp $
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 @@ XCOMM
# define SharedXvMCRev 2.0
# endif
# ifndef SharedXineramaRev
-# define SharedXineramaRev 2.0
+# define SharedXineramaRev 3.0
# endif
# ifndef SharedDpsRev
# define SharedDpsRev 2.0
diff --git a/X11.tmpl b/X11.tmpl
index b4aa0b1..80d68c9 100644
--- a/X11.tmpl
+++ b/X11.tmpl
@@ -1,5 +1,6 @@
XCOMM ----------------------------------------------------------------------
XCOMM X Window System Build Parameters and Rules
+XCOMM $XdotOrg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
XCOMM
XCOMM
@@ -897,7 +898,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#ifndef XineramaDefines
#if BuildXinerama
-#define XineramaDefines -DPANORAMIX
+#define XineramaDefines -DXINERAMA
#else
#define XineramaDefines /**/
#endif
@@ -2334,7 +2335,7 @@ ProjectUnsharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),XBuildLibDir)
XINERAMALIBSRC = $(LIBSRC)/Xinerama
#if SharedLibXinerama
#ifndef SharedXineramaRev
-#define SharedXineramaRev 1.0
+#define SharedXineramaRev 2.0
#endif
SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev)
#else