summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch33
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch (renamed from meta/recipes-graphics/mesa/mesa-demos/glut.patch)28
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch420
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch (renamed from meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Use-DEMOS_DATA_DIR-to-locate-data-files.patch)32
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch (renamed from meta/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-build-fix.patch)74
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch (renamed from meta/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch)24
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch74
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch101
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch73
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb (renamed from meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb)38
10 files changed, 795 insertions, 102 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch b/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch
index c7851035a8..93ee9c286d 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch
+++ b/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch
@@ -1,7 +1,7 @@
1From 87f9a62329d7c5f4d351fbb63a41f2a1935fb2f1 Mon Sep 17 00:00:00 2001 1From b695c3a3fa3f4cd48c13aa26542110de27075518 Mon Sep 17 00:00:00 2001
2From: Drew Moseley <drew_moseley@mentor.com> 2From: Drew Moseley <drew_moseley@mentor.com>
3Date: Mon, 12 May 2014 15:22:32 -0400 3Date: Mon, 12 May 2014 15:22:32 -0400
4Subject: [PATCH] mesa-demos: Add missing data files. 4Subject: [PATCH 1/9] mesa-demos: Add missing data files.
5 5
6Add some data files that are present in the git repository: 6Add some data files that are present in the git repository:
7 http://cgit.freedesktop.org/mesa/demos/tree/?id=mesa-demos-8.1.0 7 http://cgit.freedesktop.org/mesa/demos/tree/?id=mesa-demos-8.1.0
@@ -10,20 +10,21 @@ but not in the release tarball
10 10
11Upstream-Status: Backport 11Upstream-Status: Backport
12Signed-off-by: Drew Moseley <drew_moseley@mentor.com> 12Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13--- 14---
14 src/fpglsl/depth-read.glsl | 4 + 15 src/fpglsl/depth-read.glsl | 4 +
15 src/fpglsl/infinite-loop.glsl | 7 + 16 src/fpglsl/infinite-loop.glsl | 7 +
16 src/glsl/CH11-bumpmaptex.frag | 47 +++++++ 17 src/glsl/CH11-bumpmaptex.frag | 47 +++++++
17 src/glsl/blinking-teapot.frag | 31 +++++ 18 src/glsl/blinking-teapot.frag | 31 +++++
18 src/glsl/blinking-teapot.vert | 16 +++ 19 src/glsl/blinking-teapot.vert | 16 +++
19 src/glsl/convolution.frag | 21 +++ 20 src/glsl/convolution.frag | 21 +++
20 src/glsl/simplex-noise.glsl | 279 +++++++++++++++++++++++++++++++++++++++ 21 src/glsl/simplex-noise.glsl | 279 ++++++++++++++++++++++++++++++++++++++++
21 src/glsl/skinning.vert | 24 ++++ 22 src/glsl/skinning.vert | 24 ++++
22 src/perf/glslstateschange1.frag | 19 +++ 23 src/perf/glslstateschange1.frag | 19 +++
23 src/perf/glslstateschange1.vert | 14 ++ 24 src/perf/glslstateschange1.vert | 14 ++
24 src/perf/glslstateschange2.frag | 17 +++ 25 src/perf/glslstateschange2.frag | 17 +++
25 src/perf/glslstateschange2.vert | 14 ++ 26 src/perf/glslstateschange2.vert | 14 ++
26 src/vpglsl/infinite-loop.glsl | 8 ++ 27 src/vpglsl/infinite-loop.glsl | 8 ++
27 13 files changed, 501 insertions(+) 28 13 files changed, 501 insertions(+)
28 create mode 100644 src/fpglsl/depth-read.glsl 29 create mode 100644 src/fpglsl/depth-read.glsl
29 create mode 100644 src/fpglsl/infinite-loop.glsl 30 create mode 100644 src/fpglsl/infinite-loop.glsl
@@ -619,5 +620,5 @@ index 0000000..bc7ae4b
619+ gl_FrontColor = sum; 620+ gl_FrontColor = sum;
620+} 621+}
621-- 622--
6221.7.9.5 6232.0.0
623 624
diff --git a/meta/recipes-graphics/mesa/mesa-demos/glut.patch b/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch
index 84b6d4f7f3..c96af12acf 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/glut.patch
+++ b/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch
@@ -1,13 +1,18 @@
1Correctly implement with AC_WITH(glut) so that --without-glut works. 1From 36829a8d7ad2888515fbee95c2a70b3d636d7538 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 9 Jul 2014 14:30:33 +0200
4Subject: [PATCH 2/9] Correctly implement with AC_WITH(glut) so that
5 --without-glut works.
2 6
3Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57013] 7---
4Signed-off-by: Ross Burton <ross.burton@intel.com> 8 configure.ac | 26 +++++++++++++++-----------
9 1 file changed, 15 insertions(+), 11 deletions(-)
5 10
6Index: mesa-demos-8.0.1/configure.ac 11diff --git a/configure.ac b/configure.ac
7=================================================================== 12index c4ee12b..9445424 100644
8--- mesa-demos-8.0.1.orig/configure.ac 2010-07-13 19:52:41.000000000 +0100 13--- a/configure.ac
9+++ mesa-demos-8.0.1/configure.ac 2012-11-12 12:49:54.940054571 +0000 14+++ b/configure.ac
10@@ -65,21 +65,25 @@ 15@@ -67,21 +67,25 @@ DEMO_CFLAGS="$DEMO_CFLAGS $GL_CFLAGS"
11 DEMO_LIBS="$DEMO_LIBS $GL_LIBS" 16 DEMO_LIBS="$DEMO_LIBS $GL_LIBS"
12 17
13 dnl Check for GLUT 18 dnl Check for GLUT
@@ -42,5 +47,8 @@ Index: mesa-demos-8.0.1/configure.ac
42+ glut_enabled=yes 47+ glut_enabled=yes
43+]) 48+])
44 49
45 GLEW_CFLAGS="" 50 dnl Check for FreeGLUT 2.6 or later
46 GLEW_LIBS="-lGLEW" 51 AC_EGREP_HEADER([glutInitContextProfile],
52--
532.0.0
54
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
new file mode 100644
index 0000000000..e02f1ab4ec
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
@@ -0,0 +1,420 @@
1From b25e9c675cf560b8b037dc855c6b3b1d09957867 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 9 Jul 2014 14:23:41 +0200
4Subject: [PATCH 3/9] configure: Allow to disable demos which require GLEW or
5 GLU
6
7* in some systems without X11 support we don't have GLEW, but
8 mesa-demos are still useful
9
10Upstream-Status: Pending
11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 configure.ac | 49 ++++++++++++++++++++---------
15 src/Makefile.am | 14 ++++++---
16 src/demos/Makefile.am | 73 ++++++++++++++++++++++++-------------------
17 src/egl/Makefile.am | 8 +++--
18 src/egl/opengles1/Makefile.am | 44 +++++++++++++++-----------
19 src/egl/opengles2/Makefile.am | 33 ++++++++++---------
20 6 files changed, 135 insertions(+), 86 deletions(-)
21
22diff --git a/configure.ac b/configure.ac
23index 9445424..bc4c8d1 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -93,25 +93,44 @@ AC_EGREP_HEADER([glutInitContextProfile],
27 [AC_DEFINE(HAVE_FREEGLUT)],
28 [])
29
30-dnl Check for GLEW
31-PKG_CHECK_MODULES(GLEW, [glew >= 1.5.4])
32-DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS"
33-DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS"
34+AC_ARG_ENABLE([glew],
35+ [AS_HELP_STRING([--enable-glew],
36+ [build demos which require glew @<:@default=yes@:>@])],
37+ [enable_glew="$enableval"],
38+ [enable_glew=yes]
39+)
40+
41+if test "x$enable_glew" = xyes; then
42+ dnl Check for GLEW
43+ PKG_CHECK_MODULES(GLEW, [glew >= 1.5.4], [glew_enabled=yes], [glew_enabled=no])
44+ DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS"
45+ DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS"
46+fi
47
48 # LIBS was set by AC_CHECK_LIB above
49 LIBS=""
50
51-PKG_CHECK_MODULES(GLU, [glu], [],
52- [AC_CHECK_HEADER([GL/glu.h],
53- [],
54- AC_MSG_ERROR([GLU not found]))
55- AC_CHECK_LIB([GLU],
56- [gluBeginCurve],
57- [GLU_LIBS=-lGLU],
58- AC_MSG_ERROR([GLU required])) ])
59+AC_ARG_ENABLE([glu],
60+ [AS_HELP_STRING([--enable-glu],
61+ [build demos which require glu @<:@default=yes@:>@])],
62+ [enable_glu="$enableval"],
63+ [enable_glu=yes]
64+)
65
66-DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS"
67-DEMO_LIBS="$DEMO_LIBS $GLU_LIBS"
68+if test "x$enable_glu" = xyes; then
69+ PKG_CHECK_MODULES(GLU, [glu], [],
70+ [AC_CHECK_HEADER([GL/glu.h],
71+ [],
72+ AC_MSG_ERROR([GLU not found]))
73+ AC_CHECK_LIB([GLU],
74+ [gluBeginCurve],
75+ [GLU_LIBS=-lGLU
76+ glu_enabled=yes],
77+ AC_MSG_ERROR([GLU required])) ])
78+
79+ DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS"
80+ DEMO_LIBS="$DEMO_LIBS $GLU_LIBS"
81+fi
82
83 AC_ARG_ENABLE([egl],
84 [AS_HELP_STRING([--enable-egl],
85@@ -304,6 +323,8 @@ AC_SUBST([WAYLAND_CFLAGS])
86 AC_SUBST([WAYLAND_LIBS])
87
88
89+AM_CONDITIONAL(HAVE_GLU, test "x$glu_enabled" = "xyes")
90+AM_CONDITIONAL(HAVE_GLEW, test "x$glew_enabled" = "xyes")
91 AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes")
92 AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes")
93 AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes")
94diff --git a/src/Makefile.am b/src/Makefile.am
95index 1647d64..754c47c 100644
96--- a/src/Makefile.am
97+++ b/src/Makefile.am
98@@ -23,14 +23,13 @@
99 # Eric Anholt <eric@anholt.net>
100
101 SUBDIRS = \
102- util \
103 data \
104 demos \
105 egl \
106 fp \
107 fpglsl \
108 glsl \
109- gs \
110+ gs \
111 objviewer \
112 osdemos \
113 perf \
114@@ -40,8 +39,13 @@ SUBDIRS = \
115 slang \
116 tests \
117 tools \
118- trivial \
119- vp \
120- vpglsl \
121 wgl \
122 xdemos
123+
124+if HAVE_GLEW
125+SUBDIRS += \
126+ vp \
127+ vpglsl \
128+ util \
129+ trivial
130+endif
131diff --git a/src/demos/Makefile.am b/src/demos/Makefile.am
132index 41603fa..ab1e3ab 100644
133--- a/src/demos/Makefile.am
134+++ b/src/demos/Makefile.am
135@@ -30,91 +30,100 @@ AM_LDFLAGS = \
136 $(DEMO_LIBS) \
137 $(GLUT_LIBS)
138
139+bin_PROGRAMS =
140+
141 if HAVE_GLUT
142-bin_PROGRAMS = \
143+if HAVE_GLEW
144+bin_PROGRAMS += \
145 arbfplight \
146 arbfslight \
147 arbocclude \
148 arbocclude2 \
149- bounce \
150- clearspd \
151 copypix \
152 cubemap \
153 cuberender \
154 dinoshade \
155- dissolve \
156- drawpix \
157 engine \
158 fbo_firecube \
159 fbotexture \
160- fire \
161 fogcoord \
162 fplight \
163 fslight \
164+ gloss \
165+ isosurf \
166+ multiarb \
167+ paltex \
168+ pointblast \
169+ projtex \
170+ shadowtex \
171+ spriteblast \
172+ stex3d \
173+ textures \
174+ vao_demo \
175+ winpos
176+
177+copypix_LDADD = ../util/libutil.la
178+cubemap_LDADD = ../util/libutil.la
179+cuberender_LDADD = ../util/libutil.la
180+engine_LDADD = ../util/libutil.la
181+fbo_firecube_LDADD = ../util/libutil.la
182+gloss_LDADD = ../util/libutil.la
183+isosurf_LDADD = ../util/libutil.la
184+multiarb_LDADD = ../util/libutil.la
185+projtex_LDADD = ../util/libutil.la
186+textures_LDADD = ../util/libutil.la
187+winpos_LDADD = ../util/libutil.la
188+endif
189+
190+if HAVE_GLU
191+bin_PROGRAMS += \
192+ bounce \
193+ clearspd \
194+ dissolve \
195+ drawpix \
196+ fire \
197 gamma \
198 gearbox \
199 gears \
200 geartrain \
201 glinfo \
202- gloss \
203 gltestperf \
204 ipers \
205- isosurf \
206 lodbias \
207 morph3d \
208- multiarb \
209- paltex \
210 pixeltest \
211- pointblast \
212- projtex \
213 ray \
214 readpix \
215 reflect \
216 renormal \
217- shadowtex \
218 singlebuffer \
219 spectex \
220- spriteblast \
221- stex3d \
222 teapot \
223 terrain \
224 tessdemo \
225 texcyl \
226 texenv \
227- textures \
228 trispd \
229 tunnel2 \
230- tunnel \
231- vao_demo \
232- winpos
233-endif
234+ tunnel
235
236 tunnel_SOURCES = \
237 tunnel.c \
238 tunneldat.h
239
240-copypix_LDADD = ../util/libutil.la
241-cubemap_LDADD = ../util/libutil.la
242-cuberender_LDADD = ../util/libutil.la
243-drawpix_LDADD = ../util/libutil.la
244 dissolve_LDADD = ../util/libutil.la
245-engine_LDADD = ../util/libutil.la
246-fbo_firecube_LDADD = ../util/libutil.la
247+drawpix_LDADD = ../util/libutil.la
248 fire_LDADD = ../util/libutil.la
249-gloss_LDADD = ../util/libutil.la
250 ipers_LDADD = ../util/libutil.la
251-isosurf_LDADD = ../util/libutil.la
252 lodbias_LDADD = ../util/libutil.la
253-multiarb_LDADD = ../util/libutil.la
254-projtex_LDADD = ../util/libutil.la
255 readpix_LDADD = ../util/libutil.la
256 reflect_LDADD = ../util/libutil.la
257 teapot_LDADD = ../util/libutil.la
258 texcyl_LDADD = ../util/libutil.la
259-textures_LDADD = ../util/libutil.la
260 tunnel_LDADD = ../util/libutil.la
261 tunnel2_LDADD = ../util/libutil.la
262-winpos_LDADD = ../util/libutil.la
263+endif
264+endif
265
266 EXTRA_DIST = \
267 README
268diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
269index d64a49e..4fe1ca8 100644
270--- a/src/egl/Makefile.am
271+++ b/src/egl/Makefile.am
272@@ -24,8 +24,12 @@
273
274 SUBDIRS = \
275 eglut \
276- opengl \
277- openvg \
278 opengles1 \
279 opengles2 \
280 oes_vg
281+
282+if HAVE_GLU
283+SUBDIRS += \
284+ opengl \
285+ openvg
286+endif
287diff --git a/src/egl/opengles1/Makefile.am b/src/egl/opengles1/Makefile.am
288index 7a9828d..3455e75 100644
289--- a/src/egl/opengles1/Makefile.am
290+++ b/src/egl/opengles1/Makefile.am
291@@ -36,28 +36,43 @@ AM_LDFLAGS = \
292 $(EGL_LIBS) \
293 -lm
294
295+noinst_PROGRAMS =
296+
297 if HAVE_EGL
298 if HAVE_GLESV1
299-noinst_PROGRAMS = \
300- bindtex \
301- clear \
302+noinst_PROGRAMS += \
303 drawtex_screen \
304+ gears_screen \
305+ torus_screen \
306+ tri_screen
307+
308+drawtex_screen_SOURCES = drawtex.c
309+gears_screen_SOURCES = gears.c
310+torus_screen_SOURCES = torus.c
311+tri_screen_SOURCES = tri.c
312+
313+drawtex_screen_LDADD = ../eglut/libeglut_screen.la
314+gears_screen_LDADD = ../eglut/libeglut_screen.la
315+torus_screen_LDADD = ../eglut/libeglut_screen.la
316+tri_screen_LDADD = ../eglut/libeglut_screen.la
317+
318+if HAVE_X11
319+noinst_PROGRAMS += \
320+ clear
321+
322+bin_PROGRAMS = \
323+ bindtex \
324 drawtex_x11 \
325 eglfbdev \
326 es1_info \
327- gears_screen \
328 gears_x11 \
329 msaa \
330 pbuffer\
331 render_tex \
332 texture_from_pixmap \
333- torus_screen \
334 torus_x11 \
335- tri_screen \
336 tri_x11 \
337 two_win
338-endif
339-endif
340
341 bindtex_LDADD = $(X11_LIBS)
342 es1_info_LDADD = $(X11_LIBS)
343@@ -71,22 +86,15 @@ two_win_LDADD = $(X11_LIBS)
344 clear_LDADD = ../eglut/libeglut_x11.la $(EGL_LIBS) $(X11_LIBS)
345 clear_LDFLAGS =
346
347-drawtex_screen_SOURCES = drawtex.c
348-gears_screen_SOURCES = gears.c
349-torus_screen_SOURCES = torus.c
350-tri_screen_SOURCES = tri.c
351-
352 drawtex_x11_SOURCES = drawtex.c
353 gears_x11_SOURCES = gears.c
354 torus_x11_SOURCES = torus.c
355 tri_x11_SOURCES = tri.c
356
357-drawtex_screen_LDADD = ../eglut/libeglut_screen.la
358-gears_screen_LDADD = ../eglut/libeglut_screen.la
359-torus_screen_LDADD = ../eglut/libeglut_screen.la
360-tri_screen_LDADD = ../eglut/libeglut_screen.la
361-
362 drawtex_x11_LDADD = ../eglut/libeglut_x11.la
363 gears_x11_LDADD = ../eglut/libeglut_x11.la
364 torus_x11_LDADD = ../eglut/libeglut_x11.la
365 tri_x11_LDADD = ../eglut/libeglut_x11.la
366+endif
367+endif
368+endif
369diff --git a/src/egl/opengles2/Makefile.am b/src/egl/opengles2/Makefile.am
370index 41c1b80..74af460 100644
371--- a/src/egl/opengles2/Makefile.am
372+++ b/src/egl/opengles2/Makefile.am
373@@ -36,26 +36,29 @@ AM_LDFLAGS = \
374 if HAVE_EGL
375 if HAVE_GLESV2
376 bin_PROGRAMS = \
377- es2_info \
378- es2gears_screen \
379- es2gears_x11 \
380- es2tri
381+ es2gears_screen
382+
383+es2gears_screen_SOURCES = es2gears.c
384+es2gears_screen_LDADD = ../eglut/libeglut_screen.la
385+
386 if HAVE_WAYLAND
387 bin_PROGRAMS += es2gears_wayland
388-endif
389-endif
390-endif
391
392-es2_info_LDADD = $(X11_LIBS)
393-es2tri_LDADD = $(X11_LIBS)
394+es2gears_wayland_SOURCES = es2gears.c
395+es2gears_wayland_LDADD = ../eglut/libeglut_wayland.la
396+endif
397
398-es2gears_screen_SOURCES = es2gears.c
399+if HAVE_X11
400+bin_PROGRAMS += \
401+ es2tri \
402+ es2_info \
403+ es2gears_x11
404
405+es2_info_LDADD = $(X11_LIBS)
406 es2gears_x11_SOURCES = es2gears.c
407-
408-es2gears_screen_LDADD = ../eglut/libeglut_screen.la
409-
410 es2gears_x11_LDADD = ../eglut/libeglut_x11.la
411+es2tri_LDADD = $(X11_LIBS)
412+endif
413+endif
414+endif
415
416-es2gears_wayland_SOURCES = es2gears.c
417-es2gears_wayland_LDADD = ../eglut/libeglut_wayland.la
418--
4192.0.0
420
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Use-DEMOS_DATA_DIR-to-locate-data-files.patch b/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch
index c89f87891b..f77b97f3e5 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Use-DEMOS_DATA_DIR-to-locate-data-files.patch
+++ b/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch
@@ -1,24 +1,24 @@
1From bc7fa67d13e8032601df5cf04e15c53a7204dcd7 Mon Sep 17 00:00:00 2001 1From 5e10108d76a59abac21c7e540bcfd2ddaccca2cb Mon Sep 17 00:00:00 2001
2From: Drew Moseley <drew_moseley@mentor.com> 2From: Drew Moseley <drew_moseley@mentor.com>
3Date: Fri, 9 May 2014 11:50:24 -0400 3Date: Fri, 9 May 2014 11:50:24 -0400
4Subject: [PATCH] mesa-demos: Use DEMOS_DATA_DIR to locate data files 4Subject: [PATCH 4/9] Use DEMOS_DATA_DIR to locate data files
5 5
6Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=78496] 6Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=78496]
7Signed-off-by: Drew Moseley <drew_moseley@mentor.com> 7Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
8--- 8---
9 src/glsl/bezier.c | 2 +- 9 src/glsl/bezier.c | 2 +-
10 src/glsl/blinking-teapot.c | 4 ++-- 10 src/glsl/blinking-teapot.c | 4 ++--
11 src/glsl/brick.c | 4 ++-- 11 src/glsl/brick.c | 4 ++--
12 src/glsl/bump.c | 6 +++--- 12 src/glsl/bump.c | 6 +++---
13 src/glsl/convolutions.c | 2 +- 13 src/glsl/convolutions.c | 2 +-
14 src/glsl/mandelbrot.c | 4 ++-- 14 src/glsl/mandelbrot.c | 4 ++--
15 src/glsl/multitex.c | 4 ++-- 15 src/glsl/multitex.c | 4 ++--
16 src/glsl/simplex-noise.c | 2 +- 16 src/glsl/simplex-noise.c | 2 +-
17 src/glsl/skinning.c | 4 ++-- 17 src/glsl/skinning.c | 4 ++--
18 src/glsl/texdemo1.c | 8 ++++---- 18 src/glsl/texdemo1.c | 8 ++++----
19 src/glsl/toyball.c | 4 ++-- 19 src/glsl/toyball.c | 4 ++--
20 src/objviewer/objview.c | 12 ++++++------ 20 src/objviewer/objview.c | 12 ++++++------
21 src/perf/glslstateschange.c | 8 ++++---- 21 src/perf/glslstateschange.c | 8 ++++----
22 13 files changed, 32 insertions(+), 32 deletions(-) 22 13 files changed, 32 insertions(+), 32 deletions(-)
23 23
24diff --git a/src/glsl/bezier.c b/src/glsl/bezier.c 24diff --git a/src/glsl/bezier.c b/src/glsl/bezier.c
@@ -230,5 +230,5 @@ index 7422b78..dbf8332 100644
230 { "tex1", 1, GL_SAMPLER_2D, { 0, 0, 0, 0 }, -1 }, 230 { "tex1", 1, GL_SAMPLER_2D, { 0, 0, 0, 0 }, -1 },
231 { "tex2", 1, GL_SAMPLER_2D, { 1, 0, 0, 0 }, -1 }, 231 { "tex2", 1, GL_SAMPLER_2D, { 1, 0, 0, 0 }, -1 },
232-- 232--
2331.7.9.5 2332.0.0
234 234
diff --git a/meta/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-build-fix.patch b/meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch
index 46a3e98cfe..aac2a37294 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-build-fix.patch
+++ b/meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch
@@ -1,11 +1,11 @@
1From ab76f645e29b0a603ff95d88f976bc35ab6301ee Mon Sep 17 00:00:00 2001 1From 453353a221de9c64479f4372565d2cd8591b36cc Mon Sep 17 00:00:00 2001
2From: Frank Binns <frank.binns@imgtec.com> 2From: Frank Binns <frank.binns@imgtec.com>
3Date: Fri, 29 Jun 2012 11:26:04 +0100 3Date: Fri, 29 Jun 2012 11:26:04 +0100
4Subject: [PATCH 1/2] mesa-demos: Fix build when EGL_MESA_screen_surface 4Subject: [PATCH 5/9] Fix build when EGL_MESA_screen_surface extension isn't
5 extension isn't present 5 present
6 6
7The EGL demos won't build against EGL implementations that don't support 7The EGL demos won't build against EGL implementations that don't support
8the EGL_MESA_screen_surface extension. Fix this, in most cases, by 8the EGL_MESA_screen_surface extension. Fix this, in most cases, by
9wrapping relevant bits of code in #ifdef EGL_MESA_screen_surface. 9wrapping relevant bits of code in #ifdef EGL_MESA_screen_surface.
10 10
11Signed-off-by: Frank Binns <frank.binns@imgtec.com> 11Signed-off-by: Frank Binns <frank.binns@imgtec.com>
@@ -15,12 +15,19 @@ Applied and fixed up in Yocto by...
15Integrated-by: Tom Zanussi <tom.zanussi@linux.intel.com> 15Integrated-by: Tom Zanussi <tom.zanussi@linux.intel.com>
16 16
17Upstream-Status: Pending 17Upstream-Status: Pending
18---
19 src/egl/eglut/eglut.c | 9 +++++++--
20 src/egl/eglut/eglut_screen.c | 14 ++++++++++++++
21 src/egl/opengl/demo1.c | 2 ++
22 src/egl/opengl/demo2.c | 7 ++++++-
23 src/egl/opengl/demo3.c | 7 ++++++-
24 5 files changed, 35 insertions(+), 4 deletions(-)
18 25
19Index: mesa-demos-8.0.1/src/egl/eglut/eglut.c 26diff --git a/src/egl/eglut/eglut.c b/src/egl/eglut/eglut.c
20=================================================================== 27index 2ee6f15..f6a2ad4 100644
21--- mesa-demos-8.0.1.orig/src/egl/eglut/eglut.c 28--- a/src/egl/eglut/eglut.c
22+++ mesa-demos-8.0.1/src/egl/eglut/eglut.c 29+++ b/src/egl/eglut/eglut.c
23@@ -51,8 +51,9 @@ _eglutNow(void) 30@@ -76,8 +76,9 @@ _eglutNow(void)
24 static void 31 static void
25 _eglutDestroyWindow(struct eglut_window *win) 32 _eglutDestroyWindow(struct eglut_window *win)
26 { 33 {
@@ -32,7 +39,7 @@ Index: mesa-demos-8.0.1/src/egl/eglut/eglut.c
32 eglDestroySurface(_eglut->dpy, win->surface); 39 eglDestroySurface(_eglut->dpy, win->surface);
33 40
34 _eglutNativeFiniWindow(win); 41 _eglutNativeFiniWindow(win);
35@@ -150,7 +151,9 @@ _eglutCreateWindow(const char *title, in 42@@ -175,7 +176,9 @@ _eglutCreateWindow(const char *title, int x, int y, int w, int h)
36 win->config, win->native.u.pixmap, NULL); 43 win->config, win->native.u.pixmap, NULL);
37 break; 44 break;
38 case EGL_PBUFFER_BIT: 45 case EGL_PBUFFER_BIT:
@@ -42,7 +49,7 @@ Index: mesa-demos-8.0.1/src/egl/eglut/eglut.c
42 win->surface = win->native.u.surface; 49 win->surface = win->native.u.surface;
43 break; 50 break;
44 default: 51 default:
45@@ -264,8 +267,10 @@ eglutDestroyWindow(int win) 52@@ -289,8 +292,10 @@ eglutDestroyWindow(int win)
46 if (window->index != win) 53 if (window->index != win)
47 return; 54 return;
48 55
@@ -53,11 +60,11 @@ Index: mesa-demos-8.0.1/src/egl/eglut/eglut.c
53 eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); 60 eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
54 61
55 _eglutDestroyWindow(_eglut->current); 62 _eglutDestroyWindow(_eglut->current);
56Index: mesa-demos-8.0.1/src/egl/eglut/eglut_screen.c 63diff --git a/src/egl/eglut/eglut_screen.c b/src/egl/eglut/eglut_screen.c
57=================================================================== 64index 021a8f1..094a4e2 100644
58--- mesa-demos-8.0.1.orig/src/egl/eglut/eglut_screen.c 65--- a/src/egl/eglut/eglut_screen.c
59+++ mesa-demos-8.0.1/src/egl/eglut/eglut_screen.c 66+++ b/src/egl/eglut/eglut_screen.c
60@@ -10,26 +10,33 @@ 67@@ -35,26 +35,33 @@
61 68
62 #define MAX_MODES 100 69 #define MAX_MODES 100
63 70
@@ -91,7 +98,7 @@ Index: mesa-demos-8.0.1/src/egl/eglut/eglut_screen.c
91 static void 98 static void
92 init_kms(void) 99 init_kms(void)
93 { 100 {
94@@ -69,19 +76,23 @@ init_kms(void) 101@@ -94,19 +101,23 @@ init_kms(void)
95 kms_width = width; 102 kms_width = width;
96 kms_height = height; 103 kms_height = height;
97 } 104 }
@@ -115,7 +122,7 @@ Index: mesa-demos-8.0.1/src/egl/eglut/eglut_screen.c
115 init_kms(); 122 init_kms();
116 123
117 i = 0; 124 i = 0;
118@@ -103,14 +114,17 @@ _eglutNativeInitWindow(struct eglut_wind 125@@ -128,14 +139,17 @@ _eglutNativeInitWindow(struct eglut_window *win, const char *title,
119 126
120 win->native.width = kms_width; 127 win->native.width = kms_width;
121 win->native.height = kms_height; 128 win->native.height = kms_height;
@@ -133,10 +140,10 @@ Index: mesa-demos-8.0.1/src/egl/eglut/eglut_screen.c
133 } 140 }
134 141
135 void 142 void
136Index: mesa-demos-8.0.1/src/egl/opengl/demo1.c 143diff --git a/src/egl/opengl/demo1.c b/src/egl/opengl/demo1.c
137=================================================================== 144index d892734..3a3564c 100644
138--- mesa-demos-8.0.1.orig/src/egl/opengl/demo1.c 145--- a/src/egl/opengl/demo1.c
139+++ mesa-demos-8.0.1/src/egl/opengl/demo1.c 146+++ b/src/egl/opengl/demo1.c
140@@ -18,6 +18,7 @@ 147@@ -18,6 +18,7 @@
141 static void 148 static void
142 TestScreens(EGLDisplay dpy) 149 TestScreens(EGLDisplay dpy)
@@ -153,10 +160,10 @@ Index: mesa-demos-8.0.1/src/egl/opengl/demo1.c
153 } 160 }
154 161
155 /** 162 /**
156Index: mesa-demos-8.0.1/src/egl/opengl/demo2.c 163diff --git a/src/egl/opengl/demo2.c b/src/egl/opengl/demo2.c
157=================================================================== 164index 505b474..bfef59e 100644
158--- mesa-demos-8.0.1.orig/src/egl/opengl/demo2.c 165--- a/src/egl/opengl/demo2.c
159+++ mesa-demos-8.0.1/src/egl/opengl/demo2.c 166+++ b/src/egl/opengl/demo2.c
160@@ -16,6 +16,7 @@ 167@@ -16,6 +16,7 @@
161 168
162 /*#define FRONTBUFFER*/ 169 /*#define FRONTBUFFER*/
@@ -204,10 +211,10 @@ Index: mesa-demos-8.0.1/src/egl/opengl/demo2.c
204 211
205 return 0; 212 return 0;
206 } 213 }
207Index: mesa-demos-8.0.1/src/egl/opengl/demo3.c 214diff --git a/src/egl/opengl/demo3.c b/src/egl/opengl/demo3.c
208=================================================================== 215index f84ca23..31b5d8b 100644
209--- mesa-demos-8.0.1.orig/src/egl/opengl/demo3.c 216--- a/src/egl/opengl/demo3.c
210+++ mesa-demos-8.0.1/src/egl/opengl/demo3.c 217+++ b/src/egl/opengl/demo3.c
211@@ -46,7 +46,7 @@ GLubyte OpenGL_bits[] = { 218@@ -46,7 +46,7 @@ GLubyte OpenGL_bits[] = {
212 0x3e, 0x00, 0x00, 0xf8, 0x0c, 0x00, 219 0x3e, 0x00, 0x00, 0xf8, 0x0c, 0x00,
213 }; 220 };
@@ -217,7 +224,7 @@ Index: mesa-demos-8.0.1/src/egl/opengl/demo3.c
217 static void Init(void) 224 static void Init(void)
218 { 225 {
219 226
220@@ -551,11 +551,13 @@ write_ppm(const char *filename, const GL 227@@ -551,11 +551,13 @@ write_ppm(const char *filename, const GLubyte *buffer, int width, int height)
221 fclose(f); 228 fclose(f);
222 } 229 }
223 } 230 }
@@ -255,3 +262,6 @@ Index: mesa-demos-8.0.1/src/egl/opengl/demo3.c
255 262
256 return 0; 263 return 0;
257 } 264 }
265--
2662.0.0
267
diff --git a/meta/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch b/meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch
index 795370819b..12e0805f15 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch
+++ b/meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch
@@ -1,11 +1,11 @@
1From cf90a5c0c173d017a80cde057da57c365b3b1a40 Mon Sep 17 00:00:00 2001 1From 6a19dba1d275579c73e7763b0554410ff4e1e650 Mon Sep 17 00:00:00 2001
2From: Frank Binns <frank.binns@imgtec.com> 2From: Frank Binns <frank.binns@imgtec.com>
3Date: Fri, 29 Jun 2012 12:00:26 +0100 3Date: Fri, 29 Jun 2012 12:00:26 +0100
4Subject: [PATCH 2/2] mesa-demos: Query display for EGL_MESA_screen_surface 4Subject: [PATCH 6/9] Query display for EGL_MESA_screen_surface extension
5 extension before using it 5 before using it
6 6
7This code makes heavy use of the EGL_MESA_screen_surface extension so 7This code makes heavy use of the EGL_MESA_screen_surface extension so
8check the display to determine if it's supported by the underlying EGL 8check the display to determine if it's supported by the underlying EGL
9implementation. If it doesn't then bail. 9implementation. If it doesn't then bail.
10 10
11Signed-off-by: Frank Binns <frank.binns@imgtec.com> 11Signed-off-by: Frank Binns <frank.binns@imgtec.com>
@@ -15,11 +15,14 @@ Applied and fixed up in Yocto by...
15Integrated-by: Tom Zanussi <tom.zanussi@linux.intel.com> 15Integrated-by: Tom Zanussi <tom.zanussi@linux.intel.com>
16 16
17Upstream-Status: Pending 17Upstream-Status: Pending
18---
19 src/egl/opengl/demo1.c | 6 ++++++
20 1 file changed, 6 insertions(+)
18 21
19Index: mesa-demos-8.0.1/src/egl/opengl/demo1.c 22diff --git a/src/egl/opengl/demo1.c b/src/egl/opengl/demo1.c
20=================================================================== 23index 3a3564c..06e2138 100644
21--- mesa-demos-8.0.1.orig/src/egl/opengl/demo1.c 24--- a/src/egl/opengl/demo1.c
22+++ mesa-demos-8.0.1/src/egl/opengl/demo1.c 25+++ b/src/egl/opengl/demo1.c
23@@ -110,6 +110,12 @@ main(int argc, char *argv[]) 26@@ -110,6 +110,12 @@ main(int argc, char *argv[])
24 printf("EGL version = %d.%d\n", maj, min); 27 printf("EGL version = %d.%d\n", maj, min);
25 printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR)); 28 printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR));
@@ -33,3 +36,6 @@ Index: mesa-demos-8.0.1/src/egl/opengl/demo1.c
33 eglGetConfigs(d, NULL, 0, &numConfigs); 36 eglGetConfigs(d, NULL, 0, &numConfigs);
34 configs = malloc(sizeof(*configs) *numConfigs); 37 configs = malloc(sizeof(*configs) *numConfigs);
35 eglGetConfigs(d, configs, numConfigs, &numConfigs); 38 eglGetConfigs(d, configs, numConfigs, &numConfigs);
39--
402.0.0
41
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch b/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch
new file mode 100644
index 0000000000..89d2fac4fd
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch
@@ -0,0 +1,74 @@
1From d930b2da57f7c9efb80c8cef8f8adad15bbbc0d3 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 10 Jul 2014 14:30:52 +0200
4Subject: [PATCH 7/9] Install few more test programs
5
6Upstream-Status: Pending
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 src/egl/opengl/Makefile.am | 2 +-
11 src/egl/opengles1/Makefile.am | 10 ++++------
12 src/egl/openvg/Makefile.am | 2 +-
13 3 files changed, 6 insertions(+), 8 deletions(-)
14
15diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am
16index 0c7228f..87b2f1a 100644
17--- a/src/egl/opengl/Makefile.am
18+++ b/src/egl/opengl/Makefile.am
19@@ -50,7 +50,7 @@ endif
20 endif
21
22 if HAVE_EGL
23-noinst_PROGRAMS = \
24+bin_PROGRAMS = \
25 demo1 \
26 demo2 \
27 demo3 \
28diff --git a/src/egl/opengles1/Makefile.am b/src/egl/opengles1/Makefile.am
29index 3455e75..516e516 100644
30--- a/src/egl/opengles1/Makefile.am
31+++ b/src/egl/opengles1/Makefile.am
32@@ -36,11 +36,11 @@ AM_LDFLAGS = \
33 $(EGL_LIBS) \
34 -lm
35
36-noinst_PROGRAMS =
37+bin_PROGRAMS =
38
39 if HAVE_EGL
40 if HAVE_GLESV1
41-noinst_PROGRAMS += \
42+bin_PROGRAMS += \
43 drawtex_screen \
44 gears_screen \
45 torus_screen \
46@@ -57,10 +57,8 @@ torus_screen_LDADD = ../eglut/libeglut_screen.la
47 tri_screen_LDADD = ../eglut/libeglut_screen.la
48
49 if HAVE_X11
50-noinst_PROGRAMS += \
51- clear
52-
53-bin_PROGRAMS = \
54+bin_PROGRAMS += \
55+ clear \
56 bindtex \
57 drawtex_x11 \
58 eglfbdev \
59diff --git a/src/egl/openvg/Makefile.am b/src/egl/openvg/Makefile.am
60index 7318a43..b545225 100644
61--- a/src/egl/openvg/Makefile.am
62+++ b/src/egl/openvg/Makefile.am
63@@ -49,7 +49,7 @@ endif
64
65 if HAVE_EGL
66 if HAVE_VG
67-noinst_PROGRAMS = \
68+bin_PROGRAMS = \
69 lion_screen \
70 sp_screen \
71 $(EGL_X11_DEMOS)
72--
732.0.0
74
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch b/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch
new file mode 100644
index 0000000000..a6085754d2
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch
@@ -0,0 +1,101 @@
1From 0b6f95f9b8ece22e9856c150e4be29fd86eaf546 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 10 Jul 2014 14:29:27 +0200
4Subject: [PATCH 8/9] glsl, perf: Add few missing .glsl, .vert, .frag files to
5 EXTRA_DATA
6
7Upstream-Status: Pending
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 src/fpglsl/Makefile.am | 2 ++
12 src/glsl/Makefile.am | 10 ++++++++--
13 src/perf/Makefile.am | 6 ++++++
14 src/vpglsl/Makefile.am | 1 +
15 4 files changed, 17 insertions(+), 2 deletions(-)
16
17diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am
18index 47c1039..fd43c91 100644
19--- a/src/fpglsl/Makefile.am
20+++ b/src/fpglsl/Makefile.am
21@@ -39,10 +39,12 @@ noinst_PROGRAMS = \
22 endif
23
24 EXTRA_DIST = \
25+ depth-read.glsl \
26 dowhile2.glsl \
27 dowhile.glsl \
28 forbreak.glsl \
29 for.glsl \
30+ infinite-loop.glsl \
31 mov.glsl \
32 mov-imm.glsl \
33 simpleif.glsl \
34diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
35index 4faa8db..079a29d 100644
36--- a/src/glsl/Makefile.am
37+++ b/src/glsl/Makefile.am
38@@ -37,7 +37,7 @@ AM_LDFLAGS = \
39 if HAVE_GLUT
40 bin_PROGRAMS = \
41 array \
42- bezier \
43+ bezier \
44 bitmap \
45 brick \
46 bump \
47@@ -123,12 +123,16 @@ EXTRA_DIST = \
48 CH06-brick.vert \
49 CH11-bumpmap.frag \
50 CH11-bumpmap.vert \
51+ CH11-bumpmaptex.frag \
52 CH11-toyball.frag \
53 CH11-toyball.vert \
54 CH18-mandel.frag \
55 CH18-mandel.vert \
56- bezier.geom \
57+ bezier.geom \
58 brick.shtest \
59+ blinking-teapot.frag \
60+ blinking-teapot.vert \
61+ convolution.frag \
62 convolution.vert \
63 cubemap.frag \
64 mandelbrot.shtest \
65@@ -138,5 +142,7 @@ EXTRA_DIST = \
66 reflect.vert \
67 shadowtex.frag \
68 simple.vert \
69+ simplex-noise.glsl \
70 skinning.frag \
71+ skinning.vert \
72 toyball.shtest
73diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am
74index 5363c58..c5cca8d 100644
75--- a/src/perf/Makefile.am
76+++ b/src/perf/Makefile.am
77@@ -57,3 +57,9 @@ bin_PROGRAMS = \
78 endif
79
80 glslstateschange_LDADD = libperf.la ../util/libutil.la
81+
82+EXTRA_DIST = \
83+ glslstateschange1.frag \
84+ glslstateschange1.vert \
85+ glslstateschange2.frag \
86+ glslstateschange2.vert
87diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am
88index 4a85ed4..48b08f4 100644
89--- a/src/vpglsl/Makefile.am
90+++ b/src/vpglsl/Makefile.am
91@@ -44,6 +44,7 @@ EXTRA_DIST = \
92 func2.glsl \
93 ifelse.glsl \
94 if.glsl \
95+ infinite-loop.glsl \
96 mov.glsl \
97 nestedifs.glsl \
98 nestedswizzle.glsl \
99--
1002.0.0
101
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch b/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch
new file mode 100644
index 0000000000..1262dee237
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch
@@ -0,0 +1,73 @@
1From c8c3de5417d6b6c7d7579c528c0cab718f4bfdb6 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 10 Jul 2014 14:48:12 +0200
4Subject: [PATCH 9/9] glsl, perf: Install .glsl, .vert, .frag files
5
6Upstream-Status: Pending
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8---
9 src/fpglsl/Makefile.am | 3 ++-
10 src/glsl/Makefile.am | 3 ++-
11 src/perf/Makefile.am | 3 ++-
12 src/vpglsl/Makefile.am | 3 ++-
13 4 files changed, 8 insertions(+), 4 deletions(-)
14
15diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am
16index fd43c91..2bf51de 100644
17--- a/src/fpglsl/Makefile.am
18+++ b/src/fpglsl/Makefile.am
19@@ -38,7 +38,8 @@ noinst_PROGRAMS = \
20 fp-tri
21 endif
22
23-EXTRA_DIST = \
24+demosdatadir=$(datadir)/$(PACKAGE)/
25+dist_demosdata_DATA= \
26 depth-read.glsl \
27 dowhile2.glsl \
28 dowhile.glsl \
29diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
30index 079a29d..f66ec29 100644
31--- a/src/glsl/Makefile.am
32+++ b/src/glsl/Makefile.am
33@@ -118,7 +118,8 @@ vert_or_frag_only_LDADD = ../util/libutil.la
34 vert_tex_LDADD = ../util/libutil.la
35 vsraytrace_LDADD = ../util/libutil.la
36
37-EXTRA_DIST = \
38+demosdatadir=$(datadir)/$(PACKAGE)/
39+dist_demosdata_DATA= \
40 CH06-brick.frag \
41 CH06-brick.vert \
42 CH11-bumpmap.frag \
43diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am
44index c5cca8d..140256d 100644
45--- a/src/perf/Makefile.am
46+++ b/src/perf/Makefile.am
47@@ -58,7 +58,8 @@ endif
48
49 glslstateschange_LDADD = libperf.la ../util/libutil.la
50
51-EXTRA_DIST = \
52+demosdatadir=$(datadir)/$(PACKAGE)/
53+dist_demosdata_DATA= \
54 glslstateschange1.frag \
55 glslstateschange1.vert \
56 glslstateschange2.frag \
57diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am
58index 48b08f4..5526867 100644
59--- a/src/vpglsl/Makefile.am
60+++ b/src/vpglsl/Makefile.am
61@@ -38,7 +38,8 @@ noinst_PROGRAMS = \
62 vp-tris
63 endif
64
65-EXTRA_DIST = \
66+demosdatadir=$(datadir)/$(PACKAGE)/
67+dist_demosdata_DATA= \
68 for.glsl \
69 func.glsl \
70 func2.glsl \
71--
722.0.0
73
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
index f95b0a33a0..1caa50bc1b 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
@@ -9,22 +9,24 @@ LICENSE = "MIT & PD"
9LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=914225785450eff644a86c871d3ae00e \ 9LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=914225785450eff644a86c871d3ae00e \
10 file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06" 10 file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06"
11 11
12DEPENDS = "virtual/libgl glew"
13
14SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \ 12SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \
15 file://glut.patch \ 13 file://0001-mesa-demos-Add-missing-data-files.patch \
16 file://egl-mesa-screen-surface-build-fix.patch \ 14 file://0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch \
17 file://egl-mesa-screen-surface-query.patch \ 15 file://0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch \
18 file://0001-mesa-demos-Add-missing-data-files.patch \ 16 file://0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch \
19 file://0001-mesa-demos-Use-DEMOS_DATA_DIR-to-locate-data-files.patch" 17 file://0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch \
20 18 file://0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch \
21SRC_URI[md5sum] = "9df33ba69a26bbfbc7c8148602e59542" 19 file://0007-Install-few-more-test-programs.patch \
22SRC_URI[sha256sum] = "9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828" 20 file://0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch \
21 file://0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch \
22"
23SRC_URI[md5sum] = "72613a2c8c013716db02e3ff59d29061"
24SRC_URI[sha256sum] = "e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92"
23 25
24inherit autotools pkgconfig 26inherit autotools pkgconfig
25 27
26PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \ 28PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 glu \
27 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 29 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glew', '', d)}"
28 30
29# The Wayland code doesn't work with Wayland 1.0, so disable it for now 31# The Wayland code doesn't work with Wayland 1.0, so disable it for now
30#${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" 32#${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
@@ -42,12 +44,10 @@ PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa,"
42PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libvg" 44PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libvg"
43PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland" 45PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland"
44PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11" 46PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11"
47PACKAGECONFIG[glew] = "--enable-glew,--disable-glew,glew"
48PACKAGECONFIG[glu] = "--enable-glu,--disable-glu,virtual/libgl"
45 49
46do_install_append () { 50do_install_append() {
47 install -m 0644 ${S}/src/perf/*.frag \ 51 # it can be completely empty when all PACKAGECONFIG options are disabled
48 ${S}/src/perf/*.vert \ 52 rmdir --ignore-fail-on-non-empty ${D}${bindir}
49 ${S}/src/glsl/*.frag \
50 ${S}/src/glsl/*.vert \
51 ${S}/src/glsl/*.geom \
52 ${S}/src/glsl/*.glsl ${D}${datadir}/${BPN}
53} 53}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-14 03:13:01 +0000