version 1:0.9.1.r0.g93c55e58-2

3 files changed, 35 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e084e2da7bfa..19793df4fa71 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xrdp-git
 	pkgdesc = An open source remote desktop protocol (RDP) server - GIT version
-	pkgver = 0.8.0.r1016.gcd8b5f00
-	pkgrel = 1
+	pkgver = 0.9.1.r0.g93c55e58
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/neutrinolabs/xrdp
 	install = xrdp-git.install
@@ -9,21 +9,20 @@ pkgbase = xrdp-git
 	arch = x86_64
 	arch = armv6h
 	license = Apache
-	makedepends = libpulse
-	makedepends = fuse
 	makedepends = git
 	depends = tigervnc
 	depends = libxrandr
-	optdepends = libpulse: to use the pule audio module
-	optdepends = fuse: to use the file clipboard module
-	provides = xrdp=0.8.0
+	depends = lame
+	depends = opus
+	depends = fuse
+	provides = xrdp=0.9.1
 	conflicts = xrdp
 	backup = etc/xrdp/sesman.ini
 	backup = etc/xrdp/xrdp.ini
-	source = xrdp-git::git+https://github.com/neutrinolabs/xrdp.git
+	source = xrdp-git::git+https://github.com/neutrinolabs/xrdp.git#branch=master
 	source = arch-config.diff
 	md5sums = SKIP
-	md5sums = 6f938957f4b0ec3993258cdfa17b4621
+	md5sums = cca1a944ca04e33987b60eb7278d4d8f
 
 pkgname = xrdp-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 383ddcb24260..ca49c1ae47bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,28 @@
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 # Contributor: Tau Tsao <realturner at gmail.com>
 pkgname=xrdp-git
-pkgver=0.8.0.r1016.gcd8b5f00
-pkgrel=1
+pkgver=0.9.1.r0.g93c55e58
+pkgrel=2
 epoch=1
 pkgdesc="An open source remote desktop protocol (RDP) server - GIT version"
 url="https://github.com/neutrinolabs/xrdp"
 arch=('i686' 'x86_64' 'armv6h')
 license=('Apache')
-makedepends=('libpulse' 'fuse' 'git')
-depends=('tigervnc' 'libxrandr')
-optdepends=('libpulse: to use the pule audio module'
-            'fuse: to use the file clipboard module')
+makedepends=('git')
+depends=('tigervnc' 'libxrandr' 'lame' 'opus' 'fuse')
 conflicts=('xrdp')
-provides=('xrdp=0.8.0')
+provides=('xrdp=0.9.1')
 backup=('etc/xrdp/sesman.ini' 'etc/xrdp/xrdp.ini')
-install=xrdp-git.install
-source=("$pkgname::git+https://github.com/neutrinolabs/xrdp.git"
+install="${pkgname}.install"
+source=("$pkgname::git+https://github.com/neutrinolabs/xrdp.git#branch=master"
         "arch-config.diff")
 md5sums=('SKIP'
-         '6f938957f4b0ec3993258cdfa17b4621')
+         'cca1a944ca04e33987b60eb7278d4d8f')
 
 pkgver() {
   cd $pkgname
-  printf "0.8.0.r%s.g%s" "$(git rev-list --count v0.8.0..HEAD)" "$(git rev-parse --short HEAD)"
+  git describe --tags --long|sed -E 's,^[^0-9]*,,;s,([0-9]*-g),r\1,;s,-,.,g'
+
 }
 
 prepare() {
@@ -40,10 +39,12 @@ build() {
               --sbindir=/usr/bin \
               --with-systemdsystemdunitdir=/usr/lib/systemd/system \
               --enable-jpeg \
-              --enable-simplesound \
+              --enable-tjpeg \
               --enable-fuse \
-              --enable-loadpulsemodules
-  make
+	      --enable-opus \
+	      --enable-mp3lame \
+	      --enable-pixman
+  make V=0
 }
 
 package() {
diff --git a/arch-config.diff b/arch-config.diff
index 8bc8e9d6bb04..d55120226eb9 100644
--- a/arch-config.diff
+++ b/arch-config.diff
@@ -1,6 +1,6 @@
-diff -up src/xrdp-git/instfiles/xrdp.service.orig src/xrdp-git/instfiles/xrdp.service
---- src/xrdp-git/instfiles/xrdp.service.orig	2015-12-04 06:23:12.000000000 -0700
-+++ src/xrdp-git/instfiles/xrdp.service	2015-12-04 06:28:25.000000000 -0700
+diff -up src/xrdp-devel-git/instfiles/xrdp.service.orig src/xrdp-devel-git/instfiles/xrdp.service
+--- src/xrdp-devel-git/instfiles/xrdp.service.orig	2017-01-04 17:08:45.000000000 -0700
++++ src/xrdp-devel-git/instfiles/xrdp.service	2017-01-04 17:08:48.000000000 -0700
 @@ -6,10 +6,8 @@ After=syslog.target network.target xrdp-
  [Service]
  Type=forking
@@ -14,9 +14,9 @@ diff -up src/xrdp-git/instfiles/xrdp.service.orig src/xrdp-git/instfiles/xrdp.se
  
  [Install]
  WantedBy=multi-user.target
-diff -up src/xrdp-git/instfiles/xrdp-sesman.service.orig src/xrdp-git/instfiles/xrdp-sesman.service
---- src/xrdp-git/instfiles/xrdp-sesman.service.orig	2015-12-04 06:23:12.000000000 -0700
-+++ src/xrdp-git/instfiles/xrdp-sesman.service	2015-12-04 06:28:19.000000000 -0700
+diff -up src/xrdp-devel-git/instfiles/xrdp-sesman.service.orig src/xrdp-devel-git/instfiles/xrdp-sesman.service
+--- src/xrdp-devel-git/instfiles/xrdp-sesman.service.orig	2017-01-04 17:08:45.000000000 -0700
++++ src/xrdp-devel-git/instfiles/xrdp-sesman.service	2017-01-04 17:08:48.000000000 -0700
 @@ -7,10 +7,8 @@ BindTo=xrdp.service
  [Service]
  Type=forking
@@ -30,9 +30,9 @@ diff -up src/xrdp-git/instfiles/xrdp-sesman.service.orig src/xrdp-git/instfiles/
  
  [Install]
  WantedBy=multi-user.target
-diff -up src/xrdp-git/instfiles/xrdp.sh.orig src/xrdp-git/instfiles/xrdp.sh
---- src/xrdp-git/instfiles/xrdp.sh.orig	2015-12-04 06:23:08.000000000 -0700
-+++ src/xrdp-git/instfiles/xrdp.sh	2015-12-04 06:23:12.000000000 -0700
+diff -up src/xrdp-devel-git/instfiles/xrdp.sh.orig src/xrdp-devel-git/instfiles/xrdp.sh
+--- src/xrdp-devel-git/instfiles/xrdp.sh.orig	2017-01-04 17:08:45.000000000 -0700
++++ src/xrdp-devel-git/instfiles/xrdp.sh	2017-01-04 17:10:02.000000000 -0700
 @@ -17,7 +17,7 @@
  # Description: starts xrdp
  ### END INIT INFO
@@ -42,9 +42,9 @@ diff -up src/xrdp-git/instfiles/xrdp.sh.orig src/xrdp-git/instfiles/xrdp.sh
  LOG=/dev/null
  CFGDIR=/etc/xrdp
  
-diff -up src/xrdp-git/sesman/startwm.sh.orig src/xrdp-git/sesman/startwm.sh
---- src/xrdp-git/sesman/startwm.sh.orig	2015-12-04 06:23:09.000000000 -0700
-+++ src/xrdp-git/sesman/startwm.sh	2015-12-04 06:23:12.000000000 -0700
+diff -up src/xrdp-devel-git/sesman/startwm.sh.orig src/xrdp-devel-git/sesman/startwm.sh
+--- src/xrdp-devel-git/sesman/startwm.sh.orig	2017-01-04 17:08:46.000000000 -0700
++++ src/xrdp-devel-git/sesman/startwm.sh	2017-01-04 17:08:48.000000000 -0700
 @@ -8,6 +8,17 @@ wm_start()
      export LANG LANGUAGE
    fi