added slightly edited mesa from x11 repo

1 files changed, 60 insertions, 0 deletions

diff --git a/packages/x11-dri/mesa/files/mesa-configure.ac-Add-with-wayland-scanner-path.patch b/packages/x11-dri/mesa/files/mesa-configure.ac-Add-with-wayland-scanner-path.patch
new file mode 100644
index 0000000..a80f11a
--- /dev/null
+++ b/packages/x11-dri/mesa/files/mesa-configure.ac-Add-with-wayland-scanner-path.patch
@@ -0,0 +1,60 @@
+Upstream: under review, https://patchwork.freedesktop.org/patch/157889/
+Reason: Fix cross compiling
+
+From b9f3b1cd55ef45e196dfa9c4f9469c7a7fa7f91d Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Tue, 23 May 2017 11:13:57 +0300
+Subject: [PATCH] configure.ac: Add --with-wayland-scanner-path
+
+Modify wayland-scanner lookup: Use the path given by pkg-config
+but offer an option to override the path with
+"--with-wayland-scanner-path=PATH". The latter is useful for
+cross-compile situations.
+
+AC_PATH_PROG is no longer used (if the scanner is installed it should
+get found by pkg-config). AC_SUBST is added so the output variable is
+created when only the configure option is used.
+---
+ configure.ac | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b069f54155..5bd8dc76ab 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1661,12 +1661,19 @@ if test "x$with_platforms" = xauto; then
+     with_platforms=$with_egl_platforms
+ fi
+ 
+-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
++
++AC_ARG_WITH([wayland-scanner-path],
++    [AS_HELP_STRING([--with-wayland-scanner-path=PATH],
++        [Path to wayland-scanner (by default the path from
++        'pkg-config --variable=wayland_scanner wayland-scanner' is used)])],
++    [WAYLAND_SCANNER="$withval"],
++    [WAYLAND_SCANNER="auto"])
++if test x$WAYLAND_SCANNER = xauto; then
++    PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
+         WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
+-        WAYLAND_SCANNER='')
+-if test "x$WAYLAND_SCANNER" = x; then
+-    AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
++        WAYLAND_SCANNER=":")
+ fi
++AC_SUBST(WAYLAND_SCANNER)
+ 
+ # Do per platform setups and checks
+ platforms=`IFS=', '; echo $with_platforms`
+@@ -1677,7 +1684,7 @@ for plat in $platforms; do
+ 		PKG_CHECK_MODULES([WAYLAND], [wayland-client >= $WAYLAND_REQUIRED wayland-server >= $WAYLAND_REQUIRED])
+ 
+ 		if test "x$WAYLAND_SCANNER" = "x:"; then
+-			AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform])
++			AC_MSG_ERROR([wayland-scanner is needed by Wayland platform but it could not be found and --with-wayland-scanner-path was not used])
+ 		fi
+ 		DEFINES="$DEFINES -DHAVE_WAYLAND_PLATFORM"
+ 		;;
+-- 
+2.13.2
+