xpra*: update pkg

2 files changed, 30 insertions, 24 deletions

diff --git a/pcr/xpra-gtk2/PKGBUILD b/pcr/xpra-gtk2/PKGBUILD
index affeee821..f7d1e04c3 100644
--- a/pcr/xpra-gtk2/PKGBUILD
+++ b/pcr/xpra-gtk2/PKGBUILD
@@ -2,14 +2,14 @@
 
 _pkgname=xpra
 pkgname=$_pkgname-gtk2
-pkgver=0.17.1
-pkgrel=2
+pkgver=0.17.6
+pkgrel=1
 pkgdesc='multi-platform X11 screen and application forwarding system'
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL2')
 url="https://www.$_pkgname.org"
 backup=("etc/$_pkgname/"{xorg,$_pkgname}".conf")
-depends=('pygtk' 'ffmpeg' 'python2-cairo' 'xorg-server') # 'xvidcore': needs similar to support xvid
+depends=('pygtk' 'ffmpeg' 'python2-cairo' 'xorg-server' 'xvidcore') # 'libwebp' disabled tmp
 optdepends=('cups: CUPS (printing) support'
             'python2-lcms: LittleCMS support'
             'python2-lz4: LZ4 compression support'
@@ -21,19 +21,22 @@ optdepends=('cups: CUPS (printing) support'
 makedepends=('cups' 'cython2' 'lsb-release' 'xf86-video-dummy')
 conflicts=("$_pkgname")
 source=("$url/src/$_pkgname-$pkgver.tar.xz")
-sha1sums=('9303e0ca5d60e5f9d5497b1012ce7829dc642dec')
+sha1sums=('9559c384531aaba051182b9a9c50dde82435fa17')
 
-build () {
+prepare() {
   cd $_pkgname-$pkgver
-  CFLAGS="$CFLAGS -fno-strict-aliasing" python2 setup.py build \
-    --with-{csc_opencl,gtk_x11,server,shadow,verbose,Xdummy{,_wrapper}} --without-{csc_libyuv,xvid}
-  cd rencode
-  python2 setup.py build
+  # 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
 }
 
 package() {
   cd $_pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-  cd rencode
-  python2 setup.py install --root=$pkgdir
+  CFLAGS="$CFLAGS -fno-strict-aliasing" python2 setup.py build install \
+    --root=$pkgdir \
+    --with-{csc_opencl,gtk_x11,server,shadow,verbose,Xdummy{,_wrapper},xvid} \
+    --without-{csc_libyuv,webp}
 }
diff --git a/pcr/xpra/PKGBUILD b/pcr/xpra/PKGBUILD
index 5368ad390..350a4a3a5 100644
--- a/pcr/xpra/PKGBUILD
+++ b/pcr/xpra/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=xpra
-pkgver=0.17.1
-pkgrel=2
+pkgver=0.17.6
+pkgrel=1
 pkgdesc='multi-platform X11 screen and application forwarding system'
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL2')
 url="https://www.$pkgname.org"
 backup=("etc/$pkgname/"{xorg,$pkgname}".conf")
-depends=('gtk3' 'ffmpeg' 'python-cairo' 'xorg-server') # 'xvidcore': needs similar to support xvid
+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'
@@ -19,19 +19,22 @@ optdepends=('cups: CUPS (printing) support'
             'xf86-video-dummy: Xdummy support')
 makedepends=('cups' 'cython' 'lsb-release' 'python2-cairo' 'xf86-video-dummy')
 source=("$url/src/$pkgname-$pkgver.tar.xz")
-sha1sums=('9303e0ca5d60e5f9d5497b1012ce7829dc642dec')
+sha1sums=('9559c384531aaba051182b9a9c50dde82435fa17')
 
-build () {
+prepare() {
   cd $pkgname-$pkgver
-  CFLAGS="$CFLAGS -fno-strict-aliasing" python setup.py build \
-    --with-{csc_opencl,gtk_x11,server,shadow,verbose,Xdummy{,_wrapper}} --without-{csc_libyuv,xvid}
-  cd rencode
-  python setup.py build
+  # 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
 }
 
 package() {
   cd $pkgname-$pkgver
-  python setup.py install --root=$pkgdir
-  cd rencode
-  python setup.py install --root=$pkgdir
+  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}
 }