rpms
/
xorgxrdp
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:epel9
Branches Tags
rpms:i10ce
rpms:i9ce
rpms:i8ce
rpms:epel8
rpms:epel9
rpms:i9ce-egfx
rpms:i9
...
pull from: rpms:i9ce-egfx
Branches Tags
rpms:i10ce
rpms:i9ce
rpms:i8ce
rpms:epel8
rpms:epel9
rpms:i9ce-egfx
rpms:i9

No commits in common. 'epel9' and 'i9ce-egfx' have entirely different histories.
epel9 ... i9ce-egfx

6 changed files with 155 additions and 83 deletions
Show Stats

26
.gitignore vendored
Unescape View File

@ -1,25 +1 @@
/xorgxrdp-0.2.0.tar.gz SOURCES/xorgxrdp-8519407d7fbcb71fd046ce42e5674c308e9ea52b.tar.gz
/xorgxrdp-0.2.1.tar.gz
/xorgxrdp-0.2.2.tar.gz
/xorgxrdp-0.2.3.tar.gz
/xorgxrdp-0.2.4.tar.gz
/xorgxrdp-0.2.5.tar.gz
/xorgxrdp-0.2.6.tar.gz
/xorgxrdp-0.2.7.tar.gz
/xorgxrdp-0.2.8.tar.gz
/xorgxrdp-0.2.9.tar.gz
/xorgxrdp-0.2.10.tar.gz
/xorgxrdp-0.2.11.tar.gz
/xorgxrdp-0.2.12.tar.gz
/xorgxrdp-0.2.13.tar.gz
/xorgxrdp-0.2.14.tar.gz
/xorgxrdp-0.2.15.tar.gz
/xorgxrdp-0.2.16.tar.gz
/xorgxrdp-0.2.17.tar.gz
/xorgxrdp-0.2.18.tar.gz
/xorgxrdp-0.9.19.tar.gz
/xorgxrdp-0.9.20.tar.gz
/xorgxrdp-0.10.0.tar.gz
/xorgxrdp-0.10.1.tar.gz
/xorgxrdp-0.10.2.tar.gz
/xorgxrdp-0.10.3.tar.gz

1
.xorgxrdp-egfx.metadata
Unescape View File

@ -0,0 +1 @@
74aed7ea8fb9d6e80b08a26a773e09ab76ab10ad SOURCES/xorgxrdp-8519407d7fbcb71fd046ce42e5674c308e9ea52b.tar.gz

32
SOURCES/0001-Fix-green-screen.patch
Unescape View File

@ -0,0 +1,32 @@
From 36ecf37dccfd84dc519886c578baeef2ceee6383 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
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

88
SOURCES/lrandr-only-nvidia.diff
Unescape View File

@ -0,0 +1,88 @@
--- a/module/rdpClientCon.c 2022-10-03 19:57:25.328159263 +0200
+++ b/module/rdpClientCon.c 2022-10-03 19:59:53.433316164 +0200
@@ -55,9 +55,8 @@
#if defined(XORGXRDP_LRANDR)
#include "rdpLRandR.h"
-#else
-#include "rdpRandR.h"
#endif
+#include "rdpRandR.h"
#define LOG_LEVEL 1
#define LLOGLN(_level, _args) \
@@ -849,19 +848,24 @@
if ((dev->width != width) || (dev->height != height))
{
#if defined(XORGXRDP_LRANDR)
- /* even though we are not using the built in randr, we still need
- * to call this so driver can setup */
- ok = RRScreenSizeSet(dev->pScreen, width, height, mmwidth, mmheight);
- LLOGLN(0, ("rdpClientConProcessScreenSizeMsg: RRScreenSizeSet ok=[%d]", ok));
- ok = rdpLRRScreenSizeSet(dev, width, height, mmwidth, mmheight);
- LLOGLN(0, ("rdpClientConProcessScreenSizeMsg: LRRScreenSizeSet ok=[%d]", ok));
-#else
- dev->allow_screen_resize = 1;
- ok = RRScreenSizeSet(dev->pScreen, width, height, mmwidth, mmheight);
- dev->allow_screen_resize = 0;
- LLOGLN(0, ("rdpClientConProcessScreenSizeMsg: RRScreenSizeSet ok=[%d]", ok));
- RRTellChanged(dev->pScreen);
+ if (dev->nvidia)
+ {
+ /* even though we are not using the built in randr, we still need
+ * to call this so driver can setup */
+ ok = RRScreenSizeSet(dev->pScreen, width, height, mmwidth, mmheight);
+ LLOGLN(0, ("rdpClientConProcessScreenSizeMsg: RRScreenSizeSet ok=[%d]", ok));
+ ok = rdpLRRScreenSizeSet(dev, width, height, mmwidth, mmheight);
+ LLOGLN(0, ("rdpClientConProcessScreenSizeMsg: LRRScreenSizeSet ok=[%d]", ok));
+ }
+ else
+ {
#endif
+ dev->allow_screen_resize = 1;
+ ok = RRScreenSizeSet(dev->pScreen, width, height, mmwidth, mmheight);
+ dev->allow_screen_resize = 0;
+ LLOGLN(0, ("rdpClientConProcessScreenSizeMsg: RRScreenSizeSet ok=[%d]", ok));
+ RRTellChanged(dev->pScreen);
+ }
}
return 0;
@@ -1297,11 +1301,14 @@
dev->minfo[index].bottom));
}
#if defined(XORGXRDP_LRANDR)
- rdpLRRSetRdpOutputs(dev);
-#else
- rdpRRSetRdpOutputs(dev);
- RRTellChanged(dev->pScreen);
+ if (dev->nvidia)
+ rdpLRRSetRdpOutputs(dev);
+ else
#endif
+ {
+ rdpRRSetRdpOutputs(dev);
+ RRTellChanged(dev->pScreen);
+ }
}
else
{
@@ -1310,11 +1317,14 @@
dev->doMultimon = 0;
dev->monitorCount = 0;
#if defined(XORGXRDP_LRANDR)
- rdpLRRSetRdpOutputs(dev);
-#else
- rdpRRSetRdpOutputs(dev);
- RRTellChanged(dev->pScreen);
+ if (dev->nvidia)
+ rdpLRRSetRdpOutputs(dev);
+ else
#endif
+ {
+ rdpRRSetRdpOutputs(dev);
+ RRTellChanged(dev->pScreen);
+ }
}
/* rdpLoadLayout */

90
xorgxrdp.spec → SPECS/xorgxrdp.spec
Unescape View File

@ -1,16 +1,24 @@
Name: xorgxrdp %global real_name xorgxrdp
Version: 0.10.3
Release: 5%{?dist} %global commit 8519407d7fbcb71fd046ce42e5674c308e9ea52b
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: xorgxrdp-egfx
Version: 0.9.80
Release: 2.20240113git%{shortcommit}%{?dist}.inferit
Summary: Implementation of xrdp backend as Xorg modules Summary: Implementation of xrdp backend as Xorg modules
License: MIT License: MIT
URL: https://github.com/neutrinolabs/xorgxrdp URL: https://github.com/neutrinolabs/xorgxrdp
Source0: https://github.com/neutrinolabs/xorgxrdp/releases/download/v%{version}/%{name}-%{version}.tar.gz 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
#Patch2: lrandr-only-nvidia.diff
BuildRequires: make BuildRequires: make
BuildRequires: nasm BuildRequires: nasm
BuildRequires: xorg-x11-server-devel BuildRequires: xorg-x11-server-devel
BuildRequires: xrdp-devel >= 1:0.10.2 BuildRequires: xrdp-egfx-devel >= 1:0.9.80
%if 0%{?fedora} > 0 && 0%{?fedora} <= 24 %if 0%{?fedora} > 0 && 0%{?fedora} <= 24
BuildRequires: libXfont-devel BuildRequires: libXfont-devel
%else %else
@ -21,30 +29,25 @@ BuildRequires: libXfont2-devel
BuildRequires: mesa-libgbm-devel BuildRequires: mesa-libgbm-devel
BuildRequires: libepoxy-devel BuildRequires: libepoxy-devel
BuildRequires: libdrm-devel BuildRequires: libdrm-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
Conflicts: %{real_name}-glamor
Conflicts: %{name}-glamor Conflicts: %{name}-glamor
%endif %endif
Requires: xrdp >= 1:0.10.2 Conflicts: %{real_name} < 0.9.80
Requires: Xorg %(xserver-sdk-abi-requires videodrv 2>/dev/null) Requires: Xorg %(xserver-sdk-abi-requires videodrv 2>/dev/null)
Requires: Xorg %(xserver-sdk-abi-requires xinput 2>/dev/null) Requires: Xorg %(xserver-sdk-abi-requires xinput 2>/dev/null)
%if 0%{?fedora} >= 35 || 0%{?rhel} >= 8
Requires: xorg-x11-server-Xorg
%endif
%if 0%{?fedora} >= 35 || 0%{?rhel} >= 8 %if 0%{?fedora} >= 35 || 0%{?rhel} >= 8
%package glamor %package glamor
Summary: Implementation of xrdp backend as Xorg modules with glamor Summary: Implementation of xrdp backend as Xorg modules with glamor
RemovePathPostfixes: .glamor RemovePathPostfixes: .glamor
Conflicts: %{name} Conflicts: %{name}
Conflicts: %{real_name}
Requires: xrdp >= 1:0.10.2
Requires: Xorg %(xserver-sdk-abi-requires videodrv 2>/dev/null) Requires: Xorg %(xserver-sdk-abi-requires videodrv 2>/dev/null)
Requires: Xorg %(xserver-sdk-abi-requires xinput 2>/dev/null) Requires: Xorg %(xserver-sdk-abi-requires xinput 2>/dev/null)
Requires: xorg-x11-server-Xorg
%endif %endif
%description %description
@ -60,11 +63,10 @@ for screen resizing and multiple monitors. Built with glamor support.
%endif %endif
%prep %prep
%autosetup -p1 %autosetup -p1 -n %{real_name}
%build %build
autoreconf -i ./bootstrap
%if 0%{?fedora} >= 35 || 0%{?rhel} >= 8 %if 0%{?fedora} >= 35 || 0%{?rhel} >= 8
# Build/install with glamor support first # Build/install with glamor support first
CFLAGS="$RPM_OPT_FLAGS -I/usr/include/libdrm" \ CFLAGS="$RPM_OPT_FLAGS -I/usr/include/libdrm" \
@ -133,50 +135,24 @@ CFLAGS="$RPM_OPT_FLAGS -I/usr/include/libdrm" \
%endif %endif
%changelog %changelog
* Sun Dec 29 2024 Bojan Smojver <bojan@rexursive.com> - 0.10.3-5 * Wed Jan 17 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.9.80-2.20240113git8519407d.inferit
- Change /usr/libexec/Xorg dependency to xorg-x11-server-Xorg - sync with upstream
* Thu Dec 26 2024 Bojan Smojver <bojan@rexursive.com> - 0.10.3-2
- Add /usr/libexec/Xorg dependency
* Mon Dec 16 2024 Bojan Smojver <bojan@rexursive.com> - 0.10.3-1
- Bump up to 0.10.3
* Fri Sep 27 2024 Sérgio Basto <sergio@serjux.com> - 0.10.2-2
- Rebuild for rebase of xorg-server to versions 21.1.x
* Wed Jul 31 2024 Bojan Smojver <bojan@rexursive.com> - 0.10.2-1
- Bump up to 0.10.2
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed May 15 2024 Bojan Smojver <bojan@rexursive.com> - 0.10.1-1
- Bump up to 0.10.1
* Tue May 14 2024 Bojan Smojver <bojan@rexursive.com> - 0.10.0-4
- Rebuild against xrdp 0.10.0
* Wed Apr 03 2024 Bojan Smojver <bojan@rexursive.com> - 0.10.0-2
- Rebuild against xrdp 0.10.0-beta.2
* Tue Mar 12 2024 Bojan Smojver <bojan@rexursive.com> - 0.9.20-1
- Bump up to 0.9.20
* Mon Mar 11 2024 Bojan Smojver <bojan@rexursive.com> - 0.10.0-1 * Fri Jan 12 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.9.80-2.20240108gitf95a8b20
- Update to 0.10.0 - Build Development version with EGFX support from gfx_mainline_merge_work
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.19-8 * Wed Dec 20 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.9.80-2.20230830gitf5103aa4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - Apply lrandr patch
* Wed Jul 26 2023 Bojan Smojver <bojan@rexursive.com> - 0.9.19-7 * Tue Dec 19 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.9.80-1.20230830gitf5103aa4
- run autoreconf before build, to avoid problems on F39 - Fix green screen
https://github.com/neutrinolabs/xrdp/issues/2875#issuecomment-1852489427
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.19-7 * Mon Dec 18 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.9.80-0.20230830gitf5103aa4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - Build Development version with EGFX support from gfx_mainline_merge
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.19-6 * Fri Oct 06 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 0.9.19-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - Rebuilt for MSVSphere 9.2
* Mon Nov 14 2022 Bojan Smojver <bojan@rexursive.com> - 0.9.19-5 * Mon Nov 14 2022 Bojan Smojver <bojan@rexursive.com> - 0.9.19-5
- Insert glamoregl module into xorg.conf for glamor package - Insert glamoregl module into xorg.conf for glamor package

1
sources
Unescape View File

@ -1 +0,0 @@
SHA512 (xorgxrdp-0.10.3.tar.gz) = ac09a553e151431c70fe5f1b285b5077493e360e065af1092e8e068cc9eb4c7c305a84c71cab6da0622c2003c8d70ece49b2eefa1fb1ae32f0d36de050be079b
Write Preview
Loading…
Cancel
Save