diff options
Diffstat (limited to 'libre')
-rw-r--r-- | libre/mesa-demos/PKGBUILD | 30 | ||||
-rw-r--r-- | libre/mesa-demos/libre.patch | 133 |
2 files changed, 51 insertions, 112 deletions
diff --git a/libre/mesa-demos/PKGBUILD b/libre/mesa-demos/PKGBUILD index 31a3a6d69..5e5dac882 100644 --- a/libre/mesa-demos/PKGBUILD +++ b/libre/mesa-demos/PKGBUILD @@ -1,48 +1,54 @@ -# $Id: PKGBUILD 230258 2015-01-29 20:40:17Z andyrtr $ +# $Id: PKGBUILD 247877 2015-09-29 06:16:50Z foutrelis $ # 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=4.parabola1 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=5.parabola1 +arch=('i686' 'x86_64') 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") +makedepends=('git') +mksource=("$pkgname::git://anongit.freedesktop.org/mesa/demos#tag=$pkgname-$pkgver") source=("https://repo.parabola.nu/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2" 'LICENSE' 'libre.patch') -mksha256sums=('e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92') -sha256sums=('a16f31e0b36de9603339d5aaae3b7cded9f560411ca3309d259a12d6071707ca' +mksha256sums=('SKIP') +sha256sums=('425432b7792e7bb007cd8a7ead5b29da986b5b35aa3fb27dcd3c63e24e3fd372' '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' - '2c381ed421e734dac877116c82ff9df07a8a38658186bba9e95805d145e8eb56') + '0d1222cb515425763292e4da77a839bf1961e7815302efd712e4d16fe5a90bb6') mksource() { - cd mesa-demos-${pkgver} + cd mesa-demos + + # https://bugs.freedesktop.org/show_bug.cgi?id=91643 + git cherry-pick -n 6f7ad3f24294 74443c6ee79f + # remove nonfree demos (pointblast and spriteblast) rm -v src/demos/{pointblast,spriteblast}.c } prepare() { - cd mesa-demos-${pkgver} + cd mesa-demos + # remove nonfree demos references (pointblast and spriteblast) patch -Np1 -i ../libre.patch } build() { - cd mesa-demos-${pkgver} - ./configure --prefix=/usr \ + cd mesa-demos + ./autogen.sh --prefix=/usr \ --with-system-data-files=/usr/share/mesa-demos make } package() { - cd mesa-demos-${pkgver} + cd mesa-demos 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 index 43e2d1e37..18569ee6e 100644 --- a/libre/mesa-demos/libre.patch +++ b/libre/mesa-demos/libre.patch @@ -1,6 +1,25 @@ -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.orig/src/demos/CMakeLists.txt mesa-demos/src/demos/CMakeLists.txt +--- mesa-demos.orig/src/demos/CMakeLists.txt 1989-12-31 22:00:00.000000000 -0200 ++++ mesa-demos/src/demos/CMakeLists.txt 2015-10-03 02:29:04.278432122 -0300 +@@ -54,7 +54,6 @@ + normal + paltex + pixeltest +- pointblast + projtex + ray + readpix +@@ -63,7 +62,6 @@ + shadowtex + singlebuffer + spectex +- spriteblast + stex3d + teapot + terrain +diff -Nur mesa-demos.orig/src/demos/Makefile.am mesa-demos/src/demos/Makefile.am +--- mesa-demos.orig/src/demos/Makefile.am 1989-12-31 22:00:00.000000000 -0200 ++++ mesa-demos/src/demos/Makefile.am 2015-10-03 01:47:25.094124517 -0300 @@ -65,7 +65,6 @@ multiarb \ paltex \ @@ -17,100 +36,14 @@ 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 @@ - @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@ +diff -Nur mesa-demos.orig/src/demos/Makefile.cygnus mesa-demos/src/demos/Makefile.cygnus +--- mesa-demos.orig/src/demos/Makefile.cygnus 1989-12-31 22:00:00.000000000 -0200 ++++ mesa-demos/src/demos/Makefile.cygnus 2015-10-03 02:28:03.218252301 -0300 +@@ -38,7 +38,6 @@ + osdemo \ + paltex \ + pixeltex \ +- pointblast \ + ray \ + readpix \ + reflect \ |