From patchwork Tue Apr 10 19:06:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 133092 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1605815ljb; Tue, 10 Apr 2018 12:06:30 -0700 (PDT) X-Google-Smtp-Source: AIpwx49HBT7/TmIS5uNJoGRqx+rellviQ/+GSb27G4ApaxBBYTEGkfWeeonvhmfM0Rtr6ppy/P38 X-Received: by 2002:a17:902:32a2:: with SMTP id z31-v6mr1690398plb.41.1523387190591; Tue, 10 Apr 2018 12:06:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523387190; cv=none; d=google.com; s=arc-20160816; b=dnGh8rQt+Yv7Zqnv0PC951cC+R8yzCD7lGaTqQps1E0h5AgFQ+hzb3EODChAGnNu8Z Oosc1tmU9IEDujjxOR29RJ8dm5ZLbonCoDbz8XigabDxWFgXqpqYmjdy357l6y50k33q 4mnunwsCtFSCaZVrj7wt+Iv2UJcmlXx3F6nYInXMuIy8VU8eYJ5mFy3UBDeg9i9Ug1QP Ex0LdqZitPEwIrXJebm8eY7WafUZZRjVIokJfQGxIw6TE8RLtlEBrPxH+nnXx5ht8E9O JJDf94zbCcRlD/IBWFB127jsm/rpOLAZTVVtgiFLNNlCPnaTl3CaDZ7JfuieDs27uqup PQsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from:delivered-to :arc-authentication-results; bh=a6UVJSng3HtKHgPldGHJgh7wMkDSMBq/GoAmE/dl/f0=; b=AesDhJ5L9pFd/tTyCZ64mhflriQu2uzbCTraRVAxMbxvF2yibzk7zhzQEriJmzNJ54 Ru5BDvWzpDCEWwkDER21nT7fFCY18SYcmjN++cBWxYWANnWgURKv/4oAnIoJjdW2zkP2 TKKigAjBroSahHGCUYwD79kFQPaRhjFPCTqE1qoC7Ucr1AkDexX030KQiO18MgJy1+4V mx0pE4DBEUV7x4UgRDCI3NNP91kKX/7MrN5LabscH5IJ3dFRnq4EvT0LURxrUHcRvwEV JjqxOF3oF9HtY79Ogp5FbOnV8oBakkihW7xv7GIca6i2rzQI/SC4ZPtlKNbt5pwHtfMR xNDQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id q10si2506702pff.124.2018.04.10.12.06.30; Tue, 10 Apr 2018 12:06:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 60C0374854; Tue, 10 Apr 2018 19:06:24 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.17]) by mail.openembedded.org (Postfix) with ESMTP id BC9E974738 for ; Tue, 10 Apr 2018 19:06:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 320D320BA0; Tue, 10 Apr 2018 19:06:22 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo03-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JdqTl5CZvMCn; Tue, 10 Apr 2018 19:06:22 +0000 (UTC) Received: from mail.denix.org (pool-100-15-85-143.washdc.fios.verizon.net [100.15.85.143]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 078DB203A8; Tue, 10 Apr 2018 19:06:20 +0000 (UTC) Received: from gimli.denix (gimli [192.168.0.6]) by mail.denix.org (Postfix) with ESMTP id 7DCD916342D; Tue, 10 Apr 2018 15:06:20 -0400 (EDT) From: Denys Dmytriyenko To: openembedded-core@lists.openembedded.org Date: Tue, 10 Apr 2018 15:06:09 -0400 Message-Id: <1523387170-30191-1-git-send-email-denis@denix.org> X-Mailer: git-send-email 2.7.4 Cc: Denys Dmytriyenko Subject: [OE-core] [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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org 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%) -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core 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