diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-graphics/mesa/files/0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta/recipes-graphics/mesa/files/0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch deleted file mode 100644 index 45bcd466a3..0000000000 --- a/meta/recipes-graphics/mesa/files/0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From 5489e1d22e18740a1924628c5c97096d48dcfbf8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabio Berton <fabio.berton@ossystems.com.br> | ||
3 | Date: Fri, 15 Feb 2019 10:57:06 -0200 | ||
4 | Subject: [PATCH 4/4] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR | ||
5 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | This allows to override the wayland-protocols pkgdatadir with the | ||
8 | WAYLAND_PROTOCOLS_DATADIR from environment. | ||
9 | |||
10 | pkgconfig would return an absolute path in | ||
11 | /usr/share/wayland-protocols | ||
12 | for the pkgdatadir value, which is not suitable for cross-compiling. | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
18 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | ||
19 | --- | ||
20 | configure.ac | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/configure.ac b/configure.ac | ||
24 | index 13fed9daf59..6cff8afb7cf 100644 | ||
25 | --- a/configure.ac | ||
26 | +++ b/configure.ac | ||
27 | @@ -1852,7 +1852,7 @@ for plat in $platforms; do | ||
28 | if test "x$enable_egl" = xyes; then | ||
29 | PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl-backend >= $WAYLAND_EGL_BACKEND_REQUIRED]) | ||
30 | fi | ||
31 | - WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` | ||
32 | + PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir) | ||
33 | |||
34 | PKG_CHECK_EXISTS([wayland-scanner >= 1.15], | ||
35 | AC_SUBST(SCANNER_ARG, 'private-code'), | ||
36 | -- | ||
37 | 2.21.0 | ||
38 | |||