diff --git a/xwayland-23.2.0.tar.xz b/xwayland-23.2.0.tar.xz deleted file mode 100644 index a35c153..0000000 --- a/xwayland-23.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f33ec2a34de6e66ae1b7e44872c3a2146192872c719b9acf192814edbabd4c5 -size 1298020 diff --git a/xwayland-23.2.0.tar.xz.sig b/xwayland-23.2.0.tar.xz.sig deleted file mode 100644 index 99f9f93..0000000 Binary files a/xwayland-23.2.0.tar.xz.sig and /dev/null differ diff --git a/xwayland-23.2.1.tar.xz b/xwayland-23.2.1.tar.xz new file mode 100644 index 0000000..1c54e1d --- /dev/null +++ b/xwayland-23.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eebc2692c3aa80617d78428bc6ec7b91b254a98214d2a70e997098503cd6ef90 +size 1298128 diff --git a/xwayland-23.2.1.tar.xz.sig b/xwayland-23.2.1.tar.xz.sig new file mode 100644 index 0000000..90bbbd2 Binary files /dev/null and b/xwayland-23.2.1.tar.xz.sig differ diff --git a/xwayland-glamor-Ignore-destination-alpha-as-necessary-for-com.patch b/xwayland-glamor-Ignore-destination-alpha-as-necessary-for-com.patch deleted file mode 100644 index 5e090cc..0000000 --- a/xwayland-glamor-Ignore-destination-alpha-as-necessary-for-com.patch +++ /dev/null @@ -1,68 +0,0 @@ -From d1f142891ef346e90c36a7393009ffaac2aa8b38 Mon Sep 17 00:00:00 2001 -From: Michel Dänzer -Date: Tue, 12 Sep 2023 16:57:16 +0200 -Subject: [PATCH] glamor: Ignore destination alpha as necessary for composite operation - -If the destination drawable is a window with effective depth 24 backed -by a depth 32 pixmap. - -Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1575 ---- - glamor/glamor_priv.h | 1 + - glamor/glamor_render.c | 14 +++++++++++++- - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h -index 898380d82..71aaeb8c2 100644 ---- a/glamor/glamor_priv.h -+++ b/glamor/glamor_priv.h -@@ -111,6 +111,7 @@ enum shader_mask { - enum shader_dest_swizzle { - SHADER_DEST_SWIZZLE_DEFAULT, - SHADER_DEST_SWIZZLE_ALPHA_TO_RED, -+ SHADER_DEST_SWIZZLE_IGNORE_ALPHA, - SHADER_DEST_SWIZZLE_COUNT, - }; - -diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c -index ed1222621..0d233f27b 100644 ---- a/glamor/glamor_render.c -+++ b/glamor/glamor_render.c -@@ -197,6 +197,11 @@ glamor_create_composite_fs(glamor_screen_private *glamor_priv, struct shader_key - " float undef;\n" - " return vec4(color.a, undef, undef, undef);" - "}"; -+ const char *dest_swizzle_ignore_alpha = -+ "vec4 dest_swizzle(vec4 color)\n" -+ "{" -+ " return vec4(color.xyz, 1.0);" -+ "}"; - - const char *in_normal = - "void main()\n" -@@ -286,6 +291,9 @@ glamor_create_composite_fs(glamor_screen_private *glamor_priv, struct shader_key - case SHADER_DEST_SWIZZLE_ALPHA_TO_RED: - dest_swizzle = dest_swizzle_alpha_to_red; - break; -+ case SHADER_DEST_SWIZZLE_IGNORE_ALPHA: -+ dest_swizzle = dest_swizzle_ignore_alpha; -+ break; - default: - FatalError("Bad composite shader dest swizzle"); - } -@@ -938,7 +946,11 @@ glamor_composite_choose_shader(CARD8 op, - glamor_priv->formats[8].format == GL_RED) { - key.dest_swizzle = SHADER_DEST_SWIZZLE_ALPHA_TO_RED; - } else { -- key.dest_swizzle = SHADER_DEST_SWIZZLE_DEFAULT; -+ if (dest_pixmap->drawable.depth == 32 && -+ glamor_drawable_effective_depth(dest->pDrawable) == 24) -+ key.dest_swizzle = SHADER_DEST_SWIZZLE_IGNORE_ALPHA; -+ else -+ key.dest_swizzle = SHADER_DEST_SWIZZLE_DEFAULT; - } - - if (source && source->alphaMap) { --- -2.42.0 - diff --git a/xwayland.changes b/xwayland.changes index 2e0785c..d41e424 100644 --- a/xwayland.changes +++ b/xwayland.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 20 08:53:56 UTC 2023 - Stefan Dirsch + +- Update to version 23.2.1: + * glamor: Ignore destination alpha as necessary for composite operation + * xtest: Check whether there is a sendEventsProc to call +- supersedes xwayland-glamor-Ignore-destination-alpha-as-necessary-for-com.patch + ------------------------------------------------------------------- Mon Sep 18 15:22:57 UTC 2023 - Joan Torres diff --git a/xwayland.spec b/xwayland.spec index 9ee13ba..e5a45b1 100644 --- a/xwayland.spec +++ b/xwayland.spec @@ -24,7 +24,7 @@ %endif Name: xwayland -Version: 23.2.0 +Version: 23.2.1 Release: 0 URL: http://xorg.freedesktop.org Summary: Xwayland Xserver @@ -34,7 +34,6 @@ Source0: %{url}/archive/individual/xserver/%{name}-%{version}.tar.xz Source1: %{url}/archive/individual/xserver/%{name}-%{version}.tar.xz.sig Source2: xwayland.keyring -Patch1: xwayland-glamor-Ignore-destination-alpha-as-necessary-for-com.patch BuildRequires: meson BuildRequires: ninja