diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2015-01-23 00:34:07 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2015-01-23 00:34:07 +0000 |
| commit | 3c39ffc802cdc7b829bb792effd3efb526c6c0b6 (patch) | |
| tree | acf53ad55400c93ea860afc2f5df28052ab3f38e /net-misc/freerdp | |
| parent | Proxy commit for Johan Bergström. Version bump. Add him as proxied maintainer. (diff) | |
| download | gentoo-2-3c39ffc802cdc7b829bb792effd3efb526c6c0b6.tar.gz gentoo-2-3c39ffc802cdc7b829bb792effd3efb526c6c0b6.tar.bz2 gentoo-2-3c39ffc802cdc7b829bb792effd3efb526c6c0b6.zip | |
Make CMake fail less, add wayland useflag to avoid broken autodetection etc, #537022
(Portage version: 2.2.15/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-misc/freerdp')
| -rw-r--r-- | net-misc/freerdp/ChangeLog | 9 | ||||
| -rw-r--r-- | net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild | 12 |
2 files changed, 16 insertions, 5 deletions
diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog index 8a18dcea5e3b..2ea04f98952a 100644 --- a/net-misc/freerdp/ChangeLog +++ b/net-misc/freerdp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/freerdp -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.80 2014/11/26 01:00:24 floppym Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.81 2015/01/23 00:34:07 patrick Exp $ + + 23 Jan 2015; Patrick Lauer <patrick@gentoo.org> + freerdp-1.2.0_beta1_pre20141115.ebuild: + Make CMake fail less, add wayland useflag to avoid broken autodetection etc, + #537022 26 Nov 2014; Mike Gilbert <floppym@gentoo.org> freerdp-1.2.0_beta1_pre20141115.ebuild, freerdp-9999.1.ebuild: diff --git a/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild b/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild index 21b879e0588d..31bc17aac891 100644 --- a/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild +++ b/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild,v 1.3 2014/11/26 01:00:24 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild,v 1.4 2015/01/23 00:34:07 patrick Exp $ EAPI="5" @@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/" LICENSE="Apache-2.0" SLOT="0/1.2" IUSE="alsa +client cups debug doc ffmpeg gstreamer jpeg - pulseaudio server smartcard sse2 test usb X xinerama xv" + pulseaudio server smartcard sse2 test usb wayland X xinerama xv" RDEPEND=" dev-libs/openssl @@ -79,6 +79,10 @@ DEPEND="${RDEPEND} DOCS=( README ) +src_prepare() { + sed -i -e 's/list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)//' channels/client/CMakeLists.txt || die +} + src_configure() { local mycmakeargs=( $(cmake-utils_use_with alsa ALSA) @@ -98,6 +102,8 @@ src_configure() { $(cmake-utils_use_with xinerama XINERAMA) $(cmake-utils_use_with xv XV) $(cmake-utils_use_build test TESTING) + $(cmake-utils_use_with wayland WAYLAND) + -DWITH_XKBFILE=OFF ) cmake-utils_src_configure } |