summaryrefslogtreecommitdiff
path: root/net-misc/freerdp
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-05-14 11:09:11 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-05-14 11:09:11 +0100
commitdeba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree9a48f42594e1a9e6b2020d5535a784314434d7a7 /net-misc/freerdp
parent38423c67c8a23f6a1bc42038193182e2da3116eb (diff)
gentoo resync : 14.05.2020
Diffstat (limited to 'net-misc/freerdp')
-rw-r--r--net-misc/freerdp/Manifest15
-rw-r--r--net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch30
-rw-r--r--net-misc/freerdp/files/2.0.0-rc4-libressl.patch78
-rw-r--r--net-misc/freerdp/freerdp-2.0.0-r1.ebuild7
-rw-r--r--net-misc/freerdp/freerdp-2.0.0_rc4.ebuild124
-rw-r--r--net-misc/freerdp/freerdp-2.1.0.ebuild (renamed from net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild)55
-rw-r--r--net-misc/freerdp/freerdp-2.9999.ebuild38
-rw-r--r--net-misc/freerdp/freerdp-9999.ebuild38
8 files changed, 65 insertions, 320 deletions
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index ead6d510cbce..5424706184d1 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,13 +1,8 @@
AUX 2.0.0-backports.patch 3717 BLAKE2B a80d2fd291f4a2c94253cc41b50610b0f6116181853fd8ca07c88b17c816156f69a168347633651b23bdd8e6d65e583e03d1f7f8e9d8d26e04daee34a165506e SHA512 e8fab560145ed73d28aaeb93cbf8ada68a76ab7ee3e0cbb9f65f157a935a1c312bc6e9c188e4bca83b1e64d00af93fa39b9ab0d1fdb558936aa2d2b0738155a5
-AUX 2.0.0-rc4-bitmap-endian.patch 1184 BLAKE2B 60afebd809d06fb5fc6948b06b1928baa1fb0dcc01189964e252fc2fa190f4dc05b13a20302bc5921c4c0344e732539a560c11fd5800d661a518d99fdec68698 SHA512 cdd2a6c3524e717d68d3f386d666cbf81e53e956b8f2a5ae1b37e89c32e334e847255f3a4b77cb4b4b9bbe7f831ec4fe2ce87d5a49b11d7a452affd7083de21a
-AUX 2.0.0-rc4-libressl.patch 2914 BLAKE2B fa343a8068f59f63e8ede86fd9987aa3490c3fe969ccc000742c9d1fd77a16c46d3a3d31666023d49d419032768c5119f02380cbbd930b30998151da6070de90 SHA512 eef629707eb0e25c66dd492767b7c714545102e5c20139c028f252b0c301cd5792c67306e74fe1d5908e7500022387efba43b0e532667e32ce18b5cee1aafa84
-DIST freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch 20553 BLAKE2B 17ba83ba2dc05f2179df3aa8805877e15b353d4c6bbe88fa0553f7412baf85849a834032143ebd22ff3d27dd12ffdfddfc802868e10ca2718145a58378940ec4 SHA512 b3b548e98422362f63aedfefca399e4008a4b571e6cd786603418c5a3d1c4d832d5148ddee2f62d6bc1259c66020ee01ced6357d72333f49fc34a1059f4f804e
-DIST freerdp-2.0.0-rc4.tar.gz 6662044 BLAKE2B 50bc72336841e421b8fd89ce4f2be6a0b1a9f052933c4cd5bad33261689e6a6b54bc5563fb1ace8cc7a2271990c0ff4c7fe239243f5d75140af497ee6ff9bcd6 SHA512 63cf89aecc6d7ac55db8c7aca60f4ba29cfa54ad70d0fa87fdab011cd16500a3d184659119cd08b7596b7236346db3b61b46282c5325d7f0ca6da09b42d0df20
DIST freerdp-2.0.0.tar.gz 6857730 BLAKE2B 2873a228b82874d3efae3ea922c83c7d32692ae17da2b7b85a9dd570d8d3f4df7f4943920474cb6711c32c6e8863429a165a6f4b65c834fda1320bcb804b38db SHA512 4babb7b3a5e7b39b89c4e1dbcd5a58b5fbfb8d48083dbafc2c6455d8b739f4c444715286cc10f2f7446f96053d3f5ff4ac2cff1af9708cbc48ef07a6fee5bee6
-DIST freerdp-2.0.0_rc4_p1129.tar.gz 6774330 BLAKE2B 728a4d0f0d7ee4a6cf8a7d0d4ed6f2e0f13a76ceb1c16e7cb48ad0f3d6b6f36194839129bd57e73e02d2a6ae89a83d9d571f515ab2f46cb26f611424dd5b23b5 SHA512 407b06ca7607e01d52b7b89337dbcd5dc15633de197ea91443825672963cbb6d966a187dee022afb5f9979e8d08577ee62b681f37419e5b986f9c2f5e8a3e285
-EBUILD freerdp-2.0.0-r1.ebuild 2997 BLAKE2B 829a78f5c867887c4c74365fc8702c5565d90a5b6f6e6c6e5bde7396030985cd872a9f0fbcf2e511dd6f843494bbda2e12fe1babd69fa4712806425dff3c74c2 SHA512 339f88691209d639011948c76a2fcc37fc3104d54844ae45a53b8e85d3eefd2223a434256a5ca7b82b2b87577d9200e92e82cf511406c59ffe2665c5fe290405
-EBUILD freerdp-2.0.0_rc4.ebuild 3001 BLAKE2B 3074b0d8955c16bc10ddf54260125d66040fbca0cd286dca22e80b2e5cab5e7600db17d26440ab707bd0edc7e498da7745c0bb2a4744ac21e31d7904edda1e3f SHA512 143047ed46be75abd18927a8e10e15c2da8d3fa2b6cb1ad92dbfb33753c62617788f8cc8386f285f9aba703c60fb0cdc1e3b08848e5ebb6f8b2d336b21a29744
-EBUILD freerdp-2.0.0_rc4_p1129.ebuild 3026 BLAKE2B 52ef38105384c0ac40f4a83db2d01ee4bc5d06f34fbd26336a93ea5f96bc4c9b522d31f3c60efe2d3146c1aaa51919f905e3a29ebdddee3191cb53edc0f68fce SHA512 cd483f12fb1b591c2648f09b056c0b380d63e0fa31b59d309ab2bb2abf57de654fe31313719bfb35380e3146faf63553a7adf01c296bd07f2c1451f1eaed54ac
-EBUILD freerdp-2.9999.ebuild 3009 BLAKE2B 2a407e5ebe84252070783daf9d5564da0486fa59bae44734ed7dbc588648ce00076c07eadb7ea24d66ff7130b4c323367e40f4d38a9448ab917eaaeadf4a9344 SHA512 3cd0b4bcaf687072b70a3803931b0960a7869e815f7261b3e1d9aede0595ab9362cf40edf6c00fc786d8f37d0d9bdead4ec235fa149645a0e43217ba0188a3a0
-EBUILD freerdp-9999.ebuild 3009 BLAKE2B 2a407e5ebe84252070783daf9d5564da0486fa59bae44734ed7dbc588648ce00076c07eadb7ea24d66ff7130b4c323367e40f4d38a9448ab917eaaeadf4a9344 SHA512 3cd0b4bcaf687072b70a3803931b0960a7869e815f7261b3e1d9aede0595ab9362cf40edf6c00fc786d8f37d0d9bdead4ec235fa149645a0e43217ba0188a3a0
+DIST freerdp-2.1.0.tar.gz 21772624 BLAKE2B d3491cb9f08a34fd5b2a5b00b46494e4e0524715d73ad46e92812578fbe9843504d937dc634f1597a7f0785494fd2c68f964125b438328105e4db41191eeb166 SHA512 c0abecf3d52bf8388538f0bb60a0852b6f92c9172feda06efa96eb49a354913c7a10b9852efb0de6e545658043d0d3568cb79a54fc1d324a14e8ed2c9c9e6e3b
+EBUILD freerdp-2.0.0-r1.ebuild 2942 BLAKE2B 0f2aa9737cfd68caf4012beb385e25ac6464fc067eb40ebeb2f3c2196183c192cb85f1d92e2947f1a5555d9d280d68e8b960dd9bbc50105472003df97c62f758 SHA512 0a4e542307b57033c840d8e0b2c59b2befae7dc732e82f58e4af13fe56088efe01459f09315487e53d3c0aea55cde722a13e4e44efd804de19a8b5fc3b69c692
+EBUILD freerdp-2.1.0.ebuild 2862 BLAKE2B 8b56772f76dd55965acac75cf9abf4d777a008b9473da979f776f63399e4ed662801ca3490d2675d329cf8a0f4330f99c4ad5000d01372f0041aba7fe7bbd6eb SHA512 e16deeb57e4582d7b81f1824332f1449a1204a096f587ddb6253c47606cf988bf09acd546e26e8509b21beb855034908ea035c61ea2a2894c39076a43d84b96d
+EBUILD freerdp-2.9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
+EBUILD freerdp-9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch b/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch
deleted file mode 100644
index cd78ba983b7b..000000000000
--- a/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 18b193a1cf083b92279c3952f4f907a07cd92834 Mon Sep 17 00:00:00 2001
-From: Armin Novak <armin.novak@thincast.com>
-Date: Wed, 13 Feb 2019 09:30:34 +0100
-Subject: [PATCH] Fixed endianess issue with GETPIXEL16 and GETPIXEL32
-
----
- libfreerdp/codec/bitmap.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libfreerdp/codec/bitmap.c b/libfreerdp/codec/bitmap.c
-index 7524bb99ce..479c965e52 100644
---- a/libfreerdp/codec/bitmap.c
-+++ b/libfreerdp/codec/bitmap.c
-@@ -26,12 +26,14 @@
-
- static INLINE UINT16 GETPIXEL16(const void* d, UINT32 x, UINT32 y, UINT32 w)
- {
-- return (*(((const unsigned short*)d) + ((y) * (w) + (x))));
-+ const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT16));
-+ return (UINT16)(((UINT16)src[1] << 8) | (UINT16)src[0]);
- }
-
- static INLINE UINT32 GETPIXEL32(const void* d, UINT32 x, UINT32 y, UINT32 w)
- {
-- return (*(((const unsigned int*)d) + ((y) * (w) + (x))));
-+ const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT32));
-+ return (((UINT32)src[3]) << 24) | (((UINT32)src[2]) << 16) | (((UINT32)src[1]) << 8) | (src[0] & 0xFF);
- }
-
- /*****************************************************************************/
diff --git a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
deleted file mode 100644
index fd6e6148607a..000000000000
--- a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 649f49fa61ca98a05b26c3b2a26a1c30ca24ea26 Mon Sep 17 00:00:00 2001
-From: Armin Novak <armin.novak@thincast.com>
-Date: Thu, 22 Nov 2018 09:23:46 +0100
-Subject: [PATCH] Fix #5049: LibreSSL does not have SSL_CTX_set_security_level
-
----
- libfreerdp/crypto/tls.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
-index 20fde415d8..76f51701fe 100644
---- a/libfreerdp/crypto/tls.c
-+++ b/libfreerdp/crypto/tls.c
-@@ -656,7 +656,7 @@ static BOOL tls_prepare(rdpTls* tls, BIO* underlying, SSL_METHOD* method,
- #endif
-
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
- SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
- #endif
-
-From effa8b8562d5e4b017570815c7e4d8faa0dd9a9e Mon Sep 17 00:00:00 2001
-From: akallabeth <akallabeth@posteo.net>
-Date: Thu, 22 Nov 2018 19:10:05 +0100
-Subject: [PATCH] Fix #5049: Libressl declares OPENSSL_VERSION_NUMBER too high
-
-Need to check specifically for LIBRESSL_VERSION_NUMBER as they
-set the version higher than OpenSSL 1.1 but without API support.
----
- libfreerdp/crypto/tls.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
-index 76f51701fe..ded41f127e 100644
---- a/libfreerdp/crypto/tls.c
-+++ b/libfreerdp/crypto/tls.c
-@@ -655,8 +655,7 @@ static BOOL tls_prepare(rdpTls* tls, BIO* underlying, SSL_METHOD* method,
- SSL_CTX_set_max_proto_version(tls->ctx, 0); /* highest supported version by library */
- #endif
-
--
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
- #endif
-
-From 0c83efa753d0457eb319624f87b491badf75105f Mon Sep 17 00:00:00 2001
-From: Armin Novak <armin.novak@thincast.com>
-Date: Mon, 7 Jan 2019 14:18:14 +0100
-Subject: [PATCH] Fix #5170: Disable custom TLS alert for libressl > 2.8.3
-
----
- libfreerdp/crypto/tls.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
-index b2cf5416c8..56e16bacb4 100644
---- a/libfreerdp/crypto/tls.c
-+++ b/libfreerdp/crypto/tls.c
-@@ -1030,7 +1030,8 @@ BOOL tls_send_alert(rdpTls* tls)
- * FIXME: The following code does not work on OpenSSL > 1.1.0 because the
- * SSL struct is opaqe now
- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L)) || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER <= 0x2080300fL))
-
- if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY)
- {
-@@ -1057,7 +1058,6 @@ BOOL tls_send_alert(rdpTls* tls)
- if (tls->ssl->s3->wbuf.left == 0)
- tls->ssl->method->ssl_dispatch_alert(tls->ssl);
- }
--
- #endif
- return TRUE;
- }
diff --git a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
index 2ea42012517c..d4c577fb18e5 100644
--- a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.freerdp.com/"
LICENSE="Apache-2.0"
SLOT="0/2"
-IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -45,10 +45,7 @@ RDEPEND="
xv? ( x11-libs/libXv )
)
)
- ffmpeg? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
- )
+ ffmpeg? ( media-video/ffmpeg:0= )
!ffmpeg? (
x11-libs/cairo:0=
)
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
deleted file mode 100644
index 5bd7f37650e6..000000000000
--- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 2011-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ ${PV} != 9999 ]]; then
- MY_P=${P/_/-}
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
- https://github.com/FreeRDP/FreeRDP/commit/6931f54fad12eaf46a72c5c02ac05da817ab6b94.patch -> freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch"
- KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
-else
- inherit git-r3
- SRC_URI=""
- EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- sys-libs/zlib:0
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- client? (
- usb? (
- virtual/libudev:0=
- sys-apps/util-linux:0=
- dev-libs/dbus-glib:0=
- virtual/libusb:1=
- )
- X? (
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )
- )
- )
- ffmpeg? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
- )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- x11-libs/libXrandr
- )
- jpeg? ( virtual/jpeg:0 )
- openh264? ( media-libs/openh264 )
- pulseaudio? ( media-sound/pulseaudio )
- server? (
- X? (
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- xinerama? ( x11-libs/libXinerama )
- )
- )
- smartcard? ( sys-apps/pcsc-lite )
- systemd? ( sys-apps/systemd:0= )
- wayland? (
- dev-libs/wayland
- x11-libs/libxkbcommon
- )
- X? (
- x11-libs/libX11
- x11-libs/libxkbfile
- )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- client? ( X? ( doc? (
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto
- ) ) )
-"
-
-PATCHES=(
- "${FILESDIR}"/2.0.0-rc4-libressl.patch
- "${FILESDIR}"/2.0.0-rc4-bitmap-endian.patch
- "${DISTDIR}"/freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- -DCHANNEL_URBDRC=$(usex usb)
- -DWITH_ALSA=$(usex alsa)
- -DWITH_CCACHE=OFF
- -DWITH_CLIENT=$(usex client)
- -DWITH_CUPS=$(usex cups)
- -DWITH_DEBUG_ALL=$(usex debug)
- -DWITH_MANPAGES=$(usex doc)
- -DWITH_FFMPEG=$(usex ffmpeg)
- -DWITH_DSP_FFMPEG=$(usex ffmpeg)
- -DWITH_GSTREAMER_1_0=$(usex gstreamer)
- -DWITH_JPEG=$(usex jpeg)
- -DWITH_NEON=$(usex cpu_flags_arm_neon)
- -DWITH_OPENH264=$(usex openh264)
- -DWITH_PULSE=$(usex pulseaudio)
- -DWITH_SERVER=$(usex server)
- -DWITH_PCSC=$(usex smartcard)
- -DWITH_LIBSYSTEMD=$(usex systemd)
- -DWITH_X11=$(usex X)
- -DWITH_XINERAMA=$(usex xinerama)
- -DWITH_XV=$(usex xv)
- -DWITH_WAYLAND=$(usex wayland)
- )
- cmake-utils_src_configure
-}
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild b/net-misc/freerdp/freerdp-2.1.0.ebuild
index 4ef50289d0b5..6f7e867eb817 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild
+++ b/net-misc/freerdp/freerdp-2.1.0.ebuild
@@ -1,18 +1,21 @@
-# Copyright 2011-2019 Gentoo Authors
+# Copyright 2011-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake
-if [[ ${PV} != 9999 ]]; then
- COMMIT="483d09b760bea529972afad9b6f6c7a89dcffd40"
- SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/FreeRDP-${COMMIT}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-else
+if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+ case ${PV} in
+ 2.*) EGIT_BRANCH="stable-2.0";;
+ esac
+else
+ MY_P=${P/_/-}
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
+ KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
fi
DESCRIPTION="Free implementation of the Remote Desktop Protocol"
@@ -20,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/"
LICENSE="Apache-2.0"
SLOT="0/2"
-IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -29,26 +32,21 @@ RDEPEND="
sys-libs/zlib:0
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
- client? (
- usb? (
- virtual/libudev:0=
- sys-apps/util-linux:0=
- dev-libs/dbus-glib:0=
- virtual/libusb:1=
- )
- X? (
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )
- )
+ usb? (
+ virtual/libudev:0=
+ sys-apps/util-linux:0=
+ dev-libs/dbus-glib:0=
+ virtual/libusb:1=
)
- ffmpeg? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ xinerama? ( x11-libs/libXinerama )
+ xv? ( x11-libs/libXv )
)
+ ffmpeg? ( media-video/ffmpeg:0= )
!ffmpeg? (
x11-libs/cairo:0=
)
@@ -85,10 +83,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
- client? ( X? ( doc? (
+ X? ( doc? (
app-text/docbook-xml-dtd:4.1.2
app-text/xmlto
- ) ) )
+ ) )
"
src_configure() {
@@ -97,7 +95,6 @@ src_configure() {
-DCHANNEL_URBDRC=$(usex usb ON OFF)
-DWITH_ALSA=$(usex alsa ON OFF)
-DWITH_CCACHE=OFF
- -DWITH_CLIENT=$(usex client ON OFF)
-DWITH_CUPS=$(usex cups ON OFF)
-DWITH_DEBUG_ALL=$(usex debug ON OFF)
-DWITH_MANPAGES=$(usex doc ON OFF)
diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild
index 48ee51c92773..fa7d73ce5c84 100644
--- a/net-misc/freerdp/freerdp-2.9999.ebuild
+++ b/net-misc/freerdp/freerdp-2.9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/"
LICENSE="Apache-2.0"
SLOT="0/2"
-IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -32,26 +32,21 @@ RDEPEND="
sys-libs/zlib:0
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
- client? (
- usb? (
- virtual/libudev:0=
- sys-apps/util-linux:0=
- dev-libs/dbus-glib:0=
- virtual/libusb:1=
- )
- X? (
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )
- )
+ usb? (
+ virtual/libudev:0=
+ sys-apps/util-linux:0=
+ dev-libs/dbus-glib:0=
+ virtual/libusb:1=
)
- ffmpeg? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ xinerama? ( x11-libs/libXinerama )
+ xv? ( x11-libs/libXv )
)
+ ffmpeg? ( media-video/ffmpeg:0= )
!ffmpeg? (
x11-libs/cairo:0=
)
@@ -88,10 +83,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
- client? ( X? ( doc? (
+ X? ( doc? (
app-text/docbook-xml-dtd:4.1.2
app-text/xmlto
- ) ) )
+ ) )
"
src_configure() {
@@ -100,7 +95,6 @@ src_configure() {
-DCHANNEL_URBDRC=$(usex usb ON OFF)
-DWITH_ALSA=$(usex alsa ON OFF)
-DWITH_CCACHE=OFF
- -DWITH_CLIENT=$(usex client ON OFF)
-DWITH_CUPS=$(usex cups ON OFF)
-DWITH_DEBUG_ALL=$(usex debug ON OFF)
-DWITH_MANPAGES=$(usex doc ON OFF)
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 48ee51c92773..fa7d73ce5c84 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/"
LICENSE="Apache-2.0"
SLOT="0/2"
-IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -32,26 +32,21 @@ RDEPEND="
sys-libs/zlib:0
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
- client? (
- usb? (
- virtual/libudev:0=
- sys-apps/util-linux:0=
- dev-libs/dbus-glib:0=
- virtual/libusb:1=
- )
- X? (
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )
- )
+ usb? (
+ virtual/libudev:0=
+ sys-apps/util-linux:0=
+ dev-libs/dbus-glib:0=
+ virtual/libusb:1=
)
- ffmpeg? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ xinerama? ( x11-libs/libXinerama )
+ xv? ( x11-libs/libXv )
)
+ ffmpeg? ( media-video/ffmpeg:0= )
!ffmpeg? (
x11-libs/cairo:0=
)
@@ -88,10 +83,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
- client? ( X? ( doc? (
+ X? ( doc? (
app-text/docbook-xml-dtd:4.1.2
app-text/xmlto
- ) ) )
+ ) )
"
src_configure() {
@@ -100,7 +95,6 @@ src_configure() {
-DCHANNEL_URBDRC=$(usex usb ON OFF)
-DWITH_ALSA=$(usex alsa ON OFF)
-DWITH_CCACHE=OFF
- -DWITH_CLIENT=$(usex client ON OFF)
-DWITH_CUPS=$(usex cups ON OFF)
-DWITH_DEBUG_ALL=$(usex debug ON OFF)
-DWITH_MANPAGES=$(usex doc ON OFF)