summaryrefslogtreecommitdiffstats
path: root/package/mesa3d/0003-configure.ac-invert-order-for-wayland-scanner-check.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/mesa3d/0003-configure.ac-invert-order-for-wayland-scanner-check.patch')
-rw-r--r--package/mesa3d/0003-configure.ac-invert-order-for-wayland-scanner-check.patch14
1 files changed, 8 insertions, 6 deletions
diff --git a/package/mesa3d/0003-configure.ac-invert-order-for-wayland-scanner-check.patch b/package/mesa3d/0003-configure.ac-invert-order-for-wayland-scanner-check.patch
index d6c9a0d453..bfb6376555 100644
--- a/package/mesa3d/0003-configure.ac-invert-order-for-wayland-scanner-check.patch
+++ b/package/mesa3d/0003-configure.ac-invert-order-for-wayland-scanner-check.patch
@@ -1,4 +1,4 @@
-From 60ee5191a0c074251862a15b12afdc9db0b2df38 Mon Sep 17 00:00:00 2001
+From 11a759c33160db6e887e7640071ba84482e6164f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 17 Nov 2016 15:36:54 -0300
Subject: [PATCH] configure.ac: invert order for wayland-scanner check
@@ -13,16 +13,18 @@ pkg-config.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+[Romain: rebase on 17.3.1]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 2c7e636..0198d52 100644
+index ee03d6f582..786b7214b9 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2174,11 +2174,11 @@ if test "x$with_platforms" != xauto; then
- with_egl_platforms=$with_platforms
+@@ -1695,11 +1695,11 @@ if test "x$with_platforms" = xauto; then
+ with_platforms=$with_egl_platforms
fi
-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
@@ -36,7 +38,7 @@ index 2c7e636..0198d52 100644
+ WAYLAND_SCANNER='')
fi
- # Do per-EGL platform setups and checks
+ PKG_CHECK_EXISTS([wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], [have_wayland_protocols=yes], [have_wayland_protocols=no])
--
-2.7.3
+2.14.3
OpenPOWER on IntegriCloud