[arch-commits] Commit in rdesktop/trunk (PKGBUILD rdesktop-libao.patch)

[Jan Steffens]

    Date: Monday, June 27, 2011 @ 23:34:32
  Author: heftig
Revision: 129462

upgpkg: rdesktop 1.7.0-2
Fix libao segfault

Added:
  rdesktop/trunk/rdesktop-libao.patch
Modified:
  rdesktop/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   10 +++++++---
 rdesktop-libao.patch |   20 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-28 01:36:56 UTC (rev 129461)
+++ PKGBUILD	2011-06-28 03:34:32 UTC (rev 129462)
@@ -4,16 +4,17 @@
 
 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 @@
   # 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
 }

Added: rdesktop-libao.patch
===================================================================
--- rdesktop-libao.patch	                        (rev 0)
+++ rdesktop-libao.patch	2011-06-28 03:34:32 UTC (rev 129462)
@@ -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);