Makefile | 8
configs/autoconf.in | 1
configs/default | 2
configure.ac | 2
debian/changelog | 22 +
debian/control | 2
debian/glxinfo.1 | 2
debian/patches/01_disable-intel-classic-warn.diff | 14
debian/patches/04_osmesa_version.diff | 10
debian/patches/series | 1
docs/cell.html | 56 ++-
docs/download.html | 4
docs/news.html | 7
docs/relnotes-7.1.html | 10
docs/relnotes-7.2.html | 96 +++++
docs/relnotes.html | 1
include/GL/glu.h | 55 +--
include/GL/internal/glcore.h | 61 +--
progs/demos/rain.cxx | 2
progs/xdemos/glxinfo.c | 1
src/glu/sgi/libnurbs/interface/bezierEval.h | 62 +--
src/glu/sgi/libnurbs/interface/bezierPatch.h | 62 +--
src/glu/sgi/libnurbs/interface/bezierPatchMesh.h | 62 +--
src/glu/sgi/libnurbs/interface/glcurveval.h | 60 +--
src/glu/sgi/libnurbs/interface/glimports.h | 60 +--
src/glu/sgi/libnurbs/interface/glrenderer.h | 60 +--
src/glu/sgi/libnurbs/interface/glsurfeval.h | 60 +--
src/glu/sgi/libnurbs/interface/mystdio.h | 66 +--
src/glu/sgi/libnurbs/interface/mystdlib.h | 60 +--
src/glu/sgi/libnurbs/internals/arc.h | 60 +--
src/glu/sgi/libnurbs/internals/arcsorter.h | 60 +--
src/glu/sgi/libnurbs/internals/arctess.h | 60 +--
src/glu/sgi/libnurbs/internals/backend.cc | 2
src/glu/sgi/libnurbs/internals/backend.h | 62 +--
src/glu/sgi/libnurbs/internals/basiccrveval.h | 60 +--
src/glu/sgi/libnurbs/internals/basicsurfeval.h | 60 +--
src/glu/sgi/libnurbs/internals/bezierarc.h | 60 +--
src/glu/sgi/libnurbs/internals/bin.h | 60 +--
src/glu/sgi/libnurbs/internals/bufpool.cc | 2
src/glu/sgi/libnurbs/internals/bufpool.h | 64 +--
src/glu/sgi/libnurbs/internals/cachingeval.h | 60 +--
src/glu/sgi/libnurbs/internals/coveandtiler.h | 60 +--
src/glu/sgi/libnurbs/internals/curve.h | 60 +--
src/glu/sgi/libnurbs/internals/curvelist.h | 60 +--
src/glu/sgi/libnurbs/internals/dataTransform.h | 62 +--
src/glu/sgi/libnurbs/internals/defines.h | 60 +--
src/glu/sgi/libnurbs/internals/displaylist.h | 60 +--
src/glu/sgi/libnurbs/internals/displaymode.h | 62 +--
src/glu/sgi/libnurbs/internals/flist.h | 60 +--
src/glu/sgi/libnurbs/internals/flistsorter.h | 60 +--
src/glu/sgi/libnurbs/internals/gridline.h | 60 +--
src/glu/sgi/libnurbs/internals/gridtrimvertex.h | 60 +--
src/glu/sgi/libnurbs/internals/gridvertex.h | 60 +--
src/glu/sgi/libnurbs/internals/hull.h | 60 +--
src/glu/sgi/libnurbs/internals/jarcloc.h | 60 +--
src/glu/sgi/libnurbs/internals/knotvector.cc | 2
src/glu/sgi/libnurbs/internals/knotvector.h | 62 +--
src/glu/sgi/libnurbs/internals/mapdesc.h | 60 +--
src/glu/sgi/libnurbs/internals/maplist.h | 60 +--
src/glu/sgi/libnurbs/internals/mesher.h | 60 +--
src/glu/sgi/libnurbs/internals/monotonizer.h | 60 +--
src/glu/sgi/libnurbs/internals/myassert.h | 60 +--
src/glu/sgi/libnurbs/internals/mymath.h | 60 +--
src/glu/sgi/libnurbs/internals/mysetjmp.h | 60 +--
src/glu/sgi/libnurbs/internals/mystring.h | 60 +--
src/glu/sgi/libnurbs/internals/nurbsconsts.h | 60 +--
src/glu/sgi/libnurbs/internals/nurbstess.cc | 2
src/glu/sgi/libnurbs/internals/nurbstess.h | 62 +--
src/glu/sgi/libnurbs/internals/patch.h | 60 +--
src/glu/sgi/libnurbs/internals/patchlist.h | 60 +--
src/glu/sgi/libnurbs/internals/pwlarc.h | 60 +--
src/glu/sgi/libnurbs/internals/quilt.h | 60 +--
src/glu/sgi/libnurbs/internals/reader.h | 60 +--
src/glu/sgi/libnurbs/internals/renderhints.h | 60 +--
src/glu/sgi/libnurbs/internals/simplemath.h | 60 +--
src/glu/sgi/libnurbs/internals/slicer.h | 60 +--
src/glu/sgi/libnurbs/internals/sorter.h | 62 +--
src/glu/sgi/libnurbs/internals/subdivider.h | 60 +--
src/glu/sgi/libnurbs/internals/trimline.h | 60 +--
src/glu/sgi/libnurbs/internals/trimregion.h | 60 +--
src/glu/sgi/libnurbs/internals/trimvertex.h | 60 +--
src/glu/sgi/libnurbs/internals/trimvertpool.h | 60 +--
src/glu/sgi/libnurbs/internals/types.h | 60 +--
src/glu/sgi/libnurbs/internals/uarray.h | 60 +--
src/glu/sgi/libnurbs/internals/varray.h | 60 +--
src/glu/sgi/libnurbs/nurbtess/definitions.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/directedLine.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/glimports.h | 60 +--
src/glu/sgi/libnurbs/nurbtess/gridWrap.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/monoChain.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/mystdio.h | 60 +--
src/glu/sgi/libnurbs/nurbtess/mystdlib.h | 60 +--
src/glu/sgi/libnurbs/nurbtess/partitionX.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/partitionY.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/polyDBG.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/polyUtil.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/primitiveStream.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/quicksort.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/rectBlock.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/sampleComp.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/sampledLine.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/searchTree.h | 62 +--
src/glu/sgi/libnurbs/nurbtess/zlassert.h | 62 +--
src/glu/sgi/libtess/dict-list.h | 61 +--
src/glu/sgi/libtess/dict.c | 61 +--
src/glu/sgi/libtess/dict.h | 61 +--
src/glu/sgi/libtess/geom.c | 61 +--
src/glu/sgi/libtess/geom.h | 61 +--
src/glu/sgi/libtess/memalloc.c | 61 +--
src/glu/sgi/libtess/memalloc.h | 61 +--
src/glu/sgi/libtess/mesh.c | 61 +--
src/glu/sgi/libtess/mesh.h | 61 +--
src/glu/sgi/libtess/normal.c | 61 +--
src/glu/sgi/libtess/normal.h | 61 +--
src/glu/sgi/libtess/priorityq-heap.c | 61 +--
src/glu/sgi/libtess/priorityq-heap.h | 61 +--
src/glu/sgi/libtess/priorityq-sort.h | 61 +--
src/glu/sgi/libtess/priorityq.c | 61 +--
src/glu/sgi/libtess/priorityq.h | 61 +--
src/glu/sgi/libtess/render.c | 61 +--
src/glu/sgi/libtess/render.h | 61 +--
src/glu/sgi/libtess/sweep.c | 61 +--
src/glu/sgi/libtess/sweep.h | 61 +--
src/glu/sgi/libtess/tess.c | 61 +--
src/glu/sgi/libtess/tess.h | 61 +--
src/glu/sgi/libtess/tessmono.c | 61 +--
src/glu/sgi/libtess/tessmono.h | 61 +--
src/glu/sgi/libutil/error.c | 63 +--
src/glu/sgi/libutil/glue.c | 63 +--
src/glu/sgi/libutil/gluint.h | 63 +--
src/glu/sgi/libutil/mipmap.c | 61 +--
src/glu/sgi/libutil/project.c | 63 +--
src/glu/sgi/libutil/quad.c | 61 +--
src/glu/sgi/libutil/registry.c | 63 +--
src/glut/glx/Makefile.mgw | 2
src/glx/x11/Makefile | 5
src/glx/x11/clientattrib.c | 62 +--
src/glx/x11/compsize.c | 62 +--
src/glx/x11/dri2.c | 252 --------------
src/glx/x11/dri2.h | 53 ---
src/glx/x11/dri2_glx.c | 371 ----------------------
src/glx/x11/eval.c | 62 +--
src/glx/x11/glxclient.h | 63 +--
src/glx/x11/glxcmds.c | 62 +--
src/glx/x11/glxcurrent.c | 61 +--
src/glx/x11/glxext.c | 71 +---
src/glx/x11/indirect_vertex_program.c | 8
src/glx/x11/packrender.h | 62 +--
src/glx/x11/packsingle.h | 62 +--
src/glx/x11/pixel.c | 62 +--
src/glx/x11/pixelstore.c | 62 +--
src/glx/x11/render2.c | 62 +--
src/glx/x11/renderpix.c | 62 +--
src/glx/x11/single2.c | 62 +--
src/glx/x11/singlepix.c | 62 +--
src/glx/x11/vertarr.c | 62 +--
src/mesa/Makefile.mgw | 2
src/mesa/drivers/dri/i915/i915_debug.c | 2
src/mesa/drivers/dri/i915/i915_texstate.c | 2
src/mesa/drivers/dri/i965/brw_eu_emit.c | 13
src/mesa/drivers/dri/i965/brw_wm_glsl.c | 4
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2
src/mesa/drivers/dri/intel/intel_chipset.h | 4
src/mesa/drivers/dri/intel/intel_context.c | 3
src/mesa/drivers/dri/intel/intel_tex_format.c | 2
src/mesa/drivers/dri/tdfx/tdfx_screen.c | 77 +---
src/mesa/drivers/windows/gdi/wmesa.c | 227 ++++++++++++-
src/mesa/glapi/glthread.c | 1
src/mesa/main/arrayobj.c | 33 +
src/mesa/main/attrib.c | 89 +++--
src/mesa/main/bufferobj.c | 191 +++++------
src/mesa/main/bufferobj.h | 11
src/mesa/main/dlist.c | 7
src/mesa/main/framebuffer.c | 12
src/mesa/main/imports.c | 2
src/mesa/main/light.c | 1
src/mesa/main/mtypes.h | 4
src/mesa/main/state.c | 8
src/mesa/main/texformat.c | 24 +
src/mesa/main/texformat.h | 2
src/mesa/main/texformat_tmp.h | 27 +
src/mesa/main/texstore.c | 81 ++++
src/mesa/main/texstore.h | 1
src/mesa/main/varray.c | 15
src/mesa/main/version.h | 6
src/mesa/shader/shader_api.c | 62 +--
src/mesa/shader/slang/slang_link.c | 141 ++++----
src/mesa/shader/slang/slang_link.h | 8
src/mesa/swrast/s_texfilter.c | 2
src/mesa/tnl/t_context.c | 20 -
src/mesa/tnl/t_vp_build.c | 2
src/mesa/vbo/vbo_exec_api.c | 8
src/mesa/vbo/vbo_exec_draw.c | 26 +
src/mesa/vbo/vbo_save.c | 16
src/mesa/vbo/vbo_save_api.c | 43 ++
src/mesa/vbo/vbo_save_draw.c | 28 +
202 files changed, 4802 insertions(+), 5535 deletions(-)
New commits:
commit 5c6a44e5557763cb7ac55265d094cccb71ecae37
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Wed Sep 24 21:13:57 2008 +0300
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 68e9ad5..a78d662 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.2-1ubuntu1) intrepid; urgency=low
+
+ * Merge from Debian experimental.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Wed, 24 Sep 2008 21:00:38 +0300
+
mesa (7.2-1) experimental; urgency=low
[ Brice Goglin ]
commit 84bb8fc6958dc4c61c5a2684724cc6bd06377b5c
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Sep 24 14:28:28 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index cb8c9f5..9adcd91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.2-1) UNRELEASED; urgency=low
+mesa (7.2-1) experimental; urgency=low
[ Brice Goglin ]
* Fix grammar and punctuation in glxinfo(1), thanks Sam Hocevar,
@@ -12,7 +12,7 @@ mesa (7.2-1) UNRELEASED; urgency=low
* Remove the build-dep on dri2proto, DRI2 support has been removed.
* intel: don't warn about TTM init failure.
- -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 23 Sep 2008 16:08:48 +0300
+ -- Julien Cristau <[EMAIL PROTECTED]> Wed, 24 Sep 2008 14:28:21 +0200
mesa (7.1-1) experimental; urgency=low
commit 872cb1a0dd16304cc5a0cecc642cc6c6d3781d44
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Sep 24 14:25:30 2008 +0200
intel: don't warn about TTM init failure.
diff --git a/debian/changelog b/debian/changelog
index ea1bf79..cb8c9f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ mesa (7.2-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Remove the build-dep on dri2proto, DRI2 support has been removed.
+ * intel: don't warn about TTM init failure.
-- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 23 Sep 2008 16:08:48 +0300
diff --git a/debian/patches/01_disable-intel-classic-warn.diff
b/debian/patches/01_disable-intel-classic-warn.diff
new file mode 100644
index 0000000..0725ffe
--- /dev/null
+++ b/debian/patches/01_disable-intel-classic-warn.diff
@@ -0,0 +1,14 @@
+Index: mesa/src/mesa/drivers/dri/intel/intel_context.c
+===================================================================
+--- mesa.orig/src/mesa/drivers/dri/intel/intel_context.c
++++ mesa/src/mesa/drivers/dri/intel/intel_context.c
+@@ -490,9 +490,6 @@
+ if (intel->bufmgr == NULL) {
+ if (ttm_disable) {
+ fprintf(stderr, "TTM buffer manager disabled. Using classic.\n");
+- } else {
+- fprintf(stderr, "Failed to initialize TTM buffer manager. "
+- "Falling back to classic.\n");
+ }
+
+ if (intelScreen->tex.size == 0) {
diff --git a/debian/patches/series b/debian/patches/series
index 86f17dc..f7ae615 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+01_disable-intel-classic-warn.diff
02_use-ieee-fp-on-s390-and-m68k.patch
03_optional-progs-and-install.patch
04_osmesa_version.diff
commit ee80a3a623bc9d0f9ea01a3c1e03204300f44097
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Sep 24 12:55:15 2008 +0200
Remove the build-dep on dri2proto, DRI2 support has been removed.
diff --git a/debian/changelog b/debian/changelog
index b5e1f27..ea1bf79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ mesa (7.2-1) UNRELEASED; urgency=low
* New upstream release.
* Refresh patch 04_osmesa_version.diff
+ [ Julien Cristau ]
+ * Remove the build-dep on dri2proto, DRI2 support has been removed.
+
-- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 23 Sep 2008 16:08:48 +0300
mesa (7.1-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 80f7198..bfec2bf 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Thierry Reding <[EMAIL PROTECTED]>, Julien Cristau
<[EMAIL PROTECTED]
Standards-Version: 3.7.3
Build-Depends: debhelper (>= 5), quilt (>= 0.40), pkg-config,
libdrm-dev (>= 2.3.1) [!hurd-i386], libx11-dev, xutils-dev,
- x11proto-gl-dev (>= 1.4.8), x11proto-dri2-dev, libxxf86vm-dev,
+ x11proto-gl-dev (>= 1.4.8), libxxf86vm-dev,
libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.13.19), libxfixes-dev,
libxdamage-dev, libxext-dev, autoconf, automake
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
commit e700c5ad99fddb5908313f0d02cd0f22fa135cc3
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Tue Sep 23 16:09:00 2008 +0300
Update the changelog, refresh patch 04.
diff --git a/debian/changelog b/debian/changelog
index c875cd6..b5e1f27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-mesa (7.1-2) UNRELEASED; urgency=low
+mesa (7.2-1) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Fix grammar and punctuation in glxinfo(1), thanks Sam Hocevar,
closes: #498595.
- -- Brice Goglin <[EMAIL PROTECTED]> Thu, 11 Sep 2008 19:12:45 +0200
+ [ Timo Aaltonen ]
+ * New upstream release.
+ * Refresh patch 04_osmesa_version.diff
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 23 Sep 2008 16:08:48 +0300
mesa (7.1-1) experimental; urgency=low
diff --git a/debian/patches/04_osmesa_version.diff
b/debian/patches/04_osmesa_version.diff
index 6cc11d1..5734397 100644
--- a/debian/patches/04_osmesa_version.diff
+++ b/debian/patches/04_osmesa_version.diff
@@ -1,7 +1,7 @@
Index: mesa/src/mesa/drivers/osmesa/Makefile
===================================================================
---- mesa.orig/src/mesa/drivers/osmesa/Makefile
-+++ mesa/src/mesa/drivers/osmesa/Makefile
+--- mesa.orig/src/mesa/drivers/osmesa/Makefile 2008-09-12 10:44:02.000000000
+0300
++++ mesa/src/mesa/drivers/osmesa/Makefile 2008-09-23 16:07:40.000000000
+0300
@@ -46,7 +46,7 @@
$(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
@@ -9,14 +9,14 @@ Index: mesa/src/mesa/drivers/osmesa/Makefile
- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+ -major 6 -minor 5 -patch 3 \
-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+ -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
$(OSMESA_LIB_DEPS) $(OBJECTS)
-
-@@ -57,7 +57,7 @@
+@@ -58,7 +58,7 @@
# with all the other Mesa sources (compiled with -DCHAN_BITS=16/32
osmesa16: $(OBJECTS) $(CORE_MESA)
$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+ -major 6 -minor 5 -patch 3 \
-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+ -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
-
commit 35fe0e56e6f6b45ceea0c3d43be7596c1ea44e00
Author: Brian Paul <[EMAIL PROTECTED]>
Date: Sat Sep 20 09:28:22 2008 -0600
mesa: docs: remove parenthesis
diff --git a/docs/relnotes-7.2.html b/docs/relnotes-7.2.html
index 4512c50..4cd363f 100644
--- a/docs/relnotes-7.2.html
+++ b/docs/relnotes-7.2.html
@@ -8,7 +8,7 @@
<body bgcolor="#eeeeee">
-<H1>Mesa 7.2 Release Notes / (20 September 2008)</H1>
+<H1>Mesa 7.2 Release Notes / 20 September 2008</H1>
<p>
Mesa 7.2 is a stable release fixing bugs found in 7.1, which was a
commit 69e5311ad3ac603692dff24ae3a0d0121b36baf3
Author: Brian Paul <[EMAIL PROTECTED]>
Date: Sat Sep 20 09:24:17 2008 -0600
mesa: set 7.2 version for tarballs
diff --git a/Makefile b/Makefile
index 1d50156..f69b6dd 100644
--- a/Makefile
+++ b/Makefile
@@ -174,10 +174,10 @@ ultrix-gcc:
# Rules for making release tarballs
-DIRECTORY = Mesa-7.2-rc1
-LIB_NAME = MesaLib-7.2-rc1
-DEMO_NAME = MesaDemos-7.2-rc1
-GLUT_NAME = MesaGLUT-7.2-rc1
+DIRECTORY = Mesa-7.2
+LIB_NAME = MesaLib-7.2
+DEMO_NAME = MesaDemos-7.2
+GLUT_NAME = MesaGLUT-7.2
MAIN_FILES = \
$(DIRECTORY)/Makefile* \
commit e884c4db2b7c28cffe15fd35ba1991759c14b387
Author: Brian Paul <[EMAIL PROTECTED]>
Date: Sat Sep 20 09:23:50 2008 -0600
mesa: prep for 7.2 release
diff --git a/docs/news.html b/docs/news.html
index 4bc5087..50dda09 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -11,7 +11,7 @@
<H1>News</H1>
-<h2>September 15, 2008</h2>
+<h2>September 20, 2008</h2>
<p>
<a href="relnotes-7.2.html">Mesa 7.2</a> is released.
This is stable, bug-fix release.
diff --git a/docs/relnotes-7.2.html b/docs/relnotes-7.2.html
index 7bdb4bc..4512c50 100644
--- a/docs/relnotes-7.2.html
+++ b/docs/relnotes-7.2.html
@@ -8,7 +8,7 @@
<body bgcolor="#eeeeee">
-<H1>Mesa 7.2 Release Notes / (date tbd)</H1>
+<H1>Mesa 7.2 Release Notes / (20 September 2008)</H1>
<p>
Mesa 7.2 is a stable release fixing bugs found in 7.1, which was a
@@ -54,6 +54,12 @@ tbd
<li>Fixed multisample enable/disable bug
</ul>
+<h2>Changes</h2>
+<ul>
+<li>Updated SGI header files with new license terms.
+</ul>
+
+
<h2>To Do (someday) items</h2>
<ul>
commit e681bee04eb596d9ccdbab7fa8ed3660303f7f47
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Fri Sep 19 17:16:53 2008 -0400
Update to SGI FreeB 2.0.
Under the terms of version 1.1, "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."
FreeB 2.0 license refers to "dates of first publication". They are here
taken to be 1991-2000, as noted in the original license text:
** 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.
** Copyright in any portions created by third parties is as indicated
** elsewhere herein. All Rights Reserved.
Official FreeB 2.0 text:
http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf
As always, this code has not been tested for conformance with the OpenGL
specification. OpenGL conformance testing is available from
http://khronos.org/ and is required for use of the OpenGL logo in
product advertising and promotion.
diff --git a/include/GL/glu.h b/include/GL/glu.h
index 7db4b70..3cd1113 100644
--- a/include/GL/glu.h
+++ b/include/GL/glu.h
@@ -1,31 +1,32 @@
/*
-** 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: 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.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: This software was created using the
-** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
-** not been independently verified as being compliant with the OpenGL(R)
-** version 1.2.1 Specification.
-*/
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
#ifndef __glu_h__
#define __glu_h__
diff --git a/include/GL/internal/glcore.h b/include/GL/internal/glcore.h
index 1bb63c1..99de6c0 100644
--- a/include/GL/internal/glcore.h
+++ b/include/GL/internal/glcore.h
@@ -2,39 +2,34 @@
#define __gl_core_h_
/*
-** 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: 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.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-*/
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
#include <sys/types.h>
diff --git a/include/GLES/egl.h b/include/GLES/egl.h
index f18c86c..61a2cc3 100644
--- a/include/GLES/egl.h
+++ b/include/GLES/egl.h
@@ -2,38 +2,34 @@
#define _EGL_H
/*
-** 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.0 (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: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2004 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-*/
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
#if 0/*XXX TEMPORARY HACK*/
#include <GLES/gl.h>
diff --git a/src/glu/sgi/libnurbs/interface/bezierEval.h
b/src/glu/sgi/libnurbs/interface/bezierEval.h
index 1a9f3c7..e2d0e73 100644
--- a/src/glu/sgi/libnurbs/interface/bezierEval.h
+++ b/src/glu/sgi/libnurbs/interface/bezierEval.h
@@ -1,38 +1,32 @@
/*
-** 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: 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.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
-*/
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
/*
** $Header:
/home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/bezierEval.h,v
1.1 2001/03/17 00:25:40 brianp Exp $
*/
diff --git a/src/glu/sgi/libnurbs/interface/bezierPatch.h
b/src/glu/sgi/libnurbs/interface/bezierPatch.h
index 31c97ba..555c67c 100644
--- a/src/glu/sgi/libnurbs/interface/bezierPatch.h
+++ b/src/glu/sgi/libnurbs/interface/bezierPatch.h
@@ -1,38 +1,32 @@
/*
-** 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: 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.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
-*/
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
/*
** $Header:
/home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/bezierPatch.h,v
1.1 2001/03/17 00:25:40 brianp Exp $
*/
diff --git a/src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
b/src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
index 74cf098..aef314d 100644
--- a/src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
+++ b/src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
@@ -1,38 +1,32 @@
/*
-** 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: 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.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
-*/
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
/*
** $Header:
/home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/bezierPatchMesh.h,v
1.1 2001/03/17 00:25:40 brianp Exp $
*/
diff --git a/src/glu/sgi/libnurbs/interface/glcurveval.h
b/src/glu/sgi/libnurbs/interface/glcurveval.h
index a09a74d..8fa4930 100644
--- a/src/glu/sgi/libnurbs/interface/glcurveval.h
+++ b/src/glu/sgi/libnurbs/interface/glcurveval.h
@@ -1,36 +1,32 @@
/*
-** 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: 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.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-*/
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
