From b2baa5bbf4de342ab45779c2d4c081b49d907cab Mon Sep 17 00:00:00 2001 From: tigro Date: Tue, 19 Dec 2023 16:51:32 +0300 Subject: [PATCH] Fix green screen --- SOURCES/0001-Fix-green-screen.patch | 32 +++++++++++++++++++++++++++++ SPECS/xorgxrdp.spec | 8 +++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0001-Fix-green-screen.patch diff --git a/SOURCES/0001-Fix-green-screen.patch b/SOURCES/0001-Fix-green-screen.patch new file mode 100644 index 0000000..77b3391 --- /dev/null +++ b/SOURCES/0001-Fix-green-screen.patch @@ -0,0 +1,32 @@ +From 36ecf37dccfd84dc519886c578baeef2ceee6383 Mon Sep 17 00:00:00 2001 +From: tigro +Date: Tue, 19 Dec 2023 16:48:49 +0300 +Subject: [PATCH] Fix green screen + +--- + module/rdpCapture.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/module/rdpCapture.c b/module/rdpCapture.c +index 7d112ef..c0419e0 100644 +--- a/module/rdpCapture.c ++++ b/module/rdpCapture.c +@@ -1229,7 +1229,14 @@ rdpCapture2(rdpClientCon *clientCon, RegionPtr in_reg, BoxPtr *out_rects, + rcode = rdpRegionContainsRect(in_reg, &rect); + LLOGLN(10, ("rdpCapture2: rcode %d", rcode)); + +- if (rcode != rgnOUT) ++ if (rcode == rgnOUT) ++ { ++ LLOGLN(0, ("rdpCapture2: rgnOUT")); ++ rdpRegionInit(&tile_reg, &rect, 0); ++ rdpRegionSubtract(in_reg, in_reg, &tile_reg); ++ rdpRegionUninit(&tile_reg); ++ } ++ else + { + /* hex digits of pi as a 64 bit int */ + if (rcode == rgnPART) +-- +2.43.0 + diff --git a/SPECS/xorgxrdp.spec b/SPECS/xorgxrdp.spec index 193f1e1..0e2e1ba 100644 --- a/SPECS/xorgxrdp.spec +++ b/SPECS/xorgxrdp.spec @@ -5,12 +5,14 @@ Name: xorgxrdp-egfx Version: 0.9.80 -Release: 0.20230830git%{shortcommit}%{?dist} +Release: 1.20230830git%{shortcommit}%{?dist} Summary: Implementation of xrdp backend as Xorg modules License: MIT URL: https://github.com/neutrinolabs/xorgxrdp Source0: https://github.com/neutrinolabs/xorgxrdp/archive/%{commit}/%{real_name}-%{commit}.tar.gz +# https://github.com/neutrinolabs/xrdp/issues/2875#issuecomment-1852489427 +Patch1: 0001-Fix-green-screen.patch BuildRequires: make BuildRequires: nasm @@ -137,6 +139,10 @@ CFLAGS="$RPM_OPT_FLAGS -I/usr/include/libdrm" \ %endif %changelog +* Tue Dec 19 2023 Arkady L. Shane - 0.9.80-1.20230830gitf5103aa4 +- Fix green screen + https://github.com/neutrinolabs/xrdp/issues/2875#issuecomment-1852489427 + * Mon Dec 18 2023 Arkady L. Shane - 0.9.80-0.20230830gitf5103aa4 - Build Development version with EGFX support from gfx_mainline_merge