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

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 114 insertions, 5 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/Manifest b/net-misc/rdesktop/Manifest
index 2cd867c29978..9b4da5d430df 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -4,17 +4,19 @@ Hash: SHA256
 AUX rdesktop-1.6.0-smartcard_configure.patch 616 RMD160 1d5a67fd22426fbe2167cb8c7b4812590b7615d5 SHA1 7071e6ae1de7a8b6d9431288765bb20dd26ac2ef SHA256 04130d39c0472eda28600fd24592cf46ca0c222ef6c40d3bdd141670e388f365
 AUX rdesktop-1.6.0-sound_configure.patch 799 RMD160 1c44e9b87505454c2e5b135b36328a38c45e9dd7 SHA1 00a78abf151f7aa280b282fc0607550149bf3d6b SHA256 71db62d88e3c3bf5cbfceeddeb33958b2f24980ab3d7734511f13fd48a43e119
 AUX rdesktop-1.7.0+pcsc-lite-1.6.6.patch 2085 RMD160 ea2485799f6427718ee75ef05bb816607c03f6b0 SHA1 3ef24d8aa57552228f0ebecd893948c46159751d SHA256 afd117fd0f8f266cc15ea19561493ade8fac44b9199a8f46eee7366eeae41c1a
+AUX rdesktop-1.7.0-libao_crash.patch 494 RMD160 54cdb1aa011873e621d328773033be0f59e5cd11 SHA1 4c7c753b481c4d4f8e69073f9d1a2539e6dd34d0 SHA256 0366402ca2319059d658004834d2189e38b89676bef654238439d0ed1b90c3cb
 AUX rdesktop-keymap-additional 1568 RMD160 002873aa8c51fd8bb16357a57d90148c9a64c130 SHA1 6b84deeee4fc368459fcee897f90328be1f3c1db SHA256 3642f38bff8902fa1b5093001ce8e076dcfeddf906b745173dec4ce61da42196
 AUX rdesktop-keymap-cs 1536 RMD160 bd529b2b5f4adffd4f6914d6067ac23b0edb30da SHA1 d6cdae7769e22fbdf5cc13c4ef447e6ffe5def15 SHA256 91bd229fdb7fb1f0d9e6d0dcf35a429a2c51afa1fb8e2b3414852dc528218b6e
 AUX rdesktop-keymap-sk 1561 RMD160 0f8378b6eadd549ef735d92887d1c51003bbfbdf SHA1 117cf53e7c914f698cdd6cb77881bf2e580afbf4 SHA256 33024ca566d97b5c041d3ca45634d3baa075b456389140bd5991e3927fd37b07
 DIST rdesktop-1.7.0.tar.gz 297239 RMD160 0860d3027b19ebb3b5c9ef91d7c6ba47b730e2f1 SHA1 4f21a8fb2379ce05859e7fb13efa60071125d27f SHA256 3be0420d7f35887ec0f03d3b69b19017b2d4ffaec42261a355b66a50f7b75074
+EBUILD rdesktop-1.7.0-r1.ebuild 2294 RMD160 b8f8f4005b5393953cd02538c3c657e38b4dc130 SHA1 38723532cbb4c5e9452126b209fcc4421edc5b05 SHA256 47bb99e6cf207cb648b4d705c0ec714d8c1ba3bfb0b04f94b5c72c5590e2d94e
 EBUILD rdesktop-1.7.0.ebuild 2288 RMD160 05e1053a9f7f8f7fe5eee36fbd6cfe6b998dea34 SHA1 2e2dfa330390d37c879e709f7cf9eea7c3403c95 SHA256 3cf5fac1f9e6f09d6139dfdd5f15fae2191a9c099e72845c1e716e982b1597f6
-MISC ChangeLog 17793 RMD160 f1e956e622f80f9c8d46ea93afa8e1fbb403ac4f SHA1 5f6c580a64755f1f72e50cd0cc666e47c9bcd017 SHA256 3794aa69b11ab2e845b11db9a2cbf403b007610051f94a7853871d6eaac3ef19
+MISC ChangeLog 18030 RMD160 f2e84ed72af3569e47c0993bb4efbbf172e9cc94 SHA1 7590868b84c50c98c22ec11be11acf0728e44fcc SHA256 9c3b43480919558e42a08ec521a66d89d6bd6c9c57e3976373f1c3dac8c3a2e4
 MISC metadata.xml 673 RMD160 fb0202bc00361ddc0d8c8d41a8dc64292ef64bb4 SHA1 d81c6c9c0057b0603c0dce26f290bbe9fbae6e5d SHA256 3a52a75a54e0548b85e4d18d0a3e6eb4ff877b37e4ca2bf5a128ed89abcdce0b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF0EAREIAAYFAk22vpcACgkQFYEBGcdFJfJKKwD9HFqtq9MO+N/0lF+4u4cs7vAf
-NnkBSOupt1mLen/NPqcA9AhezAYLAtHkYVV5ZJ8B9OWBSM36HSao0RuLFY5iFog=
-=uxa5
+iF4EAREIAAYFAk3j0SYACgkQFYEBGcdFJfKO8wD+MR03EE4pisE5YSs3VajGfBU4
+/HQD4M3qzwGwl5J1tScA/j8/phjd+5ML6e9y9FrhqyAxeT5wTflK/1ufL87/FxBP
+=PJ4r
 -----END PGP SIGNATURE-----
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
+}