* [PATCH v4 1/3] wayland : Bump to version 1.14.0
@ 2017-09-28 16:01 Fabien Lahoudere
2017-09-28 16:01 ` [PATCH v4 2/3] wayland: Fix installation patch issue Fabien Lahoudere
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Fabien Lahoudere @ 2017-09-28 16:01 UTC (permalink / raw)
To: openembedded-core
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 b9396b6..2a2489d 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
--
1.8.3.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v4 2/3] wayland: Fix installation patch issue
2017-09-28 16:01 [PATCH v4 1/3] wayland : Bump to version 1.14.0 Fabien Lahoudere
@ 2017-09-28 16:01 ` Fabien Lahoudere
2017-09-29 3:08 ` Khem Raj
2017-09-29 10:32 ` Burton, Ross
2017-09-28 16:01 ` [PATCH v4 3/3] weston: Bump version to 3.0.0 Fabien Lahoudere
2017-09-28 16:30 ` ✗ patchtest: failure for "[v4] wayland : Bump to version..." and 2 more Patchwork
2 siblings, 2 replies; 11+ messages in thread
From: Fabien Lahoudere @ 2017-09-28 16:01 UTC (permalink / raw)
To: openembedded-core
This patch modify the way we manage wayland path issues.
Instead of patching each recipe to make it work with wayland and its protocols,
it is better to patch wayland to fix its path issues.
So wayland-scanner.pc, wayland-client.pc and wayland-protocols.pc are patched to change paths.
Then we can drop the following workaround:
WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}
in:
- gtk+3
- libsdl2
- xserver-xorg
- gstreamer1.0-plugins-bad
- weston-2.0.0
We also dropped libsdl2 patches which fix wayland paths.
Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
---
meta/recipes-gnome/gtk+/gtk+3.inc | 1 -
...-sysroot-path-so-that-make-finds-our-wayl.patch | 34 ----------------------
...void-finding-build-host-s-wayland-scanner.patch | 31 --------------------
meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb | 4 +--
.../usesysrootprefixforpkgdatadirvariable.patch | 27 +++++++++++++++++
.../wayland/wayland-protocols_1.10.bb | 1 +
.../wayland/wayland/fixpathinpcfiles.patch | 33 +++++++++++++++++++++
meta/recipes-graphics/wayland/wayland_1.14.0.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 -
11 files changed, 63 insertions(+), 72 deletions(-)
delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch
delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch
create mode 100644 meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch
create mode 100644 meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 0a357db..420ead2 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/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch
deleted file mode 100644
index efc8418..0000000
--- a/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b44808e43130dcd13b43e5b978b9b24aeb4c134c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Thu, 20 Oct 2016 14:57:51 +0200
-Subject: [PATCH] prepend our sysroot path so that make finds our
- wayland-protocol files
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- configure.in | 4 +-
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 726ded3..3376600 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1206,7 +1206,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for
- WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon`
- WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`
- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
-- WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client`
-- WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
-+ WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-client`
-+ WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
- video_wayland=yes
- fi
- fi
---
-2.5.5
-
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch b/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch
deleted file mode 100644
index 7837315..0000000
--- a/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ae879091cf65cb70293b375ec7e61ed12a96d8a7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Fri, 2 Dec 2016 09:39:25 +0100
-Subject: [PATCH] Avoid finding build host's wayland-scanner
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 3376600..2aa6ed4 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1204,7 +1204,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for
- if $PKG_CONFIG --exists wayland-client wayland-scanner wayland-protocols wayland-egl wayland-cursor egl xkbcommon ; then
- WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon`
- WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`
-- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
-+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
- WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-client`
- WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
- video_wayland=yes
---
-2.7.4
-
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
index 12d3aaf..032f45b 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
@@ -17,8 +17,6 @@ DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtu
SRC_URI = " \
http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
file://linkage.patch \
- file://0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch \
- file://0002-Avoid-finding-build-host-s-wayland-scanner.patch \
file://fix-build-failure-on-ppc.patch \
"
@@ -35,7 +33,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 0000000..0922a4d
--- /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 4f9e9f3..1ff12c6 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/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
new file mode 100644
index 0000000..9fb1252
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
@@ -0,0 +1,33 @@
+Fix wayland-client and wayland-scanner pc files
+
+Upstream-Status: Pending
+
+Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
+
+Index: wayland-1.14.0/src/wayland-client.pc.in
+===================================================================
+--- wayland-1.14.0.orig/src/wayland-client.pc.in
++++ wayland-1.14.0/src/wayland-client.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ datarootdir=@datarootdir@
+-pkgdatadir=@datadir@/@PACKAGE@
++pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@
+ libdir=@libdir@
+ includedir=@includedir@
+
+Index: wayland-1.14.0/src/wayland-scanner.pc.in
+===================================================================
+--- wayland-1.14.0.orig/src/wayland-scanner.pc.in
++++ wayland-1.14.0/src/wayland-scanner.pc.in
+@@ -1,8 +1,8 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ datarootdir=@datarootdir@
+ pkgdatadir=@datadir@/@PACKAGE@
+-wayland_scanner=@bindir@/wayland-scanner
++wayland_scanner=wayland-scanner
+
+ Name: Wayland Scanner
+ Description: Wayland scanner
diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb b/meta/recipes-graphics/wayland/wayland_1.14.0.bb
index 2a2489d..1a9ff98 100644
--- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.14.0.bb
@@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
DEPENDS = "expat libxml2 libffi wayland-native"
SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
+ file://fixpathinpcfiles.patch \
"
SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"
SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8"
diff --git a/meta/recipes-graphics/wayland/weston_2.0.0.bb b/meta/recipes-graphics/wayland/weston_2.0.0.bb
index 54b07bd..8160f55 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 863d80c..e8025de 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 8321da0..a83a5ba 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}"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v4 3/3] weston: Bump version to 3.0.0
2017-09-28 16:01 [PATCH v4 1/3] wayland : Bump to version 1.14.0 Fabien Lahoudere
2017-09-28 16:01 ` [PATCH v4 2/3] wayland: Fix installation patch issue Fabien Lahoudere
@ 2017-09-28 16:01 ` Fabien Lahoudere
2017-10-16 12:14 ` Burton, Ross
2017-09-28 16:30 ` ✗ patchtest: failure for "[v4] wayland : Bump to version..." and 2 more Patchwork
2 siblings, 1 reply; 11+ messages in thread
From: Fabien Lahoudere @ 2017-09-28 16:01 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
---
.../wayland/{weston_2.0.0.bb => weston_3.0.0.bb} | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
rename meta/recipes-graphics/wayland/{weston_2.0.0.bb => weston_3.0.0.bb} (90%)
diff --git a/meta/recipes-graphics/wayland/weston_2.0.0.bb b/meta/recipes-graphics/wayland/weston_3.0.0.bb
similarity index 90%
rename from meta/recipes-graphics/wayland/weston_2.0.0.bb
rename to meta/recipes-graphics/wayland/weston_3.0.0.bb
index 8160f55..6b3fad7 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
@@ -76,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
@@ -93,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"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* ✗ patchtest: failure for "[v4] wayland : Bump to version..." and 2 more
2017-09-28 16:01 [PATCH v4 1/3] wayland : Bump to version 1.14.0 Fabien Lahoudere
2017-09-28 16:01 ` [PATCH v4 2/3] wayland: Fix installation patch issue Fabien Lahoudere
2017-09-28 16:01 ` [PATCH v4 3/3] weston: Bump version to 3.0.0 Fabien Lahoudere
@ 2017-09-28 16:30 ` Patchwork
2 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2017-09-28 16:30 UTC (permalink / raw)
To: Fabien Lahoudere; +Cc: openembedded-core
== Series Details ==
Series: "[v4] wayland : Bump to version..." and 2 more
Revision: 1
URL : https://patchwork.openembedded.org/series/9154/
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 2/3] wayland: Fix installation patch issue
2017-09-28 16:01 ` [PATCH v4 2/3] wayland: Fix installation patch issue Fabien Lahoudere
@ 2017-09-29 3:08 ` Khem Raj
2017-09-29 10:32 ` Burton, Ross
1 sibling, 0 replies; 11+ messages in thread
From: Khem Raj @ 2017-09-29 3:08 UTC (permalink / raw)
To: Fabien Lahoudere; +Cc: Patches and discussions about the oe-core layer
this is a good patch. Thanks
On Thu, Sep 28, 2017 at 9:01 AM, Fabien Lahoudere
<fabien.lahoudere@collabora.co.uk> wrote:
> This patch modify the way we manage wayland path issues.
> Instead of patching each recipe to make it work with wayland and its protocols,
> it is better to patch wayland to fix its path issues.
>
> So wayland-scanner.pc, wayland-client.pc and wayland-protocols.pc are patched to change paths.
>
> Then we can drop the following workaround:
>
> WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}
>
> in:
>
> - gtk+3
> - libsdl2
> - xserver-xorg
> - gstreamer1.0-plugins-bad
> - weston-2.0.0
>
> We also dropped libsdl2 patches which fix wayland paths.
>
> Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
> ---
> meta/recipes-gnome/gtk+/gtk+3.inc | 1 -
> ...-sysroot-path-so-that-make-finds-our-wayl.patch | 34 ----------------------
> ...void-finding-build-host-s-wayland-scanner.patch | 31 --------------------
> meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb | 4 +--
> .../usesysrootprefixforpkgdatadirvariable.patch | 27 +++++++++++++++++
> .../wayland/wayland-protocols_1.10.bb | 1 +
> .../wayland/wayland/fixpathinpcfiles.patch | 33 +++++++++++++++++++++
> meta/recipes-graphics/wayland/wayland_1.14.0.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 -
> 11 files changed, 63 insertions(+), 72 deletions(-)
> delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch
> delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch
> create mode 100644 meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch
> create mode 100644 meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
>
> diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
> index 0a357db..420ead2 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/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch
> deleted file mode 100644
> index efc8418..0000000
> --- a/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -From b44808e43130dcd13b43e5b978b9b24aeb4c134c Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> -Date: Thu, 20 Oct 2016 14:57:51 +0200
> -Subject: [PATCH] prepend our sysroot path so that make finds our
> - wayland-protocol files
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Upstream-Status: Inappropriate [embedded specific]
> -
> -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ----
> - configure.in | 4 +-
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/configure.in b/configure.in
> -index 726ded3..3376600 100644
> ---- a/configure.in
> -+++ b/configure.in
> -@@ -1206,7 +1206,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for
> - WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon`
> - WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`
> - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
> -- WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client`
> -- WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
> -+ WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-client`
> -+ WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
> - video_wayland=yes
> - fi
> - fi
> ---
> -2.5.5
> -
> diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch b/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch
> deleted file mode 100644
> index 7837315..0000000
> --- a/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From ae879091cf65cb70293b375ec7e61ed12a96d8a7 Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> -Date: Fri, 2 Dec 2016 09:39:25 +0100
> -Subject: [PATCH] Avoid finding build host's wayland-scanner
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Upstream-Status: Inappropriate [embedded specific]
> -
> -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ----
> - configure.in | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/configure.in b/configure.in
> -index 3376600..2aa6ed4 100644
> ---- a/configure.in
> -+++ b/configure.in
> -@@ -1204,7 +1204,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for
> - if $PKG_CONFIG --exists wayland-client wayland-scanner wayland-protocols wayland-egl wayland-cursor egl xkbcommon ; then
> - WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon`
> - WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`
> -- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
> -+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
> - WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-client`
> - WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
> - video_wayland=yes
> ---
> -2.7.4
> -
> diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> index 12d3aaf..032f45b 100644
> --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> @@ -17,8 +17,6 @@ DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtu
> SRC_URI = " \
> http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
> file://linkage.patch \
> - file://0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch \
> - file://0002-Avoid-finding-build-host-s-wayland-scanner.patch \
> file://fix-build-failure-on-ppc.patch \
> "
>
> @@ -35,7 +33,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 0000000..0922a4d
> --- /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 4f9e9f3..1ff12c6 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/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
> new file mode 100644
> index 0000000..9fb1252
> --- /dev/null
> +++ b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
> @@ -0,0 +1,33 @@
> +Fix wayland-client and wayland-scanner pc files
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
> +
> +Index: wayland-1.14.0/src/wayland-client.pc.in
> +===================================================================
> +--- wayland-1.14.0.orig/src/wayland-client.pc.in
> ++++ wayland-1.14.0/src/wayland-client.pc.in
> +@@ -1,7 +1,7 @@
> + prefix=@prefix@
> + exec_prefix=@exec_prefix@
> + datarootdir=@datarootdir@
> +-pkgdatadir=@datadir@/@PACKAGE@
> ++pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@
> + libdir=@libdir@
> + includedir=@includedir@
> +
> +Index: wayland-1.14.0/src/wayland-scanner.pc.in
> +===================================================================
> +--- wayland-1.14.0.orig/src/wayland-scanner.pc.in
> ++++ wayland-1.14.0/src/wayland-scanner.pc.in
> +@@ -1,8 +1,8 @@
> + prefix=@prefix@
> + exec_prefix=@exec_prefix@
> + datarootdir=@datarootdir@
> + pkgdatadir=@datadir@/@PACKAGE@
> +-wayland_scanner=@bindir@/wayland-scanner
> ++wayland_scanner=wayland-scanner
> +
> + Name: Wayland Scanner
> + Description: Wayland scanner
> diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb b/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> index 2a2489d..1a9ff98 100644
> --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> +++ b/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
> DEPENDS = "expat libxml2 libffi wayland-native"
>
> SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
> + file://fixpathinpcfiles.patch \
> "
> SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"
> SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8"
> diff --git a/meta/recipes-graphics/wayland/weston_2.0.0.bb b/meta/recipes-graphics/wayland/weston_2.0.0.bb
> index 54b07bd..8160f55 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 863d80c..e8025de 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 8321da0..a83a5ba 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}"
>
> --
> 1.8.3.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 2/3] wayland: Fix installation patch issue
2017-09-28 16:01 ` [PATCH v4 2/3] wayland: Fix installation patch issue Fabien Lahoudere
2017-09-29 3:08 ` Khem Raj
@ 2017-09-29 10:32 ` Burton, Ross
2017-09-30 13:43 ` Fabien Lahoudere
1 sibling, 1 reply; 11+ messages in thread
From: Burton, Ross @ 2017-09-29 10:32 UTC (permalink / raw)
To: Fabien Lahoudere; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 14700 bytes --]
With xserver-xorg I get:
| make[2]: *** No rule to make target
'//usr/share/wayland-protocols/unstable/relative-pointer/relative-pointer-unstable-v1.xml',
needed by 'relative-pointer-unstable-v1-client-protocol.h'. Stop.
(in the xwayland directory)
Ross
On 28 September 2017 at 17:01, Fabien Lahoudere <
fabien.lahoudere@collabora.co.uk> wrote:
> This patch modify the way we manage wayland path issues.
> Instead of patching each recipe to make it work with wayland and its
> protocols,
> it is better to patch wayland to fix its path issues.
>
> So wayland-scanner.pc, wayland-client.pc and wayland-protocols.pc are
> patched to change paths.
>
> Then we can drop the following workaround:
>
> WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}
>
> in:
>
> - gtk+3
> - libsdl2
> - xserver-xorg
> - gstreamer1.0-plugins-bad
> - weston-2.0.0
>
> We also dropped libsdl2 patches which fix wayland paths.
>
> Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
> ---
> meta/recipes-gnome/gtk+/gtk+3.inc | 1 -
> ...-sysroot-path-so-that-make-finds-our-wayl.patch | 34
> ----------------------
> ...void-finding-build-host-s-wayland-scanner.patch | 31
> --------------------
> meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb | 4 +--
> .../usesysrootprefixforpkgdatadirvariable.patch | 27 +++++++++++++++++
> .../wayland/wayland-protocols_1.10.bb | 1 +
> .../wayland/wayland/fixpathinpcfiles.patch | 33
> +++++++++++++++++++++
> meta/recipes-graphics/wayland/wayland_1.14.0.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 -
> 11 files changed, 63 insertions(+), 72 deletions(-)
> delete mode 100644 meta/recipes-graphics/libsdl2/
> libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch
> delete mode 100644 meta/recipes-graphics/libsdl2/
> libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch
> create mode 100644 meta/recipes-graphics/wayland/wayland-protocols/
> usesysrootprefixforpkgdatadirvariable.patch
> create mode 100644 meta/recipes-graphics/wayland/
> wayland/fixpathinpcfiles.patch
>
> diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc
> b/meta/recipes-gnome/gtk+/gtk+3.inc
> index 0a357db..420ead2 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/0001-prepend-
> our-sysroot-path-so-that-make-finds-our-wayl.patch
> b/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-
> our-sysroot-path-so-that-make-finds-our-wayl.patch
> deleted file mode 100644
> index efc8418..0000000
> --- a/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-
> our-sysroot-path-so-that-make-finds-our-wayl.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -From b44808e43130dcd13b43e5b978b9b24aeb4c134c Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> -Date: Thu, 20 Oct 2016 14:57:51 +0200
> -Subject: [PATCH] prepend our sysroot path so that make finds our
> - wayland-protocol files
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Upstream-Status: Inappropriate [embedded specific]
> -
> -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ----
> - configure.in | 4 +-
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/configure.in b/configure.in
> -index 726ded3..3376600 100644
> ---- a/configure.in
> -+++ b/configure.in
> -@@ -1206,7 +1206,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch],
> [QtWayland server support for
> - WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client
> wayland-egl wayland-cursor xkbcommon`
> - WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client
> wayland-egl wayland-cursor xkbcommon`
> - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner
> wayland-scanner`
> -- WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG
> --variable=pkgdatadir wayland-client`
> -- WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG
> --variable=pkgdatadir wayland-protocols`
> -+ WAYLAND_CORE_PROTOCOL_DIR=${
> WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir
> wayland-client`
> -+ WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG
> --variable=pkgdatadir wayland-protocols`
> - video_wayland=yes
> - fi
> - fi
> ---
> -2.5.5
> -
> diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-
> finding-build-host-s-wayland-scanner.patch b/meta/recipes-graphics/
> libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch
> deleted file mode 100644
> index 7837315..0000000
> --- a/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-
> finding-build-host-s-wayland-scanner.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From ae879091cf65cb70293b375ec7e61ed12a96d8a7 Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> -Date: Fri, 2 Dec 2016 09:39:25 +0100
> -Subject: [PATCH] Avoid finding build host's wayland-scanner
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Upstream-Status: Inappropriate [embedded specific]
> -
> -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ----
> - configure.in | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/configure.in b/configure.in
> -index 3376600..2aa6ed4 100644
> ---- a/configure.in
> -+++ b/configure.in
> -@@ -1204,7 +1204,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch],
> [QtWayland server support for
> - if $PKG_CONFIG --exists wayland-client wayland-scanner
> wayland-protocols wayland-egl wayland-cursor egl xkbcommon ; then
> - WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client
> wayland-egl wayland-cursor xkbcommon`
> - WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client
> wayland-egl wayland-cursor xkbcommon`
> -- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner
> wayland-scanner`
> -+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
> - WAYLAND_CORE_PROTOCOL_DIR=${
> WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir
> wayland-client`
> - WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG
> --variable=pkgdatadir wayland-protocols`
> - video_wayland=yes
> ---
> -2.7.4
> -
> diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> index 12d3aaf..032f45b 100644
> --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> @@ -17,8 +17,6 @@ DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES',
> 'x11', 'virtu
> SRC_URI = " \
> http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
> file://linkage.patch \
> - file://0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch
> \
> - file://0002-Avoid-finding-build-host-s-wayland-scanner.patch \
> file://fix-build-failure-on-ppc.patch \
> "
>
> @@ -35,7 +33,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 0000000..0922a4d
> --- /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 4f9e9f3..1ff12c6 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/wayland/wayland/fixpathinpcfiles.patch
> b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
> new file mode 100644
> index 0000000..9fb1252
> --- /dev/null
> +++ b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
> @@ -0,0 +1,33 @@
> +Fix wayland-client and wayland-scanner pc files
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
> +
> +Index: wayland-1.14.0/src/wayland-client.pc.in
> +===================================================================
> +--- wayland-1.14.0.orig/src/wayland-client.pc.in
> ++++ wayland-1.14.0/src/wayland-client.pc.in
> +@@ -1,7 +1,7 @@
> + prefix=@prefix@
> + exec_prefix=@exec_prefix@
> + datarootdir=@datarootdir@
> +-pkgdatadir=@datadir@/@PACKAGE@
> ++pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@
> + libdir=@libdir@
> + includedir=@includedir@
> +
> +Index: wayland-1.14.0/src/wayland-scanner.pc.in
> +===================================================================
> +--- wayland-1.14.0.orig/src/wayland-scanner.pc.in
> ++++ wayland-1.14.0/src/wayland-scanner.pc.in
> +@@ -1,8 +1,8 @@
> + prefix=@prefix@
> + exec_prefix=@exec_prefix@
> + datarootdir=@datarootdir@
> + pkgdatadir=@datadir@/@PACKAGE@
> +-wayland_scanner=@bindir@/wayland-scanner
> ++wayland_scanner=wayland-scanner
> +
> + Name: Wayland Scanner
> + Description: Wayland scanner
> diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> b/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> index 2a2489d..1a9ff98 100644
> --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> +++ b/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=
> b31d8f53b6aaf2b4985d7dd7810a70d1 \
> DEPENDS = "expat libxml2 libffi wayland-native"
>
> SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
> + file://fixpathinpcfiles.patch \
> "
> SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"
> SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aab
> fc1ec9a13c86c98bbe2b812f008da27ab8"
> diff --git a/meta/recipes-graphics/wayland/weston_2.0.0.bb
> b/meta/recipes-graphics/wayland/weston_2.0.0.bb
> index 54b07bd..8160f55 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 863d80c..e8025de 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 8321da0..a83a5ba 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}"
>
> --
> 1.8.3.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 21545 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 2/3] wayland: Fix installation patch issue
2017-09-29 10:32 ` Burton, Ross
@ 2017-09-30 13:43 ` Fabien Lahoudere
2017-09-30 13:45 ` Otavio Salvador
0 siblings, 1 reply; 11+ messages in thread
From: Fabien Lahoudere @ 2017-09-30 13:43 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 18008 bytes --]
On Fri, 2017-09-29 at 11:32 +0100, Burton, Ross wrote:
> With xserver-xorg I get:
> | make[2]: *** No rule to make target '//usr/share/wayland-protocols/unstable/relative-
> pointer/relative-pointer-unstable-v1.xml', needed by 'relative-pointer-unstable-v1-client-
> protocol.h'. Stop.
>
> (in the xwayland directory)
>
I am really surprised, I succeed to build core-image-weston which contains xserver-xorg and
xserver-xorg-xwayland on a host where wayland is not installed.
$ ls /usr/share/wayland-protocols/unstable/relative-pointer/relative-pointer-unstable-v1.xmlls:
cannot access /usr/share/wayland-protocols/unstable/relative-pointer/relative-pointer-unstable-
v1.xml: No such file or directory$
Do you have something specific in your setup to help me to reproduce?
Thanks
Fabien
> Ross
> On 28 September 2017 at 17:01, Fabien Lahoudere <fabien.lahoudere@collabora.co.uk> wrote:
> > This patch modify the way we manage wayland path issues.
> >
> > Instead of patching each recipe to make it work with wayland and its protocols,
> >
> > it is better to patch wayland to fix its path issues.
> >
> >
> >
> > So wayland-scanner.pc, wayland-client.pc and wayland-protocols.pc are patched to change paths.
> >
> >
> >
> > Then we can drop the following workaround:
> >
> >
> >
> > WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}
> >
> >
> >
> > in:
> >
> >
> >
> > - gtk+3
> >
> > - libsdl2
> >
> > - xserver-xorg
> >
> > - gstreamer1.0-plugins-bad
> >
> > - weston-2.0.0
> >
> >
> >
> > We also dropped libsdl2 patches which fix wayland paths.
> >
> >
> >
> > Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
> >
> > ---
> >
> > meta/recipes-gnome/gtk+/gtk+3.inc | 1 -
> >
> > ...-sysroot-path-so-that-make-finds-our-wayl.patch | 34 ----------------------
> >
> > ...void-finding-build-host-s-wayland-scanner.patch | 31 --------------------
> >
> > meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb | 4 +--
> >
> > .../usesysrootprefixforpkgdatadirvariable.patch | 27 +++++++++++++++++
> >
> > .../wayland/wayland-protocols_1.10.bb | 1 +
> >
> > .../wayland/wayland/fixpathinpcfiles.patch | 33 +++++++++++++++++++++
> >
> > meta/recipes-graphics/wayland/wayland_1.14.0.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 -
> >
> > 11 files changed, 63 insertions(+), 72 deletions(-)
> >
> > delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-
> > make-finds-our-wayl.patch
> >
> > delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-
> > wayland-scanner.patch
> >
> > create mode 100644 meta/recipes-graphics/wayland/wayland-
> > protocols/usesysrootprefixforpkgdatadirvariable.patch
> >
> > create mode 100644 meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
> >
> >
> >
> > diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
> >
> > index 0a357db..420ead2 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/0001-prepend-our-sysroot-path-so-that-make-
> > finds-our-wayl.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-
> > that-make-finds-our-wayl.patch
> >
> > deleted file mode 100644
> >
> > index efc8418..0000000
> >
> > --- a/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-
> > our-wayl.patch
> >
> > +++ /dev/null
> >
> > @@ -1,34 +0,0 @@
> >
> > -From b44808e43130dcd13b43e5b978b9b24aeb4c134c Mon Sep 17 00:00:00 2001
> >
> > -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> >
> > -Date: Thu, 20 Oct 2016 14:57:51 +0200
> >
> > -Subject: [PATCH] prepend our sysroot path so that make finds our
> >
> > - wayland-protocol files
> >
> > -MIME-Version: 1.0
> >
> > -Content-Type: text/plain; charset=UTF-8
> >
> > -Content-Transfer-Encoding: 8bit
> >
> > -
> >
> > -Upstream-Status: Inappropriate [embedded specific]
> >
> > -
> >
> > -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> >
> > ----
> >
> > - configure.in | 4 +-
> >
> > - 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > -
> >
> > -diff --git a/configure.in b/configure.in
> >
> > -index 726ded3..3376600 100644
> >
> > ---- a/configure.in
> >
> > -+++ b/configure.in
> >
> > -@@ -1206,7 +1206,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server
> > support for
> >
> > - WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor
> > xkbcommon`
> >
> > - WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor
> > xkbcommon`
> >
> > - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
> >
> > -- WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client`
> >
> > -- WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
> >
> > -+ WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --
> > variable=pkgdatadir wayland-client`
> >
> > -+ WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --
> > variable=pkgdatadir wayland-protocols`
> >
> > - video_wayland=yes
> >
> > - fi
> >
> > - fi
> >
> > ---
> >
> > -2.5.5
> >
> > -
> >
> > diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-
> > scanner.patch b/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-
> > scanner.patch
> >
> > deleted file mode 100644
> >
> > index 7837315..0000000
> >
> > --- a/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-
> > scanner.patch
> >
> > +++ /dev/null
> >
> > @@ -1,31 +0,0 @@
> >
> > -From ae879091cf65cb70293b375ec7e61ed12a96d8a7 Mon Sep 17 00:00:00 2001
> >
> > -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> >
> > -Date: Fri, 2 Dec 2016 09:39:25 +0100
> >
> > -Subject: [PATCH] Avoid finding build host's wayland-scanner
> >
> > -MIME-Version: 1.0
> >
> > -Content-Type: text/plain; charset=UTF-8
> >
> > -Content-Transfer-Encoding: 8bit
> >
> > -
> >
> > -Upstream-Status: Inappropriate [embedded specific]
> >
> > -
> >
> > -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> >
> > ----
> >
> > - configure.in | 2 +-
> >
> > - 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > -
> >
> > -diff --git a/configure.in b/configure.in
> >
> > -index 3376600..2aa6ed4 100644
> >
> > ---- a/configure.in
> >
> > -+++ b/configure.in
> >
> > -@@ -1204,7 +1204,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server
> > support for
> >
> > - if $PKG_CONFIG --exists wayland-client wayland-scanner wayland-protocols wayland-
> > egl wayland-cursor egl xkbcommon ; then
> >
> > - WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor
> > xkbcommon`
> >
> > - WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor
> > xkbcommon`
> >
> > -- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
> >
> > -+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
> >
> > - WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --
> > variable=pkgdatadir wayland-client`
> >
> > - WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --
> > variable=pkgdatadir wayland-protocols`
> >
> > - video_wayland=yes
> >
> > ---
> >
> > -2.7.4
> >
> > -
> >
> > diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb b/meta/recipes-
> > graphics/libsdl2/libsdl2_2.0.5.bb
> >
> > index 12d3aaf..032f45b 100644
> >
> > --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> >
> > +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> >
> > @@ -17,8 +17,6 @@ DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11',
> > 'virtu
> >
> > SRC_URI = " \
> >
> > http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
> >
> > file://linkage.patch \
> >
> > - file://0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch \
> >
> > - file://0002-Avoid-finding-build-host-s-wayland-scanner.patch \
> >
> > file://fix-build-failure-on-ppc.patch \
> >
> > "
> >
> >
> >
> > @@ -35,7 +33,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 0000000..0922a4d
> >
> > --- /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=87
> > 5130ee3cbcf62266901ef4b91b9a0fb6adad43]
> >
> > +
> >
> > +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 4f9e9f3..1ff12c6 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/wayland/fixpathinpcfiles.patch b/meta/recipes-
> > graphics/wayland/wayland/fixpathinpcfiles.patch
> >
> > new file mode 100644
> >
> > index 0000000..9fb1252
> >
> > --- /dev/null
> >
> > +++ b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
> >
> > @@ -0,0 +1,33 @@
> >
> > +Fix wayland-client and wayland-scanner pc files
> >
> > +
> >
> > +Upstream-Status: Pending
> >
> > +
> >
> > +Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
> >
> > +
> >
> > +Index: wayland-1.14.0/src/wayland-client.pc.in
> >
> > +===================================================================
> >
> > +--- wayland-1.14.0.orig/src/wayland-client.pc.in
> >
> > ++++ wayland-1.14.0/src/wayland-client.pc.in
> >
> > +@@ -1,7 +1,7 @@
> >
> > + prefix=@prefix@
> >
> > + exec_prefix=@exec_prefix@
> >
> > + datarootdir=@datarootdir@
> >
> > +-pkgdatadir=@datadir@/@PACKAGE@
> >
> > ++pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@
> >
> > + libdir=@libdir@
> >
> > + includedir=@includedir@
> >
> > +
> >
> > +Index: wayland-1.14.0/src/wayland-scanner.pc.in
> >
> > +===================================================================
> >
> > +--- wayland-1.14.0.orig/src/wayland-scanner.pc.in
> >
> > ++++ wayland-1.14.0/src/wayland-scanner.pc.in
> >
> > +@@ -1,8 +1,8 @@
> >
> > + prefix=@prefix@
> >
> > + exec_prefix=@exec_prefix@
> >
> > + datarootdir=@datarootdir@
> >
> > + pkgdatadir=@datadir@/@PACKAGE@
> >
> > +-wayland_scanner=@bindir@/wayland-scanner
> >
> > ++wayland_scanner=wayland-scanner
> >
> > +
> >
> > + Name: Wayland Scanner
> >
> > + Description: Wayland scanner
> >
> > diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb b/meta/recipes-
> > graphics/wayland/wayland_1.14.0.bb
> >
> > index 2a2489d..1a9ff98 100644
> >
> > --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> >
> > +++ b/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> >
> > @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
> >
> > DEPENDS = "expat libxml2 libffi wayland-native"
> >
> >
> >
> > SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
> >
> > + file://fixpathinpcfiles.patch \
> >
> > "
> >
> > SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"
> >
> > SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8"
> >
> > diff --git a/meta/recipes-graphics/wayland/weston_2.0.0.bb b/meta/recipes-
> > graphics/wayland/weston_2.0.0.bb
> >
> > index 54b07bd..8160f55 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 863d80c..e8025de 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 8321da0..a83a5ba 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}"
> >
> >
> >
> > --
> >
> > 1.8.3.1
> >
> >
> >
> > --
> >
> > _______________________________________________
> >
> > Openembedded-core mailing list
> >
> > Openembedded-core@lists.openembedded.org
> >
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> >
> >
[-- Attachment #2: Type: text/html, Size: 23065 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 2/3] wayland: Fix installation patch issue
2017-09-30 13:43 ` Fabien Lahoudere
@ 2017-09-30 13:45 ` Otavio Salvador
2017-10-02 10:27 ` Burton, Ross
0 siblings, 1 reply; 11+ messages in thread
From: Otavio Salvador @ 2017-09-30 13:45 UTC (permalink / raw)
To: Fabien Lahoudere; +Cc: OE-core
On Sat, Sep 30, 2017 at 10:43 AM, Fabien Lahoudere
<fabien.lahoudere@collabora.co.uk> wrote:
> On Fri, 2017-09-29 at 11:32 +0100, Burton, Ross wrote:
>
> With xserver-xorg I get:
>
> | make[2]: *** No rule to make target
> '//usr/share/wayland-protocols/unstable/relative-pointer/relative-pointer-unstable-v1.xml',
> needed by 'relative-pointer-unstable-v1-client-protocol.h'. Stop.
>
> (in the xwayland directory)
>
>
> I am really surprised, I succeed to build core-image-weston which contains
> xserver-xorg and xserver-xorg-xwayland on a host where wayland is not
> installed.
>
> $ ls
> /usr/share/wayland-protocols/unstable/relative-pointer/relative-pointer-unstable-v1.xml
> ls: cannot access
> /usr/share/wayland-protocols/unstable/relative-pointer/relative-pointer-unstable-v1.xml:
> No such file or directory
> $
>
> Do you have something specific in your setup to help me to reproduce?
Only way I could reproduce this was using pkgconf instead of
pkgconfig. But AFAIK Ross is using pkgconfig, aren't you Ross?
--
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 2/3] wayland: Fix installation patch issue
2017-09-30 13:45 ` Otavio Salvador
@ 2017-10-02 10:27 ` Burton, Ross
0 siblings, 0 replies; 11+ messages in thread
From: Burton, Ross @ 2017-10-02 10:27 UTC (permalink / raw)
To: Otavio Salvador; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 1314 bytes --]
On 30 September 2017 at 14:45, Otavio Salvador <
otavio.salvador@ossystems.com.br> wrote:
> On Sat, Sep 30, 2017 at 10:43 AM, Fabien Lahoudere
> <fabien.lahoudere@collabora.co.uk> wrote:
> > On Fri, 2017-09-29 at 11:32 +0100, Burton, Ross wrote:
> >
> > With xserver-xorg I get:
> >
> > | make[2]: *** No rule to make target
> > '//usr/share/wayland-protocols/unstable/relative-
> pointer/relative-pointer-unstable-v1.xml',
> > needed by 'relative-pointer-unstable-v1-client-protocol.h'. Stop.
> >
> > (in the xwayland directory)
> >
> >
> > I am really surprised, I succeed to build core-image-weston which
> contains
> > xserver-xorg and xserver-xorg-xwayland on a host where wayland is not
> > installed.
> >
> > $ ls
> > /usr/share/wayland-protocols/unstable/relative-pointer/
> relative-pointer-unstable-v1.xml
> > ls: cannot access
> > /usr/share/wayland-protocols/unstable/relative-pointer/
> relative-pointer-unstable-v1.xml:
> > No such file or directory
> > $
> >
> > Do you have something specific in your setup to help me to reproduce?
>
> Only way I could reproduce this was using pkgconf instead of
> pkgconfig. But AFAIK Ross is using pkgconfig, aren't you Ross?
Ah, that last run may have been using pkgconf.
I'll have another look later today.
Ross
[-- Attachment #2: Type: text/html, Size: 1944 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 3/3] weston: Bump version to 3.0.0
2017-09-28 16:01 ` [PATCH v4 3/3] weston: Bump version to 3.0.0 Fabien Lahoudere
@ 2017-10-16 12:14 ` Burton, Ross
2017-10-16 16:29 ` Fabien Lahoudere
0 siblings, 1 reply; 11+ messages in thread
From: Burton, Ross @ 2017-10-16 12:14 UTC (permalink / raw)
To: Fabien Lahoudere; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 3440 bytes --]
Fails on the autobuilder when build against musl:
http://errors.yoctoproject.org/Errors/Details/157183/
Ross
On 28 September 2017 at 17:01, Fabien Lahoudere <
fabien.lahoudere@collabora.co.uk> wrote:
> Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
> ---
> .../wayland/{weston_2.0.0.bb => weston_3.0.0.bb} | 15
> +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
> rename meta/recipes-graphics/wayland/{weston_2.0.0.bb => weston_3.0.0.bb}
> (90%)
>
> diff --git a/meta/recipes-graphics/wayland/weston_2.0.0.bb
> b/meta/recipes-graphics/wayland/weston_3.0.0.bb
> similarity index 90%
> rename from meta/recipes-graphics/wayland/weston_2.0.0.bb
> rename to meta/recipes-graphics/wayland/weston_3.0.0.bb
> index 8160f55..6b3fad7 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] = "b4e446ac27f118196f1609dab89bb3
> cb3e81652d981414ad860e733b355365d8"
> +SRC_URI[md5sum] = "9c42a4c51a1b9f35d040fa9d45ada36d"
> +SRC_URI[sha256sum] = "cde1d55e8dd70c3cbb3d1ec72f60e6
> 0000041579caa1d6a262bd9c35e93723a5"
>
> inherit autotools pkgconfig useradd distro_features_check
> # depends on virtual/egl
> @@ -76,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
> @@ -93,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"
> --
> 1.8.3.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 5579 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 3/3] weston: Bump version to 3.0.0
2017-10-16 12:14 ` Burton, Ross
@ 2017-10-16 16:29 ` Fabien Lahoudere
0 siblings, 0 replies; 11+ messages in thread
From: Fabien Lahoudere @ 2017-10-16 16:29 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 4209 bytes --]
Hi Ross
I fix this by adding "#include <time.h>" in shared/timespec-util.hI will send a v5
Thanks
Fabien
On Mon, 2017-10-16 at 13:14 +0100, Burton, Ross wrote:
> Fails on the autobuilder when build against musl:
> http://errors.yoctoproject.org/Errors/Details/157183/
>
> Ross
> On 28 September 2017 at 17:01, Fabien Lahoudere <fabien.lahoudere@collabora.co.uk> wrote:
> > Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
> >
> > ---
> >
> > .../wayland/{weston_2.0.0.bb => weston_3.0.0.bb} | 15 +++++++--------
> >
> > 1 file changed, 7 insertions(+), 8 deletions(-)
> >
> > rename meta/recipes-graphics/wayland/{weston_2.0.0.bb => weston_3.0.0.bb} (90%)
> >
> >
> >
> > diff --git a/meta/recipes-graphics/wayland/weston_2.0.0.bb b/meta/recipes-
> > graphics/wayland/weston_3.0.0.bb
> >
> > similarity index 90%
> >
> > rename from meta/recipes-graphics/wayland/weston_2.0.0.bb
> >
> > rename to meta/recipes-graphics/wayland/weston_3.0.0.bb
> >
> > index 8160f55..6b3fad7 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
> >
> > @@ -76,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
> >
> > @@ -93,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"
> >
> > --
> >
> > 1.8.3.1
> >
> >
> >
> > --
> >
> > _______________________________________________
> >
> > Openembedded-core mailing list
> >
> > Openembedded-core@lists.openembedded.org
> >
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> >
> >
[-- Attachment #2: Type: text/html, Size: 5956 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-10-16 16:29 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-28 16:01 [PATCH v4 1/3] wayland : Bump to version 1.14.0 Fabien Lahoudere
2017-09-28 16:01 ` [PATCH v4 2/3] wayland: Fix installation patch issue Fabien Lahoudere
2017-09-29 3:08 ` Khem Raj
2017-09-29 10:32 ` Burton, Ross
2017-09-30 13:43 ` Fabien Lahoudere
2017-09-30 13:45 ` Otavio Salvador
2017-10-02 10:27 ` Burton, Ross
2017-09-28 16:01 ` [PATCH v4 3/3] weston: Bump version to 3.0.0 Fabien Lahoudere
2017-10-16 12:14 ` Burton, Ross
2017-10-16 16:29 ` Fabien Lahoudere
2017-09-28 16:30 ` ✗ patchtest: failure for "[v4] wayland : Bump to version..." and 2 more Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.