EAPI4, fix crash with libao and pulseaudio, thanks everyone in bug #280923

(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

3 files changed, 108 insertions, 1 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index 5c0675aec2e7..5868456d9acb 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/rdesktop
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.129 2011/04/26 12:46:05 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.130 2011/05/30 17:17:16 voyageur Exp $
+
+*rdesktop-1.7.0-r1 (30 May 2011)
+
+  30 May 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  +rdesktop-1.7.0-r1.ebuild, +files/rdesktop-1.7.0-libao_crash.patch:
+  EAPI4, fix crash with libao and pulseaudio, thanks everyone in bug #280923
 
   26 Apr 2011; Bernard Cafarelli <voyageur@gentoo.org>
   -rdesktop-1.6.0-r4.ebuild, -files/rdesktop-1.6.0+pcsc-lite-1.6.6.patch,
diff --git a/net-misc/rdesktop/files/rdesktop-1.7.0-libao_crash.patch b/net-misc/rdesktop/files/rdesktop-1.7.0-libao_crash.patch
new file mode 100644
index 000000000000..3afb9b2b0f23
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.7.0-libao_crash.patch
@@ -0,0 +1,18 @@
+--- rdpsnd_libao.c.orig	2010-11-29 14:55:31.124907038 +0100
++++ rdpsnd_libao.c	2010-11-29 14:55:51.708464083 +0100
+@@ -76,6 +76,7 @@
+ 	format.channels = 2;
+ 	format.rate = 44100;
+ 	format.byte_format = AO_FMT_NATIVE;
++	format.matrix = NULL;
+ 
+ 
+ 	o_device = ao_open_live(default_driver, &format, NULL);
+@@ -115,6 +116,7 @@
+ 	format.channels = pwfx->nChannels;
+ 	format.rate = 44100;
+ 	format.byte_format = AO_FMT_NATIVE;
++	format.matrix = NULL;
+ 
+ 	if (o_device != NULL)
+ 		ao_close(o_device);
diff --git a/net-misc/rdesktop/rdesktop-1.7.0-r1.ebuild b/net-misc/rdesktop/rdesktop-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..399732ba9344
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.7.0-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.7.0-r1.ebuild,v 1.1 2011/05/30 17:17:16 voyageur Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://rdesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa ao debug ipv6 libsamplerate oss pcsc-lite"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND=">=dev-libs/openssl-0.9.6b
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.6 )
+	libsamplerate? ( media-libs/libsamplerate )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+
+src_prepare() {
+	# Prevent automatic stripping
+	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
+	sed -i -e "s:${strip}::" Makefile.in \
+		|| die "sed failed in Makefile.in"
+
+	# Automagic dependency on libsamplerate
+	epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
+	# Fix --enable-smartcard logic
+	epatch "${FILESDIR}"/${PN}-1.6.0-smartcard_configure.patch
+	# bug #349813
+	epatch "${FILESDIR}"/${P}+pcsc-lite-1.6.6.patch
+	# bug #280923
+	epatch "${FILESDIR}"/${P}-libao_crash.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	if use ao; then
+		sound_conf=$(use_with ao sound libao)
+	else if use alsa; then
+			sound_conf=$(use_with alsa sound alsa)
+		else
+			sound_conf=$(use_with oss sound oss)
+		fi
+	fi
+
+	econf \
+		--with-openssl=/usr \
+		$(use_with debug) \
+		$(use_with ipv6) \
+		$(use_with libsamplerate) \
+		$(use_enable pcsc-lite smartcard) \
+		${sound_conf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/HACKING doc/TODO doc/keymapping.txt
+
+	# For #180313 - applies to versions >= 1.5.0
+	# Fixes sf.net bug
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1725634&group_id=24366&atid=381349
+	# check for next version to see if this needs to be removed
+	insinto /usr/share/rdesktop/keymaps
+	newins "${FILESDIR}/rdesktop-keymap-additional" additional
+	newins "${FILESDIR}/rdesktop-keymap-cs" cs
+	newins "${FILESDIR}/rdesktop-keymap-sk" sk
+}