diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-03-11 09:07:32 -0700 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2020-03-12 16:57:44 +0000 |
commit | ac5e346167717021d232eb51018a7ddf5efa8504 (patch) | |
tree | 54d5b97647f7884486e9781107c54136091a6a2e | |
parent | 84cb8538cd22586fc82daba38458909cedfec2db (diff) | |
download | meta-raspberrypi-ac5e346167717021d232eb51018a7ddf5efa8504.tar.gz |
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>
-rw-r--r-- | recipes-graphics/mesa/files/0001-dri2-query-dma-buf-modifiers.patch | 10 |
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 | |||
10 | 10 | ||
11 | Signed-off-by: Balaji Velmurugan <balaji.velmurugan@ltts.com> | 11 | Signed-off-by: Balaji Velmurugan <balaji.velmurugan@ltts.com> |
12 | 12 | ||
13 | diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c | ||
14 | index 6ce6f19..2f9d47d 100644 | ||
15 | --- a/src/gallium/state_trackers/dri/dri2.c | 13 | --- a/src/gallium/state_trackers/dri/dri2.c |
16 | +++ b/src/gallium/state_trackers/dri/dri2.c | 14 | +++ b/src/gallium/state_trackers/dri/dri2.c |
17 | @@ -1368,14 +1368,28 @@ dri2_from_planar(__DRIimage *image, int plane, void *loaderPrivate) | 15 | @@ -1366,14 +1366,28 @@ dri2_from_planar(__DRIimage *image, int |
18 | return img; | 16 | return img; |
19 | } | 17 | } |
20 | 18 | ||
21 | +static boolean | 19 | +static boolean |
22 | +dri2_query_dma_buf_modifiers(__DRIscreen *_screen, int fourcc, int max, | 20 | +dri2_query_dma_buf_modifiers(__DRIscreen *_screen, int fourcc, int max, |
23 | + uint64_t *modifiers, unsigned int *external_only, | 21 | + uint64_t *modifiers, unsigned int *external_only, |
@@ -41,5 +39,5 @@ index 6ce6f19..2f9d47d 100644 | |||
41 | strides, offsets, NULL, loaderPrivate); | 39 | strides, offsets, NULL, loaderPrivate); |
42 | + #endif | 40 | + #endif |
43 | } | 41 | } |
44 | 42 | ||
45 | static boolean | 43 | static boolean |