diff options
-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 \ | |||
11 | file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" | 11 | file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" |
12 | 12 | ||
13 | SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" | 13 | SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" |
14 | SRC_URI[md5sum] = "d2dc9398a83692cafc16eba6e45f85d8" | 14 | SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc" |
15 | SRC_URI[sha256sum] = "2ef587cf1a0e52b6dee44eeb9c288110e8180819abf4e419d247dfe234867a5c" | 15 | SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e" |
16 | 16 | ||
17 | SRC_URI_append_class-native = " file://just-scanner.patch" | 17 | SRC_URI_append_class-native = " file://just-scanner.patch" |
18 | 18 | ||
@@ -27,13 +27,10 @@ DEPENDS = "expat libffi wayland-native" | |||
27 | EXTRA_OECONF_virtclass-native = "--disable-documentation" | 27 | EXTRA_OECONF_virtclass-native = "--disable-documentation" |
28 | EXTRA_OECONF = "--disable-documentation --disable-scanner" | 28 | EXTRA_OECONF = "--disable-documentation --disable-scanner" |
29 | 29 | ||
30 | # Wayland installs a M4 macro for other projects to use. This M4 macro includes | 30 | # Wayland installs a M4 macro for other projects to use, which uses the target |
31 | # a path to a Makefile fragment to get the rules to generate stubs from protocol | 31 | # pkg-config to find files. Replace pkg-config with pkg-config-native. |
32 | # description files. The paths to the sysroot end up incorrect, so fix them. | 32 | do_install_append_class-native() { |
33 | do_configure_append_class-native() { | 33 | sed -e 's,PKG_CHECK_MODULES(.*),,g' \ |
34 | sed -e 's,@prefix@,${STAGING_DIR_NATIVE},g' \ | 34 | -e 's,$PKG_CONFIG,pkg-config-native,g' \ |
35 | -e 's,@exec_prefix@,${STAGING_DIR_NATIVE},g' \ | 35 | -i ${D}/${datadir}/aclocal/wayland-scanner.m4 |
36 | -e 's,@bindir@,${STAGING_BINDIR_NATIVE},g' \ | ||
37 | -e 's,@datarootdir@,${STAGING_DATADIR_NATIVE},g' \ | ||
38 | ${S}/wayland-scanner.m4.in > ${B}/wayland-scanner.m4 | ||
39 | } | 36 | } |