diff options
author | Denys Dmytriyenko <denys@ti.com> | 2016-01-19 21:49:06 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-24 09:40:22 +0000 |
commit | 95fa36e9c3a701c947979b10c03e92bf1a0d78a8 (patch) | |
tree | 398932e6420b6a73f3fca40a788dc67eba379cc6 /meta/recipes-graphics/wayland/weston | |
parent | 1bc0c89595f1914c6f9e73a183f3115d7d793017 (diff) | |
download | poky-95fa36e9c3a701c947979b10c03e92bf1a0d78a8.tar.gz |
weston: upgrade 1.8.0 -> 1.9.0
* The license was updated from MIT X11 to MIT Expat
* parallelmake.patch was accepted upstream.
(From OE-Core rev: fc945cf3e062a0a799c9ab4870b0d53e37fdbb09)
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland/weston')
-rw-r--r-- | meta/recipes-graphics/wayland/weston/parallelmake.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-graphics/wayland/weston/parallelmake.patch b/meta/recipes-graphics/wayland/weston/parallelmake.patch deleted file mode 100644 index 42b5efbc3a..0000000000 --- a/meta/recipes-graphics/wayland/weston/parallelmake.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | Backport two patches from upstream to fix parallel builds | ||
2 | |||
3 | - mkdir races (2eff22b8e6f6e5255a1915c33dfd91cecf02cbbc) | ||
4 | - weston.desktop race (315476fa7b1f1c44c1b35116036df54ac5cb9a03) | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
8 | |||
9 | diff --git a/Makefile.am b/Makefile.am | ||
10 | index 5819b19..ff13b19 100644 | ||
11 | --- a/Makefile.am | ||
12 | +++ b/Makefile.am | ||
13 | @@ -20,7 +20,7 @@ weston.ini : $(srcdir)/weston.ini.in | ||
14 | $< > $@ | ||
15 | |||
16 | ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in | ||
17 | - $(AM_V_GEN)$(SED) \ | ||
18 | + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ | ||
19 | -e 's|@bindir[@]|$(bindir)|g' \ | ||
20 | -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ | ||
21 | -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \ | ||
22 | @@ -29,7 +29,7 @@ ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in | ||
23 | $< > $@ | ||
24 | |||
25 | tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in | ||
26 | - $(AM_V_GEN)$(SED) \ | ||
27 | + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ | ||
28 | -e 's|@bindir[@]|$(bindir)|g' \ | ||
29 | -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ | ||
30 | -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \ | ||
31 | @@ -179,8 +179,7 @@ pkgconfigdir = $(libdir)/pkgconfig | ||
32 | pkgconfig_DATA = src/weston.pc | ||
33 | |||
34 | wayland_sessiondir = $(datadir)/wayland-sessions | ||
35 | -wayland_session_DATA = src/weston.desktop | ||
36 | -dist_wayland_session_DATA = $(wayland_session_DATA) | ||
37 | +dist_wayland_session_DATA = src/weston.desktop | ||
38 | |||
39 | westonincludedir = $(includedir)/weston | ||
40 | westoninclude_HEADERS = \ | ||