summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-08-01 13:17:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-19 10:45:57 +0100
commit25db6dd7fc3175aa1f2e5acc148674c9f506777e (patch)
treebe796d23d692544bacc6717521a12b1d56ada59b /meta
parent3ea5c742c825574b7e475d6d12060b1b6429ef6b (diff)
downloadpoky-25db6dd7fc3175aa1f2e5acc148674c9f506777e.tar.gz
mesa-demos: fix GLES2 build
(From OE-Core rev: 58047dcf547b582211f84c6f24c21cc1aa895f1e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch21
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb5
2 files changed, 24 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch b/meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
new file mode 100644
index 0000000000..849c974e09
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
@@ -0,0 +1,21 @@
1Fix to enable gles2 to build.
2
3Ross Burton <ross.burton@intel.com>
4
5Upstream-Status: Pending
6
7Index: mesa-demos-8.0.1/src/egl/opengles2/es2_info.c
8===================================================================
9--- mesa-demos-8.0.1.orig/src/egl/opengles2/es2_info.c 2010-07-07 18:57:15.000000000 +0100
10+++ mesa-demos-8.0.1/src/egl/opengles2/es2_info.c 2012-08-01 13:14:59.000104115 +0100
11@@ -18,8 +18,8 @@
12 #include <X11/Xlib.h>
13 #include <X11/Xutil.h>
14 #include <X11/keysym.h>
15-#include <GLES/gl.h>
16-#include <GLES/glext.h>
17+#include <GLES2/gl2.h>
18+#include <GLES2/gl2ext.h>
19 #include <EGL/egl.h>
20
21
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb b/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
index bfc62c585f..1d16bfc392 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
@@ -11,10 +11,11 @@ LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=9142
11 11
12DEPENDS = "virtual/libx11 virtual/libgl glew" 12DEPENDS = "virtual/libx11 virtual/libgl glew"
13 13
14PR = "r2" 14PR = "r3"
15 15
16SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \ 16SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \
17 file://dso_linking_change_build_fix.patch" 17 file://dso_linking_change_build_fix.patch \
18 file://gles2-info.patch"
18 19
19inherit autotools pkgconfig 20inherit autotools pkgconfig
20 21