summaryrefslogtreecommitdiff
path: root/extra/rdesktop
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-08-10 02:21:00 -0700
committerroot <root@rshg054.dnsready.net>2013-08-10 02:21:00 -0700
commit0ade1da67addf154d93c6a6399b0a3d5a18a3336 (patch)
tree0fcd3a26d8b3c5830e46d0872701a89256e3d4f7 /extra/rdesktop
parent7978ce3c736ef00274d5956c378df572315702bd (diff)
Sat Aug 10 02:18:27 PDT 2013
Diffstat (limited to 'extra/rdesktop')
-rw-r--r--extra/rdesktop/PKGBUILD19
-rw-r--r--extra/rdesktop/rdesktop-libao.patch3
-rw-r--r--extra/rdesktop/rdesktop-send_physical_buttons.diff4
3 files changed, 14 insertions, 12 deletions
diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD
index c49dd69dd..204591f4d 100644
--- a/extra/rdesktop/PKGBUILD
+++ b/extra/rdesktop/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 176924 2013-02-02 17:56:28Z andrea $
+# $Id: PKGBUILD 192288 2013-08-09 18:43:55Z eric $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Dan McGee <dan@archlinux.org>
pkgname=rdesktop
-pkgver=1.7.1
-pkgrel=3
+pkgver=1.8.0
+pkgrel=1
pkgdesc="An open source client for Windows Remote Desktop Services"
arch=('i686' 'x86_64')
url="http://www.rdesktop.org/"
license=('GPL3')
-depends=('openssl' 'libao' 'libsamplerate' 'xorg-xrandr')
+depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch')
-md5sums=('c4b39115951c4a6d74f511c99b18fcf9'
- '880d3aeac67b901e6bf44d1323374768'
- 'bd2c9bc68bddcc2652c668753d787df7')
+md5sums=('203d662ac20b22250bbbd525a9f29f3a'
+ 'cbfb12729e7f28e497afb883cc42022b'
+ '6514f31dc879a0a66c955e4e3348c143')
-build() {
+prepare() {
cd ${pkgname}-${pkgver}
# FS#15113
@@ -25,7 +25,10 @@ build() {
# Fix libao segfault, from Fedora
patch -i "${srcdir}/rdesktop-libao.patch"
+}
+build() {
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr \
--enable-smartcard \
--with-ipv6
diff --git a/extra/rdesktop/rdesktop-libao.patch b/extra/rdesktop/rdesktop-libao.patch
index 1f3dea9ed..1dcbdddce 100644
--- a/extra/rdesktop/rdesktop-libao.patch
+++ b/extra/rdesktop/rdesktop-libao.patch
@@ -1,11 +1,10 @@
diff -up rdesktop-1.6.0/rdpsnd_libao.c.ao rdesktop-1.6.0/rdpsnd_libao.c
--- rdesktop-1.6.0/rdpsnd_libao.c.ao 2007-10-30 14:57:30.000000000 +0100
+++ rdesktop-1.6.0/rdpsnd_libao.c 2010-12-02 21:22:39.000000000 +0100
-@@ -76,7 +76,7 @@ libao_open(void)
+@@ -76,6 +76,7 @@ libao_open(void)
format.channels = 2;
format.rate = 44100;
format.byte_format = AO_FMT_NATIVE;
--
+ format.matrix = NULL;
o_device = ao_open_live(default_driver, &format, NULL);
diff --git a/extra/rdesktop/rdesktop-send_physical_buttons.diff b/extra/rdesktop/rdesktop-send_physical_buttons.diff
index 8e0f6cee7..69620988f 100644
--- a/extra/rdesktop/rdesktop-send_physical_buttons.diff
+++ b/extra/rdesktop/rdesktop-send_physical_buttons.diff
@@ -26,8 +26,8 @@ diff -u -r1.163 rdesktop.c
#endif
while ((c = getopt(argc, argv,
-- VNCOPT "Au:L:d:s:c:p:n:k:g:fbBeEmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
-+ VNCOPT "Au:L:d:s:c:p:n:k:g:fbBeEMmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
+- VNCOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
++ VNCOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitMmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
{
switch (c)
{