lib32-mesa-demos-libre-8.2.0-1: updating version

2 files changed, 25 insertions, 22 deletions

diff --git a/libre-multilib/lib32-mesa-demos-libre/PKGBUILD b/libre-multilib/lib32-mesa-demos-libre/PKGBUILD
index 8f5363404..edef8a868 100644
--- a/libre-multilib/lib32-mesa-demos-libre/PKGBUILD
+++ b/libre-multilib/lib32-mesa-demos-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 94584 2013-07-27 15:01:38Z lcarlier $
+# $Id: PKGBUILD 115314 2014-07-08 15:30:12Z bluewind $
 # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
 # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgbasename=mesa-demos-libre
 pkgname=lib32-$_pkgbasename
-pkgver=8.1.0
-pkgrel=3.1
+pkgver=8.2.0
+pkgrel=1
 arch=(x86_64)
 pkgdesc="Mesa demos and tools (32-bit), without nonfree demos"
 url="http://mesa3d.sourceforge.net"
@@ -14,11 +14,12 @@ license=('custom')
 provides=("lib32-mesa-demos=$pkgver")
 replaces=('lib32-mesa-demos')
 conflicts=('lib32-mesa-demos')
+depends=('lib32-libgl' 'lib32-glew' 'mesa-demos-libre')
 makedepends=(gcc-multilib 'lib32-mesa' 'lib32-glew')
 source=(https://repo.parabolagnulinux.org/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2
         libre.patch)
-md5sums=('ef5af0042b34b3d464a5c60248443cd7'
-         '5ce0660b46beb1230194fbd852d33ab0')
+md5sums=('67cd419bd5bbaa6436ad98a703d30441'
+         'e986d07f36931e895bdbd9c83ed260c8')
 
 prepare() {
   cd "${srcdir}/mesa-demos-${pkgver}"
diff --git a/libre-multilib/lib32-mesa-demos-libre/libre.patch b/libre-multilib/lib32-mesa-demos-libre/libre.patch
index d630f373c..43e2d1e37 100644
--- a/libre-multilib/lib32-mesa-demos-libre/libre.patch
+++ b/libre-multilib/lib32-mesa-demos-libre/libre.patch
@@ -1,6 +1,6 @@
-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
+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 \
@@ -17,10 +17,10 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos
  	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 @@
+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) \
@@ -34,7 +34,7 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos
  @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 @@
+@@ -247,9 +247,6 @@
  pixeltest_SOURCES = pixeltest.c
  pixeltest_OBJECTS = pixeltest.$(OBJEXT)
  pixeltest_LDADD = $(LDADD)
@@ -44,7 +44,7 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos
  projtex_SOURCES = projtex.c
  projtex_OBJECTS = projtex.$(OBJEXT)
  projtex_DEPENDENCIES = ../util/libutil.la
-@@ -246,9 +243,6 @@
+@@ -274,9 +271,6 @@
  spectex_SOURCES = spectex.c
  spectex_OBJECTS = spectex.$(OBJEXT)
  spectex_LDADD = $(LDADD)
@@ -54,7 +54,7 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos
  stex3d_SOURCES = stex3d.c
  stex3d_OBJECTS = stex3d.$(OBJEXT)
  stex3d_LDADD = $(LDADD)
-@@ -325,8 +319,8 @@
+@@ -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 \
@@ -65,7 +65,7 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos
  	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 @@
+@@ -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 \
@@ -76,27 +76,29 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos
  	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) 
+@@ -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)
-@@ -749,9 +740,6 @@
- spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) $(EXTRA_spectex_DEPENDENCIES) 
+@@ -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)
-@@ -828,7 +816,6 @@
+@@ -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@
@@ -104,7 +106,7 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos
  @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 @@
+@@ -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@