update

Signed-off-by: Jat <jat@sinosky.org>

2 files changed, 7 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad018cafd483..864afac6451d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xorgxrdp-nvidia
 	pkgdesc = Xorg drivers for xrdp, with NVIDIA GPU support.
-	pkgver = 0.2.18.r46.gbf49ee1
+	pkgver = 0.2.18.r52.g7a9cd48
 	pkgrel = 1
 	url = https://github.com/neutrinolabs/xorgxrdp
 	install = xorgxrdp-nvidia.install
@@ -14,9 +14,7 @@ pkgbase = xorgxrdp-nvidia
 	provides = xorgxrdp
 	conflicts = xorgxrdp
 	options = staticlibs
-	source = git+https://github.com/neutrinolabs/xorgxrdp#branch=devel
-	source = nvidia.patch::https://github.com/neutrinolabs/xorgxrdp/pull/220.diff
+	source = git+https://github.com/jat001/xorgxrdp#branch=mainline_merge
 	sha256sums = SKIP
-	sha256sums = a378cd24bcbf0d65394175b2c06096c701c367d69662ed893d0941443c3e7965
 
 pkgname = xorgxrdp-nvidia
diff --git a/PKGBUILD b/PKGBUILD
index 2b93d2f8610b..dab9b4b60816 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname='xorgxrdp'
 pkgname="$_pkgname-nvidia"
-pkgver=0.2.18.r46.gbf49ee1
+pkgver=0.2.18.r52.g7a9cd48
 pkgrel=1
 pkgdesc='Xorg drivers for xrdp, with NVIDIA GPU support.'
 arch=('i686' 'x86_64')
@@ -13,23 +13,19 @@ conflicts=("$_pkgname")
 depends=('NVIDIA-MODULE')
 makedepends=('nasm' 'xorg-server-devel' 'xrdp-git')
 options=('staticlibs')
-source=("git+$url#branch=devel"
-        "nvidia.patch::$url/pull/220.diff")
-sha256sums=('SKIP'
-            'a378cd24bcbf0d65394175b2c06096c701c367d69662ed893d0941443c3e7965')
+source=("git+https://github.com/jat001/xorgxrdp#branch=mainline_merge")
+sha256sums=('SKIP')
 install="$pkgname.install"
 
 pkgver() {
-    cd "$srcdir/$_pkgname"
+  cd "$srcdir/$_pkgname"
 
-    git describe --long --tags | sed -E 's,^[^0-9]*,,;s,([0-9]*-g),r\1,;s,-,.,g'
+  git describe --long --tags | sed -E 's,^[^0-9]*,,;s,([0-9]*-g),r\1,;s,-,.,g'
 }
 
 prepare() {
   cd "$srcdir/$_pkgname"
 
-  patch -p1 -i"$srcdir/nvidia.patch"
-
   busid=$(nvidia-xconfig --query-gpu-info | grep -im1 busid | awk '{print $NF}')
   perl -i -pe 's/(?<=BusID ").+(?=")/'"$busid"'/' xrdpdev/xorg_nvidia.conf
 }