diff options
author | Tim Orling <TicoTimo@gmail.com> | 2014-05-22 09:02:20 -0700 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2014-05-23 10:45:07 -0700 |
commit | 7c40efb62f34f866c98a0b2df50d66c60d76143a (patch) | |
tree | fcdee7df53bda2dcc40ccbc5265ef168ec4b1adf | |
parent | f453259c6710a6b3fb3c542b3921426baf160347 (diff) | |
download | openembedded-core-7c40efb62f34f866c98a0b2df50d66c60d76143a.tar.gz |
weston: upgrade to 1.5.0
* replace 0001-remove-dependence-on-wayland-scanner-flags.patch with
disable-wayland-scanner-pkg-check.patch
* add make-lcms-configureable.patch (WIP... needs work)
= fix for JaMa test-dependencies
Signed-off-by: Tim Orling <TicoTimo@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r-- | meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch | 30 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch | 13 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch | 22 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/weston_1.5.0.bb (renamed from meta/recipes-graphics/wayland/weston_1.4.0.bb) | 13 |
4 files changed, 43 insertions, 35 deletions
diff --git a/meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch b/meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch deleted file mode 100644 index 14606c86c3..0000000000 --- a/meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a0335393ddde2228c84eda1081b5d7b175f78a94 Mon Sep 17 00:00:00 2001 -From: Valentin Popa <valentin.popa@intel.com> -Date: Fri, 7 Feb 2014 16:59:58 +0200 -Subject: [PATCH] remove dependence on wayland-scanner flags - -weston doesn't make use of wayland-scanner flags, -it only uses the -native- wayland-scanner for protocol. - -Upstream-Status: Pending -Signed-off-by: Valentin Popa <valentin.popa@intel.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index cce1850..8775eb9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -482,7 +482,7 @@ if test x$wayland_scanner = x; then - AC_MSG_ERROR([wayland-scanner is needed to compile weston]) - fi - --PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) -+#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) - AC_PATH_PROG(XMLLINT, xmllint) - AC_ARG_WITH([dtddir], - AS_HELP_STRING([--with-dtddir], --- -1.8.3.2 - diff --git a/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch new file mode 100644 index 0000000000..062da5cee5 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch @@ -0,0 +1,13 @@ +Index: weston-1.5.0/configure.ac +=================================================================== +--- weston-1.5.0.orig/configure.ac ++++ weston-1.5.0/configure.ac +@@ -503,7 +503,7 @@ if test x$wayland_scanner = x; then + AC_MSG_ERROR([wayland-scanner is needed to compile weston]) + fi + +-PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) ++#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) + + AC_CONFIG_FILES([Makefile src/version.h src/weston.pc]) + diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch new file mode 100644 index 0000000000..817ac70a15 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch @@ -0,0 +1,22 @@ +Index: weston-1.5.0/configure.ac +=================================================================== +--- weston-1.5.0.orig/configure.ac ++++ weston-1.5.0/configure.ac +@@ -491,8 +491,16 @@ AC_ARG_ENABLE(demo-clients-install, + enable_demo_clients_install=no) + AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"]) + ++AC_ARG_ENABLE(lcms, ++ AS_HELP_STRING([--disable-lcms], ++ [disable lcms support]),, ++ enable_lcms=yes) ++ ++AS_IF([test "x$enable_lcms" != "no"], [ + PKG_CHECK_MODULES(LCMS, lcms2, +- [have_lcms=yes], [have_lcms=no]) ++ [have_lcms=yes], [have_lcms=no])], ++ [have_lcms=no]) ++ + if test "x$have_lcms" = xyes; then + AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) + fi diff --git a/meta/recipes-graphics/wayland/weston_1.4.0.bb b/meta/recipes-graphics/wayland/weston_1.5.0.bb index afdc49c9b9..f6ae8c4970 100644 --- a/meta/recipes-graphics/wayland/weston_1.4.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.5.0.bb @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.png \ file://weston.desktop \ - file://0001-remove-dependence-on-wayland-scanner-flags.patch" -SRC_URI[md5sum] = "4438d2b1f3c9ba9a4a2b10d89fac6fd0" -SRC_URI[sha256sum] = "74a2319d98e9cdb1acf24659699719aa89ac268cf549759271e326edc5f9ed64" - + file://disable-wayland-scanner-pkg-check.patch \ + file://make-lcms-configurable.patch" +SRC_URI[md5sum] = "8eb40d230efc2411f083c20656534780" +SRC_URI[sha256sum] = "06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684" inherit autotools pkgconfig useradd @@ -25,7 +25,8 @@ EXTRA_OECONF = "--enable-setuid-install \ --enable-demo-clients-install \ --disable-libunwind \ --disable-rpi-compositor \ - --disable-rdp-compositor" + --disable-rdp-compositor \ + --disable-lcms" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ @@ -53,6 +54,8 @@ PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva" PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl" # Weston with cairo glesv2 support PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo" +# Weston with lcms support +PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" do_install_append() { # Weston doesn't need the .la files to load modules, so wipe them |