From 81262efe6e9eb8ac0ed345abccbf80233707dcc3 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Sun, 7 Jun 2020 20:54:21 +0000 Subject: [PATCH] waffle: fix patch fuzz QA warning Fix patch fuzz QA warning reported by build, use devtool to correct patches. Signed-off-by: Andrey Zhizhikin --- ...1-meson-Add-missing-wayland-dependency-on-EGL.patch | 10 ++++------ ...02-meson-Separate-surfaceless-option-from-x11.patch | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch b/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch index f613386f..b5225693 100644 --- a/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch +++ b/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch @@ -1,4 +1,4 @@ -From 932c21d2851fe79bf4fe55d3b613f71f65762adb Mon Sep 17 00:00:00 2001 +From 87fc7761cff5931a58984c7f7e78f421a0660e0e Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 22 Apr 2020 13:40:04 -0500 Subject: [PATCH] meson: Add missing wayland dependency on EGL @@ -9,12 +9,13 @@ missing dependency. Upstream-Status: Pending Signed-off-by: Tom Hochstein + --- meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 957737c..4ebb022 100644 +index ca8b127..efb51f4 100644 --- a/meson.build +++ b/meson.build @@ -65,6 +65,7 @@ dep_gl = _dep_null @@ -27,7 +28,7 @@ index 957737c..4ebb022 100644 dep_udev = _dep_null @@ -90,7 +91,8 @@ else dep_wayland_client = dependency( - 'wayland-client', version : '>= 1.0', required : get_option('wayland'), + 'wayland-client', version : '>= 1.10', required : get_option('wayland'), ) - dep_wayland_egl = dependency( + dep_wayland_egl = dependency('egl', required : get_option('wayland')) @@ -44,6 +45,3 @@ index 957737c..4ebb022 100644 build_glx = dep_gl.found() build_gbm = dep_gbm.found() and dep_udev.found() build_surfaceless = dep_egl.found() --- -2.17.1 - diff --git a/recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch b/recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch index 3f9f3b1c..9d5003e2 100644 --- a/recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch +++ b/recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch @@ -1,7 +1,7 @@ -From 451381a61ad0c96e870da2325fc188eaa3d91fec Mon Sep 17 00:00:00 2001 +From 12ac4372cc6a66e83b61f8510bdaa4f11c72113d Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 22 Apr 2020 14:08:36 -0500 -Subject: [PATCH 2/2] meson: Separate surfaceless option from x11 +Subject: [PATCH] meson: Separate surfaceless option from x11 Allow surfaceless build separate from the x11 option. Also require gbm for surfaceless build. @@ -9,12 +9,13 @@ Also require gbm for surfaceless build. Upstream-Status: Pending Signed-off-by: Tom Hochstein + --- meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 4ebb022..0705f61 100644 +index efb51f4..0ee3ee5 100644 --- a/meson.build +++ b/meson.build @@ -72,6 +72,7 @@ dep_udev = _dep_null @@ -41,6 +42,3 @@ index 4ebb022..0705f61 100644 endif dep_bash = dependency('bash-completion', required : false) --- -2.17.1 - -- 2.40.1