[PATCH v2 1/4] wayland : Bump to version 1.14.0

[PATCH v2 1/4] wayland : Bump to version 1.14.0

[Fabien Lahoudere]

Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
---
 .../recipes-graphics/wayland/{wayland_1.13.0.bb => wayland_1.14.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/wayland/{wayland_1.13.0.bb => wayland_1.14.0.bb} (92%)

diff --git a/meta/recipes-graphics/wayland/wayland_1.13.0.bb b/meta/recipes-graphics/wayland/wayland_1.14.0.bb
similarity index 92%
rename from meta/recipes-graphics/wayland/wayland_1.13.0.bb
rename to meta/recipes-graphics/wayland/wayland_1.14.0.bb
index b9396b6c75..2a2489d658 100644
--- a/meta/recipes-graphics/wayland/wayland_1.13.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.14.0.bb
@@ -14,8 +14,8 @@ DEPENDS = "expat libxml2 libffi wayland-native"
 
 SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            "
-SRC_URI[md5sum] = "cae152ed956da6de53f9727bc1c45039"
-SRC_URI[sha256sum] = "69b052c031a61e89af7cc8780893d0da1e301492352aa449dee9345043e6fe51"
+SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"
+SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8"
 
 inherit autotools pkgconfig
 
-- 
2.11.0

[PATCH v2 2/4] wayland-protocols: Fix installation patch issue

[Fabien Lahoudere]

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

Signed-off-by: Fabien Lahoudere <fabien.lahoudere@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 +
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |  1 -
 .../gstreamer/gstreamer1.0-plugins-bad_1.12.2.bb   |  1 -
 6 files changed, 29 insertions(+), 4 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@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=875130ee3cbcf62266901ef4b91b9a0fb6adad43]
+
+Reviewed-by: Daniel Stone <daniels@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/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

[PATCH v2 3/4] weston: Bump version to 3.0.0

[Fabien Lahoudere]

Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
---
 .../wayland/{weston_2.0.0.bb => weston_3.0.0.bb}         | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
 rename meta/recipes-graphics/wayland/{weston_2.0.0.bb => weston_3.0.0.bb} (89%)

diff --git a/meta/recipes-graphics/wayland/weston_2.0.0.bb b/meta/recipes-graphics/wayland/weston_3.0.0.bb
similarity index 89%
rename from meta/recipes-graphics/wayland/weston_2.0.0.bb
rename to meta/recipes-graphics/wayland/weston_3.0.0.bb
index 54b07bd6b9..6b3fad7b83 100644
--- a/meta/recipes-graphics/wayland/weston_2.0.0.bb
+++ b/meta/recipes-graphics/wayland/weston_3.0.0.bb
@@ -9,12 +9,11 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            file://weston.png \
            file://weston.desktop \
            file://0001-make-error-portable.patch \
-           file://0001-configure.ac-Fix-wayland-protocols-path.patch \
            file://xwayland.weston-start \
            file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
 "
-SRC_URI[md5sum] = "15f38945942bf2a91fe2687145fb4c7d"
-SRC_URI[sha256sum] = "b4e446ac27f118196f1609dab89bb3cb3e81652d981414ad860e733b355365d8"
+SRC_URI[md5sum] = "9c42a4c51a1b9f35d040fa9d45ada36d"
+SRC_URI[sha256sum] = "cde1d55e8dd70c3cbb3d1ec72f60e60000041579caa1d6a262bd9c35e93723a5"
 
 inherit autotools pkgconfig useradd distro_features_check
 # depends on virtual/egl
@@ -25,7 +24,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 \
@@ -77,7 +75,7 @@ PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam"
 
 do_install_append() {
 	# Weston doesn't need the .la files to load modules, so wipe them
-	rm -f ${D}/${libdir}/libweston-2/*.la
+	rm -f ${D}/${libdir}/libweston-3/*.la
 
 	# If X11, ship a desktop file to launch it
 	if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
@@ -94,16 +92,16 @@ do_install_append() {
 }
 
 PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \
-             libweston-2 ${PN}-examples"
+             libweston-3 ${PN}-examples"
 
 FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}"
 
-FILES_libweston-2 = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-2/*.so"
-SUMMARY_libweston-2 = "Helper library for implementing 'wayland window managers'."
+FILES_libweston-3 = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-3/*.so"
+SUMMARY_libweston-3 = "Helper library for implementing 'wayland window managers'."
 
 FILES_${PN}-examples = "${bindir}/*"
 
-FILES_${PN}-xwayland = "${libdir}/libweston-2/xwayland.so"
+FILES_${PN}-xwayland = "${libdir}/libweston-3/xwayland.so"
 RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland"
 
 RDEPENDS_${PN} += "xkeyboard-config"
-- 
2.11.0

[PATCH v2 4/4] mesa: Bump to version 17.2.0

[Fabien Lahoudere]

Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
---
 meta/recipes-graphics/mesa/mesa_17.2.0.bb | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 meta/recipes-graphics/mesa/mesa_17.2.0.bb

diff --git a/meta/recipes-graphics/mesa/mesa_17.2.0.bb b/meta/recipes-graphics/mesa/mesa_17.2.0.bb
new file mode 100644
index 0000000000..e522e0bbfe
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa_17.2.0.bb
@@ -0,0 +1,24 @@
+require ${BPN}.inc
+
+SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
+           file://replace_glibc_check_with_linux.patch \
+           file://disable-asm-on-non-gcc.patch \
+           file://0001-Use-wayland-scanner-in-the-path.patch \
+           file://0002-hardware-gloat.patch \
+           file://vulkan-mkdir.patch \
+           file://llvm-config-version.patch \
+           file://0001-winsys-svga-drm-Include-sys-types.h.patch \
+           file://0001-configure.ac-Always-check-for-expat.patch \
+           "
+SRC_URI[md5sum] = "1d8d7323d11146767a37c3cb6a6d411d"
+SRC_URI[sha256sum] = "3123448f770eae58bc73e15480e78909defb892f10ab777e9116c9b218094943"
+
+DEPENDS += " llvm-native wayland-protocols "
+
+#because we cannot rely on the fact that all apps will use pkgconfig,
+#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
+do_install_append() {
+    if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
+        sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
+    fi
+}
-- 
2.11.0

✗ patchtest: failure for "[v2] wayland : Bump to version..." and 3 more

[Patchwork]

== Series Details ==

Series: "[v2] wayland : Bump to version..." and 3 more
Revision: 1
URL   : https://patchwork.openembedded.org/series/9073/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence] 
  Suggested fix    Sign off the added patch file (meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [PATCH v2 4/4] mesa: Bump to version 17.2.0

[Nicolas Dechesne]

On Fri, Sep 22, 2017 at 1:02 PM, Fabien Lahoudere
<fabien.lahoudere@collabora.co.uk> wrote:
> Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
> ---
>  meta/recipes-graphics/mesa/mesa_17.2.0.bb | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
>  create mode 100644 meta/recipes-graphics/mesa/mesa_17.2.0.bb

* the diff looks suspicious. you should have renamed the existing
recipe, not just added a new one.
* there is already a patch being discussed on the list for 17.2.1, please check.
* we will not merge any x.y.0 release of mesa, the .0 release are not
meant for production use, as mentioned in the release notes: "Mesa
17.2.0 is a new development release. People who are concerned with
stability and reliability should stick with a previous release or wait
for Mesa 17.2.1."

>
> diff --git a/meta/recipes-graphics/mesa/mesa_17.2.0.bb b/meta/recipes-graphics/mesa/mesa_17.2.0.bb
> new file mode 100644
> index 0000000000..e522e0bbfe
> --- /dev/null
> +++ b/meta/recipes-graphics/mesa/mesa_17.2.0.bb
> @@ -0,0 +1,24 @@
> +require ${BPN}.inc
> +
> +SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
> +           file://replace_glibc_check_with_linux.patch \
> +           file://disable-asm-on-non-gcc.patch \
> +           file://0001-Use-wayland-scanner-in-the-path.patch \
> +           file://0002-hardware-gloat.patch \
> +           file://vulkan-mkdir.patch \
> +           file://llvm-config-version.patch \
> +           file://0001-winsys-svga-drm-Include-sys-types.h.patch \
> +           file://0001-configure.ac-Always-check-for-expat.patch \
> +           "
> +SRC_URI[md5sum] = "1d8d7323d11146767a37c3cb6a6d411d"
> +SRC_URI[sha256sum] = "3123448f770eae58bc73e15480e78909defb892f10ab777e9116c9b218094943"
> +
> +DEPENDS += " llvm-native wayland-protocols "
> +
> +#because we cannot rely on the fact that all apps will use pkgconfig,
> +#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
> +do_install_append() {
> +    if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
> +        sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> +    fi
> +}
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH v2 4/4] mesa: Bump to version 17.2.0

[Fabien Lahoudere]

On Fri, 2017-09-22 at 13:51 +0200, Nicolas Dechesne wrote:
> On Fri, Sep 22, 2017 at 1:02 PM, Fabien Lahoudere
> <fabien.lahoudere@collabora.co.uk> wrote:
> > Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
> > ---
> >  meta/recipes-graphics/mesa/mesa_17.2.0.bb | 24 ++++++++++++++++++++++++
> >  1 file changed, 24 insertions(+)
> >  create mode 100644 meta/recipes-graphics/mesa/mesa_17.2.0.bb
> 
> * the diff looks suspicious. you should have renamed the existing
> recipe, not just added a new one.
> * there is already a patch being discussed on the list for 17.2.1, please check.
> * we will not merge any x.y.0 release of mesa, the .0 release are not
> meant for production use, as mentioned in the release notes: "Mesa
> 17.2.0 is a new development release. People who are concerned with
> stability and reliability should stick with a previous release or wait
> for Mesa 17.2.1."
> 

Indeed you're right.
So please ignore this patch.

Thanks

> > 
> > diff --git a/meta/recipes-graphics/mesa/mesa_17.2.0.bb b/meta/recipes-
> > graphics/mesa/mesa_17.2.0.bb
> > new file mode 100644
> > index 0000000000..e522e0bbfe
> > --- /dev/null
> > +++ b/meta/recipes-graphics/mesa/mesa_17.2.0.bb
> > @@ -0,0 +1,24 @@
> > +require ${BPN}.inc
> > +
> > +SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
> > +           file://replace_glibc_check_with_linux.patch \
> > +           file://disable-asm-on-non-gcc.patch \
> > +           file://0001-Use-wayland-scanner-in-the-path.patch \
> > +           file://0002-hardware-gloat.patch \
> > +           file://vulkan-mkdir.patch \
> > +           file://llvm-config-version.patch \
> > +           file://0001-winsys-svga-drm-Include-sys-types.h.patch \
> > +           file://0001-configure.ac-Always-check-for-expat.patch \
> > +           "
> > +SRC_URI[md5sum] = "1d8d7323d11146767a37c3cb6a6d411d"
> > +SRC_URI[sha256sum] = "3123448f770eae58bc73e15480e78909defb892f10ab777e9116c9b218094943"
> > +
> > +DEPENDS += " llvm-native wayland-protocols "
> > +
> > +#because we cannot rely on the fact that all apps will use pkgconfig,
> > +#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
> > +do_install_append() {
> > +    if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
> > +        sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if
> > defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/'
> > ${D}${includedir}/EGL/eglplatform.h
> > +    fi
> > +}
> > --
> > 2.11.0
> > 
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH v2 2/4] wayland-protocols: Fix installation patch issue

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 5969 bytes --]

Does this depend on the upgrades, or should it work standalone?

Ross

On 22 September 2017 at 12:02, Fabien Lahoudere <
fabien.lahoudere@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
>
> Signed-off-by: Fabien Lahoudere <fabien.lahoudere@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 +
>  .../recipes-graphics/xorg-xserver/xserver-xorg.inc |  1 -
>  .../gstreamer/gstreamer1.0-plugins-bad_1.12.2.bb   |  1 -
>  6 files changed, 29 insertions(+), 4 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@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=875130ee3cbcf62266901ef4b91b9a
> 0fb6adad43]
> +
> +Reviewed-by: Daniel Stone <daniels@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=4646cd7d9edc9fa55db941f2d3a7dc
> 53"
>
>  SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
> +          file://usesysrootprefixforpkgdatadirvariable.patch \
>             "
>  SRC_URI[md5sum] = "84a7846c2b6a6a3e265fc9be36453e60"
>  SRC_URI[sha256sum] = "5719c51d7354864983171c5083e93a
> 72ac99229e2b460c4bb10513de08839c0a"
> 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] = "9c2c7edde4f59d74eb414e0701c551
> 31f562e5c605a3ce9b091754f106
>
>  S = "${WORKDIR}/gst-plugins-bad-${PV}"
>
> -EXTRA_OECONF += "WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}"
>
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 9410 bytes --]

Re: [PATCH v2 2/4] wayland-protocols: Fix installation patch issue

[Otavio Salvador]

On Tue, Sep 26, 2017 at 12:29 PM, Burton, Ross <ross.burton@intel.com> wrote:
> Does this depend on the upgrades, or should it work standalone?

This works standalone. I've been using it.


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH v2 2/4] wayland-protocols: Fix installation patch issue

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 495 bytes --]

On 26 September 2017 at 19:04, Otavio Salvador <
otavio.salvador@ossystems.com.br> wrote:

> On Tue, Sep 26, 2017 at 12:29 PM, Burton, Ross <ross.burton@intel.com>
> wrote:
> > Does this depend on the upgrades, or should it work standalone?
>
> This works standalone. I've been using it.
>

In which case I should report that when I applied it, building weston
failed:

make: *** No rule to make target
'protocol/xdg-shell-unstable-v6-protocol.c', needed by 'all'.  Stop.

Ross

[-- Attachment #2: Type: text/html, Size: 1036 bytes --]

Re: [PATCH v2 2/4] wayland-protocols: Fix installation patch issue

[Otavio Salvador]

On Tue, Sep 26, 2017 at 4:16 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 26 September 2017 at 19:04, Otavio Salvador
> <otavio.salvador@ossystems.com.br> wrote:
>>
>> On Tue, Sep 26, 2017 at 12:29 PM, Burton, Ross <ross.burton@intel.com>
>> wrote:
>> > Does this depend on the upgrades, or should it work standalone?
>>
>> This works standalone. I've been using it.
>
>
> In which case I should report that when I applied it, building weston
> failed:
>
> make: *** No rule to make target
> 'protocol/xdg-shell-unstable-v6-protocol.c', needed by 'all'.  Stop.

Are you using pkgconfig or pkgconf?


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH v2 2/4] wayland-protocols: Fix installation patch issue

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

On 26 September 2017 at 20:19, Otavio Salvador <
otavio.salvador@ossystems.com.br> wrote:

> Are you using pkgconfig or pkgconf?


pkg-config.

Ross

[-- Attachment #2: Type: text/html, Size: 493 bytes --]

Re: [PATCH v2 2/4] wayland-protocols: Fix installation patch issue

[Otavio Salvador]

On Tue, Sep 26, 2017 at 4:22 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 26 September 2017 at 20:19, Otavio Salvador
> <otavio.salvador@ossystems.com.br> wrote:
>>
>> Are you using pkgconfig or pkgconf?
>
> pkg-config.

Does it have the depends?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH v2 2/4] wayland-protocols: Fix installation patch issue

[Fabien Lahoudere]

[-- Attachment #1: Type: text/plain, Size: 706 bytes --]

On Tue, 2017-09-26 at 20:16 +0100, Burton, Ross wrote:
> On 26 September 2017 at 19:04, Otavio Salvador <otavio.salvador@ossystems.com.br> wrote:
> > On Tue, Sep 26, 2017 at 12:29 PM, Burton, Ross <ross.burton@intel.com> wrote:
> > 
> > > Does this depend on the upgrades, or should it work standalone?
> > 
> > 
> > 
> > This works standalone. I've been using it.
> 
> In which case I should report that when I applied it, building weston failed:
> 
> make: *** No rule to make target 'protocol/xdg-shell-unstable-v6-protocol.c', needed by 'all'. 
> Stop.
> 

This is because I test with weston patch (3/4) that drop line
"WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}"
> Ross
>  

[-- Attachment #2: Type: text/html, Size: 1360 bytes --]

Re: [PATCH v2 2/4] wayland-protocols: Fix installation patch issue

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 1036 bytes --]

On 27 September 2017 at 00:08, Fabien Lahoudere <
fabien.lahoudere@collabora.co.uk> wrote:

> On Tue, 2017-09-26 at 20:16 +0100, Burton, Ross wrote:
>
> On 26 September 2017 at 19:04, Otavio Salvador <otavio.salvador@ossystems.
> com.br> wrote:
>
> On Tue, Sep 26, 2017 at 12:29 PM, Burton, Ross <ross.burton@intel.com>
> wrote:
> > Does this depend on the upgrades, or should it work standalone?
>
> This works standalone. I've been using it.
>
>
> In which case I should report that when I applied it, building weston
> failed:
>
> make: *** No rule to make target 'protocol/xdg-shell-unstable-v6-protocol.c',
> needed by 'all'.  Stop.
>
>
> This is because I test with weston patch (3/4) that drop line "
> WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}"
>

Bisectability is important, so reordering the patches so this patch is
first and everything still builds followed by the upgrades would make both
merging now (there was a chance that this patch would make 2.4) and later
bisects easier.

Ross

[-- Attachment #2: Type: text/html, Size: 1930 bytes --]

Re: [PATCH v2 2/4] wayland-protocols: Fix installation patch issue

[Fabien Lahoudere]

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

On Wed, 2017-09-27 at 12:12 +0100, Burton, Ross wrote:
> On 27 September 2017 at 00:08, Fabien Lahoudere <fabien.lahoudere@collabora.co.uk> wrote:
> > On Tue, 2017-09-26 at 20:16 +0100, Burton, Ross wrote:
> > > On 26 September 2017 at 19:04, Otavio Salvador <otavio.salvador@ossystems.com.br> wrote:
> > > > On Tue, Sep 26, 2017 at 12:29 PM, Burton, Ross <ross.burton@intel.com> wrote:
> > > > 
> > > > > Does this depend on the upgrades, or should it work standalone?
> > > > 
> > > > 
> > > > 
> > > > This works standalone. I've been using it.
> > > 
> > > In which case I should report that when I applied it, building weston failed:
> > > 
> > > make: *** No rule to make target 'protocol/xdg-shell-unstable-v6-protocol.c', needed by
> > > 'all'.  Stop.
> > > 
> > 
> > This is because I test with weston patch (3/4) that drop line
> > "WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}"
> 
> Bisectability is important, so reordering the patches so this patch is first and everything still
> builds followed by the upgrades would make both merging now (there was a chance that this patch
> would make 2.4) and later bisects easier.

Yes sure, I will send a new patch series in the afternoon.
Thanks
Fabien
> Ross 

[-- Attachment #2: Type: text/html, Size: 2356 bytes --]