# HG changeset patch
# User Alan Coopersmith <Alan.Coopersmith@Sun.COM>
# Date 1191347326 25200
# Node ID 4f2fc638a732abb7f5402b3294c50a0f0ba67e0d
# Parent  c37935abfe67d08487993aef128757671935f171
6611790 glxgears, glxinfo, & ogl-select man pages should be in open-src tree

diff -r c37935abfe67 -r 4f2fc638a732 open-src/app/mesa-demos/Makefile
--- a/open-src/app/mesa-demos/Makefile	Wed Sep 26 00:00:00 2007 -0700
+++ b/open-src/app/mesa-demos/Makefile	Tue Oct 02 10:48:46 2007 -0700
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.5	07/05/15
+# @(#)Makefile	1.6	07/10/02
 #
 
 PWD:sh=pwd
@@ -106,6 +106,8 @@
 	$(MAKE) $(MFLAGS) BUILD_DIR=$(BUILD_DIR_32) ARCH_FLAGS="$(ARCH32_FLAGS)" $(BUILD_32_FLAGS) all-xdemos_gen
 
 install_gen: $(GLXGEARS_BIN) $(GLXINFO_BIN)
+	mkdir -p $(MESA_prefix)/bin $(MESA_prefix)/share/man/man1
 	cp -p $(GLXGEARS_BIN) $(GLXINFO_BIN) $(MESA_prefix)/bin
+	cp -p glxgears.1 glxinfo.1 $(MESA_prefix)/share/man/man1
 
 
diff -r c37935abfe67 -r 4f2fc638a732 open-src/app/mesa-demos/glxgears.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/mesa-demos/glxgears.1	Tue Oct 02 10:48:46 2007 -0700
@@ -0,0 +1,74 @@
+'\" t
+.\" Manual page created by The XFree86 Project, under this license:
+.\"
+.\" Copyright (C) 1994-2003 The XFree86 Project, 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, sublicense, 
+.\" and/or sell copies of the Software, and to permit persons to whom the 
+.\" Software is furnished to do so, subject to the following conditions:
+.\" 
+.\" The above copyright notice and this permission notice shall be included in
+.\" all copies or substantial portions of the Software.
+.\" 
+.\" 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.  IN NO EVENT SHALL 
+.\" THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF 
+.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+.\" SOFTWARE.
+.\" 
+.\" Except as contained in this notice, the name of the XFree86 Project shall 
+.\" not be used in advertising or otherwise to promote the sale, use or other 
+.\" dealings in this Software without prior written authorization from the 
+.\" XFree86 Project.
+.\"
+.TH GLXGEARS 1 Version\ 6.9.0 X.Org
+.SH NAME
+glxgears \- GLX version of the infamous "gears" GL demo.
+.SH SYNOPSIS
+.B "glxgears"
+[\-info]
+[\-display \fIdisplayname\fP]
+.SH DESCRIPTION
+.PP
+.I glxgears
+is a GLX demo that draws three rotating gears, and prints out framerate
+information to stdout.
+Command line options include:
+.TP 8
+.B \-info
+Print out GL implementation information before running the demo.
+.TP 8
+.BI "\-display " displayname
+Specify the display to query.
+.SH ENVIRONMENT
+.PP
+.TP 8
+.B DISPLAY
+To get the default host, display number, and screen.
+.SH "SEE ALSO"
+glxinfo(1)
+.SH AUTHOR
+Ported to straight GLX by Brian Paul.
+.\" Begin Sun update
+.\"
+
+.SH ATTRIBUTES
+See
+.BR attributes (5)
+for descriptions of the following attributes:
+.sp
+.TS
+box;
+cbp-1 | cbp-1
+l | l .
+ATTRIBUTE TYPE	ATTRIBUTE VALUE
+=
+Availability 	SUNWxorg-mesa 
+Interface Stability 	External 
+.TE 
+.\" End Sun update
diff -r c37935abfe67 -r 4f2fc638a732 open-src/app/mesa-demos/glxinfo.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/mesa-demos/glxinfo.1	Tue Oct 02 10:48:46 2007 -0700
@@ -0,0 +1,101 @@
+'\" t
+.\"
+.\" Manual page created by The XFree86 Project, under this license:
+.\"
+.\" Copyright (C) 1994-2003 The XFree86 Project, 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, sublicense, 
+.\" and/or sell copies of the Software, and to permit persons to whom the 
+.\" Software is furnished to do so, subject to the following conditions:
+.\" 
+.\" The above copyright notice and this permission notice shall be included in
+.\" all copies or substantial portions of the Software.
+.\" 
+.\" 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.  IN NO EVENT SHALL 
+.\" THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF 
+.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+.\" SOFTWARE.
+.\" 
+.\" Except as contained in this notice, the name of the XFree86 Project shall 
+.\" not be used in advertising or otherwise to promote the sale, use or other 
+.\" dealings in this Software without prior written authorization from the 
+.\" XFree86 Project.
+.\"
+.\" $XFree86: xc/programs/glxinfo/glxinfo.man,v 1.5 2001/12/14 20:00:47 dawes Exp $
+.\"
+.TH GLXINFO 1 Version\ 6.9.0 X.Org
+.SH NAME
+glxinfo \- display info about a GLX extension and OpenGL renderer.
+.SH SYNOPSIS
+.B "glxinfo"
+[\-t]
+[\-v]
+[\-b]
+[\-display \fIdisplayname\fP]
+.SH DESCRIPTION
+.PP
+.I glxinfo
+lists information about the GLX extension, OpenGL capable visuals, and the
+OpenGL renderer on an X server. The GLX and renderer info includes the version
+and extension attributes. The visual info lists the GLX visual attributes 
+available for each OpenGL capable visual (e.g. whether the visual is double
+buffered, the component sizes, Z-buffering depth, etc).
+.PP
+Command line options include:
+.TP 8
+.B \-t
+By default the visual info is presented in a concise 80 character wide
+tabular format. The -t option directs glxinfo to produce a wider, more readable
+tabular format.
+.TP 8
+.B \-v
+Directs glxinfo to generate a verbose format output style for
+the visual list similar to the info of xdpyinfo.
+.TP 8
+.B \-b
+Print the ID of the "best" visual on screen 0.
+.TP 8
+.B \-l
+Print interesting OpenGL limits.
+.TP 8
+.B \-i
+Use indirect rendering connection only.
+.TP 8
+.BI "\-display " "displayname"
+Specify the display to query.
+.PP
+.SH ENVIRONMENT
+.PP
+.TP 8
+.B DISPLAY
+To get the default host, display number, and screen.
+.SH "SEE ALSO"
+xdpyinfo(1)
+.SH AUTHOR
+Brian Paul
+.br
+Modifications for XFree86 added by Mark Paton
+.\" Begin Sun update
+.\"
+
+.SH ATTRIBUTES
+See
+.BR attributes (5)
+for descriptions of the following attributes:
+.sp
+.TS
+box;
+cbp-1 | cbp-1
+l | l .
+ATTRIBUTE TYPE	ATTRIBUTE VALUE
+=
+Availability 	SUNWxorg-mesa 
+Interface Stability 	External 
+.TE 
+.\" End Sun update
diff -r c37935abfe67 -r 4f2fc638a732 open-src/data/smf-rbac/Makefile
--- a/open-src/data/smf-rbac/Makefile	Wed Sep 26 00:00:00 2007 -0700
+++ b/open-src/data/smf-rbac/Makefile	Tue Oct 02 10:48:46 2007 -0700
@@ -29,7 +29,7 @@
 # of the copyright holder.
 #
 #
-# ident "@(#)Makefile 1.4     07/09/04 SMI"
+# ident "@(#)Makefile 1.5     07/10/02 SMI"
 #
 # Files for integration with Solaris Service Management Framework (SMF) and
 # Role Based Access Control (RBAC)
@@ -102,9 +102,10 @@
 install_i386: install_common
 	mkdir -p $(DESTDIR)$(SUN_SMF_MANIFEST_DIR)/opengl \
 		$(DESTDIR)$(SUN_SMF_METHOD_DIR) \
+		$(DESTDIR)$(X11_DIR)/share/man/man1 \
 		$(DESTDIR)/lib/opengl/ogl_select/
 	cp -p ogl-select.xml $(DESTDIR)$(SUN_SMF_MANIFEST_DIR)/opengl
+	cp -p ogl-select.man $(DESTDIR)$(X11_DIR)/share/man/man1/ogl-select.1
 	cp -p ogl-select $(DESTDIR)$(SUN_SMF_METHOD_DIR)/ogl-select
 	cp -p $(OGL_VENDOR_SCRIPTS) $(DESTDIR)/lib/opengl/ogl_select/
 
-
diff -r c37935abfe67 -r 4f2fc638a732 open-src/data/smf-rbac/ogl-select.man
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/data/smf-rbac/ogl-select.man	Tue Oct 02 10:48:46 2007 -0700
@@ -0,0 +1,89 @@
+.\"  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.
+.\" 
+.ds q \N'34'
+.TH ogl-select 1 "01 Oct 2007"
+.SH NAME
+ogl-select \- boot time selection of OpenGL vendor files 
+.PP
+.SH DESCRIPTION
+.I ogl-select
+is a service for the Service Management Facility (SMF) under
+the identifier \fIsvc:/application/opengl/ogl-select\fP
+that determines at boot time which vendor supplied OpenGL headers
+and libraries will be used.  The selection of the OpenGL vendor
+should be automatic and in most cases will not require any
+configuration.  However, for system configurations with special
+needs a property can be used to select the vendor.  The property
+is described in the SMF PROPERTIES section below. 
+.PP
+The SMF method performs the automatic probe by querying the
+device driver attached to the primary framebuffer device, /dev/fb.
+If the name reported by the driver matches the value advertised
+by a vendor registry, the rules in the vendor registry will be
+used to select the OpenGL headers and libraries.  The name reported
+by the driver can be verfied with \fIconstype\fP(1).  If the system
+configuration does not match the desired OpenGL vendor, a SMF
+property can be used to force the vendor selection.
+.SH SMF PROPERTIES
+.PP
+Configuration properties for \fBogl-select\fP program are
+managed by the service management facility, \fBsmf\fR(5), under the service 
+identifier:
+.PP
+.nf
+svc:/application/opengl/ogl-select
+.fi
+Use \fBsvccfg\fR(1M) to make configuration changes and to view configuration 
+information for this service\&. 
+.PP
+These properties may be set for ogl-select:
+.TP
+.B options/vendor 
+(Type astring) The vendor tag to use for selecting the OpenGL headers
+and libraries, overriding the results of the automatic probe.  Available
+vendors can be found with 'ls /lib/opengl/ogl_select/*_vendor_select'.
+If the property is set to an unknown vendor tag, the method will default
+to "mesa".  Setting the property to "" or "notset" causes it to be ignored
+and the results of the automatic probe are used instead.  The default
+value is "notset". 
+.TP
+.SH FILES
+.TP 30
+.I /var/svc/manifest/opengl/ogl-select.xml
+The SMF manifest
+.TP 30
+.I /lib/svc/method/ogl-select
+The SMF method run by the manifest
+.TP 30
+.I /lib/opengl/ogl_select/\fB*\fP_vendor_select
+Vendor registry files scanned by the manifest
+.PP
+.SH SEE ALSO
+.PP
+\fIsmf\fP(5), \fIsvcadm\fP(1M), \fIsvccfg\fP(1M)
diff -r c37935abfe67 -r 4f2fc638a732 packages/SUNWxorg-client-docs/prototype
--- a/packages/SUNWxorg-client-docs/prototype	Wed Sep 26 00:00:00 2007 -0700
+++ b/packages/SUNWxorg-client-docs/prototype	Tue Oct 02 10:48:46 2007 -0700
@@ -29,7 +29,7 @@
 #
 ##########################################################################
 #
-# ident "@(#)prototype 1.4     06/10/02 SMI"
+# ident "@(#)prototype 1.5     07/10/02 SMI"
 #
 # X.Org Foundation X clients for Solaris
 
@@ -47,11 +47,9 @@
 
 d none X11/share/man/man1 0755 root bin
 
-!search $HOME/openwin/share/man/man1
+!search $HOME/X11/share/man/man1
 f none X11/share/man/man1/glxgears.1 0444 root bin
 f none X11/share/man/man1/glxinfo.1 0444 root bin
-
-!search $HOME/X11/share/man/man1
 f none X11/share/man/man1/xgamma.1 0444 root bin
 f none X11/share/man/man1/xrandr.1 0444 root bin
 f none X11/share/man/man1/xvidtune.1 0444 root bin