[OE-core] [PATCH v3 2/3] wayland-protocols: Fix installation patch issue
Fabien Lahoudere
fabien.lahoudere at collabora.co.uk
Thu Sep 28 15:22:58 UTC 2017
On Wed, 2017-09-27 at 20:11 +0100, Burton, Ross wrote:
> libsdl2 doesn't build for me:
> | /bin/bash ../SDL2-2.0.5/build-scripts/mkinstalldirs build
> | make: *** No rule to make target '/usr/share/wayland/wayland.xml', needed by 'gen/wayland-
> client-protocol.h'. Stop.
>
> Do you have wayland-protocols on your build host?
>
I found a machine without wayland installed and succeed to reproduce.I found the issue and fix it.
libsdl2 build now and I am building with X enabled to check it is not broken too.
> Ross
> On 27 September 2017 at 14:14, Fabien Lahoudere <fabien.lahoudere at collabora.co.uk> wrote:
> > This patch also remove workaround to find wayland-protocols:
> >
> >
> >
> > WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}
> >
> >
> >
> > in:
> >
> >
> >
> > - gtk+3
> >
> > - libsdl2
> >
> > - xserver-xorg
> >
> > - gstreamer1.0-plugins-bad
> >
> > - weston-2.0.0
> >
> >
> >
> > Signed-off-by: Fabien Lahoudere <fabien.lahoudere at collabora.co.uk>
> >
> > ---
> >
> > meta/recipes-gnome/gtk+/gtk+3.inc | 1 -
> >
> > meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb | 2 +-
> >
> > .../usesysrootprefixforpkgdatadirvariable.patch | 27 ++++++++++++++++++++++
> >
> > .../wayland/wayland-protocols_1.10.bb | 1 +
> >
> > meta/recipes-graphics/wayland/weston_2.0.0.bb | 1 -
> >
> > .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 -
> >
> > .../gstreamer/gstreamer1.0-plugins-bad_1.12.2.bb | 1 -
> >
> > 7 files changed, 29 insertions(+), 5 deletions(-)
> >
> > create mode 100644 meta/recipes-graphics/wayland/wayland-
> > protocols/usesysrootprefixforpkgdatadirvariable.patch
> >
> >
> >
> > diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
> >
> > index 0a357db049..420ead2ca2 100644
> >
> > --- a/meta/recipes-gnome/gtk+/gtk+3.inc
> >
> > +++ b/meta/recipes-gnome/gtk+/gtk+3.inc
> >
> > @@ -35,7 +35,6 @@ EXTRA_OECONF += " \
> >
> > --enable-modules \
> >
> > --disable-cups \
> >
> > --disable-colord \
> >
> > - WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} \
> >
> > ${@bb.utils.contains("DISTRO_FEATURES", "x11", "", "--disable-gtk-doc", d)} \
> >
> > "
> >
> >
> >
> > diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb b/meta/recipes-
> > graphics/libsdl2/libsdl2_2.0.5.bb
> >
> > index 12d3aaf6f0..6bfa13200b 100644
> >
> > --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> >
> > +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> >
> > @@ -35,7 +35,7 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
> >
> > --enable-pthreads \
> >
> > --enable-sdl-dlopen \
> >
> > --disable-rpath \
> >
> > - WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}"
> >
> > + "
> >
> >
> >
> > # opengl packageconfig factored out to make it easy for distros
> >
> > # and BSP layers to pick either (desktop) opengl, gles2, or no GL
> >
> > diff --git a/meta/recipes-graphics/wayland/wayland-
> > protocols/usesysrootprefixforpkgdatadirvariable.patch b/meta/recipes-graphics/wayland/wayland-
> > protocols/usesysrootprefixforpkgdatadirvariable.patch
> >
> > new file mode 100644
> >
> > index 0000000000..0922a4d2c2
> >
> > --- /dev/null
> >
> > +++ b/meta/recipes-graphics/wayland/wayland-
> > protocols/usesysrootprefixforpkgdatadirvariable.patch
> >
> > @@ -0,0 +1,27 @@
> >
> > +From 875130ee3cbcf62266901ef4b91b9a0fb6adad43 Mon Sep 17 00:00:00 2001
> >
> > +From: Tomek Bury <tomek.bury at broadcom.com>
> >
> > +Date: Fri, 4 Aug 2017 16:16:38 +0100
> >
> > +Subject: Use sysroot prefix for pkgdatadir variable
> >
> > +
> >
> > +The pc_sysroot is automatically added to cflags and libs but not
> >
> > +to 'pkg-config --variable'
> >
> > +
> >
> > +Upstream-Status: Backport [https://cgit.freedesktop.org/wayland/wayland-protocols/commit/?id=87
> > 5130ee3cbcf62266901ef4b91b9a0fb6adad43]
> >
> > +
> >
> > +Reviewed-by: Daniel Stone <daniels at collabora.com>
> >
> > +
> >
> > +diff --git a/wayland-protocols.pc.in b/wayland-protocols.pc.in
> >
> > +index a26744c..379be06 100644
> >
> > +--- a/wayland-protocols.pc.in
> >
> > ++++ b/wayland-protocols.pc.in
> >
> > +@@ -1,6 +1,6 @@
> >
> > + prefix=@prefix@
> >
> > + datarootdir=@datarootdir@
> >
> > +-pkgdatadir=@datadir@/@PACKAGE@
> >
> > ++pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@
> >
> > +
> >
> > + Name: Wayland Protocols
> >
> > + Description: Wayland protocol files
> >
> > +--
> >
> > +cgit v0.10.2
> >
> > +
> >
> > diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb b/meta/recipes-
> > graphics/wayland/wayland-protocols_1.10.bb
> >
> > index 4f9e9f32bf..1ff12c607b 100644
> >
> > --- a/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb
> >
> > +++ b/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb
> >
> > @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
> >
> > file://stable/presentation-time/presentation-
> > time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
> >
> >
> >
> > SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
> >
> > + file://usesysrootprefixforpkgdatadirvariable.patch \
> >
> > "
> >
> > SRC_URI[md5sum] = "84a7846c2b6a6a3e265fc9be36453e60"
> >
> > SRC_URI[sha256sum] = "5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a"
> >
> > diff --git a/meta/recipes-graphics/wayland/weston_2.0.0.bb b/meta/recipes-
> > graphics/wayland/weston_2.0.0.bb
> >
> > index 54b07bd6b9..8160f5556d 100644
> >
> > --- a/meta/recipes-graphics/wayland/weston_2.0.0.bb
> >
> > +++ b/meta/recipes-graphics/wayland/weston_2.0.0.bb
> >
> > @@ -25,7 +25,6 @@ DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-
> > native"
> >
> >
> >
> > EXTRA_OECONF = "--enable-setuid-install \
> >
> > --disable-rdp-compositor \
> >
> > - WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} \
> >
> > "
> >
> > EXTRA_OECONF_append_qemux86 = "\
> >
> > WESTON_NATIVE_BACKEND=fbdev-backend.so \
> >
> > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-
> > xserver/xserver-xorg.inc
> >
> > index 863d80ce43..e8025de55f 100644
> >
> > --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> >
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> >
> > @@ -117,7 +117,6 @@ EXTRA_OECONF += "--with-fop=no \
> >
> > --sysconfdir=/etc/X11 \
> >
> > --localstatedir=/var \
> >
> > --with-xkb-output=/var/lib/xkb \
> >
> > - WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} \
> >
> > "
> >
> >
> >
> > OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
> >
> > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.2.bb
> > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.2.bb
> >
> > index 8321da0c27..a83a5bab21 100644
> >
> > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.2.bb
> >
> > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.2.bb
> >
> > @@ -22,5 +22,4 @@ SRC_URI[sha256sum] =
> > "9c2c7edde4f59d74eb414e0701c55131f562e5c605a3ce9b091754f106
> >
> >
> >
> > S = "${WORKDIR}/gst-plugins-bad-${PV}"
> >
> >
> >
> > -EXTRA_OECONF += "WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}"
> >
> >
> >
> > --
> >
> > 2.11.0
> >
> >
> >
> > --
> >
> > _______________________________________________
> >
> > Openembedded-core mailing list
> >
> > Openembedded-core at lists.openembedded.org
> >
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> >
> >
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20170928/2629bc99/attachment-0002.html>
More information about the Openembedded-core
mailing list