--- a/open-src/Makefile Thu Apr 13 17:50:42 2006 -0700
+++ b/open-src/Makefile Mon Apr 17 17:05:03 2006 -0700
@@ -1,6 +1,6 @@
# Makefile for X Consolidation Open Source bits
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.1 05/09/02
+# @(#)Makefile 1.2 06/04/11
#
###############################################################################
#
@@ -38,6 +38,7 @@
# depend on X).
BEFOREX = \
+ proto \
lib/freetype \
lib/fontconfig \
lib/Xft
--- a/open-src/common/Makefile.inc Thu Apr 13 17:50:42 2006 -0700
+++ b/open-src/common/Makefile.inc Mon Apr 17 17:05:03 2006 -0700
@@ -27,7 +27,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile.inc 1.59 05/09/02
+# @(#)Makefile.inc 1.60 06/04/11
#
BUILD_DATE:sh=date +'%e-%B-%Y'
@@ -98,6 +98,9 @@
FONT_DIR=$(OW_X11LIB_DIR)/fonts
TRUETYPE_DIR=$(FONT_DIR)/TrueType
+X11_DIR=/usr/X11
+X11_INCLUDES_DIR=$(X11_DIR)/include
+
### Default rules
BUILD_DIR_32 = build_32
@@ -171,6 +174,8 @@
WGET=/usr/sfw/bin/wget
SOURCE_TARBALL=$(TARBALLDIR)/$(SOURCE_TARBALL_NAME)
+XORG_RELEASES_URL=http://xorg.freedesktop.org/releases/individual
+
download:
if [ ! -f $(SOURCE_TARBALL) ] ; then \
$(WGET) -O $(SOURCE_TARBALL) $(SOURCE_URL) ;\
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Makefile Mon Apr 17 17:05:03 2006 -0700
@@ -0,0 +1,58 @@
+# Makefile for X Consolidation Open Source Protocol modules
+#
+# Copyright 2006 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.1 06/04/11
+#
+###############################################################################
+
+OS_SUBDIRS = X11
+
+# Need to install to proto area by default for inter-package dependencies to
+# work right.
+all: install
+
+World: clean install
+
+clean:
+ $(MAKE) $(MFLAGS) subdirs OS_TARGET=clean
+
+install:
+ $(MAKE) $(MFLAGS) subdirs OS_TARGET=install
+
+download:
+ $(MAKE) $(MFLAGS) subdirs OS_TARGET=download
+
+subdirs:
+ @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
+ for i in $(OS_SUBDIRS) ;\
+ do \
+ (cd $$i ; echo "## making" $(OS_TARGET) "in open-src/proto/$$i..."; \
+ $(MAKE) $(MFLAGS) CDEBUGFLAGS="$(CDEBUGFLAGS)" $(OS_TARGET)); \
+ done
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/X11/Makefile Mon Apr 17 17:05:03 2006 -0700
@@ -0,0 +1,78 @@
+###############################################################################
+#
+# Copyright 2006 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.1 06/04/11
+#
+
+PWD:sh=pwd
+TOP=$(PWD)/../..
+
+# Not really 32 or 64-bit, but we call it 32-bit to avoid subdirs
+BUILD_TYPES=32
+
+# Version number (used in path names)
+VERSION=7.0.4
+
+# Source tarball
+SOURCE_TARBALL_NAME=xproto-$(VERSION).tar.bz2
+
+# Download site for source
+SOURCE_URL=$(XORG_RELEASES_URL)/proto/$(SOURCE_TARBALL_NAME)
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES= Xmd.h-patch Xos.h-patch Xpoll.h-patch X.h-patch
+
+# Directory created by unpacking source
+SOURCE_DIR=$(BUILD_DIR)/xproto-$(VERSION)
+
+### Include common rulesets
+include $(TOP)/common/Makefile.inc
+
+### Rules specific to this directory:
+
+# Command line options to GNU autoconf configure script
+XPROTO_CFG=--prefix=$(X11_DIR)
+
+build_gen: $(SOURCE_DIR)/Makefile
+
+# Run configure script
+$(SOURCE_DIR)/Makefile: $(UNPACK_TARGET)
+ (cd $(SOURCE_DIR) ; \
+ chmod a+x configure ; \
+ CC=$(CC) CFLAGS="$(LIB_CFLAGS)" LD="$(CC) $(LIB_CFLAGS) $(LDFLAGS)" LDFLAGS="$(LIB_LDFLAGS)" ./configure $(XPROTO_CFG) )
+
+# Install - first is for packages, second is for building the old monolith
+install_gen: $(SOURCE_DIR)/Makefile
+ (cd $(SOURCE_DIR) ; $(MAKE) $(MFLAGS) -e DESTDIR=$(PROTODIR) install)
+ @if [ -d $(PROTODIR)/../xc/include ] ; then \
+ (set -x ; cd $(SOURCE_DIR) ; $(MAKE) $(MFLAGS) -e DESTDIR=$(PROTODIR) xprotodir=/../xc/include install) ;\
+ fi
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/X11/X.h-patch Mon Apr 17 17:05:03 2006 -0700
@@ -0,0 +1,13 @@
+Need to retain FamilyInternetV6 for backwards compatibility with CDE and other
+sources written to the original X11/IPv6 draft which was included in Solaris 9.
+
+--- X.h Mon Apr 10 17:55:35 2006
++++ X.h Mon Apr 10 18:46:35 2006
+@@ -303,6 +303,7 @@
+ #define FamilyDECnet 1
+ #define FamilyChaos 2
+ #define FamilyInternet6 6 /* IPv6 */
++#define FamilyInternetV6 6 /* SUNSOFT - retained for backwards compatibility with original IPv6 draft */
+
+ /* authentication families not tied to a specific protocol */
+ #define FamilyServerInterpreted 5
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/X11/Xmd.h-patch Mon Apr 17 17:05:03 2006 -0700
@@ -0,0 +1,16 @@
+--- Xmd.h Thu Apr 6 18:48:44 2006
++++ Xmd.h Thu Dec 22 09:26:38 2005
+@@ -48,10 +48,13 @@
+ #ifndef XMD_H
+ #define XMD_H 1
+ /* $Xorg: Xmd.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
++#pragma ident "@(#)Xmd.h-patch 1.1 06/04/11 SMI"
+ /*
+ * Xmd.h: MACHINE DEPENDENT DECLARATIONS.
+ */
+
++#include <sys/isa_defs.h> /* SUN addition: defines _LP64 if necessary */
++
+ /*
+ * Special per-machine configuration flags.
+ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/X11/Xos.h-patch Mon Apr 17 17:05:03 2006 -0700
@@ -0,0 +1,16 @@
+--- Xos.h Mon Nov 7 22:33:25 2005
++++ Xos.h Fri Apr 7 11:06:30 2006
+@@ -92,12 +92,9 @@
+ #ifndef X_NOT_STDC_ENV
+
+ #include <string.h>
+-#if defined(__SCO__) || defined(__UNIXWARE__)
++#if defined(__SCO__) || defined(__UNIXWARE__) || (defined(sun) && defined(__SVR4))
+ #include <strings.h>
+ #else
+-#if (defined(sun) && defined(__SVR4))
+-#include <strings.h>
+-#endif
+ #ifdef __STDC__
+ #ifndef index
+ #define index(s,c) (strchr((s),(c)))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/X11/Xpoll.h-patch Mon Apr 17 17:05:03 2006 -0700
@@ -0,0 +1,132 @@
+Add extended versions of select() mask macros needed for Xsun for dynamic
+1024-client support (4185418: the X server should support more connections)
+
+--- Xpoll.h.in Thu Apr 6 18:46:55 2006
++++ Xpoll.h.in Fri Apr 7 13:25:05 2006
+@@ -252,4 +252,126 @@
+
+ #endif /* WIN32 */
+
++#ifdef SUNSOFT
++/* Copyright 2006 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.
++ */
++
++/* Extended macros used by Xsun's 1024 client/file descriptor enhancement */
++
++#define XFD_SETSIZE_1024 1024
++#define XFD_SETSIZE_F(f) (f ? XFD_SETSIZE_1024 : XFD_SETSIZE)
++
++#ifndef FD_SETSIZE_F
++#define FD_SETSIZE_F(f) XFD_SETSIZE_F(f)
++#endif
++
++#define XFD_ANYSET_1024(p) \
++ ((__XFDS_BITS(p, 0)) || (__XFDS_BITS(p, 1)) || \
++ (__XFDS_BITS(p, 2)) || (__XFDS_BITS(p, 3)) || \
++ (__XFDS_BITS(p, 4)) || (__XFDS_BITS(p, 5)) || \
++ (__XFDS_BITS(p, 6)) || (__XFDS_BITS(p, 7)) || \
++ (__XFDS_BITS(p, 8)) || (__XFDS_BITS(p, 9)) || \
++ (__XFDS_BITS(p, 10)) || (__XFDS_BITS(p, 11)) || \
++ (__XFDS_BITS(p, 12)) || (__XFDS_BITS(p, 13)) || \
++ (__XFDS_BITS(p, 14)) || (__XFDS_BITS(p, 15)) || \
++ (__XFDS_BITS(p, 16)) || (__XFDS_BITS(p, 17)) || \
++ (__XFDS_BITS(p, 18)) || (__XFDS_BITS(p, 19)) || \
++ (__XFDS_BITS(p, 20)) || (__XFDS_BITS(p, 21)) || \
++ (__XFDS_BITS(p, 22)) || (__XFDS_BITS(p, 23)) || \
++ (__XFDS_BITS(p, 24)) || (__XFDS_BITS(p, 25)) || \
++ (__XFDS_BITS(p, 26)) || (__XFDS_BITS(p, 27)) || \
++ (__XFDS_BITS(p, 28)) || (__XFDS_BITS(p, 29)) || \
++ (__XFDS_BITS(p, 30)) || (__XFDS_BITS(p, 31)) )
++
++#define XFD_ANYSET_F(p,f) \
++ (XFD_ANYSET(p) || (!f ? 0 : ( \
++ (__XFDS_BITS(p, 8)) || (__XFDS_BITS(p, 9)) || \
++ (__XFDS_BITS(p, 10)) || (__XFDS_BITS(p, 11)) || \
++ (__XFDS_BITS(p, 12)) || (__XFDS_BITS(p, 13)) || \
++ (__XFDS_BITS(p, 14)) || (__XFDS_BITS(p, 15)) || \
++ (__XFDS_BITS(p, 16)) || (__XFDS_BITS(p, 17)) || \
++ (__XFDS_BITS(p, 18)) || (__XFDS_BITS(p, 19)) || \
++ (__XFDS_BITS(p, 20)) || (__XFDS_BITS(p, 21)) || \
++ (__XFDS_BITS(p, 22)) || (__XFDS_BITS(p, 23)) || \
++ (__XFDS_BITS(p, 24)) || (__XFDS_BITS(p, 25)) || \
++ (__XFDS_BITS(p, 26)) || (__XFDS_BITS(p, 27)) || \
++ (__XFDS_BITS(p, 28)) || (__XFDS_BITS(p, 29)) || \
++ (__XFDS_BITS(p, 30)) || (__XFDS_BITS(p, 31)) )))
++
++#define XFD_COPYSET_1024(src,dst) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_1024, NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) = __XFDS_BITS((src), __i__); \
++ }
++
++#define XFD_COPYSET_F(src,dst,f) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_F(f), NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) = __XFDS_BITS((src), __i__); \
++ }
++
++#define XFD_ANDSET_1024(dst,b1,b2) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_1024, NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) & (__XFDS_BITS((b2), __i__))); \
++ }
++
++#define XFD_ANDSET_F(dst,b1,b2,f) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_F(f), NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) & (__XFDS_BITS((b2), __i__))); \
++ }
++
++
++#define XFD_ORSET_1024(dst,b1,b2) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_1024, NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) | (__XFDS_BITS((b2), __i__))); \
++ }
++
++#define XFD_ORSET_F(dst,b1,b2,f) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_F(f), NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) | (__XFDS_BITS((b2), __i__))); \
++ }
++
++#define XFD_UNSET_1024(dst,b1) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_1024, NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) &= ~(__XFDS_BITS((b1), __i__)); \
++ }
++
++#define XFD_UNSET_F(dst,b1,f) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_F(f), NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) &= ~(__XFDS_BITS((b1), __i__)); \
++ }
++
++#endif /* SUNSOFT additions */
++
+ #endif /* _XPOLL_H_ */