floppym 15/01/23 01:50:19 Modified: freerdp-1.2.0_beta1_pre20141115.ebuild freerdp-9999.1.ebuild ChangeLog Log: Add patch from upstream for cmake-3.1 compatibility, bug 537022. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path 1.5 net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild?r1=1.4&r2=1.5 Index: freerdp-1.2.0_beta1_pre20141115.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- freerdp-1.2.0_beta1_pre20141115.ebuild 23 Jan 2015 00:34:07 -0000 1.4 +++ freerdp-1.2.0_beta1_pre20141115.ebuild 23 Jan 2015 01:50:19 -0000 1.5 @@ -1,6 +1,6 @@ # 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.4 2015/01/23 00:34:07 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild,v 1.5 2015/01/23 01:50:19 floppym Exp $ EAPI="5" @@ -64,6 +64,7 @@ ) ) smartcard? ( sys-apps/pcsc-lite ) + wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libxkbfile @@ -78,10 +79,7 @@ " DOCS=( README ) - -src_prepare() { - sed -i -e 's/list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)//' channels/client/CMakeLists.txt || die -} +PATCHES=( "${FILESDIR}/freerdp-cmake-3.1.patch" ) src_configure() { local mycmakeargs=( @@ -103,7 +101,6 @@ $(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 } 1.23 net-misc/freerdp/freerdp-9999.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/freerdp/freerdp-9999.1.ebuild?rev=1.23&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/freerdp/freerdp-9999.1.ebuild?rev=1.23&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/freerdp/freerdp-9999.1.ebuild?r1=1.22&r2=1.23 Index: freerdp-9999.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-9999.1.ebuild,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- freerdp-9999.1.ebuild 26 Nov 2014 01:00:24 -0000 1.22 +++ freerdp-9999.1.ebuild 23 Jan 2015 01:50:19 -0000 1.23 @@ -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-9999.1.ebuild,v 1.22 2014/11/26 01:00:24 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-9999.1.ebuild,v 1.23 2015/01/23 01:50:19 floppym Exp $ EAPI="5" @@ -23,7 +23,7 @@ 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 @@ -64,6 +64,7 @@ ) ) smartcard? ( sys-apps/pcsc-lite ) + wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libxkbfile @@ -98,6 +99,7 @@ $(cmake-utils_use_with xinerama XINERAMA) $(cmake-utils_use_with xv XV) $(cmake-utils_use_build test TESTING) + $(cmake-utils_use_with wayland WAYLAND) ) cmake-utils_src_configure } 1.82 net-misc/freerdp/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/freerdp/ChangeLog?rev=1.82&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/freerdp/ChangeLog?rev=1.82&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/freerdp/ChangeLog?r1=1.81&r2=1.82 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- ChangeLog 23 Jan 2015 00:34:07 -0000 1.81 +++ ChangeLog 23 Jan 2015 01:50:19 -0000 1.82 @@ -1,6 +1,10 @@ # ChangeLog for net-misc/freerdp # 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 $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.82 2015/01/23 01:50:19 floppym Exp $ + + 23 Jan 2015; Mike Gilbert <flop...@gentoo.org> +files/freerdp-cmake-3.1.patch, + freerdp-1.2.0_beta1_pre20141115.ebuild, freerdp-9999.1.ebuild: + Add patch from upstream for cmake-3.1 compatibility, bug 537022. 23 Jan 2015; Patrick Lauer <patr...@gentoo.org> freerdp-1.2.0_beta1_pre20141115.ebuild: