summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
diff options
context:
space:
mode:
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.patch20
1 files changed, 11 insertions, 9 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 1c2ded0e60..d065e2285c 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 @@
1From 81bcaa1aeecf1e66b4d94181e9a827d68e970b03 Mon Sep 17 00:00:00 2001 1From e53837ad7b01364f34a533b95f4817c1795789de Mon Sep 17 00:00:00 2001
2From: Fabio Berton <fabio.berton@ossystems.com.br> 2From: Fabio Berton <fabio.berton@ossystems.com.br>
3Date: Wed, 20 Feb 2019 16:17:00 -0300 3Date: Wed, 20 Feb 2019 16:17:00 -0300
4Subject: [PATCH 1/5] Simplify wayland-scanner lookup 4Subject: [PATCH 1/4] Simplify wayland-scanner lookup
5Organization: O.S. Systems Software LTDA. 5Organization: O.S. Systems Software LTDA.
6 6
7Don't use pkg-config to lookup the path of a binary that's in the path. 7Don't use pkg-config to lookup the path of a binary that's in the path.
@@ -12,31 +12,33 @@ PKG_CONFIG_SYSROOT_DIR.
12Upstream-Status: Pending 12Upstream-Status: Pending
13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
14Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 14Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
15Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
15--- 16---
16 configure.ac | 7 +------ 17 configure.ac | 7 +------
17 1 file changed, 1 insertion(+), 6 deletions(-) 18 1 file changed, 1 insertion(+), 6 deletions(-)
18 19
19diff --git a/configure.ac b/configure.ac 20diff --git a/configure.ac b/configure.ac
20index cd9ff259fad..402b4a91946 100644 21index 1ef68fe68e6..1816a4cd475 100644
21--- a/configure.ac 22--- a/configure.ac
22+++ b/configure.ac 23+++ b/configure.ac
23@@ -1841,16 +1841,11 @@ for plat in $platforms; do 24@@ -1854,16 +1854,11 @@ for plat in $platforms; do
24 fi 25 fi
25 WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` 26 WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
26 27
27- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], 28- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
28- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, 29- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
29- WAYLAND_SCANNER='') 30- WAYLAND_SCANNER='')
30 PKG_CHECK_EXISTS([wayland-scanner >= 1.15], 31 PKG_CHECK_EXISTS([wayland-scanner >= 1.15],
31 AC_SUBST(SCANNER_ARG, 'private-code'), 32 AC_SUBST(SCANNER_ARG, 'private-code'),
32 AC_SUBST(SCANNER_ARG, 'code')) 33 AC_SUBST(SCANNER_ARG, 'code'))
33 34
34- if test "x$WAYLAND_SCANNER" = x; then 35- if test "x$WAYLAND_SCANNER" = x; then
35- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) 36- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
36- fi 37- fi
37+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) 38+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
38 39
39 if test "x$WAYLAND_SCANNER" = "x:"; then 40 if test "x$WAYLAND_SCANNER" = "x:"; then
40 AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) 41 AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform])
41-- 42--
422.20.1 432.21.0
44