[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/

[Julian Ospald]

commit:     32fd4ff79b5f67597169d638ddcdb69d3b0b173a
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  5 14:24:57 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Mon Oct  5 14:28:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32fd4ff7

net-misc/freerdp: add libressl support

 ...erdp-9999.1.ebuild => freerdp-1.2.1_pre20150326-r1.ebuild} | 11 +++++++----
 net-misc/freerdp/freerdp-9999.1.ebuild                        |  5 +++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/net-misc/freerdp/freerdp-9999.1.ebuild 
b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
similarity index 88%
copy from net-misc/freerdp/freerdp-9999.1.ebuild
copy to net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
index 131105e..0ea2daf 100644
--- a/net-misc/freerdp/freerdp-9999.1.ebuild
+++ b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils vcs-snapshot
 if [[ ${PV} != 9999* ]]; then
        COMMIT="aa2181dcf2dd98693767ba738c5b2ad8c3d742d4"
        SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+       KEYWORDS="alpha amd64 arm ppc ppc64 x86"
 else
        inherit git-r3
        SRC_URI=""
@@ -23,10 +23,11 @@ HOMEPAGE="http://www.freerdp.com/";
 LICENSE="Apache-2.0"
 SLOT="0/1.2"
 IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg
-       neon pulseaudio server smartcard test usb wayland X xinerama xv"
+       libressl neon pulseaudio server smartcard test usb wayland X xinerama 
xv"
 
 RDEPEND="
-       dev-libs/openssl:0
+       !libressl? ( dev-libs/openssl:0 )
+       libressl? ( dev-libs/libressl )
        sys-libs/zlib:0
        alsa? ( media-libs/alsa-lib )
        cups? ( net-print/cups )
@@ -46,7 +47,7 @@ RDEPEND="
                        xv? ( x11-libs/libXv )
                )
        )
-       ffmpeg? ( virtual/ffmpeg )
+       ffmpeg? ( >=virtual/ffmpeg-9 )
        gstreamer? (
                media-libs/gstreamer:1.0
                media-libs/gst-plugins-base:1.0
@@ -80,6 +81,8 @@ DEPEND="${RDEPEND}
 
 DOCS=( README )
 
+PATCHES=( "${FILESDIR}/freerdp-armfp.patch" 
"${FILESDIR}/freerdp-ffmpeg29.patch" )
+
 src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_with alsa ALSA)

diff --git a/net-misc/freerdp/freerdp-9999.1.ebuild 
b/net-misc/freerdp/freerdp-9999.1.ebuild
index 131105e..d38b4c4 100644
--- a/net-misc/freerdp/freerdp-9999.1.ebuild
+++ b/net-misc/freerdp/freerdp-9999.1.ebuild
@@ -23,10 +23,11 @@ HOMEPAGE="http://www.freerdp.com/";
 LICENSE="Apache-2.0"
 SLOT="0/1.2"
 IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg
-       neon pulseaudio server smartcard test usb wayland X xinerama xv"
+       libressl neon pulseaudio server smartcard test usb wayland X xinerama 
xv"
 
 RDEPEND="
-       dev-libs/openssl:0
+       !libressl? ( dev-libs/openssl:0 )
+       libressl? ( dev-libs/libressl )
        sys-libs/zlib:0
        alsa? ( media-libs/alsa-lib )
        cups? ( net-print/cups )