From: Ross Burton <[email protected]> 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 <[email protected]> Signed-off-by: Alexander Kanavin <[email protected]> --- ....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(-) 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 <[email protected]> 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 <[email protected]> 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 -- 2.16.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
