From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io0-f193.google.com (mail-io0-f193.google.com [209.85.223.193]) by mail.openembedded.org (Postfix) with ESMTP id 65601745D1 for ; Tue, 8 May 2018 22:00:19 +0000 (UTC) Received: by mail-io0-f193.google.com with SMTP id e20-v6so40369828iof.4 for ; Tue, 08 May 2018 15:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=+IKf0HwHonbex2NYvW7teCUyigTrRaWOpKlSe16IDPc=; b=yIhXZmk1tIgNb8fSWJntfHmTx17SSRjmFmR3yZThyGrvgZ05rQmtFZReSMtfimKdL/ 0NlnCAsQfpBo/FvOrher9HPWLHdqXADfo1CBfVcCy4l2iEeNppvvjh57Uth0K+5RilL+ XL8yMYw8SNv7rXad5rak8rAf8ATLdv4P+kYSTL2z01H1XvltiVz6uQtKmz1YIeMIwkp4 9OIRz9tXMeyt9YYSqm4iTu+jgEAJxE0bPTDZjx0wYYVfdgdb+I+07mzXsrnJaOJDIK8y QUVLDNRhABqsqZXV9KCUi+Orwq5B/j9QO11Zz8FGJSRDJDVRcNoJyjSctEQBrCGo08JY 0CwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=+IKf0HwHonbex2NYvW7teCUyigTrRaWOpKlSe16IDPc=; b=WHYW3boU9WXfgmlgBbApYZL491d9+RRNtAlBK0veA3JLrIpmW+0BY3X2ijEWc5ovfn Yd/VHjdoIXuGA8tEY/QWyWF8kHOqr2epWqfiC/jGuFBSZd8EamAcp2Awrlm6QJ2Qznu7 kCtDtLthL6j6Ov0fxSPxiOgwYgQxgp22BtRwy1EuixBBf62selNjM96XPi2yyVYn8CRj gn+qy7Q5XZD/2wBwg3IoiEYS1cTqKunjhYYNm5HIc9SM0RIFkB1ghcVJg3UdPy54VfiN ICTniApXcdwcPmBlL6Rqn2ByznkmdgtV/tViaywi7tMcUnAxBe1huouesz/a1YGIzrqT NDGg== X-Gm-Message-State: ALQs6tA5hvddpR+HcTlJ16Ie/Ee3qxc39Pvk4Nj3PVK7W4jZMr1fX1aj tRY+n4FpPSVSf48u1hnpErAgmA1h637ABde3/MlTGQ== X-Google-Smtp-Source: AB8JxZrP/fUdRpm1tJKHDS/caxC/0D3fFJWVjycks6soifu+A/0nsTsJLPb0RzjDkpaFwh3pm8kGJ+KdDYHf7lhn6KQ= X-Received: by 2002:a6b:248e:: with SMTP id k136-v6mr43828178iok.270.1525816820175; Tue, 08 May 2018 15:00:20 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.239.11 with HTTP; Tue, 8 May 2018 14:59:59 -0700 (PDT) In-Reply-To: <20180508212815.GX3228@denix.org> References: <1523387170-30191-1-git-send-email-denis@denix.org> <20180508211844.GA2573@jama> <20180508212815.GX3228@denix.org> From: "Burton, Ross" Date: Tue, 8 May 2018 22:59:59 +0100 Message-ID: To: Denys Dmytriyenko Cc: OE-core , Denys Dmytriyenko Subject: Re: [PATCH 1/2] wayland: upgrade to 1.15.0 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 May 2018 22:00:19 -0000 Content-Type: multipart/alternative; boundary="0000000000008f43af056bb8e9cf" --0000000000008f43af056bb8e9cf Content-Type: text/plain; charset="UTF-8" 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 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 > > > > > > 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 > > > --- > > > 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 > --0000000000008f43af056bb8e9cf Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Yeah the problem here is that poky uses remove-libtool, an= d 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 D= mytriyenko <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.f= reedesktop.org/archives/wayland-devel/2018-April/037767.html<= br> > >
> > | libwayland-egl is now part of libwayland, and will presumably b= e removed
> > | from mesa in the not too distant future.
> >
> > Update mesa recipe by removing corresponding libwayland-egl entri= es.
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> >=C2=A0 meta/recipes-graphics/mesa/mesa.inc=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 | 7 ++++---
> >=C2=A0 .../wayland/{wayland_1.14.0.bb =3D> wayland_1.15.0.bb<= /a>}=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 4 ++--
> >=C2=A0 2 files changed, 6 insertions(+), 5 deletions(-)
> >=C2=A0 rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb= =3D> wayland_1.15.0.bb} (92%)
> >
> > diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/reci= pes-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 =3D+ "libegl-mesa libegl-mesa-d= ev \
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libgles1-me= sa libgles1-mesa-dev \
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libgles2-me= sa libgles2-mesa-dev \
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libgles3-me= sa libgles3-mesa-dev \
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libwayland-egl l= ibwayland-egl-dev \
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libxatracke= r libxatracker-dev \
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mesa-megadr= iver mesa-vulkan-drivers \
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "
> > @@ -134,6 +133,10 @@ do_install_append () {
> >=C2=A0 =C2=A0 =C2=A0 # it was packaged in libdricore9.1.3-1 and pr= eventing upgrades when debian.bbclass was used
> >=C2=A0 =C2=A0 =C2=A0 rm -f ${D}${sysconfdir}/drirc
> >=C2=A0 =C2=A0 =C2=A0 chrpath --delete ${D}${libdir}/dri/*_dri.so |= | true
> > +
> > +=C2=A0 =C2=A0 # libwayland-egl has been moved to wayland 1.15+ > > +=C2=A0 =C2=A0 rm -f ${D}${libdir}/libwayland-egl.so*
> > +=C2=A0 =C2=A0 rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc<= br> >
> Shouldn't /usr/lib/libwayland-egl.la be removed as well? Now I&= #39;m getting
> many do_prepare_recipe_sysroot failures because both mesa and wayland<= br> > provide this file.

Don't we remove .la files in bulk? I didn't see this pr= oblem 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.


> >=C2=A0 }
> >=C2=A0
> >=C2=A0 # For the packages that make up the OpenGL interfaces, inje= ct variables so that
> > @@ -204,7 +207,6 @@ FILES_libgles2-mesa =3D "${libdir}/libGL= ESv2.so.*"
> >=C2=A0 FILES_libgl-mesa =3D "${libdir}/libGL.so.*"
> >=C2=A0 FILES_libglapi =3D "${libdir}/libglapi.so.*"
> >=C2=A0 FILES_libosmesa =3D "${libdir}/libOSMesa.so.*" > > -FILES_libwayland-egl =3D "${libdir}/libwayland-egl.so.*"
> >=C2=A0 FILES_libxatracker =3D "${libdir}/libxatracker.so.*&qu= ot;
> >=C2=A0
> >=C2=A0 FILES_${PN}-dev =3D "${libdir}/pkgconfig/dri.pc ${incl= udedir}/vulkan"
> > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev =3D "${libdir}/l= ibGLESv1*.* ${includedir}/GLES ${libdir}/p
> >=C2=A0 FILES_libgles2-mesa-dev =3D "${libdir}/libGLESv2.* ${i= ncludedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
> >=C2=A0 FILES_libgles3-mesa-dev =3D "${includedir}/GLES3"=
> >=C2=A0 FILES_libosmesa-dev =3D "${libdir}/libOSMesa.* ${inclu= dedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
> > -FILES_libwayland-egl-dev =3D "${libdir}/pkgconfig/wayland-<= wbr>egl.pc ${libdir}/libwayland-egl.*"
> >=C2=A0 FILES_libxatracker-dev =3D "${libdir}/libxatracker.so = ${libdir}/libxatracker.la \
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${includedir}/xa_tracker.h ${includedir}/xa= _composite.h ${includedir}/xa_context.h \
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${libdir}/pkgconfig/xatracker.pc"=
> > diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb<= /a> 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 =3D "expat libxml2 libffi wayland-= native"
> >=C2=A0 SRC_URI =3D "https:= //wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 file://fixpathinpcfiles.patch \
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"
> > -SRC_URI[md5sum] =3D "0235f6075c32c3be61cff94fa0b9f108"
> > -SRC_URI[sha256sum] =3D "ed80cabc0961a759a42092e2c39aab= fc1ec9a13c86c98bbe2b812f008da27ab8"
> > +SRC_URI[md5sum] =3D "b7393c17fdce9a8d383edab656c92fd2"
> > +SRC_URI[sha256sum] =3D "eb3fbebb8559d56a80ad3753ec3db8= 00f587329067962dbf65e14488b4b7aeb0"
> >=C2=A0
> >=C2=A0 inherit autotools pkgconfig
> >=C2=A0
> > --
> > 2.7.4
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Opene= mbedded-core@lists.openembedded.org
> > http://lists.openembedded.= org/mailman/listinfo/openembedded-core
>
> --
> Martin 'JaMa' Jansa=C2=A0 =C2=A0 =C2=A0jabber: Martin.Jansa@gmail.com


--
_______________________________________________
Openembedded-core mailing list
Openembedded-co= re@lists.openembedded.org
http://lists.openembedded.org/m= ailman/listinfo/openembedded-core

--0000000000008f43af056bb8e9cf--