From d970f0c8379bf0fdcae34c3ee161d74cf7f60eef Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Thu, 25 Jan 2018 07:14:55 +0100
Subject: pcr/xpra: updated to 2.2.1

---
 pcr/xpra/PKGBUILD | 80 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 30 deletions(-)

diff --git a/pcr/xpra/PKGBUILD b/pcr/xpra/PKGBUILD
index f77391b92..17f437954 100644
--- a/pcr/xpra/PKGBUILD
+++ b/pcr/xpra/PKGBUILD
@@ -1,40 +1,60 @@
+# Contributor (AUR): Bug <bug2000@gmail.com>
+# Maintainer (AUR): Bug <bug2000@gmail.com>
 # Maintainer: Márcio Silva <coadde@hyperbola.info>
 
+# parabola changes and rationale:
+#  no changes.
+
 pkgname=xpra
-pkgver=0.17.6
-pkgrel=1
-pkgdesc='multi-platform X11 screen and application forwarding system'
+pkgver=2.2.1
+pkgrel=2
+pkgdesc="multi-platform screen and application forwarding system screen for X11"
 arch=('i686' 'x86_64' 'armv7h')
+url='http://xpra.org/'
 license=('GPL2')
-url="https://www.$pkgname.org"
-backup=("etc/$pkgname/"{xorg,$pkgname}".conf")
-depends=('gtk3' 'ffmpeg' 'python-cairo' 'xorg-server' 'xvidcore') # 'libwebp' disabled tmp
-optdepends=('cups: CUPS (printing) support'
-            'python-lcms: LittleCMS support'
-            'python-lz4: LZ4 compression support'
-            'python-lzo: LZO compression support'
-            'python-pycups: CUPS (printing) support'
-            'python-pyopencl: OpenCL support'
-            'x11-ssh-askpass: OpenSSH passphrase dialog support'
-            'xf86-video-dummy: Xdummy support')
-makedepends=('cups' 'cython' 'lsb-release' 'python2-cairo' 'xf86-video-dummy')
-source=("$url/src/$pkgname-$pkgver.tar.xz")
-sha1sums=('9559c384531aaba051182b9a9c50dde82435fa17')
+depends=('python2' 'pygtk' 'libxtst' 'python2-pillow' 'python2-lz4'
+         'ffmpeg' 'libvpx' 'xf86-video-dummy' 'libxkbfile'
+         'python2-numpy' 'rencode' 'python2-opengl'
+         'python2-gtkglext' 'python-lz4' 'python-opengl')
+optdepends=('x264: Codec' 'python2-dbus: dbus features'
+            'python2-pycups: Printing support' 'python2-netifaces: mdns'
+            'python2-cryptography: Cryptography'
+            'python-cryptography: Cryptography'
+            'pam-selinux: Proxy Server Support')
+conflicts=('xpra-winswitch')
+provides=('xpra-winswitch')
+replaces=('xpra-winswitch')
+makedepends=('python2-setuptools' 'cython2' 'uglify-js')
+backup=('etc/xpra/xpra.conf' 'etc/xpra/xorg.conf'
+#        'etc/xpra/cuda.conf' 'etc/xpra/nvenc.keys'
+        'etc/xpra/conf.d/05_features.conf'
+        'etc/xpra/conf.d/10_network.conf'
+        'etc/xpra/conf.d/12_ssl.conf'
+        'etc/xpra/conf.d/15_file_transfers.conf'
+        'etc/xpra/conf.d/16_printing.conf'
+        'etc/xpra/conf.d/20_sound.conf'
+        'etc/xpra/conf.d/30_picture.conf'
+        'etc/xpra/conf.d/35_webcam.conf'
+        'etc/xpra/conf.d/40_client.conf'
+        'etc/xpra/conf.d/42_client_keyboard.conf'
+        'etc/xpra/conf.d/50_server_network.conf'
+        'etc/xpra/conf.d/55_server_x11.conf'
+        'etc/xpra/conf.d/60_server.conf'
+        'etc/xpra/conf.d/65_proxy.conf'
+        'etc/pam.d/xpra')
+source=("https://xpra.org/src/xpra-$pkgver.tar.xz")
+sha256sums=('81e103712d1543fb85880a28e25702efe3be9175d18274cb8d8ffb20b8485c14')
 
-prepare() {
-  cd $pkgname-$pkgver
-  # remove xvid pkgconfig, due xvidcore package does not exist
-  sed -i 's|[ ]and[ ]pkg_config_ok[(]["]--exists["][,][ ]["]xvid["][)]||
-          \|xvid_pkgconfig[ ][=][ ]pkgconfig[(]["]xvid["][)]|d
-          s|[[]["]xpra/codecs/xvid/encoder[.]pyx["][,][ ]buffers_c[]][,]|["xpra/codecs/xvid/encoder.pyx", buffers_c]))|
-          \|[*][*]xvid_pkgconfig[)][)]|d
-         ' setup.py
+build() {
+  cd "${srcdir}/xpra-$pkgver"
+  export pkgdir
+  #python2 setup.py build
+  CFLAGS="$CFLAGS -fno-strict-aliasing" python2 setup.py build --without-enc_x265
 }
 
 package() {
-  cd $pkgname-$pkgver
-  CFLAGS="$CFLAGS -fno-strict-aliasing" python setup.py build install \
-    --root=$pkgdir \
-    --with-{csc_opencl,gtk_x11,server,shadow,verbose,Xdummy{,_wrapper},xvid} \
-    --without-{csc_libyuv,webp}
+  cd "${srcdir}/xpra-$pkgver"
+  python2 setup.py install --root="${pkgdir}" --without-enc_x265
+  mv "${pkgdir}"/lib/* "${pkgdir}"/usr/lib/
+  rmdir "${pkgdir}/lib"
 }
-- 
cgit v1.2.3