2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0012-Fix-gles-configurability.patch b/meta/recipes-graphics/mesa/mesa-demos/0012-Fix-gles-configurability.patch
new file mode 100644
index 0000000000..0b437a47d0
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-demos/0012-Fix-gles-configurability.patch
@@ -0,0 +1,39 @@
+Index: mesa-demos-8.2.0/src/egl/opengles1/Makefile.am
+===================================================================
+--- mesa-demos-8.2.0.orig/src/egl/opengles1/Makefile.am 2016-07-29 10:52:50.131729547 -0500
+++ mesa-demos-8.2.0/src/egl/opengles1/Makefile.am      2016-07-29 10:59:26.000000000 -0500
+@@ -36,6 +36,8 @@
+        $(EGL_LIBS) \
+        -lm
+ 
+if HAVE_EGL
+if HAVE_GLESV1
+ bin_PROGRAMS =
+ 
+ if HAVE_X11
+@@ -76,3 +78,5 @@
+ torus_x11_LDADD = ../eglut/libeglut_x11.la
+ tri_x11_LDADD = ../eglut/libeglut_x11.la
+ endif
+endif
+endif
+Index: mesa-demos-8.2.0/src/egl/opengles2/Makefile.am
+===================================================================
+--- mesa-demos-8.2.0.orig/src/egl/opengles2/Makefile.am 2016-07-29 10:52:50.131729547 -0500
+++ mesa-demos-8.2.0/src/egl/opengles2/Makefile.am      2016-07-29 10:59:03.000000000 -0500
+@@ -33,6 +33,8 @@
+        $(EGL_LIBS) \
+        -lm
+ 
+if HAVE_EGL
+if HAVE_GLESV2
+ bin_PROGRAMS =
+ 
+ if HAVE_WAYLAND
+@@ -53,4 +55,5 @@
+ es2gears_x11_LDADD = ../eglut/libeglut_x11.la
+ es2tri_LDADD = $(X11_LIBS)
+ endif
+-
+endif
+endif
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
index 2df9bbac29..8e12d82e11 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
@@ -21,6 +21,7 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \
    file://0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch \
    file://0010-sharedtex_mt-fix-rendering-thread-hang.patch \
    file://0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch \
+    file://0012-Fix-gles-configurability.patch \
 "
 SRC_URI[md5sum] = "72613a2c8c013716db02e3ff59d29061"
 SRC_URI[sha256sum] = "e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92"

diff --git a/meta/recipes-graphics/mesa/mesa-demos/0012-Fix-gles-configurability.patch b/meta/recipes-graphics/mesa/mesa-demos/0012-Fix-gles-configurability.patch new file mode 100644 index 0000000000..0b437a47d0 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos/0012-Fix-gles-configurability.patch
@@ -0,0 +1,39 @@
		1	Index: mesa-demos-8.2.0/src/egl/opengles1/Makefile.am
		2	===================================================================
		3	--- mesa-demos-8.2.0.orig/src/egl/opengles1/Makefile.am 2016-07-29 10:52:50.131729547 -0500
		4	+++ mesa-demos-8.2.0/src/egl/opengles1/Makefile.am 2016-07-29 10:59:26.000000000 -0500
		5	@@ -36,6 +36,8 @@
		6	$(EGL_LIBS) \
		7	-lm
		8
		9	+if HAVE_EGL
		10	+if HAVE_GLESV1
		11	bin_PROGRAMS =
		12
		13	if HAVE_X11
		14	@@ -76,3 +78,5 @@
		15	torus_x11_LDADD = ../eglut/libeglut_x11.la
		16	tri_x11_LDADD = ../eglut/libeglut_x11.la
		17	endif
		18	+endif
		19	+endif
		20	Index: mesa-demos-8.2.0/src/egl/opengles2/Makefile.am
		21	===================================================================
		22	--- mesa-demos-8.2.0.orig/src/egl/opengles2/Makefile.am 2016-07-29 10:52:50.131729547 -0500
		23	+++ mesa-demos-8.2.0/src/egl/opengles2/Makefile.am 2016-07-29 10:59:03.000000000 -0500
		24	@@ -33,6 +33,8 @@
		25	$(EGL_LIBS) \
		26	-lm
		27
		28	+if HAVE_EGL
		29	+if HAVE_GLESV2
		30	bin_PROGRAMS =
		31
		32	if HAVE_WAYLAND
		33	@@ -53,4 +55,5 @@
		34	es2gears_x11_LDADD = ../eglut/libeglut_x11.la
		35	es2tri_LDADD = $(X11_LIBS)
		36	endif
		37	-
		38	+endif
		39	+endif


diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb index 2df9bbac29..8e12d82e11 100644 --- a/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb +++ b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
@@ -21,6 +21,7 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \
21	file://0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch \	21	file://0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch \
22	file://0010-sharedtex_mt-fix-rendering-thread-hang.patch \	22	file://0010-sharedtex_mt-fix-rendering-thread-hang.patch \
23	file://0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch \	23	file://0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch \
		24	file://0012-Fix-gles-configurability.patch \
24	"	25	"
25	SRC_URI[md5sum] = "72613a2c8c013716db02e3ff59d29061"	26	SRC_URI[md5sum] = "72613a2c8c013716db02e3ff59d29061"
26	SRC_URI[sha256sum] = "e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92"	27	SRC_URI[sha256sum] = "e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92"