From: Bernard Cafarelli Date: Tue, 9 Mar 2010 10:21:43 +0000 (+0000) Subject: Add support for virtualbox USB redirection, thanks Alexey Charkov in bug #300785 Package-Manager: portage-2.2_rc66/cvs/Linux x86_64 --- diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog index 988d84134ee9..0a295e8efb7a 100644 --- a/net-misc/rdesktop/ChangeLog +++ b/net-misc/rdesktop/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/rdesktop -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.113 2009/07/05 14:26:22 voyageur Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.114 2010/03/09 10:21:43 voyageur Exp $ + +*rdesktop-1.6.0-r4 (09 Mar 2010) + + 09 Mar 2010; Bernard Cafarelli + -rdesktop-1.6.0-r1.ebuild, +rdesktop-1.6.0-r4.ebuild, metadata.xml: + Add support for virtualbox USB redirection, thanks Alexey Charkov + in bug #300785 *rdesktop-1.6.0-r3 (05 Jul 2009) diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest index 16416a69170b..bdedeb59b54f 100644 --- a/net-misc/rdesktop/Manifest +++ b/net-misc/rdesktop/Manifest @@ -3,9 +3,10 @@ AUX rdesktop-1.6.0-sound_configure.patch 799 RMD160 1c44e9b87505454c2e5b135b3632 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.6.0-rdpusb.patch.bz2 20547 RMD160 a6a33432e8bc0cc2cb09bc5d5d650f534eebc690 SHA1 e67308ab1e94a2239d885b944290836074b4d094 SHA256 c090acd39e02bebfa5d3045ec661939db3df5a0d66c3124a0e1109e5bb143a3b DIST rdesktop-1.6.0.tar.gz 284728 RMD160 cf604cd1bc0707b485deb653efa3e47e21fabc4c SHA1 b8bfd03d4640d285a0aee5b3fb199a47cb4225f2 SHA256 35026eaa8e14ca8bd0ba3730926f14222f8452f2ac662623bbf1909d8b060979 -EBUILD rdesktop-1.6.0-r1.ebuild 1860 RMD160 69380ecb6e43e40d7928621d04a14a2510e2fd2d SHA1 89be7e22b0c14f6a73febbb1c69b54e0ebc1e735 SHA256 2a327df8e05fc4190f301ca2060962c8a8cf05b1fcf63b64d662764a740ee30c EBUILD rdesktop-1.6.0-r3.ebuild 2210 RMD160 a880280606855b1945282e7be60ddd3814cadbd2 SHA1 45d8061022da5e3bd2fb341975e36eca94a4a7c4 SHA256 5d41443b192cec7f9d17706aaec354a215bf026614fc2d98ccaba7ccf1da6da5 +EBUILD rdesktop-1.6.0-r4.ebuild 2365 RMD160 9156c0a4d3505047bcb96bc4130fa0cfb9f957b2 SHA1 56c7a2553f4f476057aff79ab030487c20595adc SHA256 d5853df3dac9233075584f4f21244e70dbf8c735e33683fb2b458fa27c0b6ec6 EBUILD rdesktop-1.6.0.ebuild 1678 RMD160 587f79c6d9a6f7523395d316d4712732838b72ed SHA1 676b25d0a45cc22777fe385670cacd5a4051e299 SHA256 5b2fbaa11c63ac80657f1aed9f9b1d36d90bb0258ed0208cd417b7bfe4f33119 -MISC ChangeLog 15487 RMD160 fef0bb209b893496be937edd9c2e24b8a99feffa SHA1 a28a02fb031886623f9046d11cac620079f71e6c SHA256 e1b3cfeb081b6701ec6d096e38b1f9c51bdb9627d0f5417c9e4adf8dd6bf9ae5 -MISC metadata.xml 654 RMD160 3358277015ae7939b914ec3144883fe06a6aa2fe SHA1 b852f2e394bae44d5d43cd5d2a1c628194190290 SHA256 33cb4ce401a8e00daed5410b9514fd4d55abdda7e92c6f387c2a43b03965a895 +MISC ChangeLog 15752 RMD160 b7a8d0caeb45cb1cb398a841f61acd7980962d51 SHA1 b26578377b4dc52f723209b355379770a19033f6 SHA256 e8cf0f16d14fbf45a8660edc95752a48420a4df77dd7091db547c923d23280b2 +MISC metadata.xml 778 RMD160 309d776677ddd6688597175f76b5d2ee42ffb81b SHA1 a80d6d83c7b1bc8662f076ba14f0f28f49d05c58 SHA256 e146ff3079693d17c8602d895b0a85f0b857a722c99f8477706a927f21962a0b diff --git a/net-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml index 22806ae5f494..8157f237fb48 100644 --- a/net-misc/rdesktop/metadata.xml +++ b/net-misc/rdesktop/metadata.xml @@ -10,6 +10,7 @@ An open source client for Windows NT Terminal Server and Windows 2000/2003 Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's NT desktop. Unlike Citrix ICA, no server extensions are required. - Enable smartcard support with pcsc-lite driver + Enable smartcard support with sys-apps/pcsc-lite driver + Enable USB redirection support for app-emulation/virtualbox-bin diff --git a/net-misc/rdesktop/rdesktop-1.6.0-r1.ebuild b/net-misc/rdesktop/rdesktop-1.6.0-r4.ebuild similarity index 61% rename from net-misc/rdesktop/rdesktop-1.6.0-r1.ebuild rename to net-misc/rdesktop/rdesktop-1.6.0-r4.ebuild index 1bc8f472b677..d866eb04f73b 100644 --- a/net-misc/rdesktop/rdesktop-1.6.0-r1.ebuild +++ b/net-misc/rdesktop/rdesktop-1.6.0-r4.ebuild @@ -1,19 +1,22 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.6.0-r1.ebuild,v 1.1 2008/05/21 14:13:19 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.6.0-r4.ebuild,v 1.1 2010/03/09 10:21:43 voyageur Exp $ -inherit eutils +EAPI=2 + +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" +SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz + rdpusb? ( mirror://gentoo/${P}-rdpusb.patch.bz2 )" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="ao debug ipv6 oss pcsc-lite" +IUSE="alsa ao debug ipv6 libsamplerate oss pcsc-lite rdpusb" S=${WORKDIR}/${PN}-${MY_PV} @@ -22,37 +25,47 @@ RDEPEND=">=dev-libs/openssl-0.9.6b 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 )" DEPEND="${RDEPEND} x11-libs/libXt" -src_unpack() { - unpack ${A} - cd "${S}" - +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}"/${P}-sound_configure.patch + # Fix --enable-smartcard logic + epatch "${FILESDIR}"/${P}-smartcard_configure.patch + # USB redirection support from virtualbox + use rdpusb && epatch "${WORKDIR}"/${P}-rdpusb.patch + + eautoreconf } -src_compile() { - if use oss; then - extra_conf=$(use_with oss sound) - else - extra_conf=$(use_with ao sound libao) +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) \ - ${extra_conf} \ + ${sound_conf} \ || die "configuration failed" - - emake || die "compilation failed" } src_install() {