diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-05-16 16:22:50 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-17 17:26:04 +0100 |
commit | 9965dbeb89537be6ab97dc317b629fb24e5e6bbb (patch) | |
tree | 21c7a51ba8e1e0207d96ec10be026679164f7367 | |
parent | fc1f9c487de5a54a767932bcee7db039e3bcef30 (diff) | |
download | openembedded-core-9965dbeb89537be6ab97dc317b629fb24e5e6bbb.tar.gz |
weston: Upgrade 1.9.0 -> 1.10.0
Support for multiple new protocols, many new features:
https://lists.freedesktop.org/archives/wayland-devel/2016-February/027039.html
* Weston now depends on wayland-protocols (which is protocol
collection split off from weston).
* Remove upstreamed patches, add a patch to fix the wayland-protocols
path used during build.
* Use HTTPS for tarball download
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch | 34 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch | 70 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/weston/libsystemd.patch | 53 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch | 43 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/weston_1.10.0.bb (renamed from meta/recipes-graphics/wayland/weston_1.9.0.bb) | 15 |
5 files changed, 42 insertions, 173 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 new file mode 100644 index 0000000000..7e00038fce --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch @@ -0,0 +1,34 @@ +From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Wed, 11 May 2016 16:16:30 +0300 +Subject: [PATCH] configure.ac: Fix wayland-protocols path + +The wayland-protocols directory is used during build: Fix the path +to point to sysroot specified in recipe. + +Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that +breaks multilib weston as it would point to multilib sysroot when the +(allarch) wayland-protocols is actually in the machine sysroot. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Inappropriate [embedded specific] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index bc7c329..15a05d3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -184,7 +184,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0]) + PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) + + PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.0], +- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) ++ [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) + AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) + + AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, +-- +2.1.4 + diff --git a/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch b/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch deleted file mode 100644 index a40eaf186e..0000000000 --- a/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 8e1efcd40b3bad81c83744e2e120d70c2b567ef2 Mon Sep 17 00:00:00 2001 -From: Frederico Cadete <frederico@cadete.eu> -Date: Mon, 28 Sep 2015 00:30:10 +0200 -Subject: configure.ac: add explicit enable/disable for systemd-login support - -Otherwise, auto-enable depending on whether the system has the necessary -libraries. - -[Updated help text as per pq suggestion -- bwh] - -Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> -Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> -Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> - -Upstream-Status: Backport -Backported from Weston git: -http://cgit.freedesktop.org/wayland/weston/commit/?id=8e1efc - -Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> - -diff --git a/configure.ac b/configure.ac -index a9cd429..67e80d0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -380,18 +380,30 @@ AC_ARG_ENABLE(resize-optimization, - AS_IF([test "x$enable_resize_optimization" = "xyes"], - [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) - --PKG_CHECK_MODULES(SYSTEMD_LOGIN, -- [libsystemd >= 209], -- [have_systemd_login_209=yes;have_systemd_login=yes], -- [have_systemd_login_209=no;have_systemd_login=no]) -- --# Older versions of systemd package systemd-login separately. Fall back on that --AS_IF([test x$have_systemd_login != xyes],[ -- PKG_CHECK_MODULES(SYSTEMD_LOGIN, -- [libsystemd-login >= 198], -- [have_systemd_login=yes], -- [have_systemd_login=no]) -- ]) -+AC_ARG_ENABLE(systemd-login, -+ AS_HELP_STRING([--enable-systemd-login], -+ [Enable logind support]),, -+ enable_systemd_login=auto) -+if test x$enable_systemd_login != xno; then -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd >= 209], -+ [have_systemd_login_209=yes;have_systemd_login=yes], -+ [have_systemd_login_209=no;have_systemd_login=no]) -+ -+ # Older versions of systemd package systemd-login separately. Fall back on that -+ AS_IF([test x$have_systemd_login != xyes],[ -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd-login >= 198], -+ [have_systemd_login=yes], -+ [have_systemd_login=no]) -+ ]) -+else -+ have_systemd_login=no -+fi -+ -+if test "x$have_systemd_login" = "xno" -a "x$enable_systemd_login" = "xyes"; then -+ AC_MSG_ERROR([systemd-login support explicitly enabled, but can't find libsystemd>=209 or libsystemd-login]) -+fi - - AS_IF([test "x$have_systemd_login" = "xyes"], - [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])]) --- -cgit v0.10.2 - diff --git a/meta/recipes-graphics/wayland/weston/libsystemd.patch b/meta/recipes-graphics/wayland/weston/libsystemd.patch deleted file mode 100644 index 2d28d5689a..0000000000 --- a/meta/recipes-graphics/wayland/weston/libsystemd.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 5eb025a867b42f8bc7bc73279eac8de58e51a13e Mon Sep 17 00:00:00 2001 -From: Frederico Cadete <frederico@cadete.eu> -Date: Mon, 28 Sep 2015 00:30:09 +0200 -Subject: configure.ac: add support for new versions of systemd - -Starting from systemd version 209, a single libsystemd.pc is provided. -For previous versions, fall back on libsystemd-login.pc. - -Signed-off-by: Frederico Cadete <frederico@cadete.eu> -Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> -Reviewed-by: Derek Foreman <derekf@osg.samsung.com> - -Upstream-Status: Backport -Backported from Weston git: -http://cgit.freedesktop.org/wayland/weston/commit/?id=5eb025 - -Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> - -diff --git a/configure.ac b/configure.ac -index 045291c..a9cd429 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -380,14 +380,23 @@ AC_ARG_ENABLE(resize-optimization, - AS_IF([test "x$enable_resize_optimization" = "xyes"], - [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) - --PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198], -- [have_systemd_login=yes], [have_systemd_login=no]) -+PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd >= 209], -+ [have_systemd_login_209=yes;have_systemd_login=yes], -+ [have_systemd_login_209=no;have_systemd_login=no]) -+ -+# Older versions of systemd package systemd-login separately. Fall back on that -+AS_IF([test x$have_systemd_login != xyes],[ -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd-login >= 198], -+ [have_systemd_login=yes], -+ [have_systemd_login=no]) -+ ]) -+ - AS_IF([test "x$have_systemd_login" = "xyes"], - [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])]) - AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes") - --PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209], -- [have_systemd_login_209=yes], [have_systemd_login_209=no]) - AS_IF([test "x$have_systemd_login_209" = "xyes"], - [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])]) - --- -cgit v0.10.2 - diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch deleted file mode 100644 index 35e6d6ff58..0000000000 --- a/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch +++ /dev/null @@ -1,43 +0,0 @@ -weston-1.5.0/configure.ac: make lcms explicitly configurable - -The lcms package is outside of openembedded-core, so make it -explicitly configurable. Make it deterministic, so that if lcms -dependencies are missing, autoconf throws a fatal error. Follow -upstream style to make it more likely to be merged. - -Upstream-Status: Pending - -Index: weston-1.5.0/configure.ac -=================================================================== ---- weston-1.5.0.orig/configure.ac -+++ weston-1.5.0/configure.ac -@@ -491,12 +491,24 @@ AC_ARG_ENABLE(demo-clients-install, - enable_demo_clients_install=no) - AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"]) - --PKG_CHECK_MODULES(LCMS, lcms2, -- [have_lcms=yes], [have_lcms=no]) --if test "x$have_lcms" = xyes; then -- AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) -+AC_ARG_ENABLE(lcms, -+ AS_HELP_STRING([--disable-lcms], -+ [Disable lcms support]),, -+ enable_lcms=auto) -+AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes]) -+if test "x$enable_lcms" != "xno"; then -+ PKG_CHECK_MODULES(LCMS, -+ lcms2, -+ [have_lcms=yes], -+ [have_lcms=no]) -+ if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then -+ AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found]) -+ fi -+ if test "x$have_lcms" = "xyes"; then -+ enable_lcms=yes -+ AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) -+ fi - fi --AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) - - AC_PATH_PROG([wayland_scanner], [wayland-scanner]) - if test x$wayland_scanner = x; then diff --git a/meta/recipes-graphics/wayland/weston_1.9.0.bb b/meta/recipes-graphics/wayland/weston_1.10.0.bb index 16a788d2a3..d8c9f9f696 100644 --- a/meta/recipes-graphics/wayland/weston_1.9.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.10.0.bb @@ -5,24 +5,22 @@ LICENSE = "MIT" 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 \ +SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.png \ file://weston.desktop \ - file://make-lcms-explicitly-configurable.patch \ file://make-libwebp-explicitly-configurable.patch \ file://0001-make-error-portable.patch \ - file://libsystemd.patch \ - file://explicit-enable-disable-systemd.patch \ + file://0001-configure.ac-Fix-wayland-protocols-path.patch \ " -SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e" -SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf" +SRC_URI[md5sum] = "1cd17c54ecac6d9a3cd90bf12eaa3e20" +SRC_URI[sha256sum] = "e0b2004d00d8293ddf7903ca283c1746afa9ccb5919ab50fd04397ff472aa5c1" inherit autotools pkgconfig useradd distro_features_check # depends on virtual/egl REQUIRED_DISTRO_FEATURES = "opengl" DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" -DEPENDS += "wayland libinput virtual/egl pango wayland-native" +DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" EXTRA_OECONF = "--enable-setuid-install \ --enable-simple-clients \ @@ -30,7 +28,9 @@ EXTRA_OECONF = "--enable-setuid-install \ --enable-demo-clients-install \ --disable-rpi-compositor \ --disable-rdp-compositor \ + WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \ " +EXTRA_OECONF[vardepsexclude] = "MACHINE" EXTRA_OECONF_append_qemux86 = "\ WESTON_NATIVE_BACKEND=fbdev-backend.so \ @@ -98,6 +98,7 @@ FILES_${PN}-examples = "${bindir}/*" RDEPENDS_${PN} += "xkeyboard-config" RRECOMMENDS_${PN} = "liberation-fonts" +RRECOMMENDS_${PN}-dev += "wayland-protocols" USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "--system weston-launch" |