summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/files
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-09 20:56:06 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:27:01 -0700
commit216ad557049f8fc9f7da208780dd7326bfc266ea (patch)
treeefd5a3df6a11993f6845ee7d245d15a4f2860e3c /meta/recipes-graphics/mesa/files
parent48614ce3ce13a8efa49bb323ef0646c4bb1c32c2 (diff)
downloadpoky-216ad557049f8fc9f7da208780dd7326bfc266ea.tar.gz
mesa: refresh patches
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. (From OE-Core rev: 0cff8ae54066b25ffbe1efaa3f0a1d84aa89ebe1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/files')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch13
-rw-r--r--meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch19
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 ff8eda458c..f908d46550 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 <hongxu.jia@windriver.com>
28 src/intel/Makefile.vulkan.am | 1 + 28 src/intel/Makefile.vulkan.am | 1 +
29 1 file changed, 1 insertion(+) 29 1 file changed, 1 insertion(+)
30 30
31diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am 31Index: mesa-17.3.6/src/intel/Makefile.vulkan.am
32index 271b0a5..8fbe2c8 100644 32===================================================================
33--- a/src/intel/Makefile.vulkan.am 33--- mesa-17.3.6.orig/src/intel/Makefile.vulkan.am
34+++ b/src/intel/Makefile.vulkan.am 34+++ mesa-17.3.6/src/intel/Makefile.vulkan.am
35@@ -144,6 +144,7 @@ VULKAN_LIB_DEPS = \ 35@@ -144,6 +144,7 @@ VULKAN_LIB_DEPS = \
36 $(LIBDRM_LIBS) \ 36 $(LIBDRM_LIBS) \
37 $(PTHREAD_LIBS) \ 37 $(PTHREAD_LIBS) \
@@ -39,7 +39,4 @@ index 271b0a5..8fbe2c8 100644
39+ $(EXPAT_LIBS) \ 39+ $(EXPAT_LIBS) \
40 -lm 40 -lm
41 41
42 if HAVE_PLATFORM_X11 42 if HAVE_PLATFORM_ANDROID
43--
442.7.4
45
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 eb6ff4ff04..2444b2846b 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 <jussi.kukkonen@intel.com>
14 configure.ac | 7 +------ 14 configure.ac | 7 +------
15 1 file changed, 1 insertion(+), 6 deletions(-) 15 1 file changed, 1 insertion(+), 6 deletions(-)
16 16
17diff --git a/configure.ac b/configure.ac 17Index: mesa-17.3.6/configure.ac
18index 2c7e636fac..d2b2350739 100644 18===================================================================
19--- a/configure.ac 19--- mesa-17.3.6.orig/configure.ac
20+++ b/configure.ac 20+++ mesa-17.3.6/configure.ac
21@@ -2174,12 +2174,7 @@ if test "x$with_platforms" != xauto; then 21@@ -1694,12 +1694,7 @@ if test "x$with_platforms" = xauto; then
22 with_egl_platforms=$with_platforms 22 with_platforms=$with_egl_platforms
23 fi 23 fi
24 24
25-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], 25-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
@@ -30,8 +30,5 @@ index 2c7e636fac..d2b2350739 100644
30-fi 30-fi
31+AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) 31+AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
32 32
33 # Do per-EGL platform setups and checks 33 PKG_CHECK_EXISTS([wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], [have_wayland_protocols=yes], [have_wayland_protocols=no])
34 egl_platforms=`IFS=', '; echo $with_egl_platforms` 34 if test "x$have_wayland_protocols" = xyes; then
35--
362.13.0
37