diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-07-15 11:07:31 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:28:52 +0100 |
| commit | a5392dd424f16d25513600bff13d635cf870265d (patch) | |
| tree | ae8df1352dfae46a577080507f0433a8ed49992e /meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch | |
| parent | ddb0de65085f196ebf83c71d23b6ff4ac5f0bc76 (diff) | |
| download | poky-a5392dd424f16d25513600bff13d635cf870265d.tar.gz | |
weston: Upgrade 1.10.0 -> 1.11.0
Remove now unnecessary patch, rebase others.
Add musl build fix patch.
(From OE-Core rev: f915e81336a63331bc6e4b920089d1495ae7f63f)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch')
| -rw-r--r-- | meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch index 7e00038fce..00118d78bb 100644 --- a/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch +++ b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch | |||
| @@ -20,10 +20,10 @@ diff --git a/configure.ac b/configure.ac | |||
| 20 | index bc7c329..15a05d3 100644 | 20 | index bc7c329..15a05d3 100644 |
| 21 | --- a/configure.ac | 21 | --- a/configure.ac |
| 22 | +++ b/configure.ac | 22 | +++ b/configure.ac |
| 23 | @@ -184,7 +184,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0]) | 23 | @@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0]) |
| 24 | PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) | 24 | PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) |
| 25 | 25 | ||
| 26 | PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.0], | 26 | PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2], |
| 27 | - [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) | 27 | - [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) |
| 28 | + [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) | 28 | + [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) |
| 29 | AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) | 29 | AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) |