diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch index e49695bf85..eb6ff4ff04 100644 --- a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch +++ b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2f68fcaaf4964e7feeb383f5c26851965cda037c Mon Sep 17 00:00:00 2001 | 1 | From c908f0c13ac81a3a52140f129a13b2bc997ff4ee Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Tue, 15 Nov 2016 15:20:49 +0200 | 3 | Date: Tue, 15 Nov 2016 15:20:49 +0200 |
4 | Subject: [PATCH] Simplify wayland-scanner lookup | 4 | Subject: [PATCH] Simplify wayland-scanner lookup |
@@ -15,23 +15,23 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
15 | 1 file changed, 1 insertion(+), 6 deletions(-) | 15 | 1 file changed, 1 insertion(+), 6 deletions(-) |
16 | 16 | ||
17 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
18 | index e56e35a..a92005a 100644 | 18 | index 2c7e636fac..d2b2350739 100644 |
19 | --- a/configure.ac | 19 | --- a/configure.ac |
20 | +++ b/configure.ac | 20 | +++ b/configure.ac |
21 | @@ -2020,12 +2020,7 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then | 21 | @@ -2174,12 +2174,7 @@ if test "x$with_platforms" != xauto; then |
22 | AC_MSG_ERROR([cannot build egl state tracker without EGL library]) | 22 | with_egl_platforms=$with_platforms |
23 | fi | 23 | fi |
24 | 24 | ||
25 | -PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], | 25 | -PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], |
26 | - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, | 26 | - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, |
27 | - WAYLAND_SCANNER='') | 27 | - WAYLAND_SCANNER='') |
28 | -if test "x$WAYLAND_SCANNER" = x; then | 28 | -if test "x$WAYLAND_SCANNER" = x; then |
29 | - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) | 29 | - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) |
30 | -fi | 30 | -fi |
31 | +AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) | 31 | +AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) |
32 | 32 | ||
33 | # Do per-EGL platform setups and checks | 33 | # Do per-EGL platform setups and checks |
34 | egl_platforms=`IFS=', '; echo $with_egl_platforms` | 34 | egl_platforms=`IFS=', '; echo $with_egl_platforms` |
35 | -- | 35 | -- |
36 | 2.1.4 | 36 | 2.13.0 |
37 | 37 | ||