Patchwork [v4,1/3] Wayland : Bump to version 1.3.0

login
register
mail settings
Submitter Ewan LE BIDEAU-CANEVET
Date Oct. 14, 2013, 2:08 p.m.
Message ID <1381759718-11554-1-git-send-email-Ewan.LEBIDEAU-CANEVET@eurogiciel.fr>
Download mbox | patch
Permalink /patch/59825/
State New
Headers show

Comments

Ewan LE BIDEAU-CANEVET - Oct. 14, 2013, 2:08 p.m.
Remove do_configure_append_class-native() function useless for this version
(file wayland-scanner.m4.in does not exist anymore)
Signed-off-by: Ewan LE BIDEAU-CANEVET <Ewan.LEBIDEAU-CANEVET@eurogiciel.fr>
---
 .../wayland/{wayland_1.1.0.bb => wayland_1.3.0.bb}      |   15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)
 rename meta/recipes-graphics/wayland/{wayland_1.1.0.bb => wayland_1.3.0.bb} (62%)
Ross Burton - Oct. 14, 2013, 3:40 p.m.
On 14 October 2013 15:08, Ewan LE BIDEAU-CANEVET
<Ewan.LEBIDEAU-CANEVET@eurogiciel.fr> wrote:
> Remove do_configure_append_class-native() function useless for this version
> (file wayland-scanner.m4.in does not exist anymore)

When building weston:

| configure:17492: checking for WAYLAND_SCANNER
| configure:17499: $PKG_CONFIG --exists --print-errors "wayland-scanner"
| Package wayland-scanner was not found in the pkg-config search path.
| Perhaps you should add the directory containing `wayland-scanner.pc'
| to the PKG_CONFIG_PATH environment variable
| No package 'wayland-scanner' found

The script is calling pkg-config so is trying to find a target .pc
file, but this is only installed by wayland-native so is in the host
native sysroot.  I'll dig into this and work out a fix.

Ross
Ross Burton - Oct. 14, 2013, 4:35 p.m.
On 14 October 2013 16:40, Burton, Ross <ross.burton@intel.com> wrote:
> On 14 October 2013 15:08, Ewan LE BIDEAU-CANEVET
> <Ewan.LEBIDEAU-CANEVET@eurogiciel.fr> wrote:
>> Remove do_configure_append_class-native() function useless for this version
>> (file wayland-scanner.m4.in does not exist anymore)
>
> When building weston:
>
> | configure:17492: checking for WAYLAND_SCANNER
> | configure:17499: $PKG_CONFIG --exists --print-errors "wayland-scanner"
> | Package wayland-scanner was not found in the pkg-config search path.
> | Perhaps you should add the directory containing `wayland-scanner.pc'
> | to the PKG_CONFIG_PATH environment variable
> | No package 'wayland-scanner' found
>
> The script is calling pkg-config so is trying to find a target .pc
> file, but this is only installed by wayland-native so is in the host
> native sysroot.  I'll dig into this and work out a fix.

There needs to be a proper fix done upstream, but this works for now:

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
}

I'll send a revised series when I've tested it on hardware.

Ross

Patch

diff --git a/meta/recipes-graphics/wayland/wayland_1.1.0.bb b/meta/recipes-graphics/wayland/wayland_1.3.0.bb
similarity index 62%
rename from meta/recipes-graphics/wayland/wayland_1.1.0.bb
rename to meta/recipes-graphics/wayland/wayland_1.3.0.bb
index a71402e..41c88e8 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"
 
@@ -26,14 +26,3 @@  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
-}