diff options
| author |   Denys Dmytriyenko <denys@konsulko.com> | 2023-02-24 01:45:12 +0000 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-02-28 17:42:19 +0000 |
| commit | 532936bdd0b2639f8a8f9cb495ac2a8ea382737e (patch) | |
| tree | 8872210c2793407a77bee2eedde4174c28aae5bb | |
| parent | 13f026703991a4eda39d04e8a27275e6ec93ee1b (diff) | |
weston: update patch to remove fuzz
Fixes this warning:
WARNING: weston-8.0.0-r0 do_patch: Fuzz detected:
Applying patch 0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
patching file libweston/backend-drm/drm.c
Hunk #1 succeeded at 2992 with fuzz 2 (offset -211 lines).
Hunk #2 succeeded at 3001 (offset -213 lines).
WARNING: weston-8.0.0-r0 do_patch: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz]
Bug-AGL: SPEC-4715
Change-Id: I3d8babb1764d6ad7ebf6d5cb1f90496c53e6e19a
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28531
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Marius Vlad <marius.vlad@collabora.com>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
| -rw-r--r-- | meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch b/meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch index e8e324c32..4771f689d 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch +++ b/meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch @@ -1,6 +1,5 @@ -From d171c7b3ba346c4d0bd6494f45ebf0be3c3cc5fb Mon Sep 17 00:00:00 2001 +From bd108ca84767a339c274ad0b56d74b46b3888c38 Mon Sep 17 00:00:00 2001 From: Marius Vlad <marius.vlad@collabora.com> -Upstream-Status: Backport Date: Thu, 1 Apr 2021 00:12:00 +0300 Subject: [PATCH] libweston/backend-drm: Re-order gbm destruction at DRM-backend tear down @@ -14,17 +13,19 @@ compositor shutdown when no one would make use of it. Fixes: #314 +Upstream-Status: Backport Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Suggested-by: Daniel Stone <daniel.stone@collabora.com> + --- libweston/backend-drm/drm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c -index c780c1c16..abfcabd3b 100644 +index be2570b..3cb41bf 100644 --- a/libweston/backend-drm/drm.c +++ b/libweston/backend-drm/drm.c -@@ -3203,10 +3203,6 @@ err_drm_source: +@@ -2992,10 +2992,6 @@ err_drm_source: err_udev_input: udev_input_destroy(&b->input); err_sprite: @@ -33,9 +34,9 @@ index c780c1c16..abfcabd3b 100644 - gbm_device_destroy(b->gbm); -#endif destroy_sprites(b); - err_create_crtc_list: - drmModeFreeResources(res); -@@ -3218,6 +3214,10 @@ err_launcher: + err_udev_dev: + udev_device_unref(drm_device); +@@ -3005,6 +3001,10 @@ err_launcher: weston_launcher_destroy(compositor->launcher); err_compositor: weston_compositor_shutdown(compositor); @@ -46,6 +47,3 @@ index c780c1c16..abfcabd3b 100644 free(b); return NULL; } --- -2.33.0 - |