diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch b/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch index a50d2a2ba2..1c2ded0e60 100644 --- a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch +++ b/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 7e8e0f8a8ac2425e19a2f340c9e3da9345f25940 Mon Sep 17 00:00:00 2001 | 1 | From 81bcaa1aeecf1e66b4d94181e9a827d68e970b03 Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Fabio Berton <fabio.berton@ossystems.com.br> |
3 | Date: Tue, 15 Nov 2016 15:20:49 +0200 | 3 | Date: Wed, 20 Feb 2019 16:17:00 -0300 |
4 | Subject: [PATCH 1/6] Simplify wayland-scanner lookup | 4 | Subject: [PATCH 1/5] Simplify wayland-scanner lookup |
5 | Organization: O.S. Systems Software LTDA. | 5 | Organization: O.S. Systems Software LTDA. |
6 | 6 | ||
7 | Don't use pkg-config to lookup the path of a binary that's in the path. | 7 | Don't use pkg-config to lookup the path of a binary that's in the path. |
@@ -17,23 +17,26 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | |||
17 | 1 file changed, 1 insertion(+), 6 deletions(-) | 17 | 1 file changed, 1 insertion(+), 6 deletions(-) |
18 | 18 | ||
19 | diff --git a/configure.ac b/configure.ac | 19 | diff --git a/configure.ac b/configure.ac |
20 | index 14f1af2b2f..916d0bd207 100644 | 20 | index cd9ff259fad..402b4a91946 100644 |
21 | --- a/configure.ac | 21 | --- a/configure.ac |
22 | +++ b/configure.ac | 22 | +++ b/configure.ac |
23 | @@ -1825,12 +1825,7 @@ for plat in $platforms; do | 23 | @@ -1841,16 +1841,11 @@ for plat in $platforms; do |
24 | PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED]) | 24 | fi |
25 | WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` | 25 | WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` |
26 | 26 | ||
27 | - PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], | 27 | - PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], |
28 | - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, | 28 | - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, |
29 | - WAYLAND_SCANNER='') | 29 | - WAYLAND_SCANNER='') |
30 | PKG_CHECK_EXISTS([wayland-scanner >= 1.15], | ||
31 | AC_SUBST(SCANNER_ARG, 'private-code'), | ||
32 | AC_SUBST(SCANNER_ARG, 'code')) | ||
33 | |||
30 | - if test "x$WAYLAND_SCANNER" = x; then | 34 | - if test "x$WAYLAND_SCANNER" = x; then |
31 | - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) | 35 | - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) |
32 | - fi | 36 | - fi |
33 | + AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) | 37 | + AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) |
34 | 38 | ||
35 | if test "x$WAYLAND_SCANNER" = "x:"; then | 39 | if test "x$WAYLAND_SCANNER" = "x:"; then |
36 | AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) | 40 | AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) |
37 | -- | 41 | -- |
38 | 2.18.0 | 42 | 2.20.1 |
39 | |||