--- a/open-src/lib/Makefile Wed Mar 14 17:37:52 2007 -0700
+++ b/open-src/lib/Makefile Fri Mar 16 17:26:26 2007 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.2 07/03/12
+# @(#)Makefile 1.3 07/03/15
#
###############################################################################
@@ -44,6 +44,7 @@
libXfixes \
libXfont \
Xft \
+ libXinerama \
libxkbfile \
libxkbui \
libXrandr \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXinerama/Makefile Fri Mar 16 17:26:26 2007 -0700
@@ -0,0 +1,66 @@
+###############################################################################
+#
+# Xinerama library Makefile
+#
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.3 07/03/16
+#
+
+# Package name used in tarballs
+LIB_MODULE=libXinerama
+
+# Version number (used in path names)
+LIB_VERS=1.0.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = sun-abi.patch
+
+# Library name
+LIBNAME=Xinerama
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=man/*.man
+SUN_PACKAGE=SUNWxwplt
+LIB_STABILITY=Uncommitted
+LIB_MAN_SUFFIX=3Xinerama
+
+# Library built in tree
+LIB_BUILT=$(SOURCE_DIR)/src/.libs/libXinerama.so.1.0.0
+
+# Needed for sun-abi.patch
+LIB_ADD_CFLAGS= -D SUNSOFT
+
+# Link with version mapfile
+LIB_ADD_LD_OPTIONS = -M $(PWD)/mapfile-vers
+
+# pkg-config files that need to have -R added
+FIX_PC_FILES=xinerama.pc.in
+
+include ../Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXinerama/mapfile-vers Fri Mar 16 17:26:26 2007 -0700
@@ -0,0 +1,44 @@
+#
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+#
+# ident "@(#)mapfile-vers 1.1 07/03/15 SMI"
+#
+
+# SUNW_1.1 represents the preferred interfaces in the
+# X11R7.0 / libXinerama 1.0.1 version
+SUNW_1.1 {
+ global:
+ XineramaQueryExtension;
+ XineramaQueryVersion;
+ XineramaIsActive;
+ XineramaQueryScreens;
+ local:
+ *;
+};
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXinerama/sun-abi.patch Fri Mar 16 17:26:26 2007 -0700
@@ -0,0 +1,73 @@
+#
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+#
+# ident "@(#)sun-abi.patch 1.2 07/03/15 SMI"
+#
+
+Solaris already has the old XPanoramiX* API in libXext, so we don't export
+it from libXinerama to avoid symbol clashes.
+
+--- src/Xinerama.c 2007-03-01 15:41:16.000000000 -0800
++++ src/Xinerama.c 2007-03-07 14:50:49.899520000 -0800
+@@ -76,6 +76,9 @@
+ * *
+ ****************************************************************************/
+
++#ifdef SUNSOFT
++static inline
++#endif /* SUNSOFT */
+ Bool XPanoramiXQueryExtension (
+ Display *dpy,
+ int *event_basep,
+@@ -94,6 +97,9 @@
+ }
+
+
++#ifdef SUNSOFT
++static inline
++#endif /* SUNSOFT */
+ Status XPanoramiXQueryVersion(
+ Display *dpy,
+ int *major_versionp,
+@@ -124,6 +130,7 @@
+ return 1;
+ }
+
++#ifndef SUNSOFT
+ XPanoramiXInfo *XPanoramiXAllocInfo(void)
+ {
+ return (XPanoramiXInfo *) Xmalloc (sizeof (XPanoramiXInfo));
+@@ -219,6 +226,7 @@
+ panoramiX_info->height = rep.height;
+ return 1;
+ }
++#endif /* SUNSOFT */
+
+ /*******************************************************************\
+ Alternate interface to make up for shortcomings in the original,