0.2.16

4 files changed, 26 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ae96a815f172..7d4a64616dcc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,26 @@
-pkgbase = xorgxrdp-nvidia-git
+pkgbase = xorgxrdp-nvidia
 	pkgdesc = Xorg drivers for xrdp, with NVIDIA GPU support.
-	pkgver = 0.2.15.r12.g37d8ae7
+	pkgver = 0.2.16
 	pkgrel = 1
 	url = https://github.com/neutrinolabs/xorgxrdp
-	install = xorgxrdp-nvidia-git.install
+	install = xorgxrdp-nvidia.install
 	arch = i686
 	arch = x86_64
 	license = MIT
-	makedepends = git
 	makedepends = nasm
 	makedepends = xorg-server-devel
-	makedepends = xrdp-git
+	makedepends = xrdp
 	depends = nvidia
 	provides = xorgxrdp
 	conflicts = xorgxrdp
 	options = staticlibs
-	source = git+https://github.com/Nexarian/xorgxrdp.git#branch=resize_wyhash_egfx_nvidia_features
+	source = https://github.com/neutrinolabs/xorgxrdp/releases/download/v0.2.16/xorgxrdp-0.2.16.tar.gz
+	source = https://github.com/neutrinolabs/xorgxrdp/releases/download/v0.2.16/xorgxrdp-0.2.16.tar.gz.asc
+	source = nvidia.patch::https://github.com/neutrinolabs/xorgxrdp/compare/v0.2.16...jsorg71:nvidia_hack.diff
+	validpgpkeys = 61ECEABBF2BB40E3A35DF30A9F72CDBC01BF10EB
+	sha256sums = e6b5f3df44cbf147dcbbc326cdd08c95fe28dba80c2a216e046fe42d962f9215
 	sha256sums = SKIP
+	sha256sums = 5065757020d8a2d07096ee5dc3d7998b459dd0ea172907e52ae2945338cee154
 
-pkgname = xorgxrdp-nvidia-git
+pkgname = xorgxrdp-nvidia
 
diff --git a/.gitignore b/.gitignore
index 6e912d56ae85..630babbc3038 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
 !.gitignore
 !.SRCINFO
 !PKGBUILD
-!xorgxrdp-nvidia-git.install
+!xorgxrdp-nvidia.install
 !Dockerfile
diff --git a/PKGBUILD b/PKGBUILD
index 553af1a09027..55b0a0659d2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Jat <chat@jat.email>
 
 _pkgname=xorgxrdp
-pkgname=xorgxrdp-nvidia-git
-pkgver=0.2.15.r12.g37d8ae7
+pkgname=xorgxrdp-nvidia
+pkgver=0.2.16
 pkgrel=1
 pkgdesc="Xorg drivers for xrdp, with NVIDIA GPU support."
 arch=('i686' 'x86_64')
@@ -11,20 +11,20 @@ license=('MIT')
 provides=('xorgxrdp')
 conflicts=('xorgxrdp')
 depends=('nvidia')
-makedepends=('git' 'nasm' 'xorg-server-devel' 'xrdp-git')
+makedepends=('nasm' 'xorg-server-devel' 'xrdp')
 options=('staticlibs')
-source=('git+https://github.com/Nexarian/xorgxrdp.git#branch=resize_wyhash_egfx_nvidia_features')
-sha256sums=('SKIP')
+source=("https://github.com/neutrinolabs/xorgxrdp/releases/download/v$pkgver/xorgxrdp-$pkgver.tar.gz"{,.asc}
+        "nvidia.patch::https://github.com/neutrinolabs/xorgxrdp/compare/v$pkgver...jsorg71:nvidia_hack.diff")
+sha256sums=('e6b5f3df44cbf147dcbbc326cdd08c95fe28dba80c2a216e046fe42d962f9215'
+            'SKIP'
+            '5065757020d8a2d07096ee5dc3d7998b459dd0ea172907e52ae2945338cee154')
+validpgpkeys=('61ECEABBF2BB40E3A35DF30A9F72CDBC01BF10EB')  # Koichiro IWAO <meta@vmeta.jp>
 install="$pkgname.install"
 
-pkgver() {
-    cd "$_pkgname"
-
-    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
 prepare() {
-  cd "$_pkgname"
+  cd "$_pkgname-$pkgver"
+
+  patch -p1 -i"${srcdir}/nvidia.patch"
 
   busid=$(nvidia-xconfig --query-gpu-info | grep -im1 busid | awk '{print $NF}')
   sed -i 's/Identifier "layout"/Identifier "X11 Server"/
@@ -33,15 +33,14 @@ prepare() {
 }
 
 build() {
-  cd "$_pkgname"
+  cd "$_pkgname-$pkgver"
 
-  ./bootstrap
   ./configure --prefix="/usr"
   make
 }
 
 package() {
-  cd "$_pkgname"
+  cd "$_pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
   install -Dm644 "COPYING" -t "$pkgdir/usr/share/licenses/$_pkgname"
diff --git a/xorgxrdp-nvidia-git.install b/xorgxrdp-nvidia.install
index b98ad34590ba..b98ad34590ba 100644
--- a/xorgxrdp-nvidia-git.install
+++ b/xorgxrdp-nvidia.install