diff options
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.patch | 35 |
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 @@ -From 8d31ae23683394617c49301b039b3a069b9ea436 Mon Sep 17 00:00:00 2001 +From 06c1ba29de8a26fffb73ee99f0fc54c704e9fee4 Mon Sep 17 00:00:00 2001 From: Daniel Stone <daniel@fooishbar.org> Date: Fri, 24 May 2013 17:20:27 +0100 -Subject: [PATCH 3/4] EGL: Mutate NativeDisplayType depending on config +Subject: [PATCH 3/5] EGL: Mutate NativeDisplayType depending on config If we go through ./configure without enabling X11 anywhere, then set the fallback types for EGL NativeDisplay and friends, rather than assuming @@ -13,36 +13,39 @@ https://bugs.freedesktop.org/show_bug.cgi?id=64959) Signed-off-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - configure.ac | 5 ++ + configure.ac | 9 +++ include/EGL/eglplatform.h | 146 ------------------------------------------- include/EGL/eglplatform.h.in | 146 +++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 151 insertions(+), 146 deletions(-) + 3 files changed, 155 insertions(+), 146 deletions(-) delete mode 100644 include/EGL/eglplatform.h create mode 100644 include/EGL/eglplatform.h.in diff --git a/configure.ac b/configure.ac -index 67b8c40..afc3217 100644 +index 2b4a374..d4c7a95 100644 --- a/configure.ac +++ b/configure.ac -@@ -1499,6 +1499,9 @@ EGL_PLATFORMS="$egl_platforms" +@@ -1565,12 +1565,20 @@ fi - if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then - NEED_WINSYS_XLIB=yes + EGL_PLATFORMS="$egl_platforms" + ++if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then + MESA_EGL_NO_X11_HEADERS=0 +else + MESA_EGL_NO_X11_HEADERS=1 - fi ++fi ++ AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1) AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep 'wayland' >/dev/null 2>&1) -@@ -1512,6 +1515,7 @@ AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x") - AC_SUBST([EGL_NATIVE_PLATFORM]) - AC_SUBST([EGL_PLATFORMS]) - AC_SUBST([EGL_CFLAGS]) + AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep 'drm' >/dev/null 2>&1) + AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep 'fbdev' >/dev/null 2>&1) + AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep 'null' >/dev/null 2>&1) + +AC_SUBST([MESA_EGL_NO_X11_HEADERS]) ++ + AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x") + AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x") - AC_ARG_WITH([egl-driver-dir], - [AS_HELP_STRING([--with-egl-driver-dir=DIR], -@@ -1991,6 +1995,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" +@@ -2042,6 +2050,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" dnl Substitute the config AC_CONFIG_FILES([Makefile |