commit: fab433ae10a67af7b2932c256eea0fd1bdfbdae1 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu May 10 21:19:50 2018 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu May 10 21:19:53 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab433ae
x11-base/xorg-server: Drop old patches ...-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch | 48 ------ ....99.904-xwayland-Fix-build-without-glamor.patch | 175 --------------------- 2 files changed, 223 deletions(-) diff --git a/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch b/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch deleted file mode 100644 index f0c4ed58d33..00000000000 --- a/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a98a95b798a0062783ae6fd2135ad488af5efcfd Mon Sep 17 00:00:00 2001 -From: Matt Turner <[email protected]> -Date: Sun, 15 Apr 2018 23:37:45 -0700 -Subject: [PATCH xserver 2/2] modesetting: Move GBM code inside #ifdef - GLAMOR_HAS_GBM - -Fixes a compilation error without Glamor. - -Bugzilla: https://bugs.gentoo.org/653288 -Signed-off-by: Matt Turner <[email protected]> -Reviewed-by: Olivier Fourdan <[email protected]> ---- - hw/xfree86/drivers/modesetting/drmmode_display.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c -index 322ef050b..79e91f0f8 100644 ---- a/hw/xfree86/drivers/modesetting/drmmode_display.c -+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c -@@ -998,18 +998,18 @@ static Bool - drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo, - unsigned width, unsigned height, unsigned bpp) - { -- uint32_t format; -- -- if (drmmode->scrn->depth == 30) -- format = GBM_FORMAT_ARGB2101010; -- else -- format = GBM_FORMAT_ARGB8888; -- - bo->width = width; - bo->height = height; - - #ifdef GLAMOR_HAS_GBM - if (drmmode->glamor) { -+ uint32_t format; -+ -+ if (drmmode->scrn->depth == 30) -+ format = GBM_FORMAT_ARGB2101010; -+ else -+ format = GBM_FORMAT_ARGB8888; -+ - #ifdef GBM_BO_WITH_MODIFIERS - uint32_t num_modifiers; - uint64_t *modifiers = NULL; --- -2.16.1 - diff --git a/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch b/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch deleted file mode 100644 index 312a5e05cdc..00000000000 --- a/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch +++ /dev/null @@ -1,175 +0,0 @@ -From c3ae963a7b19e05b8296aae8b6354587756d48fa Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan <[email protected]> -Date: Mon, 16 Apr 2018 09:39:09 +0200 -Subject: [PATCH xserver 1/2] xwayland: Fix build without glamor - -Present support in Xwayland relies on glamor, make sure Xwayland can -be built without glamor by moving references to Present code inside -the conditional GLAMOR_HAS_GBM. - -Reported-by: Matt Turner <[email protected]> -Signed-off-by: Olivier Fourdan <[email protected]> -Reviewed-by: Matt Turner <[email protected]> -Reviewed-by: Roman Gilg <[email protected]> ---- - hw/xwayland/Makefile.am | 4 ++-- - hw/xwayland/meson.build | 3 +-- - hw/xwayland/xwayland.c | 10 +++++++++- - hw/xwayland/xwayland.h | 7 ++++++- - 4 files changed, 18 insertions(+), 6 deletions(-) - -diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am -index 0291afee7..80d3a1f19 100644 ---- a/hw/xwayland/Makefile.am -+++ b/hw/xwayland/Makefile.am -@@ -11,7 +11,6 @@ Xwayland_CFLAGS = \ - - Xwayland_SOURCES = \ - xwayland.c \ -- xwayland-present.c \ - xwayland-input.c \ - xwayland-cursor.c \ - xwayland-shm.c \ -@@ -35,7 +34,8 @@ Xwayland_built_sources = - - if GLAMOR_EGL - Xwayland_SOURCES += \ -- xwayland-glamor.c -+ xwayland-glamor.c \ -+ xwayland-present.c - if XV - Xwayland_SOURCES += \ - xwayland-glamor-xv.c -diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build -index 69a5c819a..8d178825e 100644 ---- a/hw/xwayland/meson.build -+++ b/hw/xwayland/meson.build -@@ -1,6 +1,5 @@ - srcs = [ - 'xwayland.c', -- 'xwayland-present.c', - 'xwayland-input.c', - 'xwayland-cursor.c', - 'xwayland-shm.c', -@@ -53,7 +52,7 @@ srcs += code.process(dmabuf_xml) - - xwayland_glamor = [] - if gbm_dep.found() -- srcs += 'xwayland-glamor.c' -+ srcs += [ 'xwayland-glamor.c', 'xwayland-present.c' ] - if build_xv - srcs += 'xwayland-glamor-xv.c' - endif -diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c -index dd074c341..44bbc3b18 100644 ---- a/hw/xwayland/xwayland.c -+++ b/hw/xwayland/xwayland.c -@@ -525,6 +525,7 @@ xwl_realize_window(WindowPtr window) - wl_region_destroy(region); - } - -+#ifdef GLAMOR_HAS_GBM - if (xwl_screen->present) { - xwl_window->present_crtc_fake = RRCrtcCreate(xwl_screen->screen, xwl_window); - xwl_window->present_msc = 1; -@@ -533,6 +534,7 @@ xwl_realize_window(WindowPtr window) - xorg_list_init(&xwl_window->present_event_list); - xorg_list_init(&xwl_window->present_release_queue); - } -+#endif - - wl_display_flush(xwl_screen->display); - -@@ -599,9 +601,11 @@ xwl_unrealize_window(WindowPtr window) - - compUnredirectWindow(serverClient, window, CompositeRedirectManual); - -+#ifdef GLAMOR_HAS_GBM - if (xwl_screen->present) - /* Always cleanup Present (Present might have been active on child window) */ - xwl_present_cleanup(window); -+#endif - - screen->UnrealizeWindow = xwl_screen->UnrealizeWindow; - ret = (*screen->UnrealizeWindow) (window); -@@ -621,8 +625,10 @@ xwl_unrealize_window(WindowPtr window) - if (xwl_window->frame_callback) - wl_callback_destroy(xwl_window->frame_callback); - -+#ifdef GLAMOR_HAS_GBM - if (xwl_window->present_crtc_fake) - RRCrtcDestroy(xwl_window->present_crtc_fake); -+#endif - - free(xwl_window); - dixSetPrivate(&window->devPrivates, &xwl_window_private_key, NULL); -@@ -709,9 +715,11 @@ xwl_screen_post_damage(struct xwl_screen *xwl_screen) - - xorg_list_for_each_entry_safe(xwl_window, next_xwl_window, - &xwl_screen->damage_window_list, link_damage) { -+#ifdef GLAMOR_HAS_GBM - /* Present on the main surface. So don't commit here as well. */ - if (xwl_window->present_window) - continue; -+#endif - /* If we're waiting on a frame callback from the server, - * don't attach a new buffer. */ - if (xwl_window->frame_callback) -@@ -1053,10 +1061,10 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv) - ErrorF("Failed to initialize glamor, falling back to sw\n"); - xwl_screen->glamor = 0; - } --#endif - - if (xwl_screen->glamor && xwl_screen->rootless) - xwl_screen->present = xwl_present_init(pScreen); -+#endif - - if (!xwl_screen->glamor) { - xwl_screen->CreateScreenResources = pScreen->CreateScreenResources; -diff --git a/hw/xwayland/xwayland.h b/hw/xwayland/xwayland.h -index a65559374..cf2551b99 100644 ---- a/hw/xwayland/xwayland.h -+++ b/hw/xwayland/xwayland.h -@@ -127,7 +127,7 @@ struct xwl_window { - struct xorg_list link_damage; - struct wl_callback *frame_callback; - Bool allow_commits; -- -+#ifdef GLAMOR_HAS_GBM - /* present */ - RRCrtcPtr present_crtc_fake; - struct xorg_list present_link; -@@ -143,8 +143,10 @@ struct xwl_window { - - struct xorg_list present_event_list; - struct xorg_list present_release_queue; -+#endif - }; - -+#ifdef GLAMOR_HAS_GBM - struct xwl_present_event { - uint64_t event_id; - uint64_t target_msc; -@@ -159,6 +161,7 @@ struct xwl_present_event { - - struct xorg_list list; - }; -+#endif - - #define MODIFIER_META 0x01 - -@@ -378,8 +381,10 @@ struct wl_buffer *xwl_glamor_pixmap_get_wl_buffer(PixmapPtr pixmap, - unsigned short height, - Bool *created); - -+#ifdef GLAMOR_HAS_GBM - Bool xwl_present_init(ScreenPtr screen); - void xwl_present_cleanup(WindowPtr window); -+#endif - - void xwl_screen_release_tablet_manager(struct xwl_screen *xwl_screen); - --- -2.16.1 -
