This hack is required tentatively until GBM_MODIFIERS is fully supported by Mesa-based EGL.
Signed-off-by: Eric Ruei <[email protected]> --- ...rm-undef-HAVE_GBM_MODIFIERS-explicit.patch | 31 +++++++++++++++++++ .../wayland/weston_5.0.0.bbappend | 3 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS-explicit.patch diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS-explicit.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS-explicit.patch new file mode 100644 index 00000000..0c1b3b94 --- /dev/null +++ b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS-explicit.patch @@ -0,0 +1,31 @@ +From fb7f77c7b039344f736c77fe85b68f0f49083fae Mon Sep 17 00:00:00 2001 +From: Eric Ruei <[email protected]> +Date: Sun, 1 Sep 2019 08:28:27 -0400 +Subject: [PATCH] HACK: composito-drm: undef HAVE_GBM_MODIFIERS explicitly + +GBM_MODIFIERS is expected for Mesa/gbm 19.1.6, but is not fully supported +yet. + +Upstream-Status: Inappropriate [tentative workaround only] + +Signed-off-by: Eric Ruei <[email protected]> +--- + libweston/compositor-drm.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c +index d92ecfcd..88f845a8 100644 +--- a/libweston/compositor-drm.c ++++ b/libweston/compositor-drm.c +@@ -68,6 +68,8 @@ + #include "linux-dmabuf-unstable-v1-server-protocol.h" + #include "linux-explicit-synchronization.h" + ++#undef HAVE_GBM_MODIFIERS ++ + #ifndef DRM_CLIENT_CAP_ASPECT_RATIO + #define DRM_CLIENT_CAP_ASPECT_RATIO 4 + #endif +-- +2.17.1 + diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend index 1bdcf7e4..edb4b54c 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend +++ b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend @@ -2,7 +2,7 @@ PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev" PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/libgbm mtdev" -PR_append = ".arago34" +PR_append = ".arago35" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" @@ -26,6 +26,7 @@ SRC_URI += " \ file://0011-compositor-Add-scene-graph-debug-scope.patch \ file://0012-compositor-drm-Add-backend-pointer-to-drm_output.patch \ file://0013-compositor-drm-Add-drm-backend-log-debug-scope.patch \ + file://0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS-explicit.patch \ " INHIBIT_PACKAGE_STRIP = "1" -- 2.17.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
