diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-11-07 11:55:33 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-08 17:27:55 +0000 |
| commit | 97a3c3bc969ffb7f0c21755c733111d2f4ef8d20 (patch) | |
| tree | 51d22049cbb8b4b971b1a0bb2f1616c506e7f31e /meta/recipes-graphics | |
| parent | 927a0065c7ce03465125b5b91258c337d2ac7bd2 (diff) | |
| download | openembedded-core-contrib-97a3c3bc969ffb7f0c21755c733111d2f4ef8d20.tar.gz | |
wayland: upgrade to 1.3.0
wayland-scanner now uses pkg-config instead of hard-coding paths, so edit the
script to use pkg-config-native.
Based on work by Ewan Le Bideau-Canevet <Ewan.LEBIDEAU-CANEVET@eurogiciel.fr>.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/wayland/wayland_1.3.0.bb (renamed from meta/recipes-graphics/wayland/wayland_1.1.0.bb) | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/meta/recipes-graphics/wayland/wayland_1.1.0.bb b/meta/recipes-graphics/wayland/wayland_1.3.0.bb index a71402e253..212e08ae1b 100644 --- a/meta/recipes-graphics/wayland/wayland_1.1.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.3.0.bb @@ -11,8 +11,8 @@ 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] = "d2dc9398a83692cafc16eba6e45f85d8" -SRC_URI[sha256sum] = "2ef587cf1a0e52b6dee44eeb9c288110e8180819abf4e419d247dfe234867a5c" +SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc" +SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e" SRC_URI_append_class-native = " file://just-scanner.patch" @@ -27,13 +27,10 @@ DEPENDS = "expat libffi wayland-native" EXTRA_OECONF_virtclass-native = "--disable-documentation" EXTRA_OECONF = "--disable-documentation --disable-scanner" -# Wayland installs a M4 macro for other projects to use. This M4 macro includes -# a path to a Makefile fragment to get the rules to generate stubs from protocol -# description files. The paths to the sysroot end up incorrect, so fix them. -do_configure_append_class-native() { - sed -e 's,@prefix@,${STAGING_DIR_NATIVE},g' \ - -e 's,@exec_prefix@,${STAGING_DIR_NATIVE},g' \ - -e 's,@bindir@,${STAGING_BINDIR_NATIVE},g' \ - -e 's,@datarootdir@,${STAGING_DATADIR_NATIVE},g' \ - ${S}/wayland-scanner.m4.in > ${B}/wayland-scanner.m4 +# 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 } |