From 108636e69eaeef67f4e7263c7f26105e25979e89 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 28 Jun 2011 23:10:22 +0000 Subject: Tue Jun 28 23:10:22 UTC 2011 --- extra/rdesktop/PKGBUILD | 12 ++++++++---- extra/rdesktop/rdesktop-libao.patch | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 extra/rdesktop/rdesktop-libao.patch (limited to 'extra/rdesktop') diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD index c2adab552..07f51ce8b 100644 --- a/extra/rdesktop/PKGBUILD +++ b/extra/rdesktop/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 120030 2011-04-18 14:48:32Z andrea $ +# $Id: PKGBUILD 129462 2011-06-28 03:34:32Z heftig $ # Maintainer: Andrea Scarpino # Contributor: Dan McGee pkgname=rdesktop pkgver=1.7.0 -pkgrel=1 +pkgrel=2 depends=('libx11' 'openssl' 'libao' 'libsamplerate') pkgdesc="An open source client for Windows Remote Desktop Services" url="http://www.rdesktop.org/" license=('GPL') arch=('i686' 'x86_64') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'rdesktop-send_physical_buttons.diff') + 'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch') md5sums=('77fa93b21aa38837a85e81c00e757228' - '880d3aeac67b901e6bf44d1323374768') + '880d3aeac67b901e6bf44d1323374768' + 'bd2c9bc68bddcc2652c668753d787df7') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -21,6 +22,9 @@ build() { # FS#15113 patch -i ${srcdir}/rdesktop-send_physical_buttons.diff + # Fix libao segfault, from Fedora + patch -i ${srcdir}/rdesktop-libao.patch + ./configure --prefix=/usr make } diff --git a/extra/rdesktop/rdesktop-libao.patch b/extra/rdesktop/rdesktop-libao.patch new file mode 100644 index 000000000..1f3dea9ed --- /dev/null +++ b/extra/rdesktop/rdesktop-libao.patch @@ -0,0 +1,20 @@ +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) + format.channels = 2; + format.rate = 44100; + format.byte_format = AO_FMT_NATIVE; +- ++ format.matrix = NULL; + + o_device = ao_open_live(default_driver, &format, NULL); + if (o_device == NULL) +@@ -115,6 +115,7 @@ libao_set_format(RD_WAVEFORMATEX * pwfx) + format.channels = pwfx->nChannels; + format.rate = 44100; + format.byte_format = AO_FMT_NATIVE; ++ format.matrix = NULL; + + if (o_device != NULL) + ao_close(o_device); -- cgit v1.2.3-54-g00ecf