Merge branch 'master' into epel8

.gitignore

@@ -12,3 +12,4 @@
 /xorgxrdp-0.2.11.tar.gz
 /xorgxrdp-0.2.12.tar.gz
 /xorgxrdp-0.2.13.tar.gz
+/xorgxrdp-0.2.14.tar.gz

sources

@@ -1 +1 @@
-SHA512 (xorgxrdp-0.2.13.tar.gz) = 1f0f6982917b4cd18660ab950a0f04ba962643a71fc2a7d7caeb3c30a6cd37ecb6e757efce3571c6c12f928eddb4e3311080a65f9074c7719980d3d7a6201185
+SHA512 (xorgxrdp-0.2.14.tar.gz) = 9abe7e831215f8922e244da8fdc8b61a2ac1c45ea454419b9176b333d8fc1def866ff5f7121c5d73c0581d3d42bc2225ffeef6f779959e277419ddf9beb5704f

xorgxrdp-0.2.12-xrandr-resize-revert.patch

@@ -1,48 +0,0 @@
---- b/module/rdp.h
-+++ a/module/rdp.h
-@@ -270,7 +270,6 @@
-     RROutputGetPropertyProcPtr rrOutputGetProperty;
-     RRGetPanningProcPtr rrGetPanning;
-     RRSetPanningProcPtr rrSetPanning;
--    int allow_screen_resize;
- 
-     int listen_sck;
-     char uds_data[256];
---- b/module/rdpClientCon.c
-+++ a/module/rdpClientCon.c
-@@ -746,9 +746,7 @@
- 
-     if ((dev->width != width) || (dev->height != height))
-     {
--        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);
-     }
---- b/module/rdpRandR.c
-+++ a/module/rdpRandR.c
-@@ -127,11 +127,6 @@
-     LLOGLN(0, ("rdpRRScreenSetSize: width %d height %d mmWidth %d mmHeight %d",
-            width, height, (int)mmWidth, (int)mmHeight));
-     dev = rdpGetDevFromScreen(pScreen);
--    if (dev->allow_screen_resize == 0)
--    {
--        LLOGLN(0, ("rdpRRScreenSetSize: not allowing resize"));
--        return FALSE;
--    }
-     root = rdpGetRootWindowPtr(pScreen);
-     if ((width < 1) || (height < 1))
-     {
---- b/xrdpdev/xrdpdev.c
-+++ a/xrdpdev/xrdpdev.c
-@@ -359,9 +359,7 @@
-     if ((dev->width != width) || (dev->height != height))
-     {
-         LLOGLN(0, ("  calling RRScreenSizeSet"));
--        dev->allow_screen_resize = 1;
-         ok = RRScreenSizeSet(dev->pScreen, width, height, mmwidth, mmheight);
--        dev->allow_screen_resize = 0;
-         LLOGLN(0, ("  RRScreenSizeSet ok %d", ok));
-     }
-     return ok;

xorgxrdp.spec

@@ -1,14 +1,15 @@
 %global xorg_server_version %(pkg-config --silence-errors --modversion xorg-server 2>/dev/null || echo 65536)
 
 Name:           xorgxrdp
-Version:        0.2.13
-Release:        2%{?dist}
+Version:        0.2.14
+Release:        1%{?dist}
 Summary:        Implementation of xrdp backend as Xorg modules
 
 License:        MIT
 URL:            https://github.com/neutrinolabs/xorgxrdp
 Source0:        https://github.com/neutrinolabs/xorgxrdp/releases/download/v%{version}/%{name}-%{version}.tar.gz
-Patch0:         xorgxrdp-0.2.12-xrandr-resize-revert.patch
+
+ExcludeArch: s390x
 
 BuildRequires:  nasm
 BuildRequires:  xorg-x11-server-devel
@@ -56,6 +57,19 @@ for screen resizing and multiple monitors.
 
 
 %changelog
+* Tue Sep  1 2020 Bojan Smojver <bojan@rexursive.com> - 0.2.14-1
+- Bump up to 0.2.14
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.13-4
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Apr 16 2020 Bojan Smojver <bojan@rexursive.com> - 0.2.13-2
+- Rebuild against Xorg 1.20.8
+
 * Tue Jun 16 2020 Bojan Smojver <bojan@rexursive.com> - 0.2.13-2
 - Rebuild against Xorg 1.20.6