summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch')
-rw-r--r--meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch35
1 files changed, 19 insertions, 16 deletions
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
index 8a83f4b07b..30a3d98758 100644
--- 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
@@ -1,7 +1,7 @@
1From 8d31ae23683394617c49301b039b3a069b9ea436 Mon Sep 17 00:00:00 2001 1From 06c1ba29de8a26fffb73ee99f0fc54c704e9fee4 Mon Sep 17 00:00:00 2001
2From: Daniel Stone <daniel@fooishbar.org> 2From: Daniel Stone <daniel@fooishbar.org>
3Date: Fri, 24 May 2013 17:20:27 +0100 3Date: Fri, 24 May 2013 17:20:27 +0100
4Subject: [PATCH 3/4] EGL: Mutate NativeDisplayType depending on config 4Subject: [PATCH 3/5] EGL: Mutate NativeDisplayType depending on config
5 5
6If we go through ./configure without enabling X11 anywhere, then set the 6If we go through ./configure without enabling X11 anywhere, then set the
7fallback types for EGL NativeDisplay and friends, rather than assuming 7fallback types for EGL NativeDisplay and friends, rather than assuming
@@ -13,36 +13,39 @@ https://bugs.freedesktop.org/show_bug.cgi?id=64959)
13Signed-off-by: Daniel Stone <daniel@fooishbar.org> 13Signed-off-by: Daniel Stone <daniel@fooishbar.org>
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15--- 15---
16 configure.ac | 5 ++ 16 configure.ac | 9 +++
17 include/EGL/eglplatform.h | 146 ------------------------------------------- 17 include/EGL/eglplatform.h | 146 -------------------------------------------
18 include/EGL/eglplatform.h.in | 146 +++++++++++++++++++++++++++++++++++++++++++ 18 include/EGL/eglplatform.h.in | 146 +++++++++++++++++++++++++++++++++++++++++++
19 3 files changed, 151 insertions(+), 146 deletions(-) 19 3 files changed, 155 insertions(+), 146 deletions(-)
20 delete mode 100644 include/EGL/eglplatform.h 20 delete mode 100644 include/EGL/eglplatform.h
21 create mode 100644 include/EGL/eglplatform.h.in 21 create mode 100644 include/EGL/eglplatform.h.in
22 22
23diff --git a/configure.ac b/configure.ac 23diff --git a/configure.ac b/configure.ac
24index 67b8c40..afc3217 100644 24index 2b4a374..d4c7a95 100644
25--- a/configure.ac 25--- a/configure.ac
26+++ b/configure.ac 26+++ b/configure.ac
27@@ -1499,6 +1499,9 @@ EGL_PLATFORMS="$egl_platforms" 27@@ -1565,12 +1565,20 @@ fi
28 28
29 if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then 29 EGL_PLATFORMS="$egl_platforms"
30 NEED_WINSYS_XLIB=yes 30
31+if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then
31+ MESA_EGL_NO_X11_HEADERS=0 32+ MESA_EGL_NO_X11_HEADERS=0
32+else 33+else
33+ MESA_EGL_NO_X11_HEADERS=1 34+ MESA_EGL_NO_X11_HEADERS=1
34 fi 35+fi
36+
35 AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1) 37 AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1)
36 AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep 'wayland' >/dev/null 2>&1) 38 AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep 'wayland' >/dev/null 2>&1)
37@@ -1512,6 +1515,7 @@ AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x") 39 AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep 'drm' >/dev/null 2>&1)
38 AC_SUBST([EGL_NATIVE_PLATFORM]) 40 AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep 'fbdev' >/dev/null 2>&1)
39 AC_SUBST([EGL_PLATFORMS]) 41 AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep 'null' >/dev/null 2>&1)
40 AC_SUBST([EGL_CFLAGS]) 42
41+AC_SUBST([MESA_EGL_NO_X11_HEADERS]) 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")
42 47
43 AC_ARG_WITH([egl-driver-dir], 48@@ -2042,6 +2050,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
44 [AS_HELP_STRING([--with-egl-driver-dir=DIR],
45@@ -1991,6 +1995,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
46 49
47 dnl Substitute the config 50 dnl Substitute the config
48 AC_CONFIG_FILES([Makefile 51 AC_CONFIG_FILES([Makefile