lib32-mesa-demos-8.3.0-1.parabola1: updating version

2 files changed, 23 insertions, 22 deletions

diff --git a/libre-multilib/lib32-mesa-demos/PKGBUILD b/libre-multilib/lib32-mesa-demos/PKGBUILD
index 5221ceeea..f793625cc 100644
--- a/libre-multilib/lib32-mesa-demos/PKGBUILD
+++ b/libre-multilib/lib32-mesa-demos/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 117596 2014-08-19 02:28:18Z fyan $
+# $Id: PKGBUILD 169618 2016-04-07 07:03:36Z lcarlier $
 # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
 # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgbasename=mesa-demos
 pkgname=lib32-$_pkgbasename
-pkgver=8.2.0
-pkgrel=2.parabola1
+pkgver=8.3.0
+pkgrel=1.parabola1
 arch=(x86_64)
 pkgdesc="Mesa demos and tools (32-bit), without nonfree demos"
 url="http://mesa3d.sourceforge.net"
@@ -14,11 +14,11 @@ license=('custom')
 replaces=('lib32-mesa-demos-libre')
 conflicts=('lib32-mesa-demos-libre')
 depends=('lib32-libgl' 'lib32-glew' 'mesa-demos')
-makedepends=(gcc-multilib 'lib32-mesa' 'lib32-glew')
+makedepends=(gcc-multilib 'lib32-mesa')
 source=(https://repo.parabola.nu/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2
         libre.patch)
-md5sums=('67cd419bd5bbaa6436ad98a703d30441'
-         'e986d07f36931e895bdbd9c83ed260c8')
+md5sums=('b7708b773178fa0d661a28c580e60aee'
+         '3e5ea3684ce3a1d285df1cdfb2c61dae')
 
 prepare() {
   cd "${srcdir}/mesa-demos-${pkgver}"
@@ -32,7 +32,8 @@ build() {
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd "${srcdir}/mesa-demos-${pkgver}"
-  ./configure --prefix=/usr 
+  ./configure --prefix=/usr \
+    --without-glut
 
   make
 }
diff --git a/libre-multilib/lib32-mesa-demos/libre.patch b/libre-multilib/lib32-mesa-demos/libre.patch
index 43e2d1e37..035d38c4b 100644
--- a/libre-multilib/lib32-mesa-demos/libre.patch
+++ b/libre-multilib/lib32-mesa-demos/libre.patch
@@ -1,6 +1,6 @@
-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
+diff -Nur mesa-demos-8.3.0.orig/src/demos/Makefile.am mesa-demos-8.3.0/src/demos/Makefile.am
+--- mesa-demos-8.3.0.orig/src/demos/Makefile.am	2012-06-25 12:34:58.000000000 -0300
++++ mesa-demos-8.3.0/src/demos/Makefile.am	2015-12-14 15:25:22.843272149 -0300
 @@ -65,7 +65,6 @@
  	multiarb \
  	paltex \
@@ -17,10 +17,10 @@ diff -Nur mesa-demos-8.2.0.orig/src/demos/Makefile.am mesa-demos-8.2.0/src/demos
  	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 @@
+diff -Nur mesa-demos-8.3.0.orig/src/demos/Makefile.in mesa-demos-8.3.0/src/demos/Makefile.in
+--- mesa-demos-8.3.0.orig/src/demos/Makefile.in	2015-12-09 18:24:00.000000000 -0300
++++ mesa-demos-8.3.0/src/demos/Makefile.in	2015-12-14 15:27:35.253289256 -0300
+@@ -128,11 +128,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.2.0.orig/src/demos/Makefile.in mesa-demos-8.2.0/src/demos
  @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 @@
+@@ -256,9 +256,6 @@
  pixeltest_SOURCES = pixeltest.c
  pixeltest_OBJECTS = pixeltest.$(OBJEXT)
  pixeltest_LDADD = $(LDADD)
@@ -44,7 +44,7 @@ diff -Nur mesa-demos-8.2.0.orig/src/demos/Makefile.in mesa-demos-8.2.0/src/demos
  projtex_SOURCES = projtex.c
  projtex_OBJECTS = projtex.$(OBJEXT)
  projtex_DEPENDENCIES = ../util/libutil.la
-@@ -274,9 +271,6 @@
+@@ -283,9 +280,6 @@
  spectex_SOURCES = spectex.c
  spectex_OBJECTS = spectex.$(OBJEXT)
  spectex_LDADD = $(LDADD)
@@ -54,7 +54,7 @@ diff -Nur mesa-demos-8.2.0.orig/src/demos/Makefile.in mesa-demos-8.2.0/src/demos
  stex3d_SOURCES = stex3d.c
  stex3d_OBJECTS = stex3d.$(OBJEXT)
  stex3d_LDADD = $(LDADD)
-@@ -353,8 +347,8 @@
+@@ -362,8 +356,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.2.0.orig/src/demos/Makefile.in mesa-demos-8.2.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
-@@ -364,8 +358,8 @@
+@@ -373,8 +367,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,7 +76,7 @@ diff -Nur mesa-demos-8.2.0.orig/src/demos/Makefile.in mesa-demos-8.2.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
-@@ -804,10 +798,6 @@
+@@ -814,10 +808,6 @@
  	@rm -f pixeltest$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS)
  
@@ -87,7 +87,7 @@ diff -Nur mesa-demos-8.2.0.orig/src/demos/Makefile.in mesa-demos-8.2.0/src/demos
  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 @@
+@@ -850,10 +840,6 @@
  	@rm -f spectex$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS)
  
@@ -98,7 +98,7 @@ diff -Nur mesa-demos-8.2.0.orig/src/demos/Makefile.in mesa-demos-8.2.0/src/demos
  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 @@
+@@ -941,7 +927,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@
@@ -106,7 +106,7 @@ diff -Nur mesa-demos-8.2.0.orig/src/demos/Makefile.in mesa-demos-8.2.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@
-@@ -940,7 +925,6 @@
+@@ -950,7 +935,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@