aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-graphics
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-03-11 09:07:32 -0700
committerAndrei Gherzan <andrei@gherzan.ro>2020-03-12 16:57:44 +0000
commitac5e346167717021d232eb51018a7ddf5efa8504 (patch)
tree54d5b97647f7884486e9781107c54136091a6a2e /recipes-graphics
parent84cb8538cd22586fc82daba38458909cedfec2db (diff)
downloadmeta-raspberrypi-ac5e346167717021d232eb51018a7ddf5efa8504.tar.gz
meta-raspberrypi-ac5e346167717021d232eb51018a7ddf5efa8504.tar.bz2
meta-raspberrypi-ac5e346167717021d232eb51018a7ddf5efa8504.zip
mesa: Fix patch fuzz
Fixes ERROR: mesa-2_20.0.1-r0 do_patch: Fuzz detected: Applying patch 0001-dri2-query-dma-buf-modifiers.patch patching file src/gallium/state_trackers/dri/dri2.c Hunk #1 succeeded at 1366 with fuzz 1 (offset -2 lines). Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-graphics')
-rw-r--r--recipes-graphics/mesa/files/0001-dri2-query-dma-buf-modifiers.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/recipes-graphics/mesa/files/0001-dri2-query-dma-buf-modifiers.patch b/recipes-graphics/mesa/files/0001-dri2-query-dma-buf-modifiers.patch
index 3ff469d..0bda014 100644
--- a/recipes-graphics/mesa/files/0001-dri2-query-dma-buf-modifiers.patch
+++ b/recipes-graphics/mesa/files/0001-dri2-query-dma-buf-modifiers.patch
@@ -10,14 +10,12 @@ Upstream-Status: Pending
Signed-off-by: Balaji Velmurugan <balaji.velmurugan@ltts.com>
-diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c
-index 6ce6f19..2f9d47d 100644
--- a/src/gallium/state_trackers/dri/dri2.c
+++ b/src/gallium/state_trackers/dri/dri2.c
-@@ -1368,14 +1368,28 @@ dri2_from_planar(__DRIimage *image, int plane, void *loaderPrivate)
+@@ -1366,14 +1366,28 @@ dri2_from_planar(__DRIimage *image, int
return img;
}
-
+
+static boolean
+dri2_query_dma_buf_modifiers(__DRIscreen *_screen, int fourcc, int max,
+ uint64_t *modifiers, unsigned int *external_only,
@@ -41,5 +39,5 @@ index 6ce6f19..2f9d47d 100644
strides, offsets, NULL, loaderPrivate);
+ #endif
}
-
- static boolean
+
+ static boolean