* [PATCH 1/2] wayland: upgrade to 1.15.0
@ 2018-04-10 19:06 Denys Dmytriyenko
2018-04-10 19:06 ` [PATCH 2/2] weston: upgrade to 4.0.0 Denys Dmytriyenko
2018-05-08 21:18 ` [PATCH 1/2] wayland: upgrade to 1.15.0 Martin Jansa
0 siblings, 2 replies; 21+ messages in thread
From: Denys Dmytriyenko @ 2018-04-10 19:06 UTC (permalink / raw)
To: openembedded-core; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@ti.com>
Official announcement:
https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html
| libwayland-egl is now part of libwayland, and will presumably be removed
| from mesa in the not too distant future.
Update mesa recipe by removing corresponding libwayland-egl entries.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta/recipes-graphics/mesa/mesa.inc | 7 ++++---
.../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb} | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb} (92%)
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index b501b7e..c3a8e76 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
libgles1-mesa libgles1-mesa-dev \
libgles2-mesa libgles2-mesa-dev \
libgles3-mesa libgles3-mesa-dev \
- libwayland-egl libwayland-egl-dev \
libxatracker libxatracker-dev \
mesa-megadriver mesa-vulkan-drivers \
"
@@ -134,6 +133,10 @@ do_install_append () {
# it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used
rm -f ${D}${sysconfdir}/drirc
chrpath --delete ${D}${libdir}/dri/*_dri.so || true
+
+ # libwayland-egl has been moved to wayland 1.15+
+ rm -f ${D}${libdir}/libwayland-egl.so*
+ rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
}
# For the packages that make up the OpenGL interfaces, inject variables so that
@@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
FILES_libgl-mesa = "${libdir}/libGL.so.*"
FILES_libglapi = "${libdir}/libglapi.so.*"
FILES_libosmesa = "${libdir}/libOSMesa.so.*"
-FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
FILES_libxatracker = "${libdir}/libxatracker.so.*"
FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"
@@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p
FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
FILES_libgles3-mesa-dev = "${includedir}/GLES3"
FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
-FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*"
FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \
${libdir}/pkgconfig/xatracker.pc"
diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
similarity index 92%
rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb
rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb
index 1a9ff98..788105b 100644
--- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
@@ -15,8 +15,8 @@ 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"
+SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"
+SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db800f587329067962dbf65e14488b4b7aeb0"
inherit autotools pkgconfig
--
2.7.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 2/2] weston: upgrade to 4.0.0
2018-04-10 19:06 [PATCH 1/2] wayland: upgrade to 1.15.0 Denys Dmytriyenko
@ 2018-04-10 19:06 ` Denys Dmytriyenko
2018-04-10 23:16 ` Burton, Ross
2018-04-11 18:03 ` [PATCH v2 " Denys Dmytriyenko
2018-05-08 21:18 ` [PATCH 1/2] wayland: upgrade to 1.15.0 Martin Jansa
1 sibling, 2 replies; 21+ messages in thread
From: Denys Dmytriyenko @ 2018-04-10 19:06 UTC (permalink / raw)
To: openembedded-core; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@ti.com>
Official announcement:
https://lists.freedesktop.org/archives/wayland-devel/2018-April/037768.html
Dropped previously backported fix-missing-header.patch and
weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch
Refresh remaining local patches.
Modify 0001-weston-launch-Provide-a-default-version-that-doesn-t.patch with
changes to apply against the new code base.
Support for libunwind was dropped in bb707dc0fe331c9af112a0552b7aa6fde755dd83:
https://cgit.freedesktop.org/wayland/weston/commit/?id=bb707dc0fe331c9af112a0552b7aa6fde755dd83
Extract major version for referring to libweston-4 helper libraries.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../wayland/weston/0001-make-error-portable.patch | 42 ++++++++---------
...ch-Provide-a-default-version-that-doesn-t.patch | 47 +++++++++---------
.../wayland/weston/fix-missing-header.patch | 30 ------------
...t-pitch-correctly-for-subsampled-textures.patch | 55 ----------------------
.../wayland/{weston_3.0.0.bb => weston_4.0.0.bb} | 20 ++++----
5 files changed, 54 insertions(+), 140 deletions(-)
delete mode 100644 meta/recipes-graphics/wayland/weston/fix-missing-header.patch
delete mode 100644 meta/recipes-graphics/wayland/weston/weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch
rename meta/recipes-graphics/wayland/{weston_3.0.0.bb => weston_4.0.0.bb} (87%)
diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
index 0671a45..6799254 100644
--- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
@@ -1,26 +1,25 @@
-From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001
+From ad1d2161c811cff25d1684c33611f300adb753bc Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 May 2015 20:56:00 -0700
-Subject: [PATCH weston] make error() portable
+Subject: [PATCH] make error() portable
error() is not posix but gnu extension so may not be available on all
kind of systemsi e.g. musl.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Submitted
- configure.ac | 2 ++
- libweston/weston-error.h | 20 ++++++++++++++++++++
- libweston/weston-launch.c | 2 +-
+---
+ configure.ac | 2 ++
+ libweston/weston-error.h | 20 ++++++++++++++++++++
+ libweston/weston-launch.c | 2 +-
3 files changed, 23 insertions(+), 1 deletion(-)
- create mode 100644 src/weston-error.h
+ create mode 100644 libweston/weston-error.h
-Index: weston-3.0.0/configure.ac
-===================================================================
---- weston-3.0.0.orig/configure.ac
-+++ weston-3.0.0/configure.ac
-@@ -103,6 +103,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
+diff --git a/configure.ac b/configure.ac
+index 7aebbdb..dc9c802 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -109,6 +109,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
[[#include <time.h>]])
AC_CHECK_HEADERS([execinfo.h])
@@ -29,10 +28,11 @@ Index: weston-3.0.0/configure.ac
AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
# check for libdrm as a build-time dependency only
-Index: weston-3.0.0/libweston/weston-error.h
-===================================================================
+diff --git a/libweston/weston-error.h b/libweston/weston-error.h
+new file mode 100644
+index 0000000..2089d02
--- /dev/null
-+++ weston-3.0.0/libweston/weston-error.h
++++ b/libweston/weston-error.h
@@ -0,0 +1,20 @@
+#ifndef _WESTON_ERROR_H
+#define _WESTON_ERROR_H
@@ -54,10 +54,10 @@ Index: weston-3.0.0/libweston/weston-error.h
+
+#endif
+
-Index: weston-3.0.0/libweston/weston-launch.c
-===================================================================
---- weston-3.0.0.orig/libweston/weston-launch.c
-+++ weston-3.0.0/libweston/weston-launch.c
+diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
+index 1adcf21..166bf3b 100644
+--- a/libweston/weston-launch.c
++++ b/libweston/weston-launch.c
@@ -33,7 +33,6 @@
#include <poll.h>
#include <errno.h>
@@ -66,7 +66,7 @@ Index: weston-3.0.0/libweston/weston-launch.c
#include <getopt.h>
#include <sys/types.h>
-@@ -60,6 +59,7 @@
+@@ -59,6 +58,7 @@
#endif
#include "weston-launch.h"
diff --git a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
index 70b9888..52eac61 100644
--- a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
@@ -1,7 +1,8 @@
-From 8ff6ed03ec4079f32e9b34085414e57be4730e04 Mon Sep 17 00:00:00 2001
+From b98b9dbda902225cdd972b5bff6a641c36cc7e90 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Wed, 22 Feb 2017 15:53:30 +0200
Subject: [PATCH] weston-launch: Provide a default version that doesn't require
+
PAM
weston-launch requires PAM for starting weston as a non-root user.
@@ -14,16 +15,18 @@ Upstream-Status: Pending
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+
---
configure.ac | 9 +++++++--
libweston/weston-launch.c | 20 ++++++++++++++++++++
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 46cb2c7..bb45f46 100644
+index dc9c802..48cf5cb 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -435,13 +435,17 @@ AC_ARG_ENABLE(resize-optimization,
+@@ -451,13 +451,17 @@ AC_ARG_ENABLE(resize-optimization,
AS_IF([test "x$enable_resize_optimization" = "xyes"],
[AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
@@ -43,7 +46,7 @@ index 46cb2c7..bb45f46 100644
fi
AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
-@@ -701,6 +705,7 @@ AC_MSG_RESULT([
+@@ -702,6 +706,7 @@ AC_MSG_RESULT([
Enable developer documentation ${enable_devdocs}
weston-launch utility ${enable_weston_launch}
@@ -52,7 +55,7 @@ index 46cb2c7..bb45f46 100644
systemd notify support ${enable_systemd_notify}
diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
-index 0491896..07e7469 100644
+index 166bf3b..6fb9232 100644
--- a/libweston/weston-launch.c
+++ b/libweston/weston-launch.c
@@ -51,7 +51,9 @@
@@ -65,7 +68,7 @@ index 0491896..07e7469 100644
#ifdef HAVE_SYSTEMD_LOGIN
#include <systemd/sd-login.h>
-@@ -93,8 +95,10 @@ drmSetMaster(int drm_fd)
+@@ -101,8 +103,10 @@ drmSetMaster(int drm_fd)
#endif
struct weston_launch {
@@ -76,7 +79,7 @@ index 0491896..07e7469 100644
int tty;
int ttynr;
int sock[2];
-@@ -181,6 +185,7 @@ weston_launch_allowed(struct weston_launch *wl)
+@@ -189,6 +193,7 @@ weston_launch_allowed(struct weston_launch *wl)
return false;
}
@@ -84,7 +87,7 @@ index 0491896..07e7469 100644
static int
pam_conversation_fn(int msg_count,
const struct pam_message **messages,
-@@ -221,6 +226,7 @@ setup_pam(struct weston_launch *wl)
+@@ -229,6 +234,7 @@ setup_pam(struct weston_launch *wl)
return 0;
}
@@ -92,7 +95,7 @@ index 0491896..07e7469 100644
static int
setup_launcher_socket(struct weston_launch *wl)
-@@ -414,6 +420,7 @@ quit(struct weston_launch *wl, int status)
+@@ -422,6 +428,7 @@ quit(struct weston_launch *wl, int status)
close(wl->signalfd);
close(wl->sock[0]);
@@ -100,7 +103,7 @@ index 0491896..07e7469 100644
if (wl->new_user) {
err = pam_close_session(wl->ph, 0);
if (err)
-@@ -421,6 +428,7 @@ quit(struct weston_launch *wl, int status)
+@@ -429,6 +436,7 @@ quit(struct weston_launch *wl, int status)
err, pam_strerror(wl->ph, err));
pam_end(wl->ph, err);
}
@@ -108,7 +111,7 @@ index 0491896..07e7469 100644
if (ioctl(wl->tty, KDSKBMUTE, 0) &&
ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
-@@ -600,6 +608,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
+@@ -608,6 +616,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
setenv("HOME", wl->pw->pw_dir, 1);
setenv("SHELL", wl->pw->pw_shell, 1);
@@ -116,7 +119,7 @@ index 0491896..07e7469 100644
env = pam_getenvlist(wl->ph);
if (env) {
for (i = 0; env[i]; ++i) {
-@@ -608,6 +617,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
+@@ -616,6 +625,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
}
free(env);
}
@@ -124,17 +127,18 @@ index 0491896..07e7469 100644
/*
* We open a new session, so it makes sense
-@@ -675,7 +685,9 @@ static void
+@@ -683,8 +693,10 @@ static void
help(const char *name)
{
fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
+#ifdef HAVE_PAM
- fprintf(stderr, " -u, --user Start session as specified username\n");
+ fprintf(stderr, " -u, --user Start session as specified username,\n"
+ " e.g. -u joe, requires root.\n");
+#endif
- fprintf(stderr, " -t, --tty Start session on alternative tty\n");
+ fprintf(stderr, " -t, --tty Start session on alternative tty,\n"
+ " e.g. -t /dev/tty4, requires -u option.\n");
fprintf(stderr, " -v, --verbose Be verbose\n");
- fprintf(stderr, " -h, --help Display this help message\n");
-@@ -688,7 +700,9 @@ main(int argc, char *argv[])
+@@ -698,7 +710,9 @@ main(int argc, char *argv[])
int i, c;
char *tty = NULL;
struct option opts[] = {
@@ -144,8 +148,8 @@ index 0491896..07e7469 100644
{ "tty", required_argument, NULL, 't' },
{ "verbose", no_argument, NULL, 'v' },
{ "help", no_argument, NULL, 'h' },
-@@ -700,9 +714,13 @@ main(int argc, char *argv[])
- while ((c = getopt_long(argc, argv, "u:t::vh", opts, &i)) != -1) {
+@@ -710,9 +724,13 @@ main(int argc, char *argv[])
+ while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
switch (c) {
case 'u':
+#ifdef HAVE_PAM
@@ -158,7 +162,7 @@ index 0491896..07e7469 100644
break;
case 't':
tty = optarg;
-@@ -740,8 +758,10 @@ main(int argc, char *argv[])
+@@ -753,8 +771,10 @@ main(int argc, char *argv[])
if (setup_tty(&wl, tty) < 0)
exit(EXIT_FAILURE);
@@ -169,6 +173,3 @@ index 0491896..07e7469 100644
if (setup_launcher_socket(&wl) < 0)
exit(EXIT_FAILURE);
---
-2.1.4
-
diff --git a/meta/recipes-graphics/wayland/weston/fix-missing-header.patch b/meta/recipes-graphics/wayland/weston/fix-missing-header.patch
deleted file mode 100644
index 55c0d4f..0000000
--- a/meta/recipes-graphics/wayland/weston/fix-missing-header.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-On the musl C library, tests/timespec-text.c does not build, with the
-following error:
-
- In file included from tests/timespec-test.c:36:0:
- ./shared/timespec-util.h:41:21: warning: ‘struct timespec’ declared
- inside parameter list will not be visible outside of this definition
- or declaration
- timespec_sub(struct timespec *r,
- ^~~~~~~~
- [...]
-
-Indeed, struct timespec is defined in time.h, so we must include it.
-
-Upstream-Status: Backport [fa41bdfbc0b962fd73b89f01aab1a5370c9c28eb]
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-
-Index: weston-3.0.0/shared/timespec-util.h
-===================================================================
---- weston-3.0.0.orig/shared/timespec-util.h
-+++ weston-3.0.0/shared/timespec-util.h
-@@ -28,6 +28,7 @@
-
- #include <stdint.h>
- #include <assert.h>
-+#include <time.h>
-
- #define NSEC_PER_SEC 1000000000
-
diff --git a/meta/recipes-graphics/wayland/weston/weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch b/meta/recipes-graphics/wayland/weston/weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch
deleted file mode 100644
index b3e1d06..0000000
--- a/meta/recipes-graphics/wayland/weston/weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Multi-plane sub-sampled textures have partial width/height, e.g.
-YUV420/I420 has a full-size Y plane, followed by a half-width/height U
-plane, and a half-width/height V plane.
-
-zwp_linux_dmabuf_v1 allows clients to pass an explicit pitch for each
-plane, but for wl_shm this must be inferred. gl-renderer was correctly
-accounting for the width and height when subsampling, but the pitch was
-being taken as the pitch for the first plane.
-
-This does not match the requirements for GStreamer's waylandsink, in
-particular, as well as other clients. Fix the SHM upload path to
-correctly set the pitch for each plane, according to subsampling.
-
-Tested with:
- $ gst-launch-1.0 videotestsrc ! waylandsink
-
-Upstream-Status: Backport [https://patchwork.freedesktop.org/patch/180767/]
-
-Signed-off-by: Daniel Stone <daniels@collabora.com>
-Fixes: fdeefe42418 ("gl-renderer: add support of WL_SHM_FORMAT_YUV420")
-Reported-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103063
-
----
- libweston/gl-renderer.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c
-index 244ce309..40bf0bb6 100644
---- a/libweston/gl-renderer.c
-+++ b/libweston/gl-renderer.c
-@@ -1445,14 +1445,13 @@ gl_renderer_flush_damage(struct weston_surface *surface)
- goto done;
- }
-
-- glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, gs->pitch);
--
- if (gs->needs_full_upload) {
- glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0);
- glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0);
- wl_shm_buffer_begin_access(buffer->shm_buffer);
- for (j = 0; j < gs->num_textures; j++) {
- glBindTexture(GL_TEXTURE_2D, gs->textures[j]);
-+ glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, gs->pitch / gs->hsub[j]);
- glTexImage2D(GL_TEXTURE_2D, 0,
- gs->gl_format[j],
- gs->pitch / gs->hsub[j],
-@@ -1477,6 +1476,7 @@ gl_renderer_flush_damage(struct weston_surface *surface)
- glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, r.y1);
- for (j = 0; j < gs->num_textures; j++) {
- glBindTexture(GL_TEXTURE_2D, gs->textures[j]);
-+ glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, gs->pitch / gs->hsub[j]);
- glTexSubImage2D(GL_TEXTURE_2D, 0,
- r.x1 / gs->hsub[j],
- r.y1 / gs->vsub[j],
diff --git a/meta/recipes-graphics/wayland/weston_3.0.0.bb b/meta/recipes-graphics/wayland/weston_4.0.0.bb
similarity index 87%
rename from meta/recipes-graphics/wayland/weston_3.0.0.bb
rename to meta/recipes-graphics/wayland/weston_4.0.0.bb
index ad0cdc2..7dfca7f 100644
--- a/meta/recipes-graphics/wayland/weston_3.0.0.bb
+++ b/meta/recipes-graphics/wayland/weston_4.0.0.bb
@@ -11,11 +11,9 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
file://0001-make-error-portable.patch \
file://xwayland.weston-start \
file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
- file://weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch \
- file://fix-missing-header.patch \
"
-SRC_URI[md5sum] = "9c42a4c51a1b9f35d040fa9d45ada36d"
-SRC_URI[sha256sum] = "cde1d55e8dd70c3cbb3d1ec72f60e60000041579caa1d6a262bd9c35e93723a5"
+SRC_URI[md5sum] = "33709aa4d5916f89643fca0fc0064b39"
+SRC_URI[sha256sum] = "a0fc0ae7ef83dfbed12abfe9b8096a24a7dd00705e86fa0db1e619ded18b4b58"
inherit autotools pkgconfig useradd distro_features_check
# depends on virtual/egl
@@ -24,6 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl"
DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
+WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
+
EXTRA_OECONF = "--enable-setuid-install \
--disable-rdp-compositor \
"
@@ -62,8 +62,6 @@ PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo"
PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms"
# Weston with webp support
PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
-# Weston with unwinding support
-PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind"
# Weston with systemd-login support
PACKAGECONFIG[systemd] = "--enable-systemd-login,--disable-systemd-login,systemd dbus"
# Weston with Xwayland support (requires X11 and Wayland)
@@ -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-3/*.la
+ rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.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-3 ${PN}-examples"
+ libweston-${WESTON_MAJOR_VERSION} ${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-3 = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-3/*.so"
-SUMMARY_libweston-3 = "Helper library for implementing 'wayland window managers'."
+FILES_libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so"
+SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'."
FILES_${PN}-examples = "${bindir}/*"
-FILES_${PN}-xwayland = "${libdir}/libweston-3/xwayland.so"
+FILES_${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so"
RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland"
RDEPENDS_${PN} += "xkeyboard-config"
--
2.7.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH 2/2] weston: upgrade to 4.0.0
2018-04-10 19:06 ` [PATCH 2/2] weston: upgrade to 4.0.0 Denys Dmytriyenko
@ 2018-04-10 23:16 ` Burton, Ross
2018-04-10 23:17 ` Burton, Ross
2018-04-11 18:03 ` [PATCH v2 " Denys Dmytriyenko
1 sibling, 1 reply; 21+ messages in thread
From: Burton, Ross @ 2018-04-10 23:16 UTC (permalink / raw)
To: Denys Dmytriyenko, Alexander Kanavin; +Cc: Denys Dmytriyenko, OE-core
On 10 April 2018 at 20:06, Denys Dmytriyenko <denis@denix.org> wrote:
> diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
> index 0671a45..6799254 100644
> --- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
> +++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
> @@ -1,26 +1,25 @@
> -From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001
> +From ad1d2161c811cff25d1684c33611f300adb753bc Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Fri, 29 May 2015 20:56:00 -0700
> -Subject: [PATCH weston] make error() portable
> +Subject: [PATCH] make error() portable
>
> error() is not posix but gnu extension so may not be available on all
> kind of systemsi e.g. musl.
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> -Upstream-Status: Submitted
Ah, I've seen this before and was wondering if it was a genuine
mistake or devtool being bad.
devtool refresh is doing A Bad Thing and for some reason dropping the
Upstream-Status tag. Alex, can you see why this is? Denys, can you
edit it back in?
Ross
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 2/2] weston: upgrade to 4.0.0
2018-04-10 23:16 ` Burton, Ross
@ 2018-04-10 23:17 ` Burton, Ross
2018-04-11 1:07 ` Denys Dmytriyenko
2018-04-11 22:11 ` Paul Eggleton
0 siblings, 2 replies; 21+ messages in thread
From: Burton, Ross @ 2018-04-10 23:17 UTC (permalink / raw)
To: Denys Dmytriyenko, Alexander Kanavin; +Cc: Denys Dmytriyenko, OE-core
Ah presumably this is because the U-S is after the scissors. Denys,
when you add it back, can you put it above the ---?
Ross
On 11 April 2018 at 00:16, Burton, Ross <ross.burton@intel.com> wrote:
> On 10 April 2018 at 20:06, Denys Dmytriyenko <denis@denix.org> wrote:
>> diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
>> index 0671a45..6799254 100644
>> --- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
>> +++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
>> @@ -1,26 +1,25 @@
>> -From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001
>> +From ad1d2161c811cff25d1684c33611f300adb753bc Mon Sep 17 00:00:00 2001
>> From: Khem Raj <raj.khem@gmail.com>
>> Date: Fri, 29 May 2015 20:56:00 -0700
>> -Subject: [PATCH weston] make error() portable
>> +Subject: [PATCH] make error() portable
>>
>> error() is not posix but gnu extension so may not be available on all
>> kind of systemsi e.g. musl.
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ----
>> -Upstream-Status: Submitted
>
> Ah, I've seen this before and was wondering if it was a genuine
> mistake or devtool being bad.
>
> devtool refresh is doing A Bad Thing and for some reason dropping the
> Upstream-Status tag. Alex, can you see why this is? Denys, can you
> edit it back in?
>
> Ross
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 2/2] weston: upgrade to 4.0.0
2018-04-10 23:17 ` Burton, Ross
@ 2018-04-11 1:07 ` Denys Dmytriyenko
2018-04-11 22:11 ` Paul Eggleton
1 sibling, 0 replies; 21+ messages in thread
From: Denys Dmytriyenko @ 2018-04-11 1:07 UTC (permalink / raw)
To: Burton, Ross; +Cc: Denys Dmytriyenko, OE-core
On Wed, Apr 11, 2018 at 12:17:51AM +0100, Burton, Ross wrote:
> Ah presumably this is because the U-S is after the scissors. Denys,
> when you add it back, can you put it above the ---?
Sure, will do.
> On 11 April 2018 at 00:16, Burton, Ross <ross.burton@intel.com> wrote:
> > On 10 April 2018 at 20:06, Denys Dmytriyenko <denis@denix.org> wrote:
> >> diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
> >> index 0671a45..6799254 100644
> >> --- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
> >> +++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
> >> @@ -1,26 +1,25 @@
> >> -From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001
> >> +From ad1d2161c811cff25d1684c33611f300adb753bc Mon Sep 17 00:00:00 2001
> >> From: Khem Raj <raj.khem@gmail.com>
> >> Date: Fri, 29 May 2015 20:56:00 -0700
> >> -Subject: [PATCH weston] make error() portable
> >> +Subject: [PATCH] make error() portable
> >>
> >> error() is not posix but gnu extension so may not be available on all
> >> kind of systemsi e.g. musl.
> >>
> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >> ----
> >> -Upstream-Status: Submitted
> >
> > Ah, I've seen this before and was wondering if it was a genuine
> > mistake or devtool being bad.
> >
> > devtool refresh is doing A Bad Thing and for some reason dropping the
> > Upstream-Status tag. Alex, can you see why this is? Denys, can you
> > edit it back in?
> >
> > Ross
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v2 2/2] weston: upgrade to 4.0.0
2018-04-10 19:06 ` [PATCH 2/2] weston: upgrade to 4.0.0 Denys Dmytriyenko
2018-04-10 23:16 ` Burton, Ross
@ 2018-04-11 18:03 ` Denys Dmytriyenko
1 sibling, 0 replies; 21+ messages in thread
From: Denys Dmytriyenko @ 2018-04-11 18:03 UTC (permalink / raw)
To: openembedded-core; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@ti.com>
Official announcement:
https://lists.freedesktop.org/archives/wayland-devel/2018-April/037768.html
Dropped previously backported fix-missing-header.patch and
weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch
Refresh remaining local patches.
Modify 0001-weston-launch-Provide-a-default-version-that-doesn-t.patch with
changes to apply against the new code base.
Support for libunwind was dropped in bb707dc0fe331c9af112a0552b7aa6fde755dd83:
https://cgit.freedesktop.org/wayland/weston/commit/?id=bb707dc0fe331c9af112a0552b7aa6fde755dd83
Extract major version for referring to libweston-4 helper libraries.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
v2 - restore lost Upstream-Status line in error() patch
.../wayland/weston/0001-make-error-portable.patch | 44 ++++++++---------
...ch-Provide-a-default-version-that-doesn-t.patch | 49 ++++++++++---------
.../wayland/weston/fix-missing-header.patch | 30 ------------
...t-pitch-correctly-for-subsampled-textures.patch | 55 ----------------------
.../wayland/{weston_3.0.0.bb => weston_4.0.0.bb} | 20 ++++----
5 files changed, 56 insertions(+), 142 deletions(-)
delete mode 100644 meta/recipes-graphics/wayland/weston/fix-missing-header.patch
delete mode 100644 meta/recipes-graphics/wayland/weston/weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch
rename meta/recipes-graphics/wayland/{weston_3.0.0.bb => weston_4.0.0.bb} (87%)
diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
index 0671a45..09ec155 100644
--- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
@@ -1,26 +1,27 @@
-From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001
+From ad1d2161c811cff25d1684c33611f300adb753bc Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 May 2015 20:56:00 -0700
-Subject: [PATCH weston] make error() portable
+Subject: [PATCH] make error() portable
error() is not posix but gnu extension so may not be available on all
kind of systemsi e.g. musl.
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
Upstream-Status: Submitted
- configure.ac | 2 ++
- libweston/weston-error.h | 20 ++++++++++++++++++++
- libweston/weston-launch.c | 2 +-
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+---
+ configure.ac | 2 ++
+ libweston/weston-error.h | 20 ++++++++++++++++++++
+ libweston/weston-launch.c | 2 +-
3 files changed, 23 insertions(+), 1 deletion(-)
- create mode 100644 src/weston-error.h
+ create mode 100644 libweston/weston-error.h
-Index: weston-3.0.0/configure.ac
-===================================================================
---- weston-3.0.0.orig/configure.ac
-+++ weston-3.0.0/configure.ac
-@@ -103,6 +103,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
+diff --git a/configure.ac b/configure.ac
+index 7aebbdb..dc9c802 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -109,6 +109,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
[[#include <time.h>]])
AC_CHECK_HEADERS([execinfo.h])
@@ -29,10 +30,11 @@ Index: weston-3.0.0/configure.ac
AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
# check for libdrm as a build-time dependency only
-Index: weston-3.0.0/libweston/weston-error.h
-===================================================================
+diff --git a/libweston/weston-error.h b/libweston/weston-error.h
+new file mode 100644
+index 0000000..2089d02
--- /dev/null
-+++ weston-3.0.0/libweston/weston-error.h
++++ b/libweston/weston-error.h
@@ -0,0 +1,20 @@
+#ifndef _WESTON_ERROR_H
+#define _WESTON_ERROR_H
@@ -54,10 +56,10 @@ Index: weston-3.0.0/libweston/weston-error.h
+
+#endif
+
-Index: weston-3.0.0/libweston/weston-launch.c
-===================================================================
---- weston-3.0.0.orig/libweston/weston-launch.c
-+++ weston-3.0.0/libweston/weston-launch.c
+diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
+index 1adcf21..166bf3b 100644
+--- a/libweston/weston-launch.c
++++ b/libweston/weston-launch.c
@@ -33,7 +33,6 @@
#include <poll.h>
#include <errno.h>
@@ -66,7 +68,7 @@ Index: weston-3.0.0/libweston/weston-launch.c
#include <getopt.h>
#include <sys/types.h>
-@@ -60,6 +59,7 @@
+@@ -59,6 +58,7 @@
#endif
#include "weston-launch.h"
diff --git a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
index 70b9888..d648538 100644
--- a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
@@ -1,8 +1,7 @@
-From 8ff6ed03ec4079f32e9b34085414e57be4730e04 Mon Sep 17 00:00:00 2001
+From b98b9dbda902225cdd972b5bff6a641c36cc7e90 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Wed, 22 Feb 2017 15:53:30 +0200
-Subject: [PATCH] weston-launch: Provide a default version that doesn't require
- PAM
+Subject: [PATCH] weston-launch: Provide a default version that doesn't require PAM
weston-launch requires PAM for starting weston as a non-root user.
@@ -14,16 +13,18 @@ Upstream-Status: Pending
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+
---
configure.ac | 9 +++++++--
libweston/weston-launch.c | 20 ++++++++++++++++++++
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 46cb2c7..bb45f46 100644
+index dc9c802..48cf5cb 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -435,13 +435,17 @@ AC_ARG_ENABLE(resize-optimization,
+@@ -451,13 +451,17 @@ AC_ARG_ENABLE(resize-optimization,
AS_IF([test "x$enable_resize_optimization" = "xyes"],
[AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
@@ -43,7 +44,7 @@ index 46cb2c7..bb45f46 100644
fi
AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
-@@ -701,6 +705,7 @@ AC_MSG_RESULT([
+@@ -702,6 +706,7 @@ AC_MSG_RESULT([
Enable developer documentation ${enable_devdocs}
weston-launch utility ${enable_weston_launch}
@@ -52,7 +53,7 @@ index 46cb2c7..bb45f46 100644
systemd notify support ${enable_systemd_notify}
diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
-index 0491896..07e7469 100644
+index 166bf3b..6fb9232 100644
--- a/libweston/weston-launch.c
+++ b/libweston/weston-launch.c
@@ -51,7 +51,9 @@
@@ -65,7 +66,7 @@ index 0491896..07e7469 100644
#ifdef HAVE_SYSTEMD_LOGIN
#include <systemd/sd-login.h>
-@@ -93,8 +95,10 @@ drmSetMaster(int drm_fd)
+@@ -101,8 +103,10 @@ drmSetMaster(int drm_fd)
#endif
struct weston_launch {
@@ -76,7 +77,7 @@ index 0491896..07e7469 100644
int tty;
int ttynr;
int sock[2];
-@@ -181,6 +185,7 @@ weston_launch_allowed(struct weston_launch *wl)
+@@ -189,6 +193,7 @@ weston_launch_allowed(struct weston_launch *wl)
return false;
}
@@ -84,7 +85,7 @@ index 0491896..07e7469 100644
static int
pam_conversation_fn(int msg_count,
const struct pam_message **messages,
-@@ -221,6 +226,7 @@ setup_pam(struct weston_launch *wl)
+@@ -229,6 +234,7 @@ setup_pam(struct weston_launch *wl)
return 0;
}
@@ -92,7 +93,7 @@ index 0491896..07e7469 100644
static int
setup_launcher_socket(struct weston_launch *wl)
-@@ -414,6 +420,7 @@ quit(struct weston_launch *wl, int status)
+@@ -422,6 +428,7 @@ quit(struct weston_launch *wl, int status)
close(wl->signalfd);
close(wl->sock[0]);
@@ -100,7 +101,7 @@ index 0491896..07e7469 100644
if (wl->new_user) {
err = pam_close_session(wl->ph, 0);
if (err)
-@@ -421,6 +428,7 @@ quit(struct weston_launch *wl, int status)
+@@ -429,6 +436,7 @@ quit(struct weston_launch *wl, int status)
err, pam_strerror(wl->ph, err));
pam_end(wl->ph, err);
}
@@ -108,7 +109,7 @@ index 0491896..07e7469 100644
if (ioctl(wl->tty, KDSKBMUTE, 0) &&
ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
-@@ -600,6 +608,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
+@@ -608,6 +616,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
setenv("HOME", wl->pw->pw_dir, 1);
setenv("SHELL", wl->pw->pw_shell, 1);
@@ -116,7 +117,7 @@ index 0491896..07e7469 100644
env = pam_getenvlist(wl->ph);
if (env) {
for (i = 0; env[i]; ++i) {
-@@ -608,6 +617,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
+@@ -616,6 +625,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
}
free(env);
}
@@ -124,17 +125,18 @@ index 0491896..07e7469 100644
/*
* We open a new session, so it makes sense
-@@ -675,7 +685,9 @@ static void
+@@ -683,8 +693,10 @@ static void
help(const char *name)
{
fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
+#ifdef HAVE_PAM
- fprintf(stderr, " -u, --user Start session as specified username\n");
+ fprintf(stderr, " -u, --user Start session as specified username,\n"
+ " e.g. -u joe, requires root.\n");
+#endif
- fprintf(stderr, " -t, --tty Start session on alternative tty\n");
+ fprintf(stderr, " -t, --tty Start session on alternative tty,\n"
+ " e.g. -t /dev/tty4, requires -u option.\n");
fprintf(stderr, " -v, --verbose Be verbose\n");
- fprintf(stderr, " -h, --help Display this help message\n");
-@@ -688,7 +700,9 @@ main(int argc, char *argv[])
+@@ -698,7 +710,9 @@ main(int argc, char *argv[])
int i, c;
char *tty = NULL;
struct option opts[] = {
@@ -144,8 +146,8 @@ index 0491896..07e7469 100644
{ "tty", required_argument, NULL, 't' },
{ "verbose", no_argument, NULL, 'v' },
{ "help", no_argument, NULL, 'h' },
-@@ -700,9 +714,13 @@ main(int argc, char *argv[])
- while ((c = getopt_long(argc, argv, "u:t::vh", opts, &i)) != -1) {
+@@ -710,9 +724,13 @@ main(int argc, char *argv[])
+ while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
switch (c) {
case 'u':
+#ifdef HAVE_PAM
@@ -158,7 +160,7 @@ index 0491896..07e7469 100644
break;
case 't':
tty = optarg;
-@@ -740,8 +758,10 @@ main(int argc, char *argv[])
+@@ -753,8 +771,10 @@ main(int argc, char *argv[])
if (setup_tty(&wl, tty) < 0)
exit(EXIT_FAILURE);
@@ -169,6 +171,3 @@ index 0491896..07e7469 100644
if (setup_launcher_socket(&wl) < 0)
exit(EXIT_FAILURE);
---
-2.1.4
-
diff --git a/meta/recipes-graphics/wayland/weston/fix-missing-header.patch b/meta/recipes-graphics/wayland/weston/fix-missing-header.patch
deleted file mode 100644
index 55c0d4f..0000000
--- a/meta/recipes-graphics/wayland/weston/fix-missing-header.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-On the musl C library, tests/timespec-text.c does not build, with the
-following error:
-
- In file included from tests/timespec-test.c:36:0:
- ./shared/timespec-util.h:41:21: warning: ‘struct timespec’ declared
- inside parameter list will not be visible outside of this definition
- or declaration
- timespec_sub(struct timespec *r,
- ^~~~~~~~
- [...]
-
-Indeed, struct timespec is defined in time.h, so we must include it.
-
-Upstream-Status: Backport [fa41bdfbc0b962fd73b89f01aab1a5370c9c28eb]
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-
-Index: weston-3.0.0/shared/timespec-util.h
-===================================================================
---- weston-3.0.0.orig/shared/timespec-util.h
-+++ weston-3.0.0/shared/timespec-util.h
-@@ -28,6 +28,7 @@
-
- #include <stdint.h>
- #include <assert.h>
-+#include <time.h>
-
- #define NSEC_PER_SEC 1000000000
-
diff --git a/meta/recipes-graphics/wayland/weston/weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch b/meta/recipes-graphics/wayland/weston/weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch
deleted file mode 100644
index b3e1d06..0000000
--- a/meta/recipes-graphics/wayland/weston/weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Multi-plane sub-sampled textures have partial width/height, e.g.
-YUV420/I420 has a full-size Y plane, followed by a half-width/height U
-plane, and a half-width/height V plane.
-
-zwp_linux_dmabuf_v1 allows clients to pass an explicit pitch for each
-plane, but for wl_shm this must be inferred. gl-renderer was correctly
-accounting for the width and height when subsampling, but the pitch was
-being taken as the pitch for the first plane.
-
-This does not match the requirements for GStreamer's waylandsink, in
-particular, as well as other clients. Fix the SHM upload path to
-correctly set the pitch for each plane, according to subsampling.
-
-Tested with:
- $ gst-launch-1.0 videotestsrc ! waylandsink
-
-Upstream-Status: Backport [https://patchwork.freedesktop.org/patch/180767/]
-
-Signed-off-by: Daniel Stone <daniels@collabora.com>
-Fixes: fdeefe42418 ("gl-renderer: add support of WL_SHM_FORMAT_YUV420")
-Reported-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103063
-
----
- libweston/gl-renderer.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c
-index 244ce309..40bf0bb6 100644
---- a/libweston/gl-renderer.c
-+++ b/libweston/gl-renderer.c
-@@ -1445,14 +1445,13 @@ gl_renderer_flush_damage(struct weston_surface *surface)
- goto done;
- }
-
-- glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, gs->pitch);
--
- if (gs->needs_full_upload) {
- glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0);
- glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0);
- wl_shm_buffer_begin_access(buffer->shm_buffer);
- for (j = 0; j < gs->num_textures; j++) {
- glBindTexture(GL_TEXTURE_2D, gs->textures[j]);
-+ glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, gs->pitch / gs->hsub[j]);
- glTexImage2D(GL_TEXTURE_2D, 0,
- gs->gl_format[j],
- gs->pitch / gs->hsub[j],
-@@ -1477,6 +1476,7 @@ gl_renderer_flush_damage(struct weston_surface *surface)
- glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, r.y1);
- for (j = 0; j < gs->num_textures; j++) {
- glBindTexture(GL_TEXTURE_2D, gs->textures[j]);
-+ glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, gs->pitch / gs->hsub[j]);
- glTexSubImage2D(GL_TEXTURE_2D, 0,
- r.x1 / gs->hsub[j],
- r.y1 / gs->vsub[j],
diff --git a/meta/recipes-graphics/wayland/weston_3.0.0.bb b/meta/recipes-graphics/wayland/weston_4.0.0.bb
similarity index 87%
rename from meta/recipes-graphics/wayland/weston_3.0.0.bb
rename to meta/recipes-graphics/wayland/weston_4.0.0.bb
index ad0cdc2..7dfca7f 100644
--- a/meta/recipes-graphics/wayland/weston_3.0.0.bb
+++ b/meta/recipes-graphics/wayland/weston_4.0.0.bb
@@ -11,11 +11,9 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
file://0001-make-error-portable.patch \
file://xwayland.weston-start \
file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
- file://weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch \
- file://fix-missing-header.patch \
"
-SRC_URI[md5sum] = "9c42a4c51a1b9f35d040fa9d45ada36d"
-SRC_URI[sha256sum] = "cde1d55e8dd70c3cbb3d1ec72f60e60000041579caa1d6a262bd9c35e93723a5"
+SRC_URI[md5sum] = "33709aa4d5916f89643fca0fc0064b39"
+SRC_URI[sha256sum] = "a0fc0ae7ef83dfbed12abfe9b8096a24a7dd00705e86fa0db1e619ded18b4b58"
inherit autotools pkgconfig useradd distro_features_check
# depends on virtual/egl
@@ -24,6 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl"
DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
+WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
+
EXTRA_OECONF = "--enable-setuid-install \
--disable-rdp-compositor \
"
@@ -62,8 +62,6 @@ PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo"
PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms"
# Weston with webp support
PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
-# Weston with unwinding support
-PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind"
# Weston with systemd-login support
PACKAGECONFIG[systemd] = "--enable-systemd-login,--disable-systemd-login,systemd dbus"
# Weston with Xwayland support (requires X11 and Wayland)
@@ -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-3/*.la
+ rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.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-3 ${PN}-examples"
+ libweston-${WESTON_MAJOR_VERSION} ${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-3 = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-3/*.so"
-SUMMARY_libweston-3 = "Helper library for implementing 'wayland window managers'."
+FILES_libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so"
+SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'."
FILES_${PN}-examples = "${bindir}/*"
-FILES_${PN}-xwayland = "${libdir}/libweston-3/xwayland.so"
+FILES_${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so"
RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland"
RDEPENDS_${PN} += "xkeyboard-config"
--
2.7.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH 2/2] weston: upgrade to 4.0.0
2018-04-10 23:17 ` Burton, Ross
2018-04-11 1:07 ` Denys Dmytriyenko
@ 2018-04-11 22:11 ` Paul Eggleton
2018-04-14 0:29 ` Khem Raj
1 sibling, 1 reply; 21+ messages in thread
From: Paul Eggleton @ 2018-04-11 22:11 UTC (permalink / raw)
To: openembedded-core; +Cc: Denys Dmytriyenko
Yes, this is a bit of a known bug although I didn't actually file one until
now:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=12674
Cheers,
Paul
On Wednesday, 11 April 2018 11:17:51 AM NZST Burton, Ross wrote:
> Ah presumably this is because the U-S is after the scissors. Denys,
> when you add it back, can you put it above the ---?
>
> Ross
>
> On 11 April 2018 at 00:16, Burton, Ross <ross.burton@intel.com> wrote:
> > On 10 April 2018 at 20:06, Denys Dmytriyenko <denis@denix.org> wrote:
> >> diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-
portable.patch b/meta/recipes-graphics/wayland/weston/0001-make-error-
portable.patch
> >> index 0671a45..6799254 100644
> >> --- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
> >> +++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
> >> @@ -1,26 +1,25 @@
> >> -From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001
> >> +From ad1d2161c811cff25d1684c33611f300adb753bc Mon Sep 17 00:00:00 2001
> >> From: Khem Raj <raj.khem@gmail.com>
> >> Date: Fri, 29 May 2015 20:56:00 -0700
> >> -Subject: [PATCH weston] make error() portable
> >> +Subject: [PATCH] make error() portable
> >>
> >> error() is not posix but gnu extension so may not be available on all
> >> kind of systemsi e.g. musl.
> >>
> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >> ----
> >> -Upstream-Status: Submitted
> >
> > Ah, I've seen this before and was wondering if it was a genuine
> > mistake or devtool being bad.
> >
> > devtool refresh is doing A Bad Thing and for some reason dropping the
> > Upstream-Status tag. Alex, can you see why this is? Denys, can you
> > edit it back in?
> >
> > Ross
>
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 2/2] weston: upgrade to 4.0.0
2018-04-11 22:11 ` Paul Eggleton
@ 2018-04-14 0:29 ` Khem Raj
0 siblings, 0 replies; 21+ messages in thread
From: Khem Raj @ 2018-04-14 0:29 UTC (permalink / raw)
To: Paul Eggleton, openembedded-core; +Cc: Denys Dmytriyenko
On 4/11/18 3:11 PM, Paul Eggleton wrote:
> Yes, this is a bit of a known bug although I didn't actually file one until
> now:
>
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=12674
>
> Cheers,
> Paul
>
> On Wednesday, 11 April 2018 11:17:51 AM NZST Burton, Ross wrote:
>> Ah presumably this is because the U-S is after the scissors. Denys,
>> when you add it back, can you put it above the ---?
>>
Upstream-Status is a Yocto project invention that can confuse other
communities when submitting the patches for those packages upstream and
Sign-off-by is also in same bucket in many upstream packages. We need to
be able to support patch headers that are git am'able upstream as well
as to openembedded recipe created trees.
One still has to delete these tags but if you forget its still is ok
since they will be ignored with git am.
>> Ross
>>
>> On 11 April 2018 at 00:16, Burton, Ross <ross.burton@intel.com> wrote:
>>> On 10 April 2018 at 20:06, Denys Dmytriyenko <denis@denix.org> wrote:
>>>> diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-
> portable.patch b/meta/recipes-graphics/wayland/weston/0001-make-error-
> portable.patch
>>>> index 0671a45..6799254 100644
>>>> --- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
>>>> +++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
>>>> @@ -1,26 +1,25 @@
>>>> -From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001
>>>> +From ad1d2161c811cff25d1684c33611f300adb753bc Mon Sep 17 00:00:00 2001
>>>> From: Khem Raj <raj.khem@gmail.com>
>>>> Date: Fri, 29 May 2015 20:56:00 -0700
>>>> -Subject: [PATCH weston] make error() portable
>>>> +Subject: [PATCH] make error() portable
>>>>
>>>> error() is not posix but gnu extension so may not be available on all
>>>> kind of systemsi e.g. musl.
>>>>
>>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>>> ----
>>>> -Upstream-Status: Submitted
>>>
>>> Ah, I've seen this before and was wondering if it was a genuine
>>> mistake or devtool being bad.
>>>
>>> devtool refresh is doing A Bad Thing and for some reason dropping the
>>> Upstream-Status tag. Alex, can you see why this is? Denys, can you
>>> edit it back in?
>>>
>>> Ross
>>
>
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/2] wayland: upgrade to 1.15.0
2018-04-10 19:06 [PATCH 1/2] wayland: upgrade to 1.15.0 Denys Dmytriyenko
2018-04-10 19:06 ` [PATCH 2/2] weston: upgrade to 4.0.0 Denys Dmytriyenko
@ 2018-05-08 21:18 ` Martin Jansa
2018-05-08 21:28 ` Denys Dmytriyenko
2018-05-09 16:00 ` Mark Asselstine
1 sibling, 2 replies; 21+ messages in thread
From: Martin Jansa @ 2018-05-08 21:18 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Denys Dmytriyenko, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 4441 bytes --]
On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>
>
> Official announcement:
> https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html
>
> | libwayland-egl is now part of libwayland, and will presumably be removed
> | from mesa in the not too distant future.
>
> Update mesa recipe by removing corresponding libwayland-egl entries.
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> meta/recipes-graphics/mesa/mesa.inc | 7 ++++---
> .../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb} | 4 ++--
> 2 files changed, 6 insertions(+), 5 deletions(-)
> rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb} (92%)
>
> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
> index b501b7e..c3a8e76 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
> libgles1-mesa libgles1-mesa-dev \
> libgles2-mesa libgles2-mesa-dev \
> libgles3-mesa libgles3-mesa-dev \
> - libwayland-egl libwayland-egl-dev \
> libxatracker libxatracker-dev \
> mesa-megadriver mesa-vulkan-drivers \
> "
> @@ -134,6 +133,10 @@ do_install_append () {
> # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used
> rm -f ${D}${sysconfdir}/drirc
> chrpath --delete ${D}${libdir}/dri/*_dri.so || true
> +
> + # libwayland-egl has been moved to wayland 1.15+
> + rm -f ${D}${libdir}/libwayland-egl.so*
> + rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
Shouldn't /usr/lib/libwayland-egl.la be removed as well? Now I'm getting
many do_prepare_recipe_sysroot failures because both mesa and wayland
provide this file.
> }
>
> # For the packages that make up the OpenGL interfaces, inject variables so that
> @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
> FILES_libgl-mesa = "${libdir}/libGL.so.*"
> FILES_libglapi = "${libdir}/libglapi.so.*"
> FILES_libosmesa = "${libdir}/libOSMesa.so.*"
> -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
> FILES_libxatracker = "${libdir}/libxatracker.so.*"
>
> FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"
> @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p
> FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
> FILES_libgles3-mesa-dev = "${includedir}/GLES3"
> FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
> -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*"
> FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
> ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \
> ${libdir}/pkgconfig/xatracker.pc"
> diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
> similarity index 92%
> rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb
> rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb
> index 1a9ff98..788105b 100644
> --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> +++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
> @@ -15,8 +15,8 @@ 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"
> +SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"
> +SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db800f587329067962dbf65e14488b4b7aeb0"
>
> inherit autotools pkgconfig
>
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/2] wayland: upgrade to 1.15.0
2018-05-08 21:18 ` [PATCH 1/2] wayland: upgrade to 1.15.0 Martin Jansa
@ 2018-05-08 21:28 ` Denys Dmytriyenko
2018-05-08 21:33 ` Martin Jansa
2018-05-08 21:59 ` Burton, Ross
2018-05-09 16:00 ` Mark Asselstine
1 sibling, 2 replies; 21+ messages in thread
From: Denys Dmytriyenko @ 2018-05-08 21:28 UTC (permalink / raw)
To: Martin Jansa; +Cc: Denys Dmytriyenko, openembedded-core
On Tue, May 08, 2018 at 11:18:44PM +0200, Martin Jansa wrote:
> On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > Official announcement:
> > https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html
> >
> > | libwayland-egl is now part of libwayland, and will presumably be removed
> > | from mesa in the not too distant future.
> >
> > Update mesa recipe by removing corresponding libwayland-egl entries.
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> > meta/recipes-graphics/mesa/mesa.inc | 7 ++++---
> > .../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb} | 4 ++--
> > 2 files changed, 6 insertions(+), 5 deletions(-)
> > rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb} (92%)
> >
> > diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
> > index b501b7e..c3a8e76 100644
> > --- a/meta/recipes-graphics/mesa/mesa.inc
> > +++ b/meta/recipes-graphics/mesa/mesa.inc
> > @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
> > libgles1-mesa libgles1-mesa-dev \
> > libgles2-mesa libgles2-mesa-dev \
> > libgles3-mesa libgles3-mesa-dev \
> > - libwayland-egl libwayland-egl-dev \
> > libxatracker libxatracker-dev \
> > mesa-megadriver mesa-vulkan-drivers \
> > "
> > @@ -134,6 +133,10 @@ do_install_append () {
> > # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used
> > rm -f ${D}${sysconfdir}/drirc
> > chrpath --delete ${D}${libdir}/dri/*_dri.so || true
> > +
> > + # libwayland-egl has been moved to wayland 1.15+
> > + rm -f ${D}${libdir}/libwayland-egl.so*
> > + rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
>
> Shouldn't /usr/lib/libwayland-egl.la be removed as well? Now I'm getting
> many do_prepare_recipe_sysroot failures because both mesa and wayland
> provide this file.
Don't we remove .la files in bulk? I didn't see this problem when I was
testing it. Plus it went through Ross' mut branch, then master-next and
presumably few autobuilder iterations?
I can make the change to also remove .la, if it's really required.
> > }
> >
> > # For the packages that make up the OpenGL interfaces, inject variables so that
> > @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
> > FILES_libgl-mesa = "${libdir}/libGL.so.*"
> > FILES_libglapi = "${libdir}/libglapi.so.*"
> > FILES_libosmesa = "${libdir}/libOSMesa.so.*"
> > -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
> > FILES_libxatracker = "${libdir}/libxatracker.so.*"
> >
> > FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"
> > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p
> > FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
> > FILES_libgles3-mesa-dev = "${includedir}/GLES3"
> > FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
> > -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*"
> > FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
> > ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \
> > ${libdir}/pkgconfig/xatracker.pc"
> > diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
> > similarity index 92%
> > rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb
> > rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb
> > index 1a9ff98..788105b 100644
> > --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> > +++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
> > @@ -15,8 +15,8 @@ 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"
> > +SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"
> > +SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db800f587329067962dbf65e14488b4b7aeb0"
> >
> > inherit autotools pkgconfig
> >
> > --
> > 2.7.4
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/2] wayland: upgrade to 1.15.0
2018-05-08 21:28 ` Denys Dmytriyenko
@ 2018-05-08 21:33 ` Martin Jansa
2018-05-09 16:19 ` Denys Dmytriyenko
2018-05-08 21:59 ` Burton, Ross
1 sibling, 1 reply; 21+ messages in thread
From: Martin Jansa @ 2018-05-08 21:33 UTC (permalink / raw)
To: Denys Dmytriyenko
Cc: Denys Dmytriyenko, Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 5540 bytes --]
It's possible to remove them globally with:
meta/classes/remove-libtool.bbclass
but mesa.inc already removes some of the .la files selectively, so it would
be nice to keep it working even for DISTROs which don't inherit
remove-libtool bbclass (for whatever reason).
On Tue, May 8, 2018 at 11:28 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> On Tue, May 08, 2018 at 11:18:44PM +0200, Martin Jansa wrote:
> > On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:
> > > From: Denys Dmytriyenko <denys@ti.com>
> > >
> > > Official announcement:
> > > https://lists.freedesktop.org/archives/wayland-devel/2018-
> April/037767.html
> > >
> > > | libwayland-egl is now part of libwayland, and will presumably be
> removed
> > > | from mesa in the not too distant future.
> > >
> > > Update mesa recipe by removing corresponding libwayland-egl entries.
> > >
> > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > > ---
> > > meta/recipes-graphics/mesa/mesa.inc |
> 7 ++++---
> > > .../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb} |
> 4 ++--
> > > 2 files changed, 6 insertions(+), 5 deletions(-)
> > > rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb =>
> wayland_1.15.0.bb} (92%)
> > >
> > > diff --git a/meta/recipes-graphics/mesa/mesa.inc
> b/meta/recipes-graphics/mesa/mesa.inc
> > > index b501b7e..c3a8e76 100644
> > > --- a/meta/recipes-graphics/mesa/mesa.inc
> > > +++ b/meta/recipes-graphics/mesa/mesa.inc
> > > @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
> > > libgles1-mesa libgles1-mesa-dev \
> > > libgles2-mesa libgles2-mesa-dev \
> > > libgles3-mesa libgles3-mesa-dev \
> > > - libwayland-egl libwayland-egl-dev \
> > > libxatracker libxatracker-dev \
> > > mesa-megadriver mesa-vulkan-drivers \
> > > "
> > > @@ -134,6 +133,10 @@ do_install_append () {
> > > # it was packaged in libdricore9.1.3-1 and preventing upgrades
> when debian.bbclass was used
> > > rm -f ${D}${sysconfdir}/drirc
> > > chrpath --delete ${D}${libdir}/dri/*_dri.so || true
> > > +
> > > + # libwayland-egl has been moved to wayland 1.15+
> > > + rm -f ${D}${libdir}/libwayland-egl.so*
> > > + rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
> >
> > Shouldn't /usr/lib/libwayland-egl.la be removed as well? Now I'm getting
> > many do_prepare_recipe_sysroot failures because both mesa and wayland
> > provide this file.
>
> Don't we remove .la files in bulk? I didn't see this problem when I was
> testing it. Plus it went through Ross' mut branch, then master-next and
> presumably few autobuilder iterations?
>
> I can make the change to also remove .la, if it's really required.
>
>
> > > }
> > >
> > > # For the packages that make up the OpenGL interfaces, inject
> variables so that
> > > @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
> > > FILES_libgl-mesa = "${libdir}/libGL.so.*"
> > > FILES_libglapi = "${libdir}/libglapi.so.*"
> > > FILES_libosmesa = "${libdir}/libOSMesa.so.*"
> > > -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
> > > FILES_libxatracker = "${libdir}/libxatracker.so.*"
> > >
> > > FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"
> > > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.*
> ${includedir}/GLES ${libdir}/p
> > > FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2
> ${libdir}/pkgconfig/glesv2.pc"
> > > FILES_libgles3-mesa-dev = "${includedir}/GLES3"
> > > FILES_libosmesa-dev = "${libdir}/libOSMesa.*
> ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
> > > -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc
> ${libdir}/libwayland-egl.*"
> > > FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/
> libxatracker.la \
> > > ${includedir}/xa_tracker.h
> ${includedir}/xa_composite.h ${includedir}/xa_context.h \
> > > ${libdir}/pkgconfig/xatracker.pc"
> > > diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
> > > similarity index 92%
> > > rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb
> > > rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb
> > > index 1a9ff98..788105b 100644
> > > --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> > > +++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
> > > @@ -15,8 +15,8 @@ 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"
> > > +SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"
> > > +SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db8
> 00f587329067962dbf65e14488b4b7aeb0"
> > >
> > > inherit autotools pkgconfig
> > >
> > > --
> > > 2.7.4
> > >
> > > --
> > > _______________________________________________
> > > Openembedded-core mailing list
> > > Openembedded-core@lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> >
> > --
> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
>
>
[-- Attachment #2: Type: text/html, Size: 8589 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/2] wayland: upgrade to 1.15.0
2018-05-08 21:28 ` Denys Dmytriyenko
2018-05-08 21:33 ` Martin Jansa
@ 2018-05-08 21:59 ` Burton, Ross
2018-05-08 22:12 ` Martin Jansa
1 sibling, 1 reply; 21+ messages in thread
From: Burton, Ross @ 2018-05-08 21:59 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: OE-core, Denys Dmytriyenko
[-- Attachment #1: Type: text/plain, Size: 5678 bytes --]
Yeah the problem here is that poky uses remove-libtool, and the nodistro
builds apparently don't build anything Wayland.
I'll check the AB configure and ensure more coverage for the nodistro
buildset.
Ross
On 8 May 2018 at 22:28, Denys Dmytriyenko <denis@denix.org> wrote:
> On Tue, May 08, 2018 at 11:18:44PM +0200, Martin Jansa wrote:
> > On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:
> > > From: Denys Dmytriyenko <denys@ti.com>
> > >
> > > Official announcement:
> > > https://lists.freedesktop.org/archives/wayland-devel/2018-
> April/037767.html
> > >
> > > | libwayland-egl is now part of libwayland, and will presumably be
> removed
> > > | from mesa in the not too distant future.
> > >
> > > Update mesa recipe by removing corresponding libwayland-egl entries.
> > >
> > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > > ---
> > > meta/recipes-graphics/mesa/mesa.inc |
> 7 ++++---
> > > .../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb} |
> 4 ++--
> > > 2 files changed, 6 insertions(+), 5 deletions(-)
> > > rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb =>
> wayland_1.15.0.bb} (92%)
> > >
> > > diff --git a/meta/recipes-graphics/mesa/mesa.inc
> b/meta/recipes-graphics/mesa/mesa.inc
> > > index b501b7e..c3a8e76 100644
> > > --- a/meta/recipes-graphics/mesa/mesa.inc
> > > +++ b/meta/recipes-graphics/mesa/mesa.inc
> > > @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
> > > libgles1-mesa libgles1-mesa-dev \
> > > libgles2-mesa libgles2-mesa-dev \
> > > libgles3-mesa libgles3-mesa-dev \
> > > - libwayland-egl libwayland-egl-dev \
> > > libxatracker libxatracker-dev \
> > > mesa-megadriver mesa-vulkan-drivers \
> > > "
> > > @@ -134,6 +133,10 @@ do_install_append () {
> > > # it was packaged in libdricore9.1.3-1 and preventing upgrades
> when debian.bbclass was used
> > > rm -f ${D}${sysconfdir}/drirc
> > > chrpath --delete ${D}${libdir}/dri/*_dri.so || true
> > > +
> > > + # libwayland-egl has been moved to wayland 1.15+
> > > + rm -f ${D}${libdir}/libwayland-egl.so*
> > > + rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
> >
> > Shouldn't /usr/lib/libwayland-egl.la be removed as well? Now I'm getting
> > many do_prepare_recipe_sysroot failures because both mesa and wayland
> > provide this file.
>
> Don't we remove .la files in bulk? I didn't see this problem when I was
> testing it. Plus it went through Ross' mut branch, then master-next and
> presumably few autobuilder iterations?
>
> I can make the change to also remove .la, if it's really required.
>
>
> > > }
> > >
> > > # For the packages that make up the OpenGL interfaces, inject
> variables so that
> > > @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
> > > FILES_libgl-mesa = "${libdir}/libGL.so.*"
> > > FILES_libglapi = "${libdir}/libglapi.so.*"
> > > FILES_libosmesa = "${libdir}/libOSMesa.so.*"
> > > -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
> > > FILES_libxatracker = "${libdir}/libxatracker.so.*"
> > >
> > > FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"
> > > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.*
> ${includedir}/GLES ${libdir}/p
> > > FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2
> ${libdir}/pkgconfig/glesv2.pc"
> > > FILES_libgles3-mesa-dev = "${includedir}/GLES3"
> > > FILES_libosmesa-dev = "${libdir}/libOSMesa.*
> ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
> > > -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc
> ${libdir}/libwayland-egl.*"
> > > FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/
> libxatracker.la \
> > > ${includedir}/xa_tracker.h
> ${includedir}/xa_composite.h ${includedir}/xa_context.h \
> > > ${libdir}/pkgconfig/xatracker.pc"
> > > diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
> > > similarity index 92%
> > > rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb
> > > rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb
> > > index 1a9ff98..788105b 100644
> > > --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> > > +++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
> > > @@ -15,8 +15,8 @@ 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"
> > > +SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"
> > > +SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db8
> 00f587329067962dbf65e14488b4b7aeb0"
> > >
> > > inherit autotools pkgconfig
> > >
> > > --
> > > 2.7.4
> > >
> > > --
> > > _______________________________________________
> > > Openembedded-core mailing list
> > > Openembedded-core@lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> >
> > --
> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 8954 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/2] wayland: upgrade to 1.15.0
2018-05-08 21:59 ` Burton, Ross
@ 2018-05-08 22:12 ` Martin Jansa
0 siblings, 0 replies; 21+ messages in thread
From: Martin Jansa @ 2018-05-08 22:12 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core, Denys Dmytriyenko
[-- Attachment #1: Type: text/plain, Size: 6008 bytes --]
Ross: nodistro includes remove-libtool as well
I've noticed the issue in DISTRO which doesn't use INHERIT_DISTRO from
defaultsetup.inc.
On Tue, May 8, 2018 at 11:59 PM, Burton, Ross <ross.burton@intel.com> wrote:
> Yeah the problem here is that poky uses remove-libtool, and the nodistro
> builds apparently don't build anything Wayland.
>
> I'll check the AB configure and ensure more coverage for the nodistro
> buildset.
>
> Ross
>
> On 8 May 2018 at 22:28, Denys Dmytriyenko <denis@denix.org> wrote:
>
>> On Tue, May 08, 2018 at 11:18:44PM +0200, Martin Jansa wrote:
>> > On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:
>> > > From: Denys Dmytriyenko <denys@ti.com>
>> > >
>> > > Official announcement:
>> > > https://lists.freedesktop.org/archives/wayland-devel/2018-Ap
>> ril/037767.html
>> > >
>> > > | libwayland-egl is now part of libwayland, and will presumably be
>> removed
>> > > | from mesa in the not too distant future.
>> > >
>> > > Update mesa recipe by removing corresponding libwayland-egl entries.
>> > >
>> > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>> > > ---
>> > > meta/recipes-graphics/mesa/mesa.inc
>> | 7 ++++---
>> > > .../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb}
>> | 4 ++--
>> > > 2 files changed, 6 insertions(+), 5 deletions(-)
>> > > rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb =>
>> wayland_1.15.0.bb} (92%)
>> > >
>> > > diff --git a/meta/recipes-graphics/mesa/mesa.inc
>> b/meta/recipes-graphics/mesa/mesa.inc
>> > > index b501b7e..c3a8e76 100644
>> > > --- a/meta/recipes-graphics/mesa/mesa.inc
>> > > +++ b/meta/recipes-graphics/mesa/mesa.inc
>> > > @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
>> > > libgles1-mesa libgles1-mesa-dev \
>> > > libgles2-mesa libgles2-mesa-dev \
>> > > libgles3-mesa libgles3-mesa-dev \
>> > > - libwayland-egl libwayland-egl-dev \
>> > > libxatracker libxatracker-dev \
>> > > mesa-megadriver mesa-vulkan-drivers \
>> > > "
>> > > @@ -134,6 +133,10 @@ do_install_append () {
>> > > # it was packaged in libdricore9.1.3-1 and preventing upgrades
>> when debian.bbclass was used
>> > > rm -f ${D}${sysconfdir}/drirc
>> > > chrpath --delete ${D}${libdir}/dri/*_dri.so || true
>> > > +
>> > > + # libwayland-egl has been moved to wayland 1.15+
>> > > + rm -f ${D}${libdir}/libwayland-egl.so*
>> > > + rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
>> >
>> > Shouldn't /usr/lib/libwayland-egl.la be removed as well? Now I'm
>> getting
>> > many do_prepare_recipe_sysroot failures because both mesa and wayland
>> > provide this file.
>>
>> Don't we remove .la files in bulk? I didn't see this problem when I was
>> testing it. Plus it went through Ross' mut branch, then master-next and
>> presumably few autobuilder iterations?
>>
>> I can make the change to also remove .la, if it's really required.
>>
>>
>> > > }
>> > >
>> > > # For the packages that make up the OpenGL interfaces, inject
>> variables so that
>> > > @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
>> > > FILES_libgl-mesa = "${libdir}/libGL.so.*"
>> > > FILES_libglapi = "${libdir}/libglapi.so.*"
>> > > FILES_libosmesa = "${libdir}/libOSMesa.so.*"
>> > > -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
>> > > FILES_libxatracker = "${libdir}/libxatracker.so.*"
>> > >
>> > > FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"
>> > > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.*
>> ${includedir}/GLES ${libdir}/p
>> > > FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2
>> ${libdir}/pkgconfig/glesv2.pc"
>> > > FILES_libgles3-mesa-dev = "${includedir}/GLES3"
>> > > FILES_libosmesa-dev = "${libdir}/libOSMesa.*
>> ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
>> > > -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc
>> ${libdir}/libwayland-egl.*"
>> > > FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/
>> libxatracker.la \
>> > > ${includedir}/xa_tracker.h
>> ${includedir}/xa_composite.h ${includedir}/xa_context.h \
>> > > ${libdir}/pkgconfig/xatracker.pc"
>> > > diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
>> b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
>> > > similarity index 92%
>> > > rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb
>> > > rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb
>> > > index 1a9ff98..788105b 100644
>> > > --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
>> > > +++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
>> > > @@ -15,8 +15,8 @@ DEPENDS = "expat libxml2 libffi wayland-native"
>> > > SRC_URI = "https://wayland.freedesktop.o
>> rg/releases/${BPN}-${PV}.tar.xz \
>> > > file://fixpathinpcfiles.patch \
>> > > "
>> > > -SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"
>> > > -SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aa
>> bfc1ec9a13c86c98bbe2b812f008da27ab8"
>> > > +SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"
>> > > +SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db
>> 800f587329067962dbf65e14488b4b7aeb0"
>> > >
>> > > inherit autotools pkgconfig
>> > >
>> > > --
>> > > 2.7.4
>> > >
>> > > --
>> > > _______________________________________________
>> > > Openembedded-core mailing list
>> > > Openembedded-core@lists.openembedded.org
>> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>> >
>> > --
>> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>>
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>
>
[-- Attachment #2: Type: text/html, Size: 9759 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/2] wayland: upgrade to 1.15.0
2018-05-08 21:18 ` [PATCH 1/2] wayland: upgrade to 1.15.0 Martin Jansa
2018-05-08 21:28 ` Denys Dmytriyenko
@ 2018-05-09 16:00 ` Mark Asselstine
2018-05-09 16:03 ` Burton, Ross
1 sibling, 1 reply; 21+ messages in thread
From: Mark Asselstine @ 2018-05-09 16:00 UTC (permalink / raw)
To: openembedded-core; +Cc: Denys Dmytriyenko
On Tuesday, May 8, 2018 5:18:44 PM EDT Martin Jansa wrote:
> On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > Official announcement:
> > https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.htm
> > l
> >
> > | libwayland-egl is now part of libwayland, and will presumably be removed
> > | from mesa in the not too distant future.
> >
> > Update mesa recipe by removing corresponding libwayland-egl entries.
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> >
> > meta/recipes-graphics/mesa/mesa.inc | 7
> > ++++--- .../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb}
> > | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-)
> > rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb =>
> > wayland_1.15.0.bb} (92%)>
> > diff --git a/meta/recipes-graphics/mesa/mesa.inc
> > b/meta/recipes-graphics/mesa/mesa.inc index b501b7e..c3a8e76 100644
> > --- a/meta/recipes-graphics/mesa/mesa.inc
> > +++ b/meta/recipes-graphics/mesa/mesa.inc
> > @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
> >
> > libgles1-mesa libgles1-mesa-dev \
> > libgles2-mesa libgles2-mesa-dev \
> > libgles3-mesa libgles3-mesa-dev \
> >
> > - libwayland-egl libwayland-egl-dev \
> >
> > libxatracker libxatracker-dev \
> > mesa-megadriver mesa-vulkan-drivers \
> >
> > "
> >
> > @@ -134,6 +133,10 @@ do_install_append () {
> >
> > # it was packaged in libdricore9.1.3-1 and preventing upgrades when
> > debian.bbclass was used rm -f ${D}${sysconfdir}/drirc
> > chrpath --delete ${D}${libdir}/dri/*_dri.so || true
> >
> > +
> > + # libwayland-egl has been moved to wayland 1.15+
> > + rm -f ${D}${libdir}/libwayland-egl.so*
> > + rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
>
> Shouldn't /usr/lib/libwayland-egl.la be removed as well? Now I'm getting
> many do_prepare_recipe_sysroot failures because both mesa and wayland
> provide this file.
I am also seeing build failures due to this conflict:
ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/
libwayland-egl.la is installed by both wayland and mesa, aborting
..
ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories were
installed but not shipped in any package:
/usr/lib64/libwayland-egl.la
Please set FILES such that these items are packaged. Alternatively if they are
unneeded, avoid installing them or delete them within do_install.
mesa: 1 installed and not shipped files. [installed-vs-shipped]
is someone working on a fix or should I take some time to put something
together?
Mark
>
> > }
> >
> > # For the packages that make up the OpenGL interfaces, inject variables
> > so that>
> > @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
> >
> > FILES_libgl-mesa = "${libdir}/libGL.so.*"
> > FILES_libglapi = "${libdir}/libglapi.so.*"
> > FILES_libosmesa = "${libdir}/libOSMesa.so.*"
> >
> > -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
> >
> > FILES_libxatracker = "${libdir}/libxatracker.so.*"
> >
> > FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"
> >
> > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.*
> > ${includedir}/GLES ${libdir}/p>
> > FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2
> > ${libdir}/pkgconfig/glesv2.pc" FILES_libgles3-mesa-dev =
> > "${includedir}/GLES3"
> > FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h
> > ${libdir}/pkgconfig/osmesa.pc">
> > -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc
> > ${libdir}/libwayland-egl.*">
> > FILES_libxatracker-dev = "${libdir}/libxatracker.so
> > ${libdir}/libxatracker.la \>
> > ${includedir}/xa_tracker.h
> > ${includedir}/xa_composite.h
> > ${includedir}/xa_context.h \
> > ${libdir}/pkgconfig/xatracker.pc"
> >
> > diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> > b/meta/recipes-graphics/wayland/wayland_1.15.0.bb similarity index 92%
> > rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb
> > rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb
> > index 1a9ff98..788105b 100644
> > --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> > +++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
> > @@ -15,8 +15,8 @@ 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"
> > +SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"
> > +SRC_URI[sha256sum] =
> > "eb3fbebb8559d56a80ad3753ec3db800f587329067962dbf65e14488b4b7aeb0">
> > inherit autotools pkgconfig
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/2] wayland: upgrade to 1.15.0
2018-05-09 16:00 ` Mark Asselstine
@ 2018-05-09 16:03 ` Burton, Ross
2018-05-09 16:09 ` Mark Asselstine
2018-05-09 18:07 ` Martin Jansa
0 siblings, 2 replies; 21+ messages in thread
From: Burton, Ross @ 2018-05-09 16:03 UTC (permalink / raw)
To: Mark Asselstine; +Cc: Denys Dmytriyenko, OE-core
[-- Attachment #1: Type: text/plain, Size: 886 bytes --]
On 9 May 2018 at 17:00, Mark Asselstine <mark.asselstine@windriver.com>
wrote:
> I am also seeing build failures due to this conflict:
>
> ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/
> libwayland-egl.la is installed by both wayland and mesa, aborting
> ..
> ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories were
> installed but not shipped in any package:
> /usr/lib64/libwayland-egl.la
> Please set FILES such that these items are packaged. Alternatively if they
> are
> unneeded, avoid installing them or delete them within do_install.
> mesa: 1 installed and not shipped files. [installed-vs-shipped]
>
> is someone working on a fix or should I take some time to put something
> together?
>
As it appears you can test quickly then I think you just drew the short
straw. Should be a trivial patch...
Ross
[-- Attachment #2: Type: text/html, Size: 1486 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/2] wayland: upgrade to 1.15.0
2018-05-09 16:03 ` Burton, Ross
@ 2018-05-09 16:09 ` Mark Asselstine
2018-05-09 16:15 ` Burton, Ross
2018-05-09 16:16 ` Burton, Ross
2018-05-09 18:07 ` Martin Jansa
1 sibling, 2 replies; 21+ messages in thread
From: Mark Asselstine @ 2018-05-09 16:09 UTC (permalink / raw)
To: Burton, Ross; +Cc: Denys Dmytriyenko, OE-core
On Wednesday, May 9, 2018 12:03:26 PM EDT Burton, Ross wrote:
> On 9 May 2018 at 17:00, Mark Asselstine <mark.asselstine@windriver.com>
>
> wrote:
> > I am also seeing build failures due to this conflict:
> >
> > ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/
> > libwayland-egl.la is installed by both wayland and mesa, aborting
> > ..
> > ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories were
> >
> > installed but not shipped in any package:
> > /usr/lib64/libwayland-egl.la
> >
> > Please set FILES such that these items are packaged. Alternatively if they
> > are
> > unneeded, avoid installing them or delete them within do_install.
> > mesa: 1 installed and not shipped files. [installed-vs-shipped]
> >
> > is someone working on a fix or should I take some time to put something
> > together?
>
> As it appears you can test quickly then I think you just drew the short
> straw. Should be a trivial patch...
I knew that this had a 50/50 chance of going this way :). Lunch then a fix. I
assume then we will go with Martin's suggestion of an explicit remove in
mesa.inc?
Mark
>
> Ross
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/2] wayland: upgrade to 1.15.0
2018-05-09 16:09 ` Mark Asselstine
@ 2018-05-09 16:15 ` Burton, Ross
2018-05-09 16:16 ` Burton, Ross
1 sibling, 0 replies; 21+ messages in thread
From: Burton, Ross @ 2018-05-09 16:15 UTC (permalink / raw)
To: Mark Asselstine; +Cc: Denys Dmytriyenko, OE-core
[-- Attachment #1: Type: text/plain, Size: 1463 bytes --]
I'd say that generalising rm -f ${D}${libdir}/libwayland-egl.so* to
libwayland-egl.* should to the trick.
Ross
On 9 May 2018 at 17:09, Mark Asselstine <mark.asselstine@windriver.com>
wrote:
> On Wednesday, May 9, 2018 12:03:26 PM EDT Burton, Ross wrote:
> > On 9 May 2018 at 17:00, Mark Asselstine <mark.asselstine@windriver.com>
> >
> > wrote:
> > > I am also seeing build failures due to this conflict:
> > >
> > > ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/
> > > libwayland-egl.la is installed by both wayland and mesa, aborting
> > > ..
> > > ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories
> were
> > >
> > > installed but not shipped in any package:
> > > /usr/lib64/libwayland-egl.la
> > >
> > > Please set FILES such that these items are packaged. Alternatively if
> they
> > > are
> > > unneeded, avoid installing them or delete them within do_install.
> > > mesa: 1 installed and not shipped files. [installed-vs-shipped]
> > >
> > > is someone working on a fix or should I take some time to put something
> > > together?
> >
> > As it appears you can test quickly then I think you just drew the short
> > straw. Should be a trivial patch...
>
> I knew that this had a 50/50 chance of going this way :). Lunch then a
> fix. I
> assume then we will go with Martin's suggestion of an explicit remove in
> mesa.inc?
>
> Mark
>
> >
> > Ross
>
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 2522 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/2] wayland: upgrade to 1.15.0
2018-05-09 16:09 ` Mark Asselstine
2018-05-09 16:15 ` Burton, Ross
@ 2018-05-09 16:16 ` Burton, Ross
2018-05-09 17:59 ` Mark Asselstine
1 sibling, 1 reply; 21+ messages in thread
From: Burton, Ross @ 2018-05-09 16:16 UTC (permalink / raw)
To: Mark Asselstine; +Cc: Denys Dmytriyenko, OE-core
[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]
Good news: Denys beat you.
Ross
On 9 May 2018 at 17:09, Mark Asselstine <mark.asselstine@windriver.com>
wrote:
> On Wednesday, May 9, 2018 12:03:26 PM EDT Burton, Ross wrote:
> > On 9 May 2018 at 17:00, Mark Asselstine <mark.asselstine@windriver.com>
> >
> > wrote:
> > > I am also seeing build failures due to this conflict:
> > >
> > > ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/
> > > libwayland-egl.la is installed by both wayland and mesa, aborting
> > > ..
> > > ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories
> were
> > >
> > > installed but not shipped in any package:
> > > /usr/lib64/libwayland-egl.la
> > >
> > > Please set FILES such that these items are packaged. Alternatively if
> they
> > > are
> > > unneeded, avoid installing them or delete them within do_install.
> > > mesa: 1 installed and not shipped files. [installed-vs-shipped]
> > >
> > > is someone working on a fix or should I take some time to put something
> > > together?
> >
> > As it appears you can test quickly then I think you just drew the short
> > straw. Should be a trivial patch...
>
> I knew that this had a 50/50 chance of going this way :). Lunch then a
> fix. I
> assume then we will go with Martin's suggestion of an explicit remove in
> mesa.inc?
>
> Mark
>
> >
> > Ross
>
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 2143 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/2] wayland: upgrade to 1.15.0
2018-05-08 21:33 ` Martin Jansa
@ 2018-05-09 16:19 ` Denys Dmytriyenko
0 siblings, 0 replies; 21+ messages in thread
From: Denys Dmytriyenko @ 2018-05-09 16:19 UTC (permalink / raw)
To: Martin Jansa
Cc: Denys Dmytriyenko, Patches and discussions about the oe-core layer
On Tue, May 08, 2018 at 11:33:25PM +0200, Martin Jansa wrote:
> It's possible to remove them globally with:
> meta/classes/remove-libtool.bbclass
> but mesa.inc already removes some of the .la files selectively, so it would
> be nice to keep it working even for DISTROs which don't inherit
> remove-libtool bbclass (for whatever reason).
Ok, sent a patch to remove all libwayland-egl files, not just .so - should
take care of .la as well.
> On Tue, May 8, 2018 at 11:28 PM, Denys Dmytriyenko <denis@denix.org> wrote:
>
> > On Tue, May 08, 2018 at 11:18:44PM +0200, Martin Jansa wrote:
> > > On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:
> > > > From: Denys Dmytriyenko <denys@ti.com>
> > > >
> > > > Official announcement:
> > > > https://lists.freedesktop.org/archives/wayland-devel/2018-
> > April/037767.html
> > > >
> > > > | libwayland-egl is now part of libwayland, and will presumably be
> > removed
> > > > | from mesa in the not too distant future.
> > > >
> > > > Update mesa recipe by removing corresponding libwayland-egl entries.
> > > >
> > > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > > > ---
> > > > meta/recipes-graphics/mesa/mesa.inc |
> > 7 ++++---
> > > > .../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb} |
> > 4 ++--
> > > > 2 files changed, 6 insertions(+), 5 deletions(-)
> > > > rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb =>
> > wayland_1.15.0.bb} (92%)
> > > >
> > > > diff --git a/meta/recipes-graphics/mesa/mesa.inc
> > b/meta/recipes-graphics/mesa/mesa.inc
> > > > index b501b7e..c3a8e76 100644
> > > > --- a/meta/recipes-graphics/mesa/mesa.inc
> > > > +++ b/meta/recipes-graphics/mesa/mesa.inc
> > > > @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
> > > > libgles1-mesa libgles1-mesa-dev \
> > > > libgles2-mesa libgles2-mesa-dev \
> > > > libgles3-mesa libgles3-mesa-dev \
> > > > - libwayland-egl libwayland-egl-dev \
> > > > libxatracker libxatracker-dev \
> > > > mesa-megadriver mesa-vulkan-drivers \
> > > > "
> > > > @@ -134,6 +133,10 @@ do_install_append () {
> > > > # it was packaged in libdricore9.1.3-1 and preventing upgrades
> > when debian.bbclass was used
> > > > rm -f ${D}${sysconfdir}/drirc
> > > > chrpath --delete ${D}${libdir}/dri/*_dri.so || true
> > > > +
> > > > + # libwayland-egl has been moved to wayland 1.15+
> > > > + rm -f ${D}${libdir}/libwayland-egl.so*
> > > > + rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
> > >
> > > Shouldn't /usr/lib/libwayland-egl.la be removed as well? Now I'm getting
> > > many do_prepare_recipe_sysroot failures because both mesa and wayland
> > > provide this file.
> >
> > Don't we remove .la files in bulk? I didn't see this problem when I was
> > testing it. Plus it went through Ross' mut branch, then master-next and
> > presumably few autobuilder iterations?
> >
> > I can make the change to also remove .la, if it's really required.
> >
> >
> > > > }
> > > >
> > > > # For the packages that make up the OpenGL interfaces, inject
> > variables so that
> > > > @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
> > > > FILES_libgl-mesa = "${libdir}/libGL.so.*"
> > > > FILES_libglapi = "${libdir}/libglapi.so.*"
> > > > FILES_libosmesa = "${libdir}/libOSMesa.so.*"
> > > > -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
> > > > FILES_libxatracker = "${libdir}/libxatracker.so.*"
> > > >
> > > > FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"
> > > > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.*
> > ${includedir}/GLES ${libdir}/p
> > > > FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2
> > ${libdir}/pkgconfig/glesv2.pc"
> > > > FILES_libgles3-mesa-dev = "${includedir}/GLES3"
> > > > FILES_libosmesa-dev = "${libdir}/libOSMesa.*
> > ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
> > > > -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc
> > ${libdir}/libwayland-egl.*"
> > > > FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/
> > libxatracker.la \
> > > > ${includedir}/xa_tracker.h
> > ${includedir}/xa_composite.h ${includedir}/xa_context.h \
> > > > ${libdir}/pkgconfig/xatracker.pc"
> > > > diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> > b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
> > > > similarity index 92%
> > > > rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb
> > > > rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb
> > > > index 1a9ff98..788105b 100644
> > > > --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
> > > > +++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
> > > > @@ -15,8 +15,8 @@ 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"
> > > > +SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"
> > > > +SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db8
> > 00f587329067962dbf65e14488b4b7aeb0"
> > > >
> > > > inherit autotools pkgconfig
> > > >
> > > > --
> > > > 2.7.4
> > > >
> > > > --
> > > > _______________________________________________
> > > > Openembedded-core mailing list
> > > > Openembedded-core@lists.openembedded.org
> > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> > >
> > > --
> > > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> >
> >
> >
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/2] wayland: upgrade to 1.15.0
2018-05-09 16:16 ` Burton, Ross
@ 2018-05-09 17:59 ` Mark Asselstine
0 siblings, 0 replies; 21+ messages in thread
From: Mark Asselstine @ 2018-05-09 17:59 UTC (permalink / raw)
To: Burton, Ross; +Cc: Denys Dmytriyenko, OE-core
On Wednesday, May 9, 2018 12:16:30 PM EDT Burton, Ross wrote:
> Good news: Denys beat you.
I need to take long lunches more often. Thanks Denys for taking care of this.
Mark
>
> Ross
>
> On 9 May 2018 at 17:09, Mark Asselstine <mark.asselstine@windriver.com>
>
> wrote:
> > On Wednesday, May 9, 2018 12:03:26 PM EDT Burton, Ross wrote:
> > > On 9 May 2018 at 17:00, Mark Asselstine <mark.asselstine@windriver.com>
> > >
> > > wrote:
> > > > I am also seeing build failures due to this conflict:
> > > >
> > > > ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file
> > > > /usr/lib64/
> > > > libwayland-egl.la is installed by both wayland and mesa, aborting
> > > > ..
> > > > ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories
> >
> > were
> >
> > > > installed but not shipped in any package:
> > > > /usr/lib64/libwayland-egl.la
> > > >
> > > > Please set FILES such that these items are packaged. Alternatively if
> >
> > they
> >
> > > > are
> > > > unneeded, avoid installing them or delete them within do_install.
> > > > mesa: 1 installed and not shipped files. [installed-vs-shipped]
> > > >
> > > > is someone working on a fix or should I take some time to put
> > > > something
> > > > together?
> > >
> > > As it appears you can test quickly then I think you just drew the short
> > > straw. Should be a trivial patch...
> >
> > I knew that this had a 50/50 chance of going this way :). Lunch then a
> > fix. I
> > assume then we will go with Martin's suggestion of an explicit remove in
> > mesa.inc?
> >
> > Mark
> >
> > > Ross
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/2] wayland: upgrade to 1.15.0
2018-05-09 16:03 ` Burton, Ross
2018-05-09 16:09 ` Mark Asselstine
@ 2018-05-09 18:07 ` Martin Jansa
1 sibling, 0 replies; 21+ messages in thread
From: Martin Jansa @ 2018-05-09 18:07 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core, Denys Dmytriyenko
[-- Attachment #1: Type: text/plain, Size: 1348 bytes --]
I have this:
http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/master&id=3271564498b37cb0faadd2ec7c8de8d853db9f2b
On Wed, May 9, 2018 at 6:03 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 9 May 2018 at 17:00, Mark Asselstine <mark.asselstine@windriver.com>
> wrote:
>
>> I am also seeing build failures due to this conflict:
>>
>> ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/
>> libwayland-egl.la is installed by both wayland and mesa, aborting
>> ..
>> ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories
>> were
>> installed but not shipped in any package:
>> /usr/lib64/libwayland-egl.la
>> Please set FILES such that these items are packaged. Alternatively if
>> they are
>> unneeded, avoid installing them or delete them within do_install.
>> mesa: 1 installed and not shipped files. [installed-vs-shipped]
>>
>> is someone working on a fix or should I take some time to put something
>> together?
>>
>
> As it appears you can test quickly then I think you just drew the short
> straw. Should be a trivial patch...
>
> Ross
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
[-- Attachment #2: Type: text/html, Size: 2715 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2018-05-09 18:07 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-10 19:06 [PATCH 1/2] wayland: upgrade to 1.15.0 Denys Dmytriyenko
2018-04-10 19:06 ` [PATCH 2/2] weston: upgrade to 4.0.0 Denys Dmytriyenko
2018-04-10 23:16 ` Burton, Ross
2018-04-10 23:17 ` Burton, Ross
2018-04-11 1:07 ` Denys Dmytriyenko
2018-04-11 22:11 ` Paul Eggleton
2018-04-14 0:29 ` Khem Raj
2018-04-11 18:03 ` [PATCH v2 " Denys Dmytriyenko
2018-05-08 21:18 ` [PATCH 1/2] wayland: upgrade to 1.15.0 Martin Jansa
2018-05-08 21:28 ` Denys Dmytriyenko
2018-05-08 21:33 ` Martin Jansa
2018-05-09 16:19 ` Denys Dmytriyenko
2018-05-08 21:59 ` Burton, Ross
2018-05-08 22:12 ` Martin Jansa
2018-05-09 16:00 ` Mark Asselstine
2018-05-09 16:03 ` Burton, Ross
2018-05-09 16:09 ` Mark Asselstine
2018-05-09 16:15 ` Burton, Ross
2018-05-09 16:16 ` Burton, Ross
2018-05-09 17:59 ` Mark Asselstine
2018-05-09 18:07 ` Martin Jansa
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.