diff options
| author | Denys Dmytriyenko <denys@ti.com> | 2016-01-19 21:49:06 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-22 23:42:39 +0000 |
| commit | fc945cf3e062a0a799c9ab4870b0d53e37fdbb09 (patch) | |
| tree | 15d66f8794e5bd8bde6660b51ca7b65091cbe632 /meta/recipes-graphics/wayland | |
| parent | 696895e39715e9e9da70a85d16fec3b385eec549 (diff) | |
| download | openembedded-core-fc945cf3e062a0a799c9ab4870b0d53e37fdbb09.tar.gz openembedded-core-fc945cf3e062a0a799c9ab4870b0d53e37fdbb09.tar.bz2 openembedded-core-fc945cf3e062a0a799c9ab4870b0d53e37fdbb09.zip | |
weston: upgrade 1.8.0 -> 1.9.0
* The license was updated from MIT X11 to MIT Expat
* parallelmake.patch was accepted upstream.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-graphics/wayland')
| -rw-r--r-- | meta/recipes-graphics/wayland/weston/parallelmake.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-graphics/wayland/weston_1.9.0.bb (renamed from meta/recipes-graphics/wayland/weston_1.8.0.bb) | 9 |
2 files changed, 4 insertions, 45 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 @@ -Backport two patches from upstream to fix parallel builds - -- mkdir races (2eff22b8e6f6e5255a1915c33dfd91cecf02cbbc) -- weston.desktop race (315476fa7b1f1c44c1b35116036df54ac5cb9a03) - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/Makefile.am b/Makefile.am -index 5819b19..ff13b19 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -20,7 +20,7 @@ weston.ini : $(srcdir)/weston.ini.in - $< > $@ - - ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in -- $(AM_V_GEN)$(SED) \ -+ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ - -e 's|@bindir[@]|$(bindir)|g' \ - -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ - -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \ -@@ -29,7 +29,7 @@ ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in - $< > $@ - - tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in -- $(AM_V_GEN)$(SED) \ -+ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ - -e 's|@bindir[@]|$(bindir)|g' \ - -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ - -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \ -@@ -179,8 +179,7 @@ pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = src/weston.pc - - wayland_sessiondir = $(datadir)/wayland-sessions --wayland_session_DATA = src/weston.desktop --dist_wayland_session_DATA = $(wayland_session_DATA) -+dist_wayland_session_DATA = src/weston.desktop - - westonincludedir = $(includedir)/weston - westoninclude_HEADERS = \ diff --git a/meta/recipes-graphics/wayland/weston_1.8.0.bb b/meta/recipes-graphics/wayland/weston_1.9.0.bb index aff9a12fdd..e14ea9d701 100644 --- a/meta/recipes-graphics/wayland/weston_1.8.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.9.0.bb @@ -2,8 +2,8 @@ SUMMARY = "Weston, a Wayland compositor" DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" HOMEPAGE = "http://wayland.freedesktop.org" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ - file://src/compositor.c;endline=23;md5=a9793f1edc8d1a4c344ca8ae252352fb" +LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ + file://src/compositor.c;endline=23;md5=1d535fed266cf39f6d8c0647f52ac331" SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.png \ @@ -11,12 +11,11 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://make-lcms-explicitly-configurable.patch \ file://make-libwebp-explicitly-configurable.patch \ file://0001-make-error-portable.patch \ - file://parallelmake.patch \ file://libsystemd.patch \ file://explicit-enable-disable-systemd.patch \ " -SRC_URI[md5sum] = "24cb8a7ed0535b4fc3642643988dab36" -SRC_URI[sha256sum] = "8963e69f328e815cec42c58046c4af721476c7541bb7d9edc71740fada5ad312" +SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e" +SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf" inherit autotools pkgconfig useradd distro_features_check # depends on virtual/egl |