From patchwork Tue Dec 5 14:18:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 120652 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5804921qgn; Tue, 5 Dec 2017 06:19:29 -0800 (PST) X-Google-Smtp-Source: AGs4zMZ3sbHHYPevRGnXhmYfiajS+79R8a5GddU3O/jHFso1f56e14WvHVCCXCsM+1SwHQcinkyK X-Received: by 10.159.194.1 with SMTP id x1mr18088485pln.235.1512483569068; Tue, 05 Dec 2017 06:19:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512483569; cv=none; d=google.com; s=arc-20160816; b=XI2CEQRMQx96SzAykr08zEx2bsWpWYGI51zm2CbwnTIC9DDkM7HjosqwI3A7tGa6nr +jh5eFUhoUIcYPvoIiRs+PCHOz0oolz9MvKl4BZHp8v/P810DhhHc67tyqqv7e1V7RtU MKSOoMdAbSmrCUXaTsBVQ+lxJ2WWTE6rP/fk77lG6ttQPE0dxubQ1Pfma7KyHVBQhNAf S4jVhsAkegpYhs2qSFFR0tD28xFQy/PXdWpTFqsS/D87v3hCjWmSCvBlOf6L8lcMYLpX 3b8+QwnVPaOocZO0LdO3MJE3g4yGjZKcPZzJG14Cg+qx+CiFq+rH86nhh841kqS42Q13 lBPg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Zexp00cqEs/sUdDN6/HdF+lfMMRjG98gO9yK6LPK6Zw=; b=BZmeEjPvpIKVBXYbI+YSsA/DoHhb2j3LolZJrX+xtTxdRdQplIfLdm1E1bnSN5t0Ge e8aq69/LLoJi9lzEUmxZAictTBWRf8fcYsXMrAx2k2k9fWSDVElVFyy2tZF+e6B1mdjX 8GMxhLwodRpPXirlq3D3fj21Xl09EXLUiW4JwTc26t4+iH5QE0ANVmAXCbKMsU3NVk9Q NUVpxEpOH/JgHSKzdtK8J6jyRiCtr4Avs9zt8djm4OqRO00pLXGxTchwPd61OdHX9x40 4o4i6KY/5l0bS31KRFWk7VX06GHR3i6R6tQGqNApNnMil5hKuhCgWf4GC5H2J2dLnlKk q7sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=udYzHtAs; 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 k185si151400pge.131.2017.12.05.06.19.28; Tue, 05 Dec 2017 06:19:29 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=udYzHtAs; 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 3069D7874D; Tue, 5 Dec 2017 14:19:22 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by mail.openembedded.org (Postfix) with ESMTP id 254027870E for ; Tue, 5 Dec 2017 14:18:58 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id x49so438538wrb.13 for ; Tue, 05 Dec 2017 06:19:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=Lt3rpkVxIGb+ymVva+T044tnKL08RLeRWLuNgoEUh+k=; b=udYzHtAscNDNgTxILfb3HCSXQnEAlvggs9+UXtoq7yy1bbpH5odCV1HJT5yLfVk2x7 igM6KmG2IQp3Pt9ONzy4lgOAxowQukNuXordOtOAob4lpkENI3q0IbQ0CoMVQ3R14fE7 q3ECG2UYrcaHoFpeW8ZZpVuLnzGVlpXRPJVGeSr+VsVGXUV/MADjfacLGdLjrLP2MbDT DBbrdf2rp9NH/XXYgIpjPCwB199bI0LKYPtg6Lp0Bijk+oFvLhTaLcXDdWG8Joxwvphu JHGpokIGXl9Lg8PvnGrdnWlQQGkNtwAjPHqCicNFr8laFoIYr4bdINW+w5NXL8U44Ecc BkKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Lt3rpkVxIGb+ymVva+T044tnKL08RLeRWLuNgoEUh+k=; b=JyofZOrXE83kqoAxlDf4/Z7zzR3nauTTmriRbLfRVR4BWcXKddcUuWNVWeGHbKo5DN /6AIcgH6yXjY3oMMsrfowOZFNiKUCxt04EdRwJuSZWwFZ7CWM4m9Z7xnbCFozZuqfaYg imf6EOdaRE8Mx4HGqLEZzmctDa07fliwVI4IOASzeFHsFP5vloloQgJO98LsFT2R51tv JueHfbXwk7K52il48HyoEtffCv+xfPcxHypRnX619k9PbVXI/u5lMxi2oSSrE0cgEKqI PPD4M9LJsiTuf/TFvCD0VhXtaGC/HYFrFApbp9fDXkp9BeXcJ0+vw4ol8JJr+f05oyeI 6D/g== X-Gm-Message-State: AKGB3mLYFaP2LfIgMdHBpsPqxYe7scOUq1XO0i5oQigmikOToBCxY70c delhf9nBsX60Z7JsMzKd2THXRaBj X-Received: by 10.223.180.69 with SMTP id v5mr2662028wrd.193.1512483539528; Tue, 05 Dec 2017 06:18:59 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id 34sm301178wra.39.2017.12.05.06.18.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2017 06:18:58 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 5 Dec 2017 14:18:47 +0000 Message-Id: <20171205141848.24825-3-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171205141848.24825-1-ross.burton@intel.com> References: <20171205141848.24825-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 3/4] xserver-xorg: remove redundant Wayland patch 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 The installation path and wayland-scanner location problems in Wayland were resolved in "wayland: Fix installation patch issue" (oe-core 14c0d99) which made the WAYLAND_PROTOCOLS_SYSROOT_DIR workaround redundant. Signed-off-by: Ross Burton --- ...c-Fix-wayland-scanner-and-protocols-locat.patch | 38 ---------------------- .../xorg-xserver/xserver-xorg_1.19.5.bb | 1 - 2 files changed, 39 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch deleted file mode 100644 index eafd07a5f19..00000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 963428f914c42270d3312d4f0c0840565521534e Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Wed, 16 Nov 2016 00:41:51 +0200 -Subject: [PATCH 2/2] configure.ac: Fix wayland-scanner and protocols locations - -We want to use the wayland-scanner in path (native sysroot) -instead of using pkg-config which gives us target paths. - -The protocols paths on the other hand need to be prefixed with the -(allarch) sysroot because, again, pkg-config gives us target paths. - -Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Jussi Kukkonen ---- - configure.ac | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 58f1567..383a7df 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2525,11 +2525,9 @@ if test "x$XWAYLAND" = xyes; then - AC_MSG_ERROR([Xwayland requires CLOCK_MONOTONIC support.]) - fi - -- WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client` -- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],, -- [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH]) -+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) - -- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) -+ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) - fi - - --- -2.1.4 - diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.5.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.5.bb index c9530315179..398eb817dbb 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.5.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.5.bb @@ -2,7 +2,6 @@ require xserver-xorg.inc SRC_URI += "file://musl-arm-inb-outb.patch \ file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \ - file://0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch \ file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \ file://0003-Remove-check-for-useSIGIO-option.patch \ "