diff options
author | Aníbal Limón <anibal.limon@linux.intel.com> | 2014-12-03 22:11:11 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-11 11:34:55 +0000 |
commit | 993989f033a31f3ac72891d9627c0d2c46e893be (patch) | |
tree | dc6bd01d7ea6d6b7a565730213ffaeb09de32ff7 /meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch | |
parent | fe4aa1afad30eebf1a46405603d0b1cf5390d8be (diff) | |
download | poky-993989f033a31f3ac72891d9627c0d2c46e893be.tar.gz |
mesa: Upgrade to 10.3.4.
Remove 0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA,
0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch and
0006-fix-out-of-tree-egl.patch are already in upstream.
(From OE-Core rev: 929dc6e581a94b45e6d41b8a596e76f4c2b078ee)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch b/meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch deleted file mode 100644 index 88a4fb0636..0000000000 --- a/meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | Fix out of tree compilation failure due to | ||
2 | 0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch. | ||
3 | |||
4 | Upstream-Status: Inappropriate (upstream has different solution to root problem) | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | diff --git a/src/egl/drivers/dri2/Makefile.am b/src/egl/drivers/dri2/Makefile.am | ||
8 | index 45f7dfa..ed0e777 100644 | ||
9 | --- a/src/egl/drivers/dri2/Makefile.am | ||
10 | +++ b/src/egl/drivers/dri2/Makefile.am | ||
11 | @@ -21,6 +21,7 @@ | ||
12 | |||
13 | AM_CFLAGS = \ | ||
14 | -I$(top_srcdir)/include \ | ||
15 | + -I$(top_builddir)/include \ | ||
16 | -I$(top_srcdir)/src/egl/main \ | ||
17 | -I$(top_srcdir)/src/gbm/main \ | ||
18 | -I$(top_srcdir)/src/gbm/backends/dri \ | ||
19 | diff --git a/src/egl/drivers/glx/Makefile.am b/src/egl/drivers/glx/Makefile.am | ||
20 | index 6bf67ea..7b87047 100644 | ||
21 | --- a/src/egl/drivers/glx/Makefile.am | ||
22 | +++ b/src/egl/drivers/glx/Makefile.am | ||
23 | @@ -21,6 +21,7 @@ | ||
24 | |||
25 | AM_CFLAGS = \ | ||
26 | -I$(top_srcdir)/include \ | ||
27 | + -I$(top_builddir)/include \ | ||
28 | -I$(top_srcdir)/src/egl/main \ | ||
29 | $(X11_CFLAGS) \ | ||
30 | $(DEFINES) | ||
31 | diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am | ||
32 | index ca5257a..13a5734 100644 | ||
33 | --- a/src/egl/main/Makefile.am | ||
34 | +++ b/src/egl/main/Makefile.am | ||
35 | @@ -27,6 +27,7 @@ endif | ||
36 | |||
37 | AM_CFLAGS = \ | ||
38 | -I$(top_srcdir)/include \ | ||
39 | + -I$(top_builddir)/include \ | ||
40 | -I$(top_srcdir)/src/gbm/main \ | ||
41 | $(DEFINES) \ | ||
42 | $(EGL_CFLAGS) \ | ||
43 | @@ -135,4 +136,4 @@ egl_HEADERS = \ | ||
44 | $(top_srcdir)/include/EGL/eglext.h \ | ||
45 | $(top_srcdir)/include/EGL/egl.h \ | ||
46 | $(top_srcdir)/include/EGL/eglmesaext.h \ | ||
47 | - $(top_srcdir)/include/EGL/eglplatform.h | ||
48 | + $(top_builddir)/include/EGL/eglplatform.h | ||