From e7d41d3a273adfefc5ca8a3b5562d3cd763739f1 Mon Sep 17 00:00:00 2001 From: Valentin Popa Date: Thu, 13 Feb 2014 15:45:19 +0200 Subject: wayland: upgrade to 1.4.0 (*) tested on qemux86 and genericx86 with core-image-weston and core-image-sato (From OE-Core rev: 46100431a726010645824a84850fd7bef8cc923b) Signed-off-by: Valentin Popa Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../wayland/wayland/just-scanner.patch | 21 ++++++++++--- meta/recipes-graphics/wayland/wayland_1.3.0.bb | 36 ---------------------- meta/recipes-graphics/wayland/wayland_1.4.0.bb | 36 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/wayland_1.3.0.bb create mode 100644 meta/recipes-graphics/wayland/wayland_1.4.0.bb diff --git a/meta/recipes-graphics/wayland/wayland/just-scanner.patch b/meta/recipes-graphics/wayland/wayland/just-scanner.patch index 234a9c5f79..ae9935e089 100644 --- a/meta/recipes-graphics/wayland/wayland/just-scanner.patch +++ b/meta/recipes-graphics/wayland/wayland/just-scanner.patch @@ -1,3 +1,8 @@ +From f674544d4f6f5f763e449207da77a561b22eff97 Mon Sep 17 00:00:00 2001 +From: Valentin Popa +Date: Fri, 7 Feb 2014 16:36:47 +0200 +Subject: [PATCH] just scanner + We only build wayland-native for the scanner, so disable the bits we don't actually need. This gives us a small speed up but importantly should allow wayland-native to compile on older hosts such as CentOS 5 which currently fails: @@ -10,22 +15,27 @@ wayland-native to compile on older hosts such as CentOS 5 which currently fails: Upstream-Status: Inappropriate Signed-off-by: Ross Burton +Signed-off-by: Valentin Popa +--- + Makefile.am | 2 +- + src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 306d7b3..571fe89 100644 +index 99607b0..ecce1f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ if BUILD_DOCS doc_subdir = doc endif --SUBDIRS = src protocol $(doc_subdir) tests cursor -+SUBDIRS = src protocol $(doc_subdir) +-SUBDIRS = protocol src $(doc_subdir) tests cursor ++SUBDIRS = protocol src $(doc_subdir) ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} diff --git a/src/Makefile.am b/src/Makefile.am -index e1d04ea..702342e 100644 +index 15f44a5..b938d17 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ @@ -34,3 +44,6 @@ index e1d04ea..702342e 100644 noinst_LTLIBRARIES = libwayland-util.la include_HEADERS = \ +-- +1.8.3.2 + diff --git a/meta/recipes-graphics/wayland/wayland_1.3.0.bb b/meta/recipes-graphics/wayland/wayland_1.3.0.bb deleted file mode 100644 index aa04f8d1c5..0000000000 --- a/meta/recipes-graphics/wayland/wayland_1.3.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Wayland, a protocol between a compositor and clients" -DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ -as well as a C library implementation of that protocol. The compositor can be \ -a standalone display server running on Linux kernel modesetting and evdev \ -input devices, an X application, or a wayland client itself. The clients can \ -be traditional applications, X servers (rootless or fullscreen) or other \ -display servers." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ - file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" - -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc" -SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e" - -SRC_URI_append_class-native = " file://just-scanner.patch" - -inherit autotools pkgconfig - -# We need wayland-native for the wayland-scanner utility -BBCLASSEXTEND = "native" - -DEPENDS_class-native = "expat-native libffi-native" -DEPENDS = "expat libffi wayland-native" - -EXTRA_OECONF_class-native = "--disable-documentation" -EXTRA_OECONF = "--disable-documentation --disable-scanner" - -# Wayland installs a M4 macro for other projects to use, which uses the target -# pkg-config to find files. Replace pkg-config with pkg-config-native. -do_install_append_class-native() { - sed -e 's,PKG_CHECK_MODULES(.*),,g' \ - -e 's,$PKG_CONFIG,pkg-config-native,g' \ - -i ${D}/${datadir}/aclocal/wayland-scanner.m4 -} diff --git a/meta/recipes-graphics/wayland/wayland_1.4.0.bb b/meta/recipes-graphics/wayland/wayland_1.4.0.bb new file mode 100644 index 0000000000..0f08cacfea --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland_1.4.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "Wayland, a protocol between a compositor and clients" +DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ +as well as a C library implementation of that protocol. The compositor can be \ +a standalone display server running on Linux kernel modesetting and evdev \ +input devices, an X application, or a wayland client itself. The clients can \ +be traditional applications, X servers (rootless or fullscreen) or other \ +display servers." +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ + file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" + +SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "332cf9191837be12638a29265ed7cf46" +SRC_URI[sha256sum] = "18f33b9f15b4c8b662fb1968e7636e7926b419dfc48de8a164b3a3d7095c5a58" + +SRC_URI_append_class-native = " file://just-scanner.patch" +EXTRA_OECONF_class-native = "--disable-documentation --enable-scanner" + +inherit autotools pkgconfig + +# We need wayland-native for the wayland-scanner utility +BBCLASSEXTEND = "native" + +DEPENDS_class-native = "expat-native libffi-native" +DEPENDS = "expat libffi wayland-native" + +EXTRA_OECONF = "--disable-documentation --disable-scanner" + +# Wayland installs a M4 macro for other projects to use, which uses the target +# pkg-config to find files. Replace pkg-config with pkg-config-native. +do_install_append_class-native() { + sed -e 's,PKG_CHECK_MODULES(.*),,g' \ + -e 's,$PKG_CONFIG,pkg-config-native,g' \ + -i ${D}/${datadir}/aclocal/wayland-scanner.m4 +} -- cgit v1.2.3-54-g00ecf