diff options
Diffstat (limited to 'meta-openembedded/meta-xfce/recipes-xfce/xfwm4')
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch | 92 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb (renamed from meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.5.bb) | 5 |
2 files changed, 2 insertions, 95 deletions
diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch deleted file mode 100644 index 04fd623e8..000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch +++ /dev/null @@ -1,92 +0,0 @@ -From acdceb0b28d86199b8c2233880fa8a04cb24d4d4 Mon Sep 17 00:00:00 2001 -From: Kai Kang <kai.kang@windriver.com> -Date: Wed, 24 Jul 2019 09:48:04 +0800 -Subject: [PATCH] Revert "compositor: Revert to GLX as default vblank method - (again)" - -This reverts commit e07574d6e7a2dbaa08c3ba4765c6306073d9493e. - -It sets the default vblank method (auto) to GLX from 4.13.2. But it -fails to start xfwm4 on intel-x86-64 boards with error: - -| xfwm4: ../mesa-19.1.1/src/mesa/drivers/dri/i965/intel_mipmap_tree.c:1293: -| intel_miptree_match_image: Assertion `image->TexObject->Target == mt->target' failed. -| Aborted - -There is also a RHEL defect: -https://bugzilla.redhat.com/show_bug.cgi?id=1678334 - -Revert the commit to fix the issue. - -Upstream-Status: Inappropriate [workaround] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - src/compositor.c | 41 +++++++++++++++++++---------------------- - 1 file changed, 19 insertions(+), 22 deletions(-) - -diff --git a/src/compositor.c b/src/compositor.c -index 25615282..daced607 100644 ---- a/src/compositor.c -+++ b/src/compositor.c -@@ -4483,13 +4483,28 @@ compositorManageScreen (ScreenInfo *screen_info) - XClearArea (display_info->dpy, screen_info->output, 0, 0, 0, 0, TRUE); - TRACE ("manual compositing enabled"); - -+#ifdef HAVE_PRESENT_EXTENSION -+ screen_info->use_present = display_info->have_present && -+ (screen_info->vblank_mode == VBLANK_AUTO || -+ screen_info->vblank_mode == VBLANK_XPRESENT); -+ if (screen_info->use_present) -+ { -+ screen_info->present_pending = FALSE; -+ XPresentSelectInput (display_info->dpy, -+ screen_info->output, -+ PresentCompleteNotifyMask); -+ } -+#else /* HAVE_PRESENT_EXTENSION */ -+ screen_info->use_present = FALSE; -+#endif /* HAVE_PRESENT_EXTENSION */ -+ - #ifdef HAVE_EPOXY -- screen_info->use_glx = (screen_info->vblank_mode == VBLANK_AUTO || -- screen_info->vblank_mode == VBLANK_GLX); -+ screen_info->use_glx = !screen_info->use_present && - #ifdef HAVE_XSYNC -- screen_info->use_glx &= display_info->have_xsync; -+ display_info->have_xsync && - #endif /* HAVE_XSYNC */ -- -+ (screen_info->vblank_mode == VBLANK_AUTO || -+ screen_info->vblank_mode == VBLANK_GLX); - if (screen_info->use_glx) - { - screen_info->glx_context = None; -@@ -4503,24 +4518,6 @@ compositorManageScreen (ScreenInfo *screen_info) - screen_info->use_glx = FALSE; - #endif /* HAVE_EPOXY */ - --#ifdef HAVE_PRESENT_EXTENSION -- screen_info->use_present = display_info->have_present && --#ifdef HAVE_EPOXY -- !screen_info->use_glx && --#endif /* HAVE_EPOXY */ -- (screen_info->vblank_mode == VBLANK_AUTO || -- screen_info->vblank_mode == VBLANK_XPRESENT); -- if (screen_info->use_present) -- { -- screen_info->present_pending = FALSE; -- XPresentSelectInput (display_info->dpy, -- screen_info->output, -- PresentCompleteNotifyMask); -- } --#else /* HAVE_PRESENT_EXTENSION */ -- screen_info->use_present = FALSE; --#endif /* HAVE_PRESENT_EXTENSION */ -- - if (screen_info->use_present) - { - g_info ("Compositor using XPresent for vsync"); --- -2.20.1 - diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.5.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb index f8febe804..3f64365f0 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.5.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb @@ -2,14 +2,13 @@ DESCRIPTION = "Xfce4 Window Manager" SECTION = "x11/wm" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama exo-native" +DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama" inherit xfce update-alternatives features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += "file://0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch" -SRC_URI[sha256sum] = "d7a7c63fa42ec6d7cb3caab130d6f496be5bd7689b775d20e8786b7f3e282930" +SRC_URI[sha256sum] = "1e22eae1bbb66cebfd1753b0a5606e76ecbf6b09ce4cdfd732d093c936f1feb3" PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ |