diff options
Diffstat (limited to 'meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch')
| -rw-r--r-- | meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch index 062da5cee5..68ba38ba8e 100644 --- a/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch +++ b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch | |||
| @@ -1,13 +1,17 @@ | |||
| 1 | Index: weston-1.5.0/configure.ac | 1 | Index: git/configure.ac |
| 2 | =================================================================== | 2 | =================================================================== |
| 3 | --- weston-1.5.0.orig/configure.ac | 3 | --- git.orig/configure.ac |
| 4 | +++ weston-1.5.0/configure.ac | 4 | +++ git/configure.ac |
| 5 | @@ -503,7 +503,7 @@ if test x$wayland_scanner = x; then | 5 | @@ -501,12 +501,6 @@ if test "x$have_lcms" = xyes; then |
| 6 | AC_MSG_ERROR([wayland-scanner is needed to compile weston]) | ||
| 7 | fi | 6 | fi |
| 7 | AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) | ||
| 8 | 8 | ||
| 9 | -PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) | 9 | -AC_PATH_PROG([wayland_scanner], [wayland-scanner]) |
| 10 | +#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) | 10 | -if test x$wayland_scanner = x; then |
| 11 | 11 | - PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner]) | |
| 12 | - wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` | ||
| 13 | -fi | ||
| 14 | - | ||
| 12 | AC_CONFIG_FILES([Makefile src/version.h src/weston.pc]) | 15 | AC_CONFIG_FILES([Makefile src/version.h src/weston.pc]) |
| 13 | 16 | ||
| 17 | AM_CONDITIONAL([HAVE_GIT_REPO], [test -f $srcdir/.git/logs/HEAD]) | ||