Author: dnusinow
Date: 2006-09-24 16:58:01 -0400 (Sun, 24 Sep 2006)
New Revision: 3472
Modified:
trunk/proto/x11proto-gl/ChangeLog
trunk/proto/x11proto-gl/configure
trunk/proto/x11proto-gl/configure.ac
trunk/proto/x11proto-gl/debian/changelog
trunk/proto/x11proto-gl/debian/compat
trunk/proto/x11proto-gl/debian/control
trunk/proto/x11proto-gl/debian/copyright
trunk/proto/x11proto-gl/debian/rules
trunk/proto/x11proto-gl/glxtokens.h
Log:
Merge x11proto-gl from 7.1 branch to trunk
Modified: trunk/proto/x11proto-gl/ChangeLog
===================================================================
--- trunk/proto/x11proto-gl/ChangeLog 2006-09-24 14:10:15 UTC (rev 3471)
+++ trunk/proto/x11proto-gl/ChangeLog 2006-09-24 20:58:01 UTC (rev 3472)
@@ -1,3 +1,8 @@
+2006-04-30 Adam Jackson <[EMAIL PROTECTED]>
+
+ * glxtokens.h:
+ Bump to 1.4.7 for final EXT_tfp tokens.
+
2006-03-16 Kristian Høgsberg <[EMAIL PROTECTED]>
* configure.ac: Bump to 1.4.6 for FBO opcodes.
Modified: trunk/proto/x11proto-gl/configure
===================================================================
--- trunk/proto/x11proto-gl/configure 2006-09-24 14:10:15 UTC (rev 3471)
+++ trunk/proto/x11proto-gl/configure 2006-09-24 20:58:01 UTC (rev 3472)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for GLProto 1.4.6.
+# Generated by GNU Autoconf 2.59 for GLProto 1.4.7.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='GLProto'
PACKAGE_TARNAME='glproto'
-PACKAGE_VERSION='1.4.6'
-PACKAGE_STRING='GLProto 1.4.6'
+PACKAGE_VERSION='1.4.7'
+PACKAGE_STRING='GLProto 1.4.7'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar
am__untar LIBOBJS LTLIBOBJS'
@@ -722,7 +722,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GLProto 1.4.6 to adapt to many kinds of systems.
+\`configure' configures GLProto 1.4.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -784,7 +784,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GLProto 1.4.6:";;
+ short | recursive ) echo "Configuration of GLProto 1.4.7:";;
esac
cat <<\_ACEOF
@@ -890,7 +890,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-GLProto configure 1.4.6
+GLProto configure 1.4.7
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -904,7 +904,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GLProto $as_me 1.4.6, which was
+It was created by GLProto $as_me 1.4.7, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1547,7 +1547,7 @@
# Define the identity of the package.
PACKAGE='glproto'
- VERSION='1.4.6'
+ VERSION='1.4.7'
cat >>confdefs.h <<_ACEOF
@@ -2089,7 +2089,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by GLProto $as_me 1.4.6, which was
+This file was extended by GLProto $as_me 1.4.7, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2144,7 +2144,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-GLProto config.status 1.4.6
+GLProto config.status 1.4.7
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Modified: trunk/proto/x11proto-gl/configure.ac
===================================================================
--- trunk/proto/x11proto-gl/configure.ac 2006-09-24 14:10:15 UTC (rev
3471)
+++ trunk/proto/x11proto-gl/configure.ac 2006-09-24 20:58:01 UTC (rev
3472)
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([GLProto], [1.4.6],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([GLProto], [1.4.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
Modified: trunk/proto/x11proto-gl/debian/changelog
===================================================================
--- trunk/proto/x11proto-gl/debian/changelog 2006-09-24 14:10:15 UTC (rev
3471)
+++ trunk/proto/x11proto-gl/debian/changelog 2006-09-24 20:58:01 UTC (rev
3472)
@@ -1,8 +1,31 @@
+x11proto-gl (1.4.7-2) UNRELEASED; urgency=low
+
+ [ Andres Salomon ]
+ * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
+ idempotency fix.
+
+ [ Riccardo Setti ]
+ * Now we ship the entire Licenses (closes: #368558)
+
+ -- Andres Salomon <[EMAIL PROTECTED]> Mon, 17 Jul 2006 00:04:43 -0400
+
+x11proto-gl (1.4.7-1) experimental; urgency=low
+
+ * New upstream release
+ * Move debhelper from build-depends-indep to build-depends because we use
+ dh_clean in the clean target of debian/rules
+ * Bump standards version to 3.7.2.0
+ * Run dh_install with --list-missing
+ * Bump debhelper compat to 5
+
+ -- David Nusinow <[EMAIL PROTECTED]> Sat, 1 Jul 2006 22:40:35 -0400
+
x11proto-gl (1.4.6-2) unstable; urgency=low
+ [ David Nusinow ]
* Upload to unstable
- -- David Nusinow <[EMAIL PROTECTED]> Thu, 23 Mar 2006 21:36:05 -0500
+ -- Riccardo Setti <[EMAIL PROTECTED]> Sun, 6 Aug 2006 21:40:34 +0200
x11proto-gl (1.4.6-1) experimental; urgency=low
Modified: trunk/proto/x11proto-gl/debian/compat
===================================================================
--- trunk/proto/x11proto-gl/debian/compat 2006-09-24 14:10:15 UTC (rev
3471)
+++ trunk/proto/x11proto-gl/debian/compat 2006-09-24 20:58:01 UTC (rev
3472)
@@ -1 +1 @@
-4
+5
Modified: trunk/proto/x11proto-gl/debian/control
===================================================================
--- trunk/proto/x11proto-gl/debian/control 2006-09-24 14:10:15 UTC (rev
3471)
+++ trunk/proto/x11proto-gl/debian/control 2006-09-24 20:58:01 UTC (rev
3472)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>= 4.0.0)
-Standards-Version: 3.6.1.0
+Build-Depends: debhelper (>= 5.0.0)
+Standards-Version: 3.7.2
Package: x11proto-gl-dev
Architecture: all
Modified: trunk/proto/x11proto-gl/debian/copyright
===================================================================
--- trunk/proto/x11proto-gl/debian/copyright 2006-09-24 14:10:15 UTC (rev
3471)
+++ trunk/proto/x11proto-gl/debian/copyright 2006-09-24 20:58:01 UTC (rev
3472)
@@ -1,3 +1,4 @@
+glcore.h, glxmd.h, glxproto.h, glxtokens.h are copyright of:
The headers in this module are copyright 1991-1999 Silicon Graphics, Inc.
License Applicability. Except to the extent portions of this file are
@@ -16,6 +17,10 @@
CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+A entire text of the FreeB license can be found below.
+
+glxint.h is copyright of Silicon Graphics Inc and it's releasend under the
terms of:
+
Original Code. The Original Code is: OpenGL Sample Implementation,
Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
@@ -43,3 +48,347 @@
1999. The developer of the Original Software is Silicon Graphics, Inc.
Those portions of the Subject Software created by Silicon Graphics, Inc.
are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
+
+SGI FreeB license: ****NOTE: THIS LICENSE IS NON-FREE BY DEBIAN STANDARDS
+***
+
+SGI FREE SOFTWARE LICENSE B (Version 1.1 [02/22/2000])
+1.Definitions.
+1.1."Additional Notice Provisions" means such additional provisions as appear
in the Notice in Original Code under the heading
+"Additional Notice Provisions."
+1.2."Covered Code" means the Original Code or Modifications, or any
combination thereof.
+1.3."Hardware" means any physical device that accepts input, processes input,
stores the results of processing, and/or provides
+output.
+1.4."Larger Work" means a work that combines Covered Code or portions thereof
with code not governed by the terms of this License.
+1.5."Licensable" means having the right to grant, to the maximum extent
possible, whether at the time of the initial grant or
+subsequently acquired, any and all of the rights conveyed herein.
+1.6."License" means this document.
+1.7."Licensed Patents" means patent claims Licensable by SGI that are
infringed by the use or sale of Original Code or any
+Modifications provided by SGI, or any combination thereof.
+1.8."Modifications" means any addition to or deletion from the substance or
structure of the Original Code or any previous
+Modifications. When Covered Code is released as a series of files, a
Modification is:
+A.Any addition to the contents of a file containing Original Code and/or
addition to or deletion from the contents of a file
+containing previous Modifications.
+B.Any new file that contains any part of the Original Code or previous
Modifications.
+1.9."Notice" means any notice in Original Code or Covered Code, as required by
and in compliance with this License.
+1.10."Original Code" means source code of computer software code that is
described in the source code Notice required by Exhibit A as
+Original Code, and updates and error corrections specifically thereto.
+1.11."Recipient" means an individual or a legal entity exercising rights
under, and complying with all of the terms of, this License
+or a future version of this License issued under Section 8. For legal
entities, "Recipient" includes any entity that controls, is
+controlled by, or is under common control with Recipient. For purposes of this
definition, "control" of an entity means (a) the power,
+direct or indirect, to direct or manage such entity, or (b) ownership of fifty
percent (50%) or more of the outstanding shares or
+beneficial ownership of such entity.
+1.12."Recipient Patents" means patent claims Licensable by a Recipient that
are infringed by the use or sale of Original Code or any
+Modifications provided by SGI, or any combination thereof.
+1.13."SGI" means Silicon Graphics, Inc.
+1.14."SGI Patents" means patent claims Licensable by SGI other than the
Licensed Patents.
+2.License Grant and Restrictions.
+2.1.SGI License Grant. Subject to the terms of this License and any third
party intellectual property claims, for the duration of
+intellectual property protections inherent in the Original Code, SGI hereby
grants Recipient a worldwide, royalty-free, non-exclusive
+license, to do the following: (i) under copyrights Licensable by SGI, to
reproduce, distribute, create derivative works from, and, to
+the extent applicable, display and perform the Original Code and/or any
Modifications provided by SGI alone and/or as part of a Larger
+Work; and (ii) under any Licensable Patents, to make, have made, use, sell,
offer for sale, import and/or otherwise transfer the
+Original Code and/or any Modifications provided by SGI. Recipient accepts the
terms and conditions of this License by undertaking any
+of the aforementioned actions. The patent license shall apply to the Covered
Code if, at the time any related Modification is added,
+such addition of the Modification causes such combination to be covered by the
Licensed Patents. The patent license in Section 2.1(ii)
+shall not apply to any other combinations that include the Modification. No
patent license is provided under SGI Patents for
+infringements of SGI Patents by Modifications not provided by SGI or
combinations of Original Code and Modifications not provided by
+SGI.
+2.2.Recipient License Grant. Subject to the terms of this License and any
third party intellectual property claims, Recipient hereby
+grants SGI and any other Recipients a worldwide, royalty-free, non-exclusive
license, under any Recipient Patents, to make, have made,
+use, sell, offer for sale, import and/or otherwise transfer the Original Code
and/or any Modifications provided by SGI.
+2.3.No License For Hardware Implementations. The licenses granted in Section
2.1 and 2.2 are not applicable to implementation in
+Hardware of the algorithms embodied in the Original Code or any Modifications
provided by SGI .
+3.Redistributions.
+3.1.Retention of Notice/Copy of License. The Notice set forth in Exhibit A,
below, must be conspicuously retained or included in any
+and all redistributions of Covered Code. For distributions of the Covered Code
in source code form, the Notice must appear in every
+file that can include a text comments field; in executable form, the Notice
and a copy of this License must appear in related
+documentation or collateral where the Recipient’s rights relating to Covered
Code are described. Any Additional Notice Provisions
+which actually appears in the Original Code must also be retained or included
in any and all redistributions of Covered Code.
+3.2.Alternative License. Provided that Recipient is in compliance with the
terms of this License, Recipient may, so long as without
+derogation of any of SGI’s rights in and to the Original Code, distribute the
source code and/or executable version(s) of Covered Code
+under (1) this License; (2) a license identical to this License but for only
such changes as are necessary in order to clarify
+Recipient’s role as licensor of Modifications; and/or (3) a license of
Recipient’s choosing, containing terms different from this
+License, provided that the license terms include this Section 3 and Sections
4, 6, 7, 10, 12, and 13, which terms may not be modified
+or superseded by any other terms of such license. If Recipient elects to use
any license other than this License, Recipient must make
+it absolutely clear that any of its terms which differ from this License are
offered by Recipient alone, and not by SGI. It is
+emphasized that this License is a limited license, and, regardless of the
license form employed by Recipient in accordance with this
+Section 3.2, Recipient may relicense only such rights, in Original Code and
Modifications by SGI, as it has actually been granted by
+SGI in this License.
+3.3.Indemnity. Recipient hereby agrees to indemnify SGI for any liability
incurred by SGI as a result of any such alternative license
+terms Recipient offers.
+4.Termination. This License and the rights granted hereunder will terminate
automatically if Recipient breaches any term herein and
+fails to cure such breach within 30 days thereof. Any sublicense to the
Covered Code that is properly granted shall survive any
+termination of this License, absent termination by the terms of such
sublicense. Provisions that, by their nature, must remain in
+effect beyond the termination of this License, shall survive.
+5.No Trademark Or Other Rights. This License does not grant any rights to: (i)
any software apart from the Covered Code, nor shall any
+other rights or licenses not expressly granted hereunder arise by implication,
estoppel or otherwise with respect to the Covered Code;
+(ii) any trade name, trademark or service mark whatsoever, including without
limitation any related right for purposes of endorsement
+or promotion of products derived from the Covered Code, without prior written
permission of SGI; or (iii) any title to or ownership of
+the Original Code, which shall at all times remains with SGI. All rights in
the Original Code not expressly granted under this License
+are reserved.
+6.Compliance with Laws; Non-Infringement. There are various worldwide laws,
regulations, and executive orders applicable to
+dispositions of Covered Code, including without limitation export, re-export,
and import control laws, regulations, and executive
+orders, of the U.S. government and other countries, and Recipient is reminded
it is obliged to obey such laws, regulations, and
+executive orders. Recipient may not distribute Covered Code that (i) in any
way infringes (directly or contributorily) any
+intellectual property rights of any kind of any other person or entity or (ii)
breaches any representation or warranty, express,
+implied or statutory, to which, under any applicable law, it might be deemed
to have been subject.
+7.Claims of Infringement. If Recipient learns of any third party claim that
any disposition of Covered Code and/or functionality
+wholly or partially infringes the third party's intellectual property rights,
Recipient will promptly notify SGI of such claim.
+8.Versions of the License. SGI may publish revised and/or new versions of the
License from time to time, each with a distinguishing
+version number. Once Covered Code has been published under a particular
version of the License, Recipient may, for the duration of the
+license, continue to use it under the terms of that version, or choose to use
such Covered Code under the terms of any subsequent
+version published by SGI. Subject to the provisions of Sections 3 and 4 of
this License, only SGI may modify the terms applicable to
+Covered Code created under this License.
+9.DISCLAIMER OF WARRANTY. COVERED CODE IS PROVIDED "AS IS." ALL EXPRESS AND
IMPLIED WARRANTIES AND CONDITIONS ARE DISCLAIMED,
+INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF
MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+PARTICULAR PURPOSE, AND NON-INFRINGEMENT. SGI ASSUMES NO RISK AS TO THE
QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD THE SOFTWARE
+PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR
SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY IS
+AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED
HEREUNDER EXCEPT SUBJECT TO THIS DISCLAIMER.
+10.LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES NOR LEGAL THEORY, WHETHER
TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT
+LIABILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE
FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
+CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES
FOR LOSS OF GOODWILL, WORK STOPPAGE, LOSS OF DATA,
+COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
+POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM
+SGI's NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION
+OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY
NOT APPLY TO RECIPIENT.
+11.Indemnity. Recipient shall be solely responsible for damages arising,
directly or indirectly, out of its utilization of rights
+under this License. Recipient will defend, indemnify and hold harmless Silicon
Graphics, Inc. from and against any loss, liability,
+damages, costs or expenses (including the payment of reasonable attorneys
fees) arising out of Recipient's use, modification,
+reproduction and distribution of the Covered Code or out of any representation
or warranty made by Recipient.
+12.U.S. Government End Users. The Covered Code is a "commercial item"
consisting of "commercial computer software" as such terms are
+defined in title 48 of the Code of Federal Regulations and all U.S. Government
End Users acquire only the rights set forth in this
+License and are subject to the terms of this License.
+13.Miscellaneous. This License represents the complete agreement concerning
the its subject matter. If any provision of this License
+is held to be unenforceable, such provision shall be reformed so as to achieve
as nearly as possible the same legal and economic
+effect as the original provision and the remainder of this License will remain
in effect. This License shall be governed by and
+construed in accordance with the laws of the United States and the State of
California as applied to agreements entered into and to be
+performed entirely within California between California residents. Any
litigation relating to this License shall be subject to the
+exclusive jurisdiction of the Federal Courts of the Northern District of
California (or, absent subject matter jurisdiction in such
+courts, the courts of the State of California), with venue lying exclusively
in Santa Clara County, California, with the losing party
+responsible for costs, including without limitation, court costs and
reasonable attorneys fees and expenses. The application of the
+United Nations Convention on Contracts for the International Sale of Goods is
expressly excluded. Any law or regulation that provides
+that the language of a contract shall be construed against the drafter shall
not apply to this License.
+Exhibit A
+License Applicability. Except to the extent portions of this file are made
subject to an alternative license as permitted in the SGI
+Free Software License B, Version 1.1 (the "License"), the contents of this
file are subject only to the provisions of the License. You
+may not use this file except in compliance with the License. You may obtain a
copy of the License at Silicon Graphics, Inc., attn:
+Legal Services, 1600 Amphitheatre Parkway, Mountain View, CA 94043-1351, or
at:
+http://oss.sgi.com/projects/FreeB
+Note that, as provided in the License, the Software is distributed on an "AS
IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND
+CONDITIONS DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES
AND CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+Original Code. The Original Code is: [name of software, version number, and
release date], developed by Silicon Graphics, Inc. The
+Original Code is Copyright (c) [dates of first publication, as appearing in
the Notice in the Original Code] Silicon Graphics, Inc.
+Copyright in any portions created by third parties is as indicated elsewhere
herein. All Rights Reserved.
+Additional Notice Provisions: [such additional provisions, if any, as appear
in the Notice in the Original Code under the heading
+"Additional Notice Provisions"]
+
+GLX Licnese:
+
+GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License")
+
+Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby
+grants permission to Recipient (defined below), under Recipient's
+copyrights in the Original Software (defined below), to use, copy,
+modify, merge, publish, distribute, sublicense and/or sell copies of
+Subject Software (defined below), and to permit persons to whom the
+Subject Software is furnished in accordance with this License to do the
+same, subject to all of the following terms and conditions, which
+Recipient accepts by engaging in any such use, copying, modifying,
+merging, publishing, distributing, sublicensing or selling:
+
+1. Definitions.
+
+ (a) "Original Software" means source code of computer software code
+ which is described in Exhibit A as Original Software.
+
+ (b) "Modifications" means any addition to or deletion from the
+ substance or structure of either the Original Software or any
+ previous Modifications. When Subject Software is released as a
+ series of files, a Modification means (i) any addition to or
+ deletion from the contents of a file containing Original Software or
+ previous Modifications and (ii) any new file that contains any part
+ of the Original Code or previous Modifications.
+
+ (c) "Subject Software" means the Original Software or Modifications
+ or the combination of the Original Software and Modifications, or
+ portions of any of the foregoing.
+
+ (d) "Recipient" means an individual or a legal entity exercising
+ rights under, and complying with all of the terms of, this License.
+ For legal entities, "Recipient" includes any entity which controls,
+ is controlled by, or is under common control with Recipient. For
+ purposes of this definition, "control" of an entity means (a) the
+ power, direct or indirect, to direct or manage such entity, or (b)
+ ownership of fifty percent (50%) or more of the outstanding shares
+ or beneficial ownership of such entity.
+
+2. Redistribution of Source Code Subject to These Terms. Redistributions
+of Subject Software in source code form must retain the notice set forth
+in Exhibit A, below, in every file. A copy of this License must be
+included in any documentation for such Subject Software where the
+recipients' rights relating to Subject Software are described. Recipient
+may distribute the source code version of Subject Software under a
+license of Recipient's choice, which may contain terms different from
+this License, provided that (i) Recipient is in compliance with the
+terms of this License, and (ii) the license terms include this Section 2
+and Sections 3, 4, 7, 8, 10, 12 and 13 of this License, which terms may
+not be modified or superseded by any other terms of such license. If
+Recipient distributes the source code version under a different license
+Recipient must make it absolutely clear that any terms which differ from
+this License are offered by Recipient alone, not by SGI. Recipient
+hereby agrees to indemnify SGI for any liability incurred by SGI as a
+result of any such terms Recipient offers.
+
+3. Redistribution in Executable Form. The notice set forth in Exhibit A
+must be conspicuously included in any notice in an executable version of
+Subject Software, related documentation or collateral in which Recipient
+describes the user's rights relating to the Subject Software. Recipient
+may distribute the executable version of Subject Software under a
+license of Recipient's choice, which may contain terms different from
+this License, provided that (i) Recipient is in compliance with the
+terms of this License, and (ii) the license terms include this Section 3
+and Sections 4, 7, 8, 10, 12 and 13 of this License, which terms may not
+be modified or superseded by any other terms of such license. If
+Recipient distributes the executable version under a different license
+Recipient must make it absolutely clear that any terms which differ from
+this License are offered by Recipient alone, not by SGI. Recipient
+hereby agrees to indemnify SGI for any liability incurred by SGI as a
+result of any such terms Recipient offers.
+
+4. Termination. This License and the rights granted hereunder will
+terminate automatically if Recipient fails to comply with terms herein
+and fails to cure such breach within 30 days of the breach. Any
+sublicense to the Subject Software which is properly granted shall
+survive any termination of this License absent termination by the terms
+of such sublicense. Provisions which, by their nature, must remain in
+effect beyond the termination of this License shall survive.
+
+5. No Trademark Rights. This License does not grant any rights to use
+any trade name, trademark or service mark whatsoever. No trade name,
+trademark or service mark of SGI may be used to endorse or promote
+products derived from the Subject Software without prior written
+permission of SGI.
+
+6. No Other Rights. This License does not grant any rights with respect
+to the OpenGL API or to any software or hardware implementation thereof
+or to any other software whatsoever, nor shall any other rights or
+licenses not expressly granted hereunder arise by implication, estoppel
+or otherwise with respect to the Subject Software. Title to and
+ownership of the Original Software at all times remains with SGI. All
+rights in the Original Software not expressly granted under this License
+are reserved.
+
+7. Compliance with Laws; Non-Infringement. Recipient shall comply with
+all applicable laws and regulations in connection with use and
+distribution of the Subject Software, including but not limited to, all
+export and import control laws and regulations of the U.S. government
+and other countries. Recipient may not distribute Subject Software that
+(i) in any way infringes (directly or contributorily) the rights
+(including patent, copyright, trade secret, trademark or other
+intellectual property rights of any kind) of any other person or entity
+or (ii) breaches any representation or warranty, express, implied or
+statutory, which under any applicable law it might be deemed to have
+been distributed.
+
+8. Claims of Infringement. If Recipient at any time has knowledge of any
+one or more third party claims that reproduction, modification, use,
+distribution, import or sale of Subject Software (including particular
+functionality or code incorporated in Subject Software) infringes the
+third party's intellectual property rights, Recipient must place in a
+well-identified web page bearing the title "LEGAL" a description of each
+such claim and a description of the party making each such claim in
+sufficient detail that a user of the Subject Software will know whom to
+contact regarding the claim. Also, upon gaining such knowledge of any
+such claim, Recipient must conspicuously include the URL for such web
+page in the Exhibit A notice required under Sections 2 and 3, above, and
+in the text of any related documentation, license agreement or
+collateral in which Recipient describes end user's rights relating to
+the Subject Software. If Recipient obtains such knowledge after it makes
+Subject Software available to any other person or entity, Recipient
+shall take other steps (such as notifying appropriate mailing lists or
+newsgroups) reasonably calculated to inform those who received the
+Subject Software that new knowledge has been obtained.
+
+9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS
+FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
+INFRINGING. SGI ASSUMES NO RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+SOFTWARE. SHOULD ANY SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, SGI
+ASSUMES NO COST OR LIABILITY FOR ANY SERVICING, REPAIR OR CORRECTION.
+THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
+LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT
+UNDER THIS DISCLAIMER.
+
+10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
+THEORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR
+STRICT LIABILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR
+BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
+CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION,
+DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOSS OF DATA, COMPUTER
+FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
+LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY
+OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO
+LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE
+TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
+JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO
+RECIPIENT.
+
+11. Indemnity. Recipient shall be solely responsible for damages
+arising, directly or indirectly, out of its utilization of rights under
+this License. Recipient will defend, indemnify and hold harmless Silicon
+Graphics, Inc. from and against any loss, liability, damages, costs or
+expenses (including the payment of reasonable attorneys fees) arising
+out of Recipient's use, modification, reproduction and distribution of
+the Subject Software or out of any representation or warranty made by
+Recipient.
+
+12. U.S. Government End Users. The Subject Software is a "commercial
+item" consisting of "commercial computer software" as such terms are
+defined in title 48 of the Code of Federal Regulations and all U.S.
+Government End Users acquire only the rights set forth in this License
+and are subject to the terms of this License.
+
+13. Miscellaneous. This License represents the complete agreement
+concerning subject matter hereof. If any provision of this License is
+held to be unenforceable, such provision shall be reformed so as to
+achieve as nearly as possible the same economic effect as the original
+provision and the remainder of this License will remain in effect. This
+License shall be governed by and construed in accordance with the laws
+of the United States and the State of California as applied to
+agreements entered into and to be performed entirely within California
+between California residents. Any litigation relating to this License
+shall be subject to the exclusive jurisdiction of the Federal Courts of
+the Northern District of California (or, absent subject matter
+jurisdiction in such courts, the courts of the State of California),
+with venue lying exclusively in Santa Clara County, California, with the
+losing party responsible for costs, including without limitation, court
+costs and reasonable attorneys fees and expenses. The application of the
+United Nations Convention on Contracts for the International Sale of
+Goods is expressly excluded. Any law or regulation which provides that
+the language of a contract shall be construed against the drafter shall
+not apply to this License.
+
+Exhibit A
+
+The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12
+and 13 of the GLX Public License Version 1.0 (the "License"). You may
+not use this file except in compliance with those sections of the
+License. You may obtain a copy of the License at Silicon Graphics, Inc.,
+attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
+or at http://www.sgi.com/software/opensource/glx/license.html.
+
+Software distributed under the License is distributed on an "AS IS"
+basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
+IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
+PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
+language governing rights and limitations under the License.
+
+The Original Software is GLX version 1.2 source code, released February,
+1999. The developer of the Original Software is Silicon Graphics, Inc.
+Those portions of the Subject Software created by Silicon Graphics, Inc.
+are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
+
Modified: trunk/proto/x11proto-gl/debian/rules
===================================================================
--- trunk/proto/x11proto-gl/debian/rules 2006-09-24 14:10:15 UTC (rev
3471)
+++ trunk/proto/x11proto-gl/debian/rules 2006-09-24 20:58:01 UTC (rev
3472)
@@ -35,7 +35,7 @@
build-stamp:
dh_testdir
- mkdir obj-$(DEB_BUILD_GNU_TYPE)
+ test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --disable-shared \
@@ -72,7 +72,7 @@
dh_installdocs
dh_installman
- dh_install --sourcedir=debian/tmp
+ dh_install --sourcedir=debian/tmp --list-missing
dh_installchangelogs
dh_link
dh_strip
Modified: trunk/proto/x11proto-gl/glxtokens.h
===================================================================
--- trunk/proto/x11proto-gl/glxtokens.h 2006-09-24 14:10:15 UTC (rev 3471)
+++ trunk/proto/x11proto-gl/glxtokens.h 2006-09-24 20:58:01 UTC (rev 3472)
@@ -234,8 +234,45 @@
/*
** GLX_EXT_texture_from_pixmap
*/
-#define GLX_FRONT_LEFT_EXT 0x6005
+#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0
+#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1
+#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x20D2
+#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3
+#define GLX_Y_INVERTED_EXT 0x20D4
+#define GLX_TEXTURE_FORMAT_EXT 0x20D5
+#define GLX_TEXTURE_TARGET_EXT 0x20D6
+#define GLX_MIPMAP_TEXTURE_EXT 0x20D7
+
+#define GLX_TEXTURE_FORMAT_NONE_EXT 0x20D8
+#define GLX_TEXTURE_FORMAT_RGB_EXT 0x20D9
+#define GLX_TEXTURE_FORMAT_RGBA_EXT 0x20DA
+
+#define GLX_TEXTURE_1D_BIT_EXT 0x00000001
+#define GLX_TEXTURE_2D_BIT_EXT 0x00000002
+#define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004
+
+#define GLX_TEXTURE_1D_EXT 0x20DB
+#define GLX_TEXTURE_2D_EXT 0x20DC
+#define GLX_TEXTURE_RECTANGLE_EXT 0x20DD
+
+#define GLX_FRONT_LEFT_EXT 0x20DE
+#define GLX_FRONT_RIGHT_EXT 0x20DF
+#define GLX_BACK_LEFT_EXT 0x20E0
+#define GLX_BACK_RIGHT_EXT 0x20E1
+#define GLX_FRONT_EXT GLX_FRONT_LEFT_EXT
+#define GLX_BACK_EXT GLX_BACK_LEFT_EXT
+#define GLX_AUX0_EXT 0x20E2
+#define GLX_AUX1_EXT 0x20E3
+#define GLX_AUX2_EXT 0x20E4
+#define GLX_AUX3_EXT 0x20E5
+#define GLX_AUX4_EXT 0x20E6
+#define GLX_AUX5_EXT 0x20E7
+#define GLX_AUX6_EXT 0x20E8
+#define GLX_AUX7_EXT 0x20E9
+#define GLX_AUX8_EXT 0x20EA
+#define GLX_AUX9_EXT 0x20EB
+
/*
* GLX 1.4 and later:
*/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
