From patchwork Thu Mar 8 18:17:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131049 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp52324lja; Thu, 8 Mar 2018 10:27:02 -0800 (PST) X-Google-Smtp-Source: AG47ELuhO7YYwySv9YWedPLdyUiVCvKmExReVCrz2ReLOviefRzrx7f03bjy28yLS2NI6DIM97+q X-Received: by 10.99.147.11 with SMTP id b11mr9495209pge.379.1520533622411; Thu, 08 Mar 2018 10:27:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533622; cv=none; d=google.com; s=arc-20160816; b=VWv/5zhsrrRNWDW1PTZz3wVLYoe7VYUivvbI4xOIA+98crmq0InZs/WfodWsIzh9wa lwc5oKIXWvlUiDvJTp5qjv5Jthf/4I8opc0nLSFqwF+todSpOhodOwmg3KGPo+loDvQj KzJC9z3IWaVlSH8xYEzeQdvjzSdIKe4sqN4Y/KMETxBckT2MGISXuTjWtd+AOJdq6h5u xy15BaDGMAcLVAaZ3gn9WAYCLYBK7CxoIykqHk7kN0ZLKtn47t818AfTvqSRSEJNPtBQ TEHL/Cz+BkPypa4WOcWDYYueY0FTxbMMgwiWXJ//NqOYyZBf27SPwaGCurTaW+rYjZVE EF4Q== 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:delivered-to:arc-authentication-results; bh=30lgULiPDpGDO7djEyqIZIhRhs41cxLvS1vL/Cs7Q1k=; b=rZcRncOLcdkhhngizdEkRKCrNkR+UxMCkEkWZuDQvjAbiSKrzFClfciCtJnzezPoLH XSG/LWPw2btejhFY91BZREvNfwW3EmqMSQj17+e927zPWL0aJiA/+5FNr5fwvvF5mBuC KuvzodUXZE8xv8IRw5ltBxOsA8JCNokNjue2J3ghazUKr3qmH+8QzqdRZT8BnNMXDbGB 4GveSHjR4rgcszN4ffj0dU4Tc3Zhke6rsr/UrnqWnefhsYM4AtrcFrF51iOTIpo4HXQR fLZLSYc9qPyMI22qKaNKxP//tls0wumIzqYy14k4d0fa2DLrrpGY//1HXgo0wj8JAJnp 6dWQ== 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 7-v6si13919804plb.573.2018.03.08.10.27.02; Thu, 08 Mar 2018 10:27:02 -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; 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 683ED789F0; Thu, 8 Mar 2018 18:25:25 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 3E31C78989 for ; Thu, 8 Mar 2018 18:25:06 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053862" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:06 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:38 +0200 Message-Id: <20180308181804.31261-16-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 16/42] wayland: refresh patches 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: Ross Burton The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin --- .../wayland/wayland/fixpathinpcfiles.patch | 3 +-- .../wayland/weston/0001-make-error-portable.patch | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) -- 2.16.1 -- _______________________________________________ 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/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch index 9fb12522843..ad3526d9845 100644 --- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch +++ b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch @@ -21,8 +21,7 @@ Index: wayland-1.14.0/src/wayland-scanner.pc.in =================================================================== --- wayland-1.14.0.orig/src/wayland-scanner.pc.in +++ wayland-1.14.0/src/wayland-scanner.pc.in -@@ -1,8 +1,8 @@ - prefix=@prefix@ +@@ -2,7 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ datarootdir=@datarootdir@ pkgdatadir=@datadir@/@PACKAGE@ diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch index e2213aca60c..0671a450442 100644 --- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch +++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch @@ -16,9 +16,11 @@ Upstream-Status: Submitted 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 src/weston-error.h ---- a/configure.ac -+++ b/configure.ac -@@ -60,6 +60,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], +Index: weston-3.0.0/configure.ac +=================================================================== +--- weston-3.0.0.orig/configure.ac ++++ weston-3.0.0/configure.ac +@@ -103,6 +103,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], [[#include ]]) AC_CHECK_HEADERS([execinfo.h]) @@ -26,9 +28,11 @@ Upstream-Status: Submitted + AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) - COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1 >= 0.25.2" + # check for libdrm as a build-time dependency only +Index: weston-3.0.0/libweston/weston-error.h +=================================================================== --- /dev/null -+++ b/libweston/weston-error.h ++++ weston-3.0.0/libweston/weston-error.h @@ -0,0 +1,20 @@ +#ifndef _WESTON_ERROR_H +#define _WESTON_ERROR_H @@ -50,8 +54,10 @@ Upstream-Status: Submitted + +#endif + ---- a/libweston/weston-launch.c -+++ b/libweston/weston-launch.c +Index: weston-3.0.0/libweston/weston-launch.c +=================================================================== +--- weston-3.0.0.orig/libweston/weston-launch.c ++++ weston-3.0.0/libweston/weston-launch.c @@ -33,7 +33,6 @@ #include #include @@ -60,7 +66,7 @@ Upstream-Status: Submitted #include #include -@@ -59,6 +58,7 @@ +@@ -60,6 +59,7 @@ #endif #include "weston-launch.h"