mesa-demos: remove libre suffix and add complex pkgrel

3 files changed, 247 insertions, 0 deletions

diff --git a/libre/mesa-demos/LICENSE b/libre/mesa-demos/LICENSE
new file mode 100644
index 000000000..ae33d2709
--- /dev/null
+++ b/libre/mesa-demos/LICENSE
@@ -0,0 +1,82 @@
+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/PKGBUILD b/libre/mesa-demos/PKGBUILD
new file mode 100644
index 000000000..24521b827
--- /dev/null
+++ b/libre/mesa-demos/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 216566 2014-07-06 13:43:09Z andyrtr $
+# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
+# Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+pkgname='mesa-demos'
+pkgver=8.2.0
+pkgrel=3.parabola1
+arch=('i686' 'x86_64' 'mips64el')
+pkgdesc="Mesa demos and tools, without nonfree demos"
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+replaces=('mesa-demos-libre')
+conflicts=('mesa-demos-libre')
+depends=('libgl' 'glew' 'freeglut')
+mksource=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2")
+source=("https://repo.parabolagnulinux.org/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2"
+        'LICENSE'
+        'libre.patch')
+mksha256sums=('e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92')
+sha256sums=('a16f31e0b36de9603339d5aaae3b7cded9f560411ca3309d259a12d6071707ca'
+            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
+            '2c381ed421e734dac877116c82ff9df07a8a38658186bba9e95805d145e8eb56')
+
+mksource() {
+  cd mesa-demos-${pkgver}
+  # remove nonfree demos (pointblast and spriteblast)
+  rm -v src/demos/{pointblast,spriteblast}.c
+}
+
+prepare() {
+  cd mesa-demos-${pkgver}
+  # remove nonfree demos references (pointblast and spriteblast)
+  patch -Np1 -i ../libre.patch
+}
+
+build() {
+  cd mesa-demos-${pkgver}
+  ./configure --prefix=/usr \
+    --with-system-data-files=/usr/share/mesa-demos
+  make
+}
+
+package() {
+  cd mesa-demos-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos"
+  install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/"
+}
diff --git a/libre/mesa-demos/libre.patch b/libre/mesa-demos/libre.patch
new file mode 100644
index 000000000..43e2d1e37
--- /dev/null
+++ b/libre/mesa-demos/libre.patch
@@ -0,0 +1,116 @@
+diff -Nur mesa-demos-8.2.0.orig/src/demos/Makefile.am mesa-demos-8.2.0/src/demos/Makefile.am
+--- mesa-demos-8.2.0.orig/src/demos/Makefile.am	1989-12-31 22:00:00.000000000 -0200
++++ mesa-demos-8.2.0/src/demos/Makefile.am	2014-08-07 00:37:02.756984258 -0300
+@@ -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.2.0.orig/src/demos/Makefile.in mesa-demos-8.2.0/src/demos/Makefile.in
+--- mesa-demos-8.2.0.orig/src/demos/Makefile.in	1989-12-31 22:00:00.000000000 -0200
++++ mesa-demos-8.2.0/src/demos/Makefile.in	2014-08-07 00:39:20.077849509 -0300
+@@ -118,11 +118,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) \
+@@ -247,9 +247,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
+@@ -274,9 +271,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)
+@@ -353,8 +347,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
+@@ -364,8 +358,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
+@@ -804,10 +798,6 @@
+ 	@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)
+@@ -840,10 +830,6 @@
+ 	@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)
+@@ -931,7 +917,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@
+@@ -940,7 +925,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@