[Git][xorg-team/wayland/xwayland][debian-unstable] 6 commits: xwayland: Fix cursor color

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / wayland / xwayland

Commits:

278b48ac

by Olivier Fourdan at 2022-02-11T11:02:59+01:00

xwayland: Fix cursor color

When using colored X11 cursors, the colors would appear wrong, yellow
would show white, green would show as cyan, and blue would show black
whereas red would show fine.

This is because the code expanding the cursor data accounts for green
for both green and blue channels. Funnily this bug has been there from
the beginning.

Fix the issue by correctly account for the color channels.

Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1303
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
(cherry picked from commit 6ad6517a796cb4536d368091b647423981ad1217)

ef746ca9

by Olivier Fourdan at 2022-02-16T11:18:43+01:00

Bump version to 22.1.0

Xwayland 22.1.0 final release

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>

36739bfe

by Timo Aaltonen at 2022-02-16T20:17:47+02:00

Merge branch 'upstream-unstable' into debian-unstable

bb7ff52c
by Timo Aaltonen at 2022-02-16T20:18:22+02:00
```
version bump
```
3a524481
by Timo Aaltonen at 2022-02-16T20:20:05+02:00
```
control: Bump policy to 4.6.0.
```
6e0c248e
by Timo Aaltonen at 2022-02-16T20:20:14+02:00
```
release to sid
```

Changes:

debian/changelog

 +xwayland (2:22.1.0-1) unstable; urgency=medium
++
 +  * New upstream release.
 +  * control: Bump policy to 4.6.0.
++
 + -- Timo Aaltonen <tjaalton@debian.org>  Wed, 16 Feb 2022 20:20:06 +0200
++
  xwayland (2:22.0.99.902-1) unstable; urgency=medium
    * New upstream release candidate.

debian/control

@@ -25,7 +25,7 @@ Build-Depends:
   xfonts-utils,
   xtrans-dev,
   wayland-protocols,
 -Standards-Version: 4.5.1
 +Standards-Version: 4.6.0
  Vcs-Git: https://salsa.debian.org/xorg-team/wayland/xwayland.git
  Vcs-Browser: https://salsa.debian.org/xorg-team/wayland/xwayland
  Homepage: https://www.x.org/

hw/xwayland/xwayland-cursor.c

@@ -54,9 +54,11 @@ expand_source_and_mask(CursorPtr cursor, CARD32 *data)
      p = data;
      fg = ((cursor->foreRed & 0xff00) << 8) |
 -        (cursor->foreGreen & 0xff00) | (cursor->foreGreen >> 8);
 +          (cursor->foreGreen & 0xff00) |
 +          (cursor->foreBlue >> 8);
      bg = ((cursor->backRed & 0xff00) << 8) |
 -        (cursor->backGreen & 0xff00) | (cursor->backGreen >> 8);
 +          (cursor->backGreen & 0xff00) |
 +          (cursor->backBlue >> 8);
      stride = BitmapBytePad(bits->width);
      for (y = 0; y < bits->height; y++)
          for (x = 0; x < bits->width; x++) {

meson.build

@@ -3,7 +3,7 @@ project('xwayland', 'c',
              'buildtype=debugoptimized',
              'c_std=gnu99',
          ],
 -        version: '22.0.99.902',
 +        version: '22.1.0',
          meson_version: '>= 0.47.0',
+ )
  release_date = '2021-07-05'