Skip to content

Commit

Permalink
chore: Drop one unneeded Fedora patch
Browse files Browse the repository at this point in the history
  • Loading branch information
@KyleGospo
KyleGospo committed Apr 20, 2024
1 parent 9d96c61 commit 9fe690f
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 82 deletions.
56 changes: 28 additions & 28 deletions staging/mutter/0002-3567.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ index 7d5e46ac7..577ed2760 100644
meta_window_actor_notify_damaged (META_WINDOW_ACTOR (actor_x11));
}
diff --git a/src/core/frame.c b/src/core/frame.c
index 1c90ce423..dbd111d76 100644
index 145f0b7bd..502622598 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -33,6 +33,7 @@
Expand All @@ -173,16 +173,16 @@ index 1c90ce423..dbd111d76 100644
+#include "x11/window-x11.h"

#include <X11/Xatom.h>

@@ -65,6 +66,7 @@ meta_window_x11_set_frame_xwindow (MetaWindow *window,
#include <X11/extensions/shape.h>
@@ -66,6 +67,7 @@ meta_window_x11_set_frame_xwindow (MetaWindow *window,
XSetWindowAttributes attrs;
gulong create_serial = 0;
MetaFrame *frame;
+ int child_x, child_y;

if (window->frame)
return;
@@ -123,11 +125,19 @@ meta_window_x11_set_frame_xwindow (MetaWindow *window,
@@ -127,11 +129,19 @@ meta_window_x11_set_frame_xwindow (MetaWindow *window,
meta_stack_tracker_record_remove (window->display->stack_tracker,
meta_window_x11_get_xwindow (window),
XNextRequest (x11_display->xdisplay));
Expand All @@ -204,7 +204,7 @@ index 1c90ce423..dbd111d76 100644
window->reparents_pending += 1;
/* FIXME handle this error */
mtk_x11_error_trap_pop (x11_display->xdisplay);
@@ -197,6 +207,8 @@ meta_window_destroy_frame (MetaWindow *window)
@@ -201,6 +211,8 @@ meta_window_destroy_frame (MetaWindow *window)

if (!x11_display->closing)
{
Expand All @@ -213,7 +213,7 @@ index 1c90ce423..dbd111d76 100644
if (!window->unmanaging)
{
meta_stack_tracker_record_add (window->display->stack_tracker,
@@ -204,6 +216,14 @@ meta_window_destroy_frame (MetaWindow *window)
@@ -208,6 +220,14 @@ meta_window_destroy_frame (MetaWindow *window)
XNextRequest (x11_display->xdisplay));
}

Expand All @@ -228,7 +228,7 @@ index 1c90ce423..dbd111d76 100644
XReparentWindow (x11_display->xdisplay,
meta_window_x11_get_xwindow (window),
x11_display->xroot,
@@ -211,8 +231,7 @@ meta_window_destroy_frame (MetaWindow *window)
@@ -215,8 +235,7 @@ meta_window_destroy_frame (MetaWindow *window)
* coordinates here means we'll need to ensure a configure
* notify event is sent; see bug 399552.
*/
Expand All @@ -238,15 +238,15 @@ index 1c90ce423..dbd111d76 100644
window->reparents_pending += 1;
}

@@ -263,6 +282,7 @@ meta_frame_query_borders (MetaFrame *frame,
@@ -270,6 +289,7 @@ meta_frame_query_borders (MetaFrame *frame,
MetaFrameBorders *borders)
{
MetaWindow *window = frame->window;
+ MetaWindowX11 *window_x11 = META_WINDOW_X11 (window);
MetaX11Display *x11_display = window->display->x11_display;
int format, res;
Atom type;
@@ -288,12 +308,22 @@ meta_frame_query_borders (MetaFrame *frame,
@@ -295,12 +315,22 @@ meta_frame_query_borders (MetaFrame *frame,

if (res == Success && nitems == 4)
{
Expand Down Expand Up @@ -275,7 +275,7 @@ index 1c90ce423..dbd111d76 100644
}

g_clear_pointer (&data, XFree);
@@ -314,12 +344,21 @@ meta_frame_query_borders (MetaFrame *frame,
@@ -321,12 +351,21 @@ meta_frame_query_borders (MetaFrame *frame,

if (res == Success && nitems == 4)
{
Expand Down Expand Up @@ -303,7 +303,7 @@ index 1c90ce423..dbd111d76 100644
}

g_clear_pointer (&data, XFree);
@@ -363,7 +402,9 @@ meta_frame_sync_to_window (MetaFrame *frame,
@@ -370,7 +409,9 @@ meta_frame_sync_to_window (MetaFrame *frame,
gboolean need_resize)
{
MetaWindow *window = frame->window;
Expand All @@ -313,7 +313,7 @@ index 1c90ce423..dbd111d76 100644

meta_topic (META_DEBUG_GEOMETRY,
"Syncing frame geometry %d,%d %dx%d (SE: %d,%d)",
@@ -374,12 +415,22 @@ meta_frame_sync_to_window (MetaFrame *frame,
@@ -381,12 +422,22 @@ meta_frame_sync_to_window (MetaFrame *frame,

mtk_x11_error_trap_push (x11_display->xdisplay);

Expand All @@ -340,15 +340,15 @@ index 1c90ce423..dbd111d76 100644

mtk_x11_error_trap_pop (x11_display->xdisplay);

@@ -416,6 +467,7 @@ static void
@@ -423,6 +474,7 @@ static void
send_configure_notify (MetaFrame *frame)
{
MetaX11Display *x11_display = frame->window->display->x11_display;
+ MetaWindowX11 *window_x11 = META_WINDOW_X11 (frame->window);
XEvent event = { 0 };

/* We never get told by the frames client, just reassert the
@@ -425,10 +477,16 @@ send_configure_notify (MetaFrame *frame)
@@ -432,10 +484,16 @@ send_configure_notify (MetaFrame *frame)
event.xconfigure.display = x11_display->xdisplay;
event.xconfigure.event = frame->xwindow;
event.xconfigure.window = frame->xwindow;
Expand Down Expand Up @@ -1299,7 +1299,7 @@ index 5c0760daa..f67e9e427 100644

static Bool
diff --git a/src/x11/window-props.c b/src/x11/window-props.c
index c18b3eab5..55c7b8b98 100644
index c18b3eab5..6adb69bb8 100644
--- a/src/x11/window-props.c
+++ b/src/x11/window-props.c
@@ -305,10 +305,15 @@ reload_icon_geometry (MetaWindow *window,
Expand Down Expand Up @@ -1436,7 +1436,7 @@ index c18b3eab5..55c7b8b98 100644
window->size_hints.flags = 0;

diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index c2ae6bad7..45506120e 100644
index a60650732..839759bc4 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -110,6 +110,113 @@ meta_window_x11_get_private (MetaWindowX11 *window_x11)
Expand Down Expand Up @@ -1745,9 +1745,9 @@ index c2ae6bad7..45506120e 100644
+ attrs.border_width, 0, 0, 0,
+ &priv->border_width, NULL, NULL, NULL);

G_OBJECT_CLASS (meta_window_x11_parent_class)->constructed (object);
}
@@ -2188,6 +2340,8 @@ meta_window_x11_class_init (MetaWindowX11Class *klass)
g_signal_connect (window, "notify::decorated",
G_CALLBACK (meta_window_x11_update_input_region),
@@ -2192,6 +2344,8 @@ meta_window_x11_class_init (MetaWindowX11Class *klass)
klass->thaw_commits = meta_window_x11_impl_thaw_commits;
klass->always_update_shape = meta_window_x11_impl_always_update_shape;
klass->process_property_notify = meta_window_x11_impl_process_property_notify;
Expand All @@ -1756,7 +1756,7 @@ index c2ae6bad7..45506120e 100644

obj_props[PROP_ATTRIBUTES] =
g_param_spec_pointer ("attributes", NULL, NULL,
@@ -2459,7 +2613,10 @@ meta_window_x11_update_input_region (MetaWindow *window)
@@ -2468,7 +2622,10 @@ meta_window_x11_update_input_region (MetaWindow *window)
else
{
/* Window has a custom shape. */
Expand All @@ -1768,7 +1768,7 @@ index c2ae6bad7..45506120e 100644
}

meta_XFree (rects);
@@ -2543,7 +2700,10 @@ meta_window_x11_update_shape_region (MetaWindow *window)
@@ -2552,7 +2709,10 @@ meta_window_x11_update_shape_region (MetaWindow *window)

if (rects)
{
Expand All @@ -1780,15 +1780,15 @@ index c2ae6bad7..45506120e 100644
XFree (rects);
}
}
@@ -2821,6 +2981,7 @@ meta_window_x11_configure_request (MetaWindow *window,
@@ -2830,6 +2990,7 @@ meta_window_x11_configure_request (MetaWindow *window,
{
MetaWindowX11 *window_x11 = META_WINDOW_X11 (window);
MetaWindowX11Private *priv = meta_window_x11_get_instance_private (window_x11);
+ int new_x, new_y, new_width, new_height;

/* Note that x, y is the corner of the window border,
* and width, height is the size of the window inside
@@ -2829,15 +2990,25 @@ meta_window_x11_configure_request (MetaWindow *window,
@@ -2838,15 +2999,25 @@ meta_window_x11_configure_request (MetaWindow *window,
* requested border here.
*/
if (event->xconfigurerequest.value_mask & CWBorderWidth)
Expand Down Expand Up @@ -1822,7 +1822,7 @@ index c2ae6bad7..45506120e 100644

/* Handle stacking. We only handle raises/lowers, mostly because
* stack.c really can't deal with anything else. I guess we'll fix
@@ -3332,8 +3503,13 @@ meta_window_x11_client_message (MetaWindow *window,
@@ -3341,8 +3512,13 @@ meta_window_x11_client_message (MetaWindow *window,
guint32 timestamp;
MetaWindowDrag *window_drag;

Expand All @@ -1838,15 +1838,15 @@ index c2ae6bad7..45506120e 100644
action = event->xclient.data.l[2];
button = event->xclient.data.l[3];

@@ -3497,6 +3673,7 @@ meta_window_x11_client_message (MetaWindow *window,
@@ -3506,6 +3682,7 @@ meta_window_x11_client_message (MetaWindow *window,
{
MetaGravity gravity;
guint value_mask;
+ int x, y, width, height;

gravity = (MetaGravity) (event->xclient.data.l[0] & 0xff);
value_mask = (event->xclient.data.l[0] & 0xf00) >> 8;
@@ -3505,13 +3682,20 @@ meta_window_x11_client_message (MetaWindow *window,
@@ -3514,13 +3691,20 @@ meta_window_x11_client_message (MetaWindow *window,
if (gravity == 0)
gravity = window->size_hints.win_gravity;

Expand All @@ -1871,7 +1871,7 @@ index c2ae6bad7..45506120e 100644
}
else if (event->xclient.message_type ==
x11_display->atom__NET_ACTIVE_WINDOW &&
@@ -3568,11 +3752,15 @@ meta_window_x11_client_message (MetaWindow *window,
@@ -3577,11 +3761,15 @@ meta_window_x11_client_message (MetaWindow *window,
else if (event->xclient.message_type ==
x11_display->atom__GTK_SHOW_WINDOW_MENU)
{
Expand All @@ -1890,7 +1890,7 @@ index c2ae6bad7..45506120e 100644

meta_window_show_menu (window, META_WINDOW_MENU_WM, x, y);
}
@@ -4094,10 +4282,11 @@ meta_window_x11_configure_notify (MetaWindow *window,
@@ -4103,10 +4291,11 @@ meta_window_x11_configure_notify (MetaWindow *window,
g_assert (window->override_redirect);
g_assert (window->frame == NULL);

Expand Down
16 changes: 8 additions & 8 deletions staging/mutter/0003-3304.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ index 09bee954a..8b955c90c 100644
EGLDisplay display,
GError **error);
diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c
index 405ce80a4..086e217cb 100644
index e40b03f3e..2710352d1 100644
--- a/src/backends/native/meta-onscreen-native.c
+++ b/src/backends/native/meta-onscreen-native.c
@@ -841,6 +841,9 @@ copy_shared_framebuffer_gpu (CoglOnscreen *onscreen,
@@ -840,6 +840,9 @@ copy_shared_framebuffer_gpu (CoglOnscreen *onscreen,
COGL_TRACE_BEGIN_SCOPED (CopySharedFramebufferSecondaryGpu,
"copy_shared_framebuffer_gpu()");

Expand All @@ -46,7 +46,7 @@ index 405ce80a4..086e217cb 100644
render_device = renderer_gpu_data->render_device;
egl_display = meta_render_device_get_egl_display (render_device);

@@ -948,8 +951,7 @@ copy_shared_framebuffer_primary_gpu (CoglOnscreen *onscre
@@ -947,8 +950,7 @@ copy_shared_framebuffer_primary_gpu (CoglOnscreen *onscre
COGL_TRACE_BEGIN_SCOPED (CopySharedFramebufferPrimaryGpu,
"copy_shared_framebuffer_primary_gpu()");

Expand All @@ -56,7 +56,7 @@ index 405ce80a4..086e217cb 100644
return NULL;

primary_gpu = meta_renderer_native_get_primary_gpu (renderer_native);
@@ -2418,6 +2420,15 @@ init_secondary_gpu_state_gpu_copy_mode (MetaRendererNative *renderer_nat
@@ -2417,6 +2419,15 @@ init_secondary_gpu_state_gpu_copy_mode (MetaRendererNative *renderer_nat
width, height,
format,
GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
Expand Down Expand Up @@ -471,7 +471,7 @@ index 997fe6f69..2d3fe1971 100644
/* For GPU blit mode */
EGLContext egl_context;
diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
index 5ffbafb58..aa76d018c 100644
index 7b64ff3f4..893ee4216 100644
--- a/src/backends/native/meta-renderer-native.c
+++ b/src/backends/native/meta-renderer-native.c
@@ -63,6 +63,7 @@
Expand All @@ -482,7 +482,7 @@ index 5ffbafb58..aa76d018c 100644
#include "backends/native/meta-renderer-native-private.h"
#include "backends/native/meta-renderer-view-native.h"
#include "cogl/cogl.h"
@@ -137,6 +138,9 @@ meta_renderer_native_gpu_data_free (MetaRendererNativeGpuData *renderer_gpu_data
@@ -136,6 +137,9 @@ meta_renderer_native_gpu_data_free (MetaRendererNativeGpuData *renderer_gpu_data
MetaRendererNative *renderer_native = renderer_gpu_data->renderer_native;
MetaEgl *egl = meta_renderer_native_get_egl (renderer_native);

Expand All @@ -492,15 +492,15 @@ index 5ffbafb58..aa76d018c 100644
meta_egl_destroy_context (egl,
egl_display,
renderer_gpu_data->secondary.egl_context,
@@ -1806,6 +1810,7 @@ init_secondary_gpu_data_gpu (MetaRendererNativeGpuData *renderer_gpu_data,
@@ -1805,6 +1809,7 @@ init_secondary_gpu_data_gpu (MetaRendererNativeGpuData *renderer_gpu_data,
CoglContext *cogl_context;
CoglDisplay *cogl_display;
const char **missing_gl_extensions;
+ const char *egl_vendor;

egl_display = meta_render_device_get_egl_display (render_device);
if (egl_display == EGL_NO_DISPLAY)
@@ -1872,6 +1877,11 @@ init_secondary_gpu_data_gpu (MetaRendererNativeGpuData *renderer_gpu_data,
@@ -1871,6 +1876,11 @@ init_secondary_gpu_data_gpu (MetaRendererNativeGpuData *renderer_gpu_data,
meta_egl_has_extensions (egl, egl_display, NULL,
"EGL_EXT_image_dma_buf_import_modifiers",
NULL);
Expand Down
Loading

0 comments on commit 9fe690f

Please sign in to comment.