summaryrefslogtreecommitdiffstats
path: root/package/mesa3d/0004-configure.ac-invert-order-for-wayland-scanner-check.patch
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2017-07-01 10:09:33 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-01 10:12:27 +0200
commitd561a02dba7a0554a6eedc950b2e7ac4bd804cc7 (patch)
treed4b7a3b853e95316b9520befabb5b3717e89f641 /package/mesa3d/0004-configure.ac-invert-order-for-wayland-scanner-check.patch
parent712378a416d65f12ca7efed9a75c2e58c6e62189 (diff)
downloadbuildroot-d561a02dba7a0554a6eedc950b2e7ac4bd804cc7.tar.gz
buildroot-d561a02dba7a0554a6eedc950b2e7ac4bd804cc7.zip
package/{mesa3d, mesa3d-headers}: bump version to 17.1.4
Removed patch 0001, applied upstream: https://cgit.freedesktop.org/mesa/mesa/commit/?h=17.1&id=0069a613ac3b6ca75315cbb2fd3d86b0f6c9ede4 Renumbered remaining patches. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/mesa3d/0004-configure.ac-invert-order-for-wayland-scanner-check.patch')
-rw-r--r--package/mesa3d/0004-configure.ac-invert-order-for-wayland-scanner-check.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/package/mesa3d/0004-configure.ac-invert-order-for-wayland-scanner-check.patch b/package/mesa3d/0004-configure.ac-invert-order-for-wayland-scanner-check.patch
new file mode 100644
index 0000000000..d6c9a0d453
--- /dev/null
+++ b/package/mesa3d/0004-configure.ac-invert-order-for-wayland-scanner-check.patch
@@ -0,0 +1,42 @@
+From 60ee5191a0c074251862a15b12afdc9db0b2df38 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
+
+When cross-compiling the .pc file might point to the wrong
+wayland-scanner binary (target rather than host) resulting in a
+non-executable and wrong scanner.
+Try searching the PATH first, and if that fails fall back into
+pkg-config.
+
+[Vincent: tweak patch for 17.1.1 version]
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2c7e636..0198d52 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2174,11 +2174,11 @@ if test "x$with_platforms" != xauto; then
+ with_egl_platforms=$with_platforms
+ fi
+
+-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
+- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
+- WAYLAND_SCANNER='')
++AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
+ if test "x$WAYLAND_SCANNER" = x; then
+- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
++ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
++ WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
++ WAYLAND_SCANNER='')
+ fi
+
+ # Do per-EGL platform setups and checks
+--
+2.7.3
+
OpenPOWER on IntegriCloud