From patchwork Tue Oct 17 23:51:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 116166 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp5460639qgn; Tue, 17 Oct 2017 16:51:47 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RUAr/Pmc3N46rFPotRAos17W91Q9volsWswhaHRgqMLlq0tUbpBMZD9pZGUzMK9cY2ZhQo X-Received: by 10.98.113.130 with SMTP id m124mr3849835pfc.157.1508284307525; Tue, 17 Oct 2017 16:51:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508284307; cv=none; d=google.com; s=arc-20160816; b=lIYkxsQznUIwARSi1jHnH4qk0yW8BT5vKcxmXLkk63y3qdXIZ6CM0WXPUKHrwa1esj P9o/U4/wYoCSnxdNoVLFDOjZE6LBQCm4CYwyfzneDATuTH9+NCxPsyt0UokRC2VbsK6K QmtvE9BXBie06BQ/2BVdz0i0cZYa9KsFofPGS0CQtYfY1V4Ox9CLVpivAzruD3oxhmq0 PGSKQBOq/huTHGD/ImNKzfyUJjX7feiRnRpa6HmM7Oh1yfC+lbaXvdrMWM9HwbdX8art sEfIaYxNI3xX7mbNIOJ63zj2TaFA74XvAzv/xdnqd9+/8M3udlNIM2gsuSkkAoctfQ5b h+rw== 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=ou6XiVrScNn75VQU/bz7dZb2jwdHmulQdc7JidmIKzM=; b=sInf/p9dzBTtKhgKCYm38SzUm0meOJM03SP4RwRFF2KLw7YqZQE/3EzXe+46epYrgW St37SbwPRR+29ZmZ9l2kOxTw8bYRH0q2/PuZlj5rg8RiRZhpVW66QGTNR5rEKXk9Y24O vLDMsAXyeqIyICHLY9FiYBqTcIkLJyALoc6W+7ZIsVWxnJVjdg9wG/zL4U9Y5/7ZHQ8E AaljlU2J0TeS6R/3R+cFvwHb5qKqx5GlU5NPJIW67emxztiv1yp1uyhzSI0LKAqcFm6I glf5wflfcSH5ETlvjyQL2xyDBs5JUaG2Vx+ZliEru5mb8Y+u0weyEQMKtZ+Gwkq+X9c+ T/Zw== 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 b35si4812984plh.46.2017.10.17.16.51.46; Tue, 17 Oct 2017 16:51:47 -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 review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id D46757833B; Tue, 17 Oct 2017 23:51:42 +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 C6FE86074F for ; Tue, 17 Oct 2017 23:51:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 6F85D20A3B; Tue, 17 Oct 2017 23:51:41 +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 rZUSVbSS_Jwl; Tue, 17 Oct 2017 23:51:41 +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 4E52F204B1; Tue, 17 Oct 2017 23:51:40 +0000 (UTC) Received: from gimli.denix (gimli [192.168.0.6]) by mail.denix.org (Postfix) with ESMTP id C7C861626FE; Tue, 17 Oct 2017 19:51:39 -0400 (EDT) From: Denys Dmytriyenko To: openembedded-core@lists.openembedded.org Date: Tue, 17 Oct 2017 19:51:30 -0400 Message-Id: <1508284290-137033-1-git-send-email-denis@denix.org> X-Mailer: git-send-email 2.7.4 Cc: Denys Dmytriyenko Subject: [OE-core] [PATCH v2] wayland-protocols: upgrade to 1.11 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 usesysrootprefixforpkgdatadirvariable.patch was a backport from 1.11, no longer needed. Signed-off-by: Denys Dmytriyenko --- v2 - drop usesysrootprefixforpkgdatadirvariable.patch This is on top of ross/mut, since usesysrootprefixforpkgdatadirvariable.patch is not yet in master .../usesysrootprefixforpkgdatadirvariable.patch | 27 ---------------------- ...protocols_1.10.bb => wayland-protocols_1.11.bb} | 5 ++-- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch rename meta/recipes-graphics/wayland/{wayland-protocols_1.10.bb => wayland-protocols_1.11.bb} (80%) -- 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/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch b/meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch deleted file mode 100644 index 0922a4d..0000000 --- a/meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 875130ee3cbcf62266901ef4b91b9a0fb6adad43 Mon Sep 17 00:00:00 2001 -From: Tomek Bury -Date: Fri, 4 Aug 2017 16:16:38 +0100 -Subject: Use sysroot prefix for pkgdatadir variable - -The pc_sysroot is automatically added to cflags and libs but not -to 'pkg-config --variable' - -Upstream-Status: Backport [https://cgit.freedesktop.org/wayland/wayland-protocols/commit/?id=875130ee3cbcf62266901ef4b91b9a0fb6adad43] - -Reviewed-by: Daniel Stone - -diff --git a/wayland-protocols.pc.in b/wayland-protocols.pc.in -index a26744c..379be06 100644 ---- a/wayland-protocols.pc.in -+++ b/wayland-protocols.pc.in -@@ -1,6 +1,6 @@ - prefix=@prefix@ - datarootdir=@datarootdir@ --pkgdatadir=@datadir@/@PACKAGE@ -+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ - - Name: Wayland Protocols - Description: Wayland protocol files --- -cgit v0.10.2 - diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.11.bb similarity index 80% rename from meta/recipes-graphics/wayland/wayland-protocols_1.10.bb rename to meta/recipes-graphics/wayland/wayland-protocols_1.11.bb index 1ff12c6..26b0094 100644 --- a/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb +++ b/meta/recipes-graphics/wayland/wayland-protocols_1.11.bb @@ -10,10 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://usesysrootprefixforpkgdatadirvariable.patch \ " -SRC_URI[md5sum] = "84a7846c2b6a6a3e265fc9be36453e60" -SRC_URI[sha256sum] = "5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a" +SRC_URI[md5sum] = "8d0338556d77ad86d7fca84ff086af88" +SRC_URI[sha256sum] = "3afcee1d51c5b1d70b59da790c9830b354236324b19b2b7af9683bd3b7be6804" inherit allarch autotools pkgconfig