summaryrefslogtreecommitdiff
path: root/libre/mesa-demos-libre
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-01-28 03:27:16 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-01-28 03:27:16 +0000
commit462391357aa5e749dc9908c15f3baa0b4416f3d8 (patch)
tree11d4d3f054aae9ffd869adc634054f64a16d83b8 /libre/mesa-demos-libre
parent748e32a3a886569b58a27003e85b76be5746153d (diff)
Tue Jan 28 03:22:21 UTC 2014
Diffstat (limited to 'libre/mesa-demos-libre')
-rw-r--r--libre/mesa-demos-libre/LICENSE82
-rwxr-xr-xlibre/mesa-demos-libre/mesa-demos-libre.patch114
2 files changed, 0 insertions, 196 deletions
diff --git a/libre/mesa-demos-libre/LICENSE b/libre/mesa-demos-libre/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/libre/mesa-demos-libre/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components. Different copyrights
-and licenses apply to different components. For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors. See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007 Brian Paul 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
-BRIAN PAUL 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.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component Location Primary Author License
-----------------------------------------------------------------------------
-Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
-
-Device drivers src/mesa/drivers/* See drivers See drivers
-
-Ext headers include/GL/glext.h SGI SGI Free B
- include/GL/glxext.h
-
-GLUT src/glut/ Mark Kilgard Mark's copyright
-
-Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
-
-SGI GLU library src/glu/sgi/ SGI SGI Free B
-
-demo programs progs/demos/ various see source files
-
-X demos progs/xdemos/ Brian Paul see source files
-
-SGI demos progs/samples/ SGI SGI copyright
-
-RedBook demos progs/redbook/ SGI SGI copyright
diff --git a/libre/mesa-demos-libre/mesa-demos-libre.patch b/libre/mesa-demos-libre/mesa-demos-libre.patch
deleted file mode 100755
index d630f373c..000000000
--- a/libre/mesa-demos-libre/mesa-demos-libre.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos/Makefile.am
---- mesa-demos-8.1.0.orig/src/demos/Makefile.am 2012-12-15 05:17:06.000000000 -0200
-+++ mesa-demos-8.1.0/src/demos/Makefile.am 2013-02-26 17:22:04.845832793 -0200
-@@ -65,7 +65,6 @@
- multiarb \
- paltex \
- pixeltest \
-- pointblast \
- projtex \
- ray \
- readpix \
-@@ -74,7 +73,6 @@
- shadowtex \
- singlebuffer \
- spectex \
-- spriteblast \
- stex3d \
- teapot \
- terrain \
-diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos/Makefile.in
---- mesa-demos-8.1.0.orig/src/demos/Makefile.in 2013-02-24 09:12:04.000000000 -0200
-+++ mesa-demos-8.1.0/src/demos/Makefile.in 2013-02-26 17:48:36.711995049 -0200
-@@ -90,11 +90,11 @@
- @HAVE_GLUT_TRUE@ ipers$(EXEEXT) isosurf$(EXEEXT) \
- @HAVE_GLUT_TRUE@ lodbias$(EXEEXT) morph3d$(EXEEXT) \
- @HAVE_GLUT_TRUE@ multiarb$(EXEEXT) paltex$(EXEEXT) \
--@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) pointblast$(EXEEXT) \
-+@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) \
- @HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \
- @HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \
- @HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \
--@HAVE_GLUT_TRUE@ spectex$(EXEEXT) spriteblast$(EXEEXT) \
-+@HAVE_GLUT_TRUE@ spectex$(EXEEXT) \
- @HAVE_GLUT_TRUE@ stex3d$(EXEEXT) teapot$(EXEEXT) \
- @HAVE_GLUT_TRUE@ terrain$(EXEEXT) tessdemo$(EXEEXT) \
- @HAVE_GLUT_TRUE@ texcyl$(EXEEXT) texenv$(EXEEXT) \
-@@ -219,9 +219,6 @@
- pixeltest_SOURCES = pixeltest.c
- pixeltest_OBJECTS = pixeltest.$(OBJEXT)
- pixeltest_LDADD = $(LDADD)
--pointblast_SOURCES = pointblast.c
--pointblast_OBJECTS = pointblast.$(OBJEXT)
--pointblast_LDADD = $(LDADD)
- projtex_SOURCES = projtex.c
- projtex_OBJECTS = projtex.$(OBJEXT)
- projtex_DEPENDENCIES = ../util/libutil.la
-@@ -246,9 +243,6 @@
- spectex_SOURCES = spectex.c
- spectex_OBJECTS = spectex.$(OBJEXT)
- spectex_LDADD = $(LDADD)
--spriteblast_SOURCES = spriteblast.c
--spriteblast_OBJECTS = spriteblast.$(OBJEXT)
--spriteblast_LDADD = $(LDADD)
- stex3d_SOURCES = stex3d.c
- stex3d_OBJECTS = stex3d.$(OBJEXT)
- stex3d_LDADD = $(LDADD)
-@@ -325,8 +319,8 @@
- fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
- gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
- ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
-- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
-- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
-+ pixeltest.c projtex.c ray.c readpix.c reflect.c \
-+ renormal.c shadowtex.c singlebuffer.c spectex.c \
- stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
- textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
- winpos.c
-@@ -336,8 +330,8 @@
- fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
- gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
- ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
-- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
-- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
-+ pixeltest.c projtex.c ray.c readpix.c reflect.c \
-+ renormal.c shadowtex.c singlebuffer.c spectex.c \
- stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
- textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
- winpos.c
-@@ -722,9 +716,6 @@
- pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixeltest_DEPENDENCIES)
- @rm -f pixeltest$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS)
--pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) $(EXTRA_pointblast_DEPENDENCIES)
-- @rm -f pointblast$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS)
- projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) $(EXTRA_projtex_DEPENDENCIES)
- @rm -f projtex$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS)
-@@ -749,9 +740,6 @@
- spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) $(EXTRA_spectex_DEPENDENCIES)
- @rm -f spectex$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS)
--spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) $(EXTRA_spriteblast_DEPENDENCIES)
-- @rm -f spriteblast$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS)
- stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) $(EXTRA_stex3d_DEPENDENCIES)
- @rm -f stex3d$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS)
-@@ -828,7 +816,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeltest.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@
-@@ -837,7 +824,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spriteblast.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@