[OE-core] [PATCH 1/2] wayland: upgrade to 1.15.0

[Martin Jansa]

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 at 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 at 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 at 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 at lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> >
> > --
> > Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20180508/a939a4f6/attachment-0002.html>