From 3d989e7ce40c6396d89ff81f043f7a8058c07930 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 21 May 2014 07:41:22 -0300 Subject: mesa-demos-libre-8.1.0-2: fix building with mesa-10.2 (FS#40435 => https://bugs.archlinux.org/task/40435) --- libre/mesa-demos-libre/PKGBUILD | 33 +++--- ...-resolve-glDrawTexfOES-extension-function.patch | 94 +++++++++++++++++ libre/mesa-demos-libre/libre.patch | 114 +++++++++++++++++++++ libre/mesa-demos-libre/mesa-demos-libre.patch | 114 --------------------- 4 files changed, 228 insertions(+), 127 deletions(-) create mode 100644 libre/mesa-demos-libre/drawtex-resolve-glDrawTexfOES-extension-function.patch create mode 100644 libre/mesa-demos-libre/libre.patch delete mode 100644 libre/mesa-demos-libre/mesa-demos-libre.patch (limited to 'libre') diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD index 2838b51b9..15c7e11b9 100644 --- a/libre/mesa-demos-libre/PKGBUILD +++ b/libre/mesa-demos-libre/PKGBUILD @@ -1,39 +1,46 @@ -# $Id: PKGBUILD 178740 2013-02-26 16:15:13Z andyrtr $ +# $Id: PKGBUILD 213124 2014-05-19 12:03:07Z lcarlier $ # Maintainer (Arch): Jan de Groot # Maintainer (Arch): Andreas Radke # Maintainer: André Silva pkgname='mesa-demos-libre' pkgver=8.1.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Mesa demos and tools, without nonfree demos" url="http://mesa3d.sourceforge.net" license=('custom') -depends=('libgl' 'glew') provides=("mesa-demos=$pkgver") replaces=('mesa-demos') conflicts=('mesa-demos') -mksource=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2" - 'mesa-demos-libre.patch') +depends=('libgl' 'glew') +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') -mksha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828' - '476f58fc62e9074936643b0d61165c5160a6d5aed082e60c10b39d219f56913f') -sha256sums=('d2678138f7ff4a684a6d851f1086fd7baf4ee321ef65531063b072632c2c504b' + 'LICENSE' + 'drawtex-resolve-glDrawTexfOES-extension-function.patch' + 'libre.patch') +mksha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828') +sha256sums=('b0b966cc08c4fd787cf0542118e07e2fe1f1bcc3752ff7676ebb1b4f2a1b86c8' + '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' + '963b3e45b2eccafea50fdab4f2fac17bd308f4c15522c00d4787b50ebb25423a' '476f58fc62e9074936643b0d61165c5160a6d5aed082e60c10b39d219f56913f') mksource() { cd "${srcdir}/mesa-demos-${pkgver}" - - # Remove nonfree demos (pointblast and spriteblast) + # remove nonfree demos (pointblast and spriteblast) rm -v src/demos/{pointblast,spriteblast}.c - patch -Np1 -i "${srcdir}/mesa-demos-libre.patch" } -build() { +prepare() { cd "${srcdir}/mesa-demos-${pkgver}" + # merged upstream + patch -Np1 -i ../drawtex-resolve-glDrawTexfOES-extension-function.patch + # remove nonfree demos references (pointblast and spriteblast) + patch -Np1 -i ../libre.patch +} +build() { + cd "${srcdir}/mesa-demos-${pkgver}" ./configure --prefix=/usr make } diff --git a/libre/mesa-demos-libre/drawtex-resolve-glDrawTexfOES-extension-function.patch b/libre/mesa-demos-libre/drawtex-resolve-glDrawTexfOES-extension-function.patch new file mode 100644 index 000000000..d803b3eec --- /dev/null +++ b/libre/mesa-demos-libre/drawtex-resolve-glDrawTexfOES-extension-function.patch @@ -0,0 +1,94 @@ +From 9c326a34e088971a3c11b2e5289cd1a8e4d439df Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tapani=20P=C3=A4lli?= +Date: Wed, 30 Apr 2014 14:05:11 +0300 +Subject: [PATCH] drawtex: resolve glDrawTexfOES extension function +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78101 +Signed-off-by: Tapani Pälli +Reviewed-by: Brian Paul +Reviewed-by: Ian Romanick +--- + src/egl/opengles1/drawtex.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/egl/opengles1/drawtex.c b/src/egl/opengles1/drawtex.c +index 524f931..1ba8ac7 100644 +--- a/src/egl/opengles1/drawtex.c ++++ b/src/egl/opengles1/drawtex.c +@@ -25,13 +25,14 @@ static GLfloat width = 200, height = 200; + static GLboolean animate = GL_FALSE; + static int win; + ++static PFNGLDRAWTEXFOESPROC glDrawTexfOES_func = NULL; + + static void + draw(void) + { + glClear(GL_COLOR_BUFFER_BIT); + +- glDrawTexfOES(view_posx, view_posy, 0.0, width, height); ++ glDrawTexfOES_func(view_posx, view_posy, 0.0, width, height); + } + + +@@ -128,6 +129,13 @@ init(void) + exit(1); + } + ++ glDrawTexfOES_func = eglGetProcAddress("glDrawTexfOES"); ++ ++ if (!glDrawTexfOES_func) { ++ fprintf(stderr, "Sorry, failed to resolve glDrawTexfOES function\n"); ++ exit(1); ++ } ++ + glClearColor(0.4, 0.4, 0.4, 0.0); + + make_smile_texture(); +-- +1.9.2 + +From 6ad8820c457845300806a2f9469599460ca96af9 Mon Sep 17 00:00:00 2001 +From: Stefan Dirsch +Date: Thu, 8 May 2014 11:48:44 +0200 +Subject: [PATCH] drawtex: fixed compiler warnings related to use of + eglGetProcAddress +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add proper include and cast in order to fix compiler +warnings related to the use of eglGetProcAddress. + +Reviewed-By: Tapani Pälli +--- + src/egl/opengles1/drawtex.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/egl/opengles1/drawtex.c b/src/egl/opengles1/drawtex.c +index 1ba8ac7..dc1de13 100644 +--- a/src/egl/opengles1/drawtex.c ++++ b/src/egl/opengles1/drawtex.c +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include "eglut.h" + +@@ -129,7 +130,7 @@ init(void) + exit(1); + } + +- glDrawTexfOES_func = eglGetProcAddress("glDrawTexfOES"); ++ glDrawTexfOES_func = (PFNGLDRAWTEXFOESPROC) eglGetProcAddress("glDrawTexfOES"); + + if (!glDrawTexfOES_func) { + fprintf(stderr, "Sorry, failed to resolve glDrawTexfOES function\n"); +-- +1.9.2 + diff --git a/libre/mesa-demos-libre/libre.patch b/libre/mesa-demos-libre/libre.patch new file mode 100644 index 000000000..d630f373c --- /dev/null +++ b/libre/mesa-demos-libre/libre.patch @@ -0,0 +1,114 @@ +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 +@@ -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.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 @@ + @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) \ +@@ -219,9 +219,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 +@@ -246,9 +243,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) +@@ -325,8 +319,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 +@@ -336,8 +330,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 +@@ -722,9 +716,6 @@ + pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixeltest_DEPENDENCIES) + @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) + @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 @@ + @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@ +@@ -837,7 +824,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 --git a/libre/mesa-demos-libre/mesa-demos-libre.patch b/libre/mesa-demos-libre/mesa-demos-libre.patch deleted file mode 100644 index d630f373c..000000000 --- a/libre/mesa-demos-libre/mesa-demos-libre.patch +++ /dev/null @@ -1,114 +0,0 @@ -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 -@@ -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.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 @@ - @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) \ -@@ -219,9 +219,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 -@@ -246,9 +243,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) -@@ -325,8 +319,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 -@@ -336,8 +330,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 -@@ -722,9 +716,6 @@ - pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixeltest_DEPENDENCIES) - @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) - @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 @@ - @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@ -@@ -837,7 +824,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@ -- cgit v1.2.3