diff options
| author | Fabio Berton <fabio.berton@ossystems.com.br> | 2019-05-15 18:22:43 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-16 09:16:50 +0100 |
| commit | e47715708729fe3fed2c5bcafa06f5f1c84f302f (patch) | |
| tree | 708f428a746a6be67482f0b0bb2640a8b40d5b3a /meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch | |
| parent | 9095dc153a760a4336260419aa2298fad8d7d031 (diff) | |
| download | poky-e47715708729fe3fed2c5bcafa06f5f1c84f302f.tar.gz | |
mesa: Convert recipe to use meson build system
- Remove all non related meson patches
- Change radeon driver to r100
- Add python3-mako-native gettext-native to DEPENDS
Based on https://patchwork.openembedded.org/patch/158748/
Alex: added a patch to restore glx-tls option, which
addresses the musl runtime issue.
(From OE-Core rev: c72b6d46d392bfbcf54154f43663a7a8ada8c567)
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch | 44 |
1 files changed, 0 insertions, 44 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 deleted file mode 100644 index d065e2285c..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | From e53837ad7b01364f34a533b95f4817c1795789de Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Fabio Berton <fabio.berton@ossystems.com.br> | ||
| 3 | Date: Wed, 20 Feb 2019 16:17:00 -0300 | ||
| 4 | Subject: [PATCH 1/4] Simplify wayland-scanner lookup | ||
| 5 | Organization: O.S. Systems Software LTDA. | ||
| 6 | |||
| 7 | Don't use pkg-config to lookup the path of a binary that's in the path. | ||
| 8 | |||
| 9 | Alternatively we'd have to prefix the path returned by pkg-config with | ||
| 10 | PKG_CONFIG_SYSROOT_DIR. | ||
| 11 | |||
| 12 | Upstream-Status: Pending | ||
| 13 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
| 14 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
| 15 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | ||
| 16 | --- | ||
| 17 | configure.ac | 7 +------ | ||
| 18 | 1 file changed, 1 insertion(+), 6 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/configure.ac b/configure.ac | ||
| 21 | index 1ef68fe68e6..1816a4cd475 100644 | ||
| 22 | --- a/configure.ac | ||
| 23 | +++ b/configure.ac | ||
| 24 | @@ -1854,16 +1854,11 @@ for plat in $platforms; do | ||
| 25 | fi | ||
| 26 | WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` | ||
| 27 | |||
| 28 | - PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], | ||
| 29 | - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, | ||
| 30 | - WAYLAND_SCANNER='') | ||
| 31 | PKG_CHECK_EXISTS([wayland-scanner >= 1.15], | ||
| 32 | AC_SUBST(SCANNER_ARG, 'private-code'), | ||
| 33 | AC_SUBST(SCANNER_ARG, 'code')) | ||
| 34 | |||
| 35 | - if test "x$WAYLAND_SCANNER" = x; then | ||
| 36 | - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) | ||
| 37 | - fi | ||
| 38 | + AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) | ||
| 39 | |||
| 40 | if test "x$WAYLAND_SCANNER" = "x:"; then | ||
| 41 | AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) | ||
| 42 | -- | ||
| 43 | 2.21.0 | ||
| 44 | |||
