libre.patch 5.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117
  1. diff -Nur mesa-demos-8.3.0.orig/src/demos/Makefile.am mesa-demos-8.3.0/src/demos/Makefile.am
  2. --- mesa-demos-8.3.0.orig/src/demos/Makefile.am 2012-06-25 12:34:58.000000000 -0300
  3. +++ mesa-demos-8.3.0/src/demos/Makefile.am 2015-12-14 15:25:22.843272149 -0300
  4. @@ -65,7 +65,6 @@
  5. multiarb \
  6. paltex \
  7. pixeltest \
  8. - pointblast \
  9. projtex \
  10. ray \
  11. readpix \
  12. @@ -74,7 +73,6 @@
  13. shadowtex \
  14. singlebuffer \
  15. spectex \
  16. - spriteblast \
  17. stex3d \
  18. teapot \
  19. terrain \
  20. diff -Nur mesa-demos-8.3.0.orig/src/demos/Makefile.in mesa-demos-8.3.0/src/demos/Makefile.in
  21. --- mesa-demos-8.3.0.orig/src/demos/Makefile.in 2015-12-09 18:24:00.000000000 -0300
  22. +++ mesa-demos-8.3.0/src/demos/Makefile.in 2015-12-14 15:27:35.253289256 -0300
  23. @@ -128,11 +128,11 @@
  24. @HAVE_GLUT_TRUE@ ipers$(EXEEXT) isosurf$(EXEEXT) \
  25. @HAVE_GLUT_TRUE@ lodbias$(EXEEXT) morph3d$(EXEEXT) \
  26. @HAVE_GLUT_TRUE@ multiarb$(EXEEXT) paltex$(EXEEXT) \
  27. -@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) pointblast$(EXEEXT) \
  28. +@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) \
  29. @HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \
  30. @HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \
  31. @HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \
  32. -@HAVE_GLUT_TRUE@ spectex$(EXEEXT) spriteblast$(EXEEXT) \
  33. +@HAVE_GLUT_TRUE@ spectex$(EXEEXT) \
  34. @HAVE_GLUT_TRUE@ stex3d$(EXEEXT) teapot$(EXEEXT) \
  35. @HAVE_GLUT_TRUE@ terrain$(EXEEXT) tessdemo$(EXEEXT) \
  36. @HAVE_GLUT_TRUE@ texcyl$(EXEEXT) texenv$(EXEEXT) \
  37. @@ -256,9 +256,6 @@
  38. pixeltest_SOURCES = pixeltest.c
  39. pixeltest_OBJECTS = pixeltest.$(OBJEXT)
  40. pixeltest_LDADD = $(LDADD)
  41. -pointblast_SOURCES = pointblast.c
  42. -pointblast_OBJECTS = pointblast.$(OBJEXT)
  43. -pointblast_LDADD = $(LDADD)
  44. projtex_SOURCES = projtex.c
  45. projtex_OBJECTS = projtex.$(OBJEXT)
  46. projtex_DEPENDENCIES = ../util/libutil.la
  47. @@ -283,9 +280,6 @@
  48. spectex_SOURCES = spectex.c
  49. spectex_OBJECTS = spectex.$(OBJEXT)
  50. spectex_LDADD = $(LDADD)
  51. -spriteblast_SOURCES = spriteblast.c
  52. -spriteblast_OBJECTS = spriteblast.$(OBJEXT)
  53. -spriteblast_LDADD = $(LDADD)
  54. stex3d_SOURCES = stex3d.c
  55. stex3d_OBJECTS = stex3d.$(OBJEXT)
  56. stex3d_LDADD = $(LDADD)
  57. @@ -362,8 +356,8 @@
  58. fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
  59. gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
  60. ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
  61. - pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
  62. - renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
  63. + pixeltest.c projtex.c ray.c readpix.c reflect.c \
  64. + renormal.c shadowtex.c singlebuffer.c spectex.c \
  65. stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
  66. textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
  67. winpos.c
  68. @@ -373,8 +367,8 @@
  69. fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
  70. gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
  71. ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
  72. - pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
  73. - renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
  74. + pixeltest.c projtex.c ray.c readpix.c reflect.c \
  75. + renormal.c shadowtex.c singlebuffer.c spectex.c \
  76. stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
  77. textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
  78. winpos.c
  79. @@ -814,10 +808,6 @@
  80. @rm -f pixeltest$(EXEEXT)
  81. $(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS)
  82. -pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) $(EXTRA_pointblast_DEPENDENCIES)
  83. - @rm -f pointblast$(EXEEXT)
  84. - $(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS)
  85. -
  86. projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) $(EXTRA_projtex_DEPENDENCIES)
  87. @rm -f projtex$(EXEEXT)
  88. $(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS)
  89. @@ -850,10 +840,6 @@
  90. @rm -f spectex$(EXEEXT)
  91. $(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS)
  92. -spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) $(EXTRA_spriteblast_DEPENDENCIES)
  93. - @rm -f spriteblast$(EXEEXT)
  94. - $(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS)
  95. -
  96. stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) $(EXTRA_stex3d_DEPENDENCIES)
  97. @rm -f stex3d$(EXEEXT)
  98. $(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS)
  99. @@ -941,7 +927,6 @@
  100. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@
  101. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@
  102. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeltest.Po@am__quote@
  103. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@
  104. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@
  105. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@
  106. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@
  107. @@ -950,7 +935,6 @@
  108. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@
  109. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@
  110. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@
  111. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spriteblast.Po@am__quote@
  112. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@
  113. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@
  114. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@