From 2c0f8a53f14d914b0c7157a3be5fef3a98edfb7e Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 7 Aug 2014 03:49:51 -0300 Subject: mesa-demos-libre-8.2.0-1: updating version --- libre/mesa-demos-libre/PKGBUILD | 26 +++++++++++--------------- libre/mesa-demos-libre/libre.patch | 36 +++++++++++++++++++----------------- 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD index 15c7e11b9..61eb044be 100644 --- a/libre/mesa-demos-libre/PKGBUILD +++ b/libre/mesa-demos-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 213124 2014-05-19 12:03:07Z lcarlier $ +# $Id: PKGBUILD 216566 2014-07-06 13:43:09Z andyrtr $ # Maintainer (Arch): Jan de Groot # Maintainer (Arch): Andreas Radke # Maintainer: André Silva pkgname='mesa-demos-libre' -pkgver=8.1.0 -pkgrel=2 +pkgver=8.2.0 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Mesa demos and tools, without nonfree demos" url="http://mesa3d.sourceforge.net" @@ -13,40 +13,36 @@ license=('custom') provides=("mesa-demos=$pkgver") replaces=('mesa-demos') conflicts=('mesa-demos') -depends=('libgl' 'glew') +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' - 'drawtex-resolve-glDrawTexfOES-extension-function.patch' 'libre.patch') -mksha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828') -sha256sums=('b0b966cc08c4fd787cf0542118e07e2fe1f1bcc3752ff7676ebb1b4f2a1b86c8' +mksha256sums=('e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92') +sha256sums=('a16f31e0b36de9603339d5aaae3b7cded9f560411ca3309d259a12d6071707ca' '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' - '963b3e45b2eccafea50fdab4f2fac17bd308f4c15522c00d4787b50ebb25423a' - '476f58fc62e9074936643b0d61165c5160a6d5aed082e60c10b39d219f56913f') + '2c381ed421e734dac877116c82ff9df07a8a38658186bba9e95805d145e8eb56') mksource() { - cd "${srcdir}/mesa-demos-${pkgver}" + cd mesa-demos-${pkgver} # remove nonfree demos (pointblast and spriteblast) rm -v src/demos/{pointblast,spriteblast}.c } prepare() { - cd "${srcdir}/mesa-demos-${pkgver}" - # merged upstream - patch -Np1 -i ../drawtex-resolve-glDrawTexfOES-extension-function.patch + cd mesa-demos-${pkgver} # remove nonfree demos references (pointblast and spriteblast) patch -Np1 -i ../libre.patch } build() { - cd "${srcdir}/mesa-demos-${pkgver}" + cd mesa-demos-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/mesa-demos-${pkgver}" + 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/libre.patch b/libre/mesa-demos-libre/libre.patch index d630f373c..43e2d1e37 100644 --- a/libre/mesa-demos-libre/libre.patch +++ b/libre/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@ -- cgit v1.2.3-54-g00ecf