From patchwork Fri Mar 9 18:56:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131237 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1345030lja; Fri, 9 Mar 2018 11:06:26 -0800 (PST) X-Google-Smtp-Source: AG47ELuU1Fo3IRzPTCGe8U4KPfuL+pt1II8+5W2graDIzZYG7M2MrXdOVx6JndgExT+gL3y3zvK+ X-Received: by 2002:a17:902:4222:: with SMTP id g31-v6mr28158471pld.335.1520622385938; Fri, 09 Mar 2018 11:06:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622385; cv=none; d=google.com; s=arc-20160816; b=KlHbfDetUocxt4KuwKNm0pOgrRis8i+ZdIFZCABLP8xjk7LFqOXmSEZyXzXJdj+mUi hFv3+d5zW/plD7mWNzH8qiTTZZevNfgKz2QOqUUmw4T9bYOwSDqV/HBJnftCZuPxOe/q cfJPj+Wk/+k3LpgM8mf1kPg2bvKQ/7bc248tlMFypQO/hHISRSbTxYdVt1KaBKC4W/Gn Pv8SGMZutwNwxZ+2Dedfdpjb/pxuiF8q7wlXdBh5cORCpLpg0gcdLttLhuG03TUCxHqo b4Z4PbD4mdz/ivRXt5fl+F9voXW2G+jge7lQKuk+5BsFAk3yS9haYIi+dVUCijhLbGEO eUtw== 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=BkoYL/gLo88mO1uIDFRs3HWSKxqY8nhEpytSe5DwZe0=; b=nM9w0kafq3plqhzBUIYO8Vg62d0/NLRbkIfXls2w+7dxx+4/QbpWQhvxBU/zH+qItd rOQpKwmB0bCaZSff6KcSdsgMfklKj1P1YCwRh5nL6PG2BhVrJkpQkpjSlRA9+C0VpANu +Mx7Rx/5K2bNLonTkxXIcjgrl9rYDBZ/AyYqD9kOjvLvmces9ZIWZuqbZC26rdIQ1MEI 9oARRMvQyms94YsXL4o6pWd0veSuTiRifwApSO5rgdc3DyxOvlwuiboogMH3sFYgkDlF QV+Gkja91PNkjRPsAriwlawHGDhmM7nGO+tHqod8o4AiLn00YNS4o3BTApAkM2qg1B0T 8TfA== 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 r59-v6si1325324plb.69.2018.03.09.11.06.25; Fri, 09 Mar 2018 11:06:25 -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 3D3CE789CC; Fri, 9 Mar 2018 19:03:43 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mail.openembedded.org (Postfix) with ESMTP id A47B2789AE for ; Fri, 9 Mar 2018 19:03:31 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Mar 2018 11:03:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652044" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:32 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:06 +0200 Message-Id: <20180309185614.31113-28-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180309185614.31113-1-alexander.kanavin@linux.intel.com> References: <20180309185614.31113-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 28/36] mesa: 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 --- ....vulkan.am-explictly-add-lib-expat-to-intel-.patch | 13 +++++-------- .../files/0001-Use-wayland-scanner-in-the-path.patch | 19 ++++++++----------- 2 files changed, 13 insertions(+), 19 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/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch index ff8eda458c2..f908d46550e 100644 --- a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch +++ b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch @@ -28,10 +28,10 @@ Signed-off-by: Hongxu Jia src/intel/Makefile.vulkan.am | 1 + 1 file changed, 1 insertion(+) -diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am -index 271b0a5..8fbe2c8 100644 ---- a/src/intel/Makefile.vulkan.am -+++ b/src/intel/Makefile.vulkan.am +Index: mesa-17.3.6/src/intel/Makefile.vulkan.am +=================================================================== +--- mesa-17.3.6.orig/src/intel/Makefile.vulkan.am ++++ mesa-17.3.6/src/intel/Makefile.vulkan.am @@ -144,6 +144,7 @@ VULKAN_LIB_DEPS = \ $(LIBDRM_LIBS) \ $(PTHREAD_LIBS) \ @@ -39,7 +39,4 @@ index 271b0a5..8fbe2c8 100644 + $(EXPAT_LIBS) \ -lm - if HAVE_PLATFORM_X11 --- -2.7.4 - + if HAVE_PLATFORM_ANDROID diff --git a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch index eb6ff4ff044..2444b2846b0 100644 --- a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch +++ b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch @@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen configure.ac | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -diff --git a/configure.ac b/configure.ac -index 2c7e636fac..d2b2350739 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2174,12 +2174,7 @@ if test "x$with_platforms" != xauto; then - with_egl_platforms=$with_platforms +Index: mesa-17.3.6/configure.ac +=================================================================== +--- mesa-17.3.6.orig/configure.ac ++++ mesa-17.3.6/configure.ac +@@ -1694,12 +1694,7 @@ if test "x$with_platforms" = xauto; then + with_platforms=$with_egl_platforms fi -PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], @@ -30,8 +30,5 @@ index 2c7e636fac..d2b2350739 100644 -fi +AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) - # Do per-EGL platform setups and checks - egl_platforms=`IFS=', '; echo $with_egl_platforms` --- -2.13.0 - + PKG_CHECK_EXISTS([wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], [have_wayland_protocols=yes], [have_wayland_protocols=no]) + if test "x$have_wayland_protocols" = xyes; then