From 526b89cfd883073c048e32cabe4597e2c83084bd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 May 2026 08:37:29 +0200 Subject: [PATCH] package/efl: re-add patches to fix drm-related build errors Buildroot commit c7a1b73f1758855e47c188c38617dd309b2c2428 removed patches 0001-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch and 0002-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch. This defconfig BR2_x86_64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_EFL=y BR2_PACKAGE_EFL_DRM=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_LUAJIT=y is broken now during configure stage output/build/efl-1.28.1/src/modules/ecore_evas/engines/drm/meson.build:6:18: ERROR: Unknown variable "engine_gl_drm". which is fixed by former patch 0001. Later a build error occurs which is fixed by former patch 0002. The error was not yet caught by the autobuilders. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- ...es-drm-meson.build-use-gl_deps-as-en.patch | 37 ++++++++++++++++++ ...es-drm-meson.build-fix-gl_drm-includ.patch | 38 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 package/efl/0009-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch create mode 100644 package/efl/0010-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch diff --git a/package/efl/0009-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch b/package/efl/0009-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch new file mode 100644 index 0000000000..dd6ac1ae25 --- /dev/null +++ b/package/efl/0009-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch @@ -0,0 +1,37 @@ +From 00833baac6935bd1e3e9856211bc165c5b02a7bd Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 1 Aug 2020 02:25:47 +0200 +Subject: [PATCH] ecore_evas/engines/drm/meson.build: use "gl_deps" as engine + dependencies + +Meson trigger an error since "engine_gl_drm" variable doesn't exist. + +src/modules/ecore_evas/engines/drm/meson.build:10:2: ERROR: Unknown variable "engine_gl_drm". + +Instead use "gl_deps" as engine dependencies. + +Upstream: https://sourceforge.net/p/enlightenment/mailman/message/37075016/ + +Signed-off-by: Romain Naour +[Bernd: added Upstream: tag] +Signed-off-by: Bernd Kuhls +--- + src/modules/ecore_evas/engines/drm/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/ecore_evas/engines/drm/meson.build b/src/modules/ecore_evas/engines/drm/meson.build +index 58071010d0..0741d7fccd 100644 +--- a/src/modules/ecore_evas/engines/drm/meson.build ++++ b/src/modules/ecore_evas/engines/drm/meson.build +@@ -3,7 +3,7 @@ engine_deps = [ecore_drm2, ecore_input, eeze, elput, libdrm, engine_drm] + + if get_option('opengl') != 'none' + config_h.set('BUILD_ECORE_EVAS_GL_DRM', '1') +- engine_deps += [engine_gl_drm] ++ engine_deps += [gl_deps] + endif + + engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'drm')) +-- +2.31.1 + diff --git a/package/efl/0010-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch b/package/efl/0010-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch new file mode 100644 index 0000000000..e71a1705c0 --- /dev/null +++ b/package/efl/0010-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch @@ -0,0 +1,38 @@ +From a21e71cc2284a19a34c913aff757e656e3a8c14a Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 1 Aug 2020 01:01:00 +0200 +Subject: [PATCH] ecore_evas/engines/drm/meson.build: fix "gl_drm" include + directory + +The Evas_Engine_GL_Drm.h file is in "gl_drm" directory, not "drm". + +../src/modules/ecore_evas/engines/drm/ecore_evas_drm.c:23:11: fatal error: Evas_Engine_GL_Drm.h: No such file or directory + 23 | # include + | ^~~~~~~~~~~~~~~~~~~~~~ +compilation terminated. + +Upstream: https://sourceforge.net/p/enlightenment/mailman/message/37075004/ + +Signed-off-by: Romain Naour +[Bernd: added Upstream: tag] +Signed-off-by: Bernd Kuhls +--- + src/modules/ecore_evas/engines/drm/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/ecore_evas/engines/drm/meson.build b/src/modules/ecore_evas/engines/drm/meson.build +index 0741d7fccd..edda1abd71 100644 +--- a/src/modules/ecore_evas/engines/drm/meson.build ++++ b/src/modules/ecore_evas/engines/drm/meson.build +@@ -6,7 +6,7 @@ if get_option('opengl') != 'none' + engine_deps += [gl_deps] + endif + +-engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'drm')) ++engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'gl_drm')) + + shared_module(mod_full_name, engine_src, + include_directories : config_dir + [engine_include_dir], +-- +2.31.1 +