Updated to v0.9.21.1 and removed unnecessary dependencies

3 files changed, 15 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab8f0976d0f2..ad4f8aadad11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xrdp
 	pkgdesc = An open source remote desktop protocol (RDP) server
-	pkgver = 0.9.19
-	pkgrel = 2
+	pkgver = 0.9.21.1
+	pkgrel = 1
 	url = https://github.com/neutrinolabs/xrdp
 	install = xrdp.install
 	arch = i686
@@ -12,20 +12,22 @@ pkgbase = xrdp
 	license = Apache
 	checkdepends = check
 	makedepends = nasm
-	depends = tigervnc
 	depends = libxrandr
 	depends = fuse
 	depends = libfdk-aac
 	depends = ffmpeg
 	depends = imlib2
+	optdepends = tigervnc
+	optdepends = tightvnc
+	optdepends = realvnc-vnc-server
 	backup = etc/xrdp/sesman.ini
 	backup = etc/xrdp/xrdp.ini
 	backup = etc/xrdp/cert.pem
 	backup = etc/xrdp/key.pem
 	backup = etc/xrdp/startwm.sh
-	source = https://github.com/neutrinolabs/xrdp/releases/download/v0.9.19/xrdp-0.9.19.tar.gz
+	source = https://github.com/neutrinolabs/xrdp/releases/download/v0.9.21.1/xrdp-0.9.21.1.tar.gz
 	source = arch-config.diff
-	sha256sums = 94017d30e475c6d7a24f651e16791551862ae46f82d8de62385e63393f5f93d0
-	sha256sums = 28a58f9cdf8cffc29b0d7738ee6b4d1bdab7fc7361be54282a49e0fa00c57d3c
+	sha256sums = 7c6c42dce7d3201efe4481e0d388e00094bf8f15224ddad9e47b402a672e08e3
+	sha256sums = 1ea3b860870786e52c7ae0dc83c533ada7e6ef8a33f7bcf4889228337ea3dc15
 
 pkgname = xrdp
diff --git a/PKGBUILD b/PKGBUILD
index e48408e9e060..0a06a1b1f40e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,19 @@
 # Contributor: Tomasz Zok <tomasz.zok [at] gmail.com>
 # Contributor: techryda <techryda at silentdome dot com>
 # Contributor: Mathias R. <pu154r@overlinux.org>
+# Contributor: Alan Beale <the.mrabz@gmail.com>
 
 pkgname=xrdp
-pkgver=0.9.19
-pkgrel=2
+pkgver=0.9.21.1
+pkgrel=1
 pkgdesc="An open source remote desktop protocol (RDP) server"
 url="https://github.com/neutrinolabs/xrdp"
 arch=(i686 x86_64 armv6h armv7l aarch64)
 license=('Apache')
 makedepends=('nasm')
-depends=('tigervnc' 'libxrandr' 'fuse' 'libfdk-aac' 'ffmpeg' 'imlib2')
+depends=('libxrandr' 'fuse' 'libfdk-aac' 'ffmpeg' 'imlib2')
 checkdepends=('check')
+optdepends=('tigervnc' 'tightvnc' 'realvnc-vnc-server')
 backup=('etc/xrdp/sesman.ini'
 	'etc/xrdp/xrdp.ini'
 	'etc/xrdp/cert.pem'
@@ -23,8 +25,8 @@ backup=('etc/xrdp/sesman.ini'
 install="${pkgname}.install"
 source=("https://github.com/neutrinolabs/xrdp/releases/download/v${pkgver}/xrdp-${pkgver}.tar.gz"
 	"arch-config.diff")
-sha256sums=('94017d30e475c6d7a24f651e16791551862ae46f82d8de62385e63393f5f93d0'
-            '28a58f9cdf8cffc29b0d7738ee6b4d1bdab7fc7361be54282a49e0fa00c57d3c')
+sha256sums=('7c6c42dce7d3201efe4481e0d388e00094bf8f15224ddad9e47b402a672e08e3'
+            '1ea3b860870786e52c7ae0dc83c533ada7e6ef8a33f7bcf4889228337ea3dc15')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
diff --git a/arch-config.diff b/arch-config.diff
index d036f9f643fd..4f6f598f5b0b 100644
--- a/arch-config.diff
+++ b/arch-config.diff
@@ -34,18 +34,6 @@ diff -up src/xrdp-0.9.16/instfiles/xrdp-sesman.service.in.orig src/xrdp-0.9.16/i
  
  [Install]
  WantedBy=multi-user.target
-diff -up src/xrdp-0.9.16/sesman/sesman.ini.orig src/xrdp-0.9.16/sesman/sesman.ini
---- src/xrdp-0.9.16/sesman/sesman.ini.orig	2021-04-30 06:26:36.000000000 -0600
-+++ src/xrdp-0.9.16/sesman/sesman.ini	2021-05-12 17:09:30.930000000 -0600
-@@ -94,7 +94,7 @@ EnableSyslog=true
- ; CentOS 7              :  param=/usr/bin/Xorg or param=Xorg
- ; CentOS 8              :  param=/usr/libexec/Xorg
- ;
--param=Xorg
-+param=/usr/lib/Xorg
- ; Leave the rest paramaters as-is unless you understand what will happen.
- param=-config
- param=xrdp/xorg.conf
 diff -up src/xrdp-0.9.16/sesman/startwm.sh.orig src/xrdp-0.9.16/sesman/startwm.sh
 --- src/xrdp-0.9.16/sesman/startwm.sh.orig	2020-12-28 07:03:43.000000000 -0700
 +++ src/xrdp-0.9.16/sesman/startwm.sh	2021-05-12 17:06:31.690000000 -0600