summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2014-12-03 22:11:11 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-11 11:34:55 +0000
commit993989f033a31f3ac72891d9627c0d2c46e893be (patch)
treedc6bd01d7ea6d6b7a565730213ffaeb09de32ff7 /meta
parentfe4aa1afad30eebf1a46405603d0b1cf5390d8be (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_10.3.4.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch52
-rw-r--r--meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch362
-rw-r--r--meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch48
-rw-r--r--meta/recipes-graphics/mesa/mesa_10.3.4.bb (renamed from meta/recipes-graphics/mesa/mesa_10.1.3.bb)9
-rw-r--r--meta/recipes-graphics/mesa/mesa_git.bb9
6 files changed, 6 insertions, 474 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb b/meta/recipes-graphics/mesa/mesa-gl_10.3.4.bb
index 2acc21dce5..2acc21dce5 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_10.3.4.bb
diff --git a/meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch b/meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch
deleted file mode 100644
index 2df5e61d21..0000000000
--- a/meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From debac5531f7107d239530ff6e29eeda72b9ec1e9 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 29 Jun 2013 11:20:51 +0200
4Subject: [PATCH 2/4] pipe_loader_sw: include xlib_sw_winsys.h only when
5 HAVE_PIPE_LOADER_XLIB
6
7* HAVE_WINSYS_XLIB was removed in
8 commit b3f1f665b0fef178ae193e6b111f14c9a5ad3b25
9 Author: Matt Turner <mattst88@gmail.com>
10 Date: Sun Jan 20 15:32:08 2013 -0800
11 build: Get rid of GALLIUM_WINSYS_DIRS
12
13* HAVE_PIPE_LOADER_XLIB is set correctly:
14 if test "x$NEED_WINSYS_XLIB" = xyes; then
15 GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_XLIB"
16 GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS \$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la"
17 fi
18
19* fixes build of pipe_loader_sw without libx11 headers available
20
21Upstream-Status: Submitted https://bugs.freedesktop.org/show_bug.cgi?id=66357
22Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
23---
24 src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 4 +++-
25 1 file changed, 3 insertions(+), 1 deletion(-)
26
27diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
28index c2b78c6..0da3f4d 100644
29--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
30+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
31@@ -31,7 +31,9 @@
32 #include "util/u_dl.h"
33 #include "sw/null/null_sw_winsys.h"
34 #include "target-helpers/inline_sw_helper.h"
35+#ifdef HAVE_PIPE_LOADER_XLIB
36 #include "state_tracker/xlib_sw_winsys.h"
37+#endif
38
39 struct pipe_loader_sw_device {
40 struct pipe_loader_device base;
41@@ -44,7 +46,7 @@ struct pipe_loader_sw_device {
42 static struct pipe_loader_ops pipe_loader_sw_ops;
43
44 static struct sw_winsys *(*backends[])() = {
45-#ifdef HAVE_WINSYS_XLIB
46+#ifdef HAVE_PIPE_LOADER_XLIB
47 x11_sw_create,
48 #endif
49 null_sw_create
50--
511.8.2.1
52
diff --git a/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch b/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
deleted file mode 100644
index 30a3d98758..0000000000
--- a/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
+++ /dev/null
@@ -1,362 +0,0 @@
1From 06c1ba29de8a26fffb73ee99f0fc54c704e9fee4 Mon Sep 17 00:00:00 2001
2From: Daniel Stone <daniel@fooishbar.org>
3Date: Fri, 24 May 2013 17:20:27 +0100
4Subject: [PATCH 3/5] EGL: Mutate NativeDisplayType depending on config
5
6If we go through ./configure without enabling X11 anywhere, then set the
7fallback types for EGL NativeDisplay and friends, rather than assuming
8X11/Xlib.
9
10Upstream-Status: Backport (slightly different solution was applied in master
11https://bugs.freedesktop.org/show_bug.cgi?id=64959)
12
13Signed-off-by: Daniel Stone <daniel@fooishbar.org>
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15---
16 configure.ac | 9 +++
17 include/EGL/eglplatform.h | 146 -------------------------------------------
18 include/EGL/eglplatform.h.in | 146 +++++++++++++++++++++++++++++++++++++++++++
19 3 files changed, 155 insertions(+), 146 deletions(-)
20 delete mode 100644 include/EGL/eglplatform.h
21 create mode 100644 include/EGL/eglplatform.h.in
22
23diff --git a/configure.ac b/configure.ac
24index 2b4a374..d4c7a95 100644
25--- a/configure.ac
26+++ b/configure.ac
27@@ -1565,12 +1565,20 @@ fi
28
29 EGL_PLATFORMS="$egl_platforms"
30
31+if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then
32+ MESA_EGL_NO_X11_HEADERS=0
33+else
34+ MESA_EGL_NO_X11_HEADERS=1
35+fi
36+
37 AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1)
38 AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep 'wayland' >/dev/null 2>&1)
39 AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep 'drm' >/dev/null 2>&1)
40 AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep 'fbdev' >/dev/null 2>&1)
41 AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep 'null' >/dev/null 2>&1)
42
43+AC_SUBST([MESA_EGL_NO_X11_HEADERS])
44+
45 AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x")
46 AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x")
47
48@@ -2042,6 +2050,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
49
50 dnl Substitute the config
51 AC_CONFIG_FILES([Makefile
52+ include/EGL/eglplatform.h
53 src/Makefile
54 src/egl/Makefile
55 src/egl/drivers/Makefile
56diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
57deleted file mode 100644
58index 17fdc61..0000000
59--- a/include/EGL/eglplatform.h
60+++ /dev/null
61@@ -1,146 +0,0 @@
62-#ifndef __eglplatform_h_
63-#define __eglplatform_h_
64-
65-/*
66-** Copyright (c) 2007-2009 The Khronos Group Inc.
67-**
68-** Permission is hereby granted, free of charge, to any person obtaining a
69-** copy of this software and/or associated documentation files (the
70-** "Materials"), to deal in the Materials without restriction, including
71-** without limitation the rights to use, copy, modify, merge, publish,
72-** distribute, sublicense, and/or sell copies of the Materials, and to
73-** permit persons to whom the Materials are furnished to do so, subject to
74-** the following conditions:
75-**
76-** The above copyright notice and this permission notice shall be included
77-** in all copies or substantial portions of the Materials.
78-**
79-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
80-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
81-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
82-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
83-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
84-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
85-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
86-*/
87-
88-/* Platform-specific types and definitions for egl.h
89- * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $
90- *
91- * Adopters may modify khrplatform.h and this file to suit their platform.
92- * You are encouraged to submit all modifications to the Khronos group so that
93- * they can be included in future versions of this file. Please submit changes
94- * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
95- * by filing a bug against product "EGL" component "Registry".
96- */
97-
98-#include <KHR/khrplatform.h>
99-
100-/* Macros used in EGL function prototype declarations.
101- *
102- * EGL functions should be prototyped as:
103- *
104- * EGLAPI return-type EGLAPIENTRY eglFunction(arguments);
105- * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments);
106- *
107- * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h
108- */
109-
110-#ifndef EGLAPI
111-#define EGLAPI KHRONOS_APICALL
112-#endif
113-
114-#ifndef EGLAPIENTRY
115-#define EGLAPIENTRY KHRONOS_APIENTRY
116-#endif
117-#define EGLAPIENTRYP EGLAPIENTRY*
118-
119-/* The types NativeDisplayType, NativeWindowType, and NativePixmapType
120- * are aliases of window-system-dependent types, such as X Display * or
121- * Windows Device Context. They must be defined in platform-specific
122- * code below. The EGL-prefixed versions of Native*Type are the same
123- * types, renamed in EGL 1.3 so all types in the API start with "EGL".
124- *
125- * Khronos STRONGLY RECOMMENDS that you use the default definitions
126- * provided below, since these changes affect both binary and source
127- * portability of applications using EGL running on different EGL
128- * implementations.
129- */
130-
131-#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
132-#ifndef WIN32_LEAN_AND_MEAN
133-#define WIN32_LEAN_AND_MEAN 1
134-#endif
135-#include <windows.h>
136-
137-typedef HDC EGLNativeDisplayType;
138-typedef HBITMAP EGLNativePixmapType;
139-typedef HWND EGLNativeWindowType;
140-
141-#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */
142-
143-typedef int EGLNativeDisplayType;
144-typedef void *EGLNativeWindowType;
145-typedef void *EGLNativePixmapType;
146-
147-#elif defined(WL_EGL_PLATFORM)
148-
149-typedef struct wl_display *EGLNativeDisplayType;
150-typedef struct wl_egl_pixmap *EGLNativePixmapType;
151-typedef struct wl_egl_window *EGLNativeWindowType;
152-
153-#elif defined(__GBM__)
154-
155-typedef struct gbm_device *EGLNativeDisplayType;
156-typedef struct gbm_bo *EGLNativePixmapType;
157-typedef void *EGLNativeWindowType;
158-
159-#elif defined(ANDROID) /* Android */
160-
161-struct ANativeWindow;
162-struct egl_native_pixmap_t;
163-
164-typedef struct ANativeWindow *EGLNativeWindowType;
165-typedef struct egl_native_pixmap_t *EGLNativePixmapType;
166-typedef void *EGLNativeDisplayType;
167-
168-#elif defined(__unix__)
169-
170-#ifdef MESA_EGL_NO_X11_HEADERS
171-
172-typedef void *EGLNativeDisplayType;
173-typedef khronos_uint32_t EGLNativePixmapType;
174-typedef khronos_uint32_t EGLNativeWindowType;
175-
176-#else
177-
178-/* X11 (tentative) */
179-#include <X11/Xlib.h>
180-#include <X11/Xutil.h>
181-
182-typedef Display *EGLNativeDisplayType;
183-typedef Pixmap EGLNativePixmapType;
184-typedef Window EGLNativeWindowType;
185-
186-#endif /* MESA_EGL_NO_X11_HEADERS */
187-
188-#else
189-#error "Platform not recognized"
190-#endif
191-
192-/* EGL 1.2 types, renamed for consistency in EGL 1.3 */
193-typedef EGLNativeDisplayType NativeDisplayType;
194-typedef EGLNativePixmapType NativePixmapType;
195-typedef EGLNativeWindowType NativeWindowType;
196-
197-
198-/* Define EGLint. This must be a signed integral type large enough to contain
199- * all legal attribute names and values passed into and out of EGL, whether
200- * their type is boolean, bitmask, enumerant (symbolic constant), integer,
201- * handle, or other. While in general a 32-bit integer will suffice, if
202- * handles are 64 bit types, then EGLint should be defined as a signed 64-bit
203- * integer type.
204- */
205-typedef khronos_int32_t EGLint;
206-
207-#endif /* __eglplatform_h */
208diff --git a/include/EGL/eglplatform.h.in b/include/EGL/eglplatform.h.in
209new file mode 100644
210index 0000000..5126c92
211--- /dev/null
212+++ b/include/EGL/eglplatform.h.in
213@@ -0,0 +1,146 @@
214+#ifndef __eglplatform_h_
215+#define __eglplatform_h_
216+
217+/*
218+** Copyright (c) 2007-2009 The Khronos Group Inc.
219+**
220+** Permission is hereby granted, free of charge, to any person obtaining a
221+** copy of this software and/or associated documentation files (the
222+** "Materials"), to deal in the Materials without restriction, including
223+** without limitation the rights to use, copy, modify, merge, publish,
224+** distribute, sublicense, and/or sell copies of the Materials, and to
225+** permit persons to whom the Materials are furnished to do so, subject to
226+** the following conditions:
227+**
228+** The above copyright notice and this permission notice shall be included
229+** in all copies or substantial portions of the Materials.
230+**
231+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
232+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
233+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
234+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
235+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
236+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
237+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
238+*/
239+
240+/* Platform-specific types and definitions for egl.h
241+ * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $
242+ *
243+ * Adopters may modify khrplatform.h and this file to suit their platform.
244+ * You are encouraged to submit all modifications to the Khronos group so that
245+ * they can be included in future versions of this file. Please submit changes
246+ * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
247+ * by filing a bug against product "EGL" component "Registry".
248+ */
249+
250+#include <KHR/khrplatform.h>
251+
252+/* Macros used in EGL function prototype declarations.
253+ *
254+ * EGL functions should be prototyped as:
255+ *
256+ * EGLAPI return-type EGLAPIENTRY eglFunction(arguments);
257+ * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments);
258+ *
259+ * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h
260+ */
261+
262+#ifndef EGLAPI
263+#define EGLAPI KHRONOS_APICALL
264+#endif
265+
266+#ifndef EGLAPIENTRY
267+#define EGLAPIENTRY KHRONOS_APIENTRY
268+#endif
269+#define EGLAPIENTRYP EGLAPIENTRY*
270+
271+/* The types NativeDisplayType, NativeWindowType, and NativePixmapType
272+ * are aliases of window-system-dependent types, such as X Display * or
273+ * Windows Device Context. They must be defined in platform-specific
274+ * code below. The EGL-prefixed versions of Native*Type are the same
275+ * types, renamed in EGL 1.3 so all types in the API start with "EGL".
276+ *
277+ * Khronos STRONGLY RECOMMENDS that you use the default definitions
278+ * provided below, since these changes affect both binary and source
279+ * portability of applications using EGL running on different EGL
280+ * implementations.
281+ */
282+
283+#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
284+#ifndef WIN32_LEAN_AND_MEAN
285+#define WIN32_LEAN_AND_MEAN 1
286+#endif
287+#include <windows.h>
288+
289+typedef HDC EGLNativeDisplayType;
290+typedef HBITMAP EGLNativePixmapType;
291+typedef HWND EGLNativeWindowType;
292+
293+#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */
294+
295+typedef int EGLNativeDisplayType;
296+typedef void *EGLNativeWindowType;
297+typedef void *EGLNativePixmapType;
298+
299+#elif defined(WL_EGL_PLATFORM)
300+
301+typedef struct wl_display *EGLNativeDisplayType;
302+typedef struct wl_egl_pixmap *EGLNativePixmapType;
303+typedef struct wl_egl_window *EGLNativeWindowType;
304+
305+#elif defined(__GBM__)
306+
307+typedef struct gbm_device *EGLNativeDisplayType;
308+typedef struct gbm_bo *EGLNativePixmapType;
309+typedef void *EGLNativeWindowType;
310+
311+#elif defined(ANDROID) /* Android */
312+
313+struct ANativeWindow;
314+struct egl_native_pixmap_t;
315+
316+typedef struct ANativeWindow *EGLNativeWindowType;
317+typedef struct egl_native_pixmap_t *EGLNativePixmapType;
318+typedef void *EGLNativeDisplayType;
319+
320+#elif defined(__unix__)
321+
322+#if @MESA_EGL_NO_X11_HEADERS@
323+
324+typedef void *EGLNativeDisplayType;
325+typedef khronos_uint32_t EGLNativePixmapType;
326+typedef khronos_uint32_t EGLNativeWindowType;
327+
328+#else
329+
330+/* X11 (tentative) */
331+#include <X11/Xlib.h>
332+#include <X11/Xutil.h>
333+
334+typedef Display *EGLNativeDisplayType;
335+typedef Pixmap EGLNativePixmapType;
336+typedef Window EGLNativeWindowType;
337+
338+#endif /* MESA_EGL_NO_X11_HEADERS */
339+
340+#else
341+#error "Platform not recognized"
342+#endif
343+
344+/* EGL 1.2 types, renamed for consistency in EGL 1.3 */
345+typedef EGLNativeDisplayType NativeDisplayType;
346+typedef EGLNativePixmapType NativePixmapType;
347+typedef EGLNativeWindowType NativeWindowType;
348+
349+
350+/* Define EGLint. This must be a signed integral type large enough to contain
351+ * all legal attribute names and values passed into and out of EGL, whether
352+ * their type is boolean, bitmask, enumerant (symbolic constant), integer,
353+ * handle, or other. While in general a 32-bit integer will suffice, if
354+ * handles are 64 bit types, then EGLint should be defined as a signed 64-bit
355+ * integer type.
356+ */
357+typedef khronos_int32_t EGLint;
358+
359+#endif /* __eglplatform_h */
360--
3611.8.2.1
362
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 @@
1Fix out of tree compilation failure due to
20003-EGL-Mutate-NativeDisplayType-depending-on-config.patch.
3
4Upstream-Status: Inappropriate (upstream has different solution to root problem)
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7diff --git a/src/egl/drivers/dri2/Makefile.am b/src/egl/drivers/dri2/Makefile.am
8index 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 \
19diff --git a/src/egl/drivers/glx/Makefile.am b/src/egl/drivers/glx/Makefile.am
20index 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)
31diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
32index 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
diff --git a/meta/recipes-graphics/mesa/mesa_10.1.3.bb b/meta/recipes-graphics/mesa/mesa_10.3.4.bb
index abc450a9c5..50092c9a5c 100644
--- a/meta/recipes-graphics/mesa/mesa_10.1.3.bb
+++ b/meta/recipes-graphics/mesa/mesa_10.3.4.bb
@@ -1,12 +1,9 @@
1require ${BPN}.inc 1require ${BPN}.inc
2 2
3SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ 3SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
4 file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \
5 file://0006-fix-out-of-tree-egl.patch \
6 "
7 4
8SRC_URI[md5sum] = "ba6dbe2b9cab0b4de840c996b9b6a3ad" 5SRC_URI[md5sum] = "fa0558a3d02c2bb8c208c030ccdc992e"
9SRC_URI[sha256sum] = "b2615e236ef25d0fb94b8420bdd2e2a520b7dd5ca2d4b93306154f7fd4adecc3" 6SRC_URI[sha256sum] = "e6373913142338d10515daf619d659433bfd2989988198930c13b0945a15e98a"
10 7
11S = "${WORKDIR}/Mesa-${PV}" 8S = "${WORKDIR}/Mesa-${PV}"
12 9
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index cda310a525..b046ae2e65 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -4,13 +4,10 @@ DEFAULT_PREFERENCE = "-1"
4 4
5LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de" 5LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de"
6 6
7SRCREV = "0028eb1083e6adc110a23a5f02c993cda217067a" 7SRCREV = "c7b9a2e38a3e471562b50dab8be65db8ac6819f8"
8PV = "10.1.3+git${SRCPV}" 8PV = "10.3.4+git${SRCPV}"
9 9
10SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.1 \ 10SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.4"
11 file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \
12 file://0006-fix-out-of-tree-egl.patch \
13 "
14 11
15S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
16 13