summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/wayland/weston/parallelmake.patch40
-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 @@
1Backport two patches from upstream to fix parallel builds
2
3- mkdir races (2eff22b8e6f6e5255a1915c33dfd91cecf02cbbc)
4- weston.desktop race (315476fa7b1f1c44c1b35116036df54ac5cb9a03)
5
6Upstream-Status: Backport
7Signed-off-by: Ross Burton <ross.burton@intel.com>
8
9diff --git a/Makefile.am b/Makefile.am
10index 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 = \
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"
2DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" 2DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
3HOMEPAGE = "http://wayland.freedesktop.org" 3HOMEPAGE = "http://wayland.freedesktop.org"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
6 file://src/compositor.c;endline=23;md5=a9793f1edc8d1a4c344ca8ae252352fb" 6 file://src/compositor.c;endline=23;md5=1d535fed266cf39f6d8c0647f52ac331"
7 7
8SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ 8SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
9 file://weston.png \ 9 file://weston.png \
@@ -11,12 +11,11 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
11 file://make-lcms-explicitly-configurable.patch \ 11 file://make-lcms-explicitly-configurable.patch \
12 file://make-libwebp-explicitly-configurable.patch \ 12 file://make-libwebp-explicitly-configurable.patch \
13 file://0001-make-error-portable.patch \ 13 file://0001-make-error-portable.patch \
14 file://parallelmake.patch \
15 file://libsystemd.patch \ 14 file://libsystemd.patch \
16 file://explicit-enable-disable-systemd.patch \ 15 file://explicit-enable-disable-systemd.patch \
17" 16"
18SRC_URI[md5sum] = "24cb8a7ed0535b4fc3642643988dab36" 17SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e"
19SRC_URI[sha256sum] = "8963e69f328e815cec42c58046c4af721476c7541bb7d9edc71740fada5ad312" 18SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf"
20 19
21inherit autotools pkgconfig useradd distro_features_check 20inherit autotools pkgconfig useradd distro_features_check
22# depends on virtual/egl 21# depends on virtual/egl