1 |
commit: 33b46b6ee0ee08282ff60b0cb264b92a932b4584 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 26 19:20:20 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 2 17:15:33 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33b46b6e |
7 |
|
8 |
net-misc/freerdp: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.51_p14, Repoman-2.3.12_p5 |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
net-misc/freerdp/Manifest | 4 - |
14 |
net-misc/freerdp/files/1.2.1-gstreamer.patch | 71 ------------ |
15 |
net-misc/freerdp/files/2.0.0-rc0-libressl.patch | 89 --------------- |
16 |
.../files/2.0.0-rc1-CredSSP-protocol-version.patch | 49 -------- |
17 |
net-misc/freerdp/files/2.0.0-rc1-libressl.patch | 35 ------ |
18 |
.../freerdp-Fix-gstreamer-1.0-detection.patch | 25 ----- |
19 |
net-misc/freerdp/files/freerdp-armfp.patch | 84 -------------- |
20 |
net-misc/freerdp/files/freerdp-ffmpeg29.patch | 42 ------- |
21 |
.../freerdp/freerdp-1.2.1_pre20150326-r1.ebuild | 114 ------------------- |
22 |
net-misc/freerdp/freerdp-2.0.0_rc0.ebuild | 124 --------------------- |
23 |
net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild | 123 -------------------- |
24 |
net-misc/freerdp/freerdp-2.0.0_rc3-r1.ebuild | 116 ------------------- |
25 |
net-misc/freerdp/freerdp-2.0.0_rc3.ebuild | 115 ------------------- |
26 |
13 files changed, 991 deletions(-) |
27 |
|
28 |
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest |
29 |
index bbd94c0d422..4b61307e109 100644 |
30 |
--- a/net-misc/freerdp/Manifest |
31 |
+++ b/net-misc/freerdp/Manifest |
32 |
@@ -1,6 +1,2 @@ |
33 |
-DIST FreeRDP-2.0.0-rc0.tar.gz 6486529 BLAKE2B 6d9bf0e88c925f2184f87696b78a374c5fb24ecb3014515e077825805191fcb2e58b930ef4eccb797d496d142024357ca7562426e990a65cd3c54c58de3cc525 SHA512 d3eb0d5d23aa2a4d0277414f13a984d40aba051102c5af1e5ade975cdb469ef3549b145cd4339415fc33f056044929cfac71884512ea77a1e718d70d5b21b9dd |
34 |
-DIST FreeRDP-2.0.0-rc1.tar.gz 6530403 BLAKE2B 5e276c3d1153f04512dba4bf09807751ca70ece3496c1ba00766b04369fffde8d86ad446345f0eab0fea4641708b7f985f95ea4a6001107163ee60e35822a955 SHA512 5d8fd7d6900feac1e42bfc0ebc111524205c3baa093958ced42d03635076ae7d88cd86439a22ff0656bc53f0302daee5a114a4ac26328ae598ee086490926182 |
35 |
-DIST freerdp-1.2.1_pre20150326.tar.gz 6146857 BLAKE2B 8ead05b89e129ba09b046f545073d128ca1d44dac7248c23bc543094f0fd23f336c890367945e7fce4def98c4ce1e01c4e5a970e92f3d4f74d08daf3cf0a8c6a SHA512 ca1499d56ecb9c9bc624de2ecc976eb9633b795050ac01e16fcc9e0a8951d274cc63644a0e2b830e75f66de894f6a22274864fd20a9351834f6d664874e65ec8 |
36 |
DIST freerdp-2.0.0-rc2.tar.gz 6611081 BLAKE2B 564abd6289f0c9d3947b9074111ade8c2e7b6e6dce9af8a06ef1772d0e76822c5df80932a5cbac2f23c4d2a76d4796c12bd4fa067c6ef21ea84a1b8423be1ce3 SHA512 cb765b3b9559c4877be4c10e5df9e95d11a0184ce34e89564097c3234f859de8e82b6de6217396628e5f70c85c40c65ccd75f9b0f7f89daaed7e0e971a833589 |
37 |
-DIST freerdp-2.0.0-rc3.tar.gz 6575186 BLAKE2B a99b54ca284d1c5c61104e22edd6bb4bc435ed1d5b95a84f089c06e6d49c14987be24c5e6b08e02f7df4a56230159c827b8ada24f68ff0188e74c0386507d691 SHA512 0019daadd5f0071d983053c554834392a751ec3bcde2ed96d4c0fceb7c32a319b9bbfeb68ff9b15216f7db479c883b461e7c51e612c99626dd09af5a68ff96f5 |
38 |
DIST freerdp-2.0.0-rc4.tar.gz 6662044 BLAKE2B 50bc72336841e421b8fd89ce4f2be6a0b1a9f052933c4cd5bad33261689e6a6b54bc5563fb1ace8cc7a2271990c0ff4c7fe239243f5d75140af497ee6ff9bcd6 SHA512 63cf89aecc6d7ac55db8c7aca60f4ba29cfa54ad70d0fa87fdab011cd16500a3d184659119cd08b7596b7236346db3b61b46282c5325d7f0ca6da09b42d0df20 |
39 |
|
40 |
diff --git a/net-misc/freerdp/files/1.2.1-gstreamer.patch b/net-misc/freerdp/files/1.2.1-gstreamer.patch |
41 |
deleted file mode 100644 |
42 |
index cafe9702210..00000000000 |
43 |
--- a/net-misc/freerdp/files/1.2.1-gstreamer.patch |
44 |
+++ /dev/null |
45 |
@@ -1,71 +0,0 @@ |
46 |
-From bea27fd919b64ee8d97996409e279e1e83d13594 Mon Sep 17 00:00:00 2001 |
47 |
-From: Jean-Louis Dupond <jean-louis@××××××.be> |
48 |
-Date: Sun, 4 Oct 2015 18:17:33 +0200 |
49 |
-Subject: [PATCH] FindGStreamer_1_0: fix build failure for new gstreamer |
50 |
- versions |
51 |
- |
52 |
---- |
53 |
- cmake/FindGStreamer_1_0.cmake | 30 +++++++++++++++--------------- |
54 |
- 1 file changed, 15 insertions(+), 15 deletions(-) |
55 |
- |
56 |
-diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake |
57 |
-index f7bf990..3aa8fc6 100644 |
58 |
---- a/cmake/FindGStreamer_1_0.cmake |
59 |
-+++ b/cmake/FindGStreamer_1_0.cmake |
60 |
-@@ -53,17 +53,17 @@ set(GSTREAMER_1_0_MINIMUM_VERSION 1.0.5) |
61 |
- # Helper macro to find a Gstreamer plugin (or Gstreamer itself) |
62 |
- # _component_prefix is prepended to the _INCLUDE_DIRS and _LIBRARIES variables (eg. "GSTREAMER_1_0_AUDIO") |
63 |
- # _pkgconfig_name is the component's pkg-config name (eg. "gstreamer-1.0", or "gstreamer-video-1.0"). |
64 |
--# _header is the component's header, relative to the gstreamer-1.0 directory (eg. "gst/gst.h"). |
65 |
- # _library is the component's library name (eg. "gstreamer-1.0" or "gstvideo-1.0") |
66 |
--macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library) |
67 |
-+macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library) |
68 |
- # FIXME: The QUIET keyword can be used once we require CMake 2.8.2. |
69 |
-- pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name}) |
70 |
- |
71 |
-- find_path(${_component_prefix}_INCLUDE_DIRS |
72 |
-- NAMES ${_header} |
73 |
-- HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR} |
74 |
-- PATH_SUFFIXES gstreamer-1.0 |
75 |
-- ) |
76 |
-+ string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}") |
77 |
-+ if ("${CMAKE_MATCH_2}" STREQUAL "") |
78 |
-+ pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}") |
79 |
-+ else () |
80 |
-+ pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name}) |
81 |
-+ endif () |
82 |
-+ set(${_component_prefix}_INCLUDE_DIRS ${PC_${_component_prefix}_INCLUDE_DIRS}) |
83 |
- |
84 |
- find_library(${_component_prefix}_LIBRARIES |
85 |
- NAMES ${_library} gstreamer_android |
86 |
-@@ -78,8 +78,8 @@ endmacro() |
87 |
- # 1.1. Find headers and libraries |
88 |
- set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR}) |
89 |
- find_package(Glib REQUIRED) |
90 |
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0) |
91 |
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0) |
92 |
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0) |
93 |
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gstbase-1.0) |
94 |
- |
95 |
- # 1.2. Check Gstreamer version |
96 |
- if (GSTREAMER_1_0_INCLUDE_DIRS) |
97 |
-@@ -110,11 +110,11 @@ endif () |
98 |
- # 2. Find Gstreamer plugins |
99 |
- # ------------------------- |
100 |
- |
101 |
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 gst/app/gstappsink.h gstapp-1.0) |
102 |
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 gst/audio/audio.h gstaudio-1.0) |
103 |
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gst/fft/gstfft.h gstfft-1.0) |
104 |
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 gst/pbutils/pbutils.h gstpbutils-1.0) |
105 |
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 gst/video/video.h gstvideo-1.0) |
106 |
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 gstapp-1.0) |
107 |
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 gstaudio-1.0) |
108 |
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gstfft-1.0) |
109 |
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 gstpbutils-1.0) |
110 |
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 gstvideo-1.0) |
111 |
- |
112 |
- # ------------------------------------------------ |
113 |
- # 3. Process the COMPONENTS passed to FIND_PACKAGE |
114 |
--- |
115 |
-2.6.3 |
116 |
- |
117 |
|
118 |
diff --git a/net-misc/freerdp/files/2.0.0-rc0-libressl.patch b/net-misc/freerdp/files/2.0.0-rc0-libressl.patch |
119 |
deleted file mode 100644 |
120 |
index 9e565e5b05d..00000000000 |
121 |
--- a/net-misc/freerdp/files/2.0.0-rc0-libressl.patch |
122 |
+++ /dev/null |
123 |
@@ -1,89 +0,0 @@ |
124 |
-From 9bf9ff9e8a548ecb5306d0142e75cdc274e93ba1 Mon Sep 17 00:00:00 2001 |
125 |
-From: Valery Kartel <valery.kartel@×××××.com> |
126 |
-Date: Wed, 26 Jul 2017 17:12:14 +0300 |
127 |
-Subject: [PATCH] Fix build with LibreSSL |
128 |
- |
129 |
---- |
130 |
- libfreerdp/crypto/crypto.c | 2 +- |
131 |
- winpr/libwinpr/utils/ssl.c | 6 +++--- |
132 |
- winpr/tools/makecert/makecert.c | 6 +++--- |
133 |
- 3 files changed, 7 insertions(+), 7 deletions(-) |
134 |
- |
135 |
-diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c |
136 |
-index 15e65d534..f3bb595b8 100644 |
137 |
---- a/libfreerdp/crypto/crypto.c |
138 |
-+++ b/libfreerdp/crypto/crypto.c |
139 |
-@@ -388,7 +388,7 @@ BOOL x509_verify_certificate(CryptoCert cert, char* certificate_store_path) |
140 |
- if (cert_ctx == NULL) |
141 |
- goto end; |
142 |
- |
143 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
144 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
145 |
- OpenSSL_add_all_algorithms(); |
146 |
- #else |
147 |
- OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ |
148 |
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c |
149 |
-index b674e21d5..78cbab1d8 100644 |
150 |
---- a/winpr/libwinpr/utils/ssl.c |
151 |
-+++ b/winpr/libwinpr/utils/ssl.c |
152 |
-@@ -255,7 +255,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_ONCE once, PVOID param, PVO |
153 |
- } |
154 |
- #endif |
155 |
- /* SSL_load_error_strings() is void */ |
156 |
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) |
157 |
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) |
158 |
- SSL_load_error_strings(); |
159 |
- /* SSL_library_init() always returns "1" */ |
160 |
- SSL_library_init(); |
161 |
-@@ -296,7 +296,7 @@ BOOL winpr_CleanupSSL(DWORD flags) |
162 |
- #ifdef WINPR_OPENSSL_LOCKING_REQUIRED |
163 |
- _winpr_openssl_cleanup_locking(); |
164 |
- #endif |
165 |
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) |
166 |
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) |
167 |
- CRYPTO_cleanup_all_ex_data(); |
168 |
- ERR_free_strings(); |
169 |
- EVP_cleanup(); |
170 |
-@@ -307,7 +307,7 @@ BOOL winpr_CleanupSSL(DWORD flags) |
171 |
- #ifdef WINPR_OPENSSL_LOCKING_REQUIRED |
172 |
- if (flags & WINPR_SSL_CLEANUP_THREAD) |
173 |
- { |
174 |
--#if (OPENSSL_VERSION_NUMBER < 0x10000000L) |
175 |
-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER) |
176 |
- ERR_remove_state(0); |
177 |
- #else |
178 |
- ERR_remove_thread_state(NULL); |
179 |
-diff --git a/winpr/tools/makecert/makecert.c b/winpr/tools/makecert/makecert.c |
180 |
-index a9efb352c..c9e38200a 100644 |
181 |
---- a/winpr/tools/makecert/makecert.c |
182 |
-+++ b/winpr/tools/makecert/makecert.c |
183 |
-@@ -620,7 +620,7 @@ int makecert_context_output_certificate_file(MAKECERT_CONTEXT* context, char* pa |
184 |
- printf("Using default export password \"password\"\n"); |
185 |
- } |
186 |
- |
187 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
188 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
189 |
- OpenSSL_add_all_algorithms(); |
190 |
- OpenSSL_add_all_ciphers(); |
191 |
- OpenSSL_add_all_digests(); |
192 |
-@@ -1008,7 +1008,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv) |
193 |
- key_length = atoi(arg->Value); |
194 |
- } |
195 |
- |
196 |
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) |
197 |
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) |
198 |
- context->rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL); |
199 |
- #else |
200 |
- { |
201 |
-@@ -1043,7 +1043,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv) |
202 |
- { |
203 |
- ASN1_TIME* before; |
204 |
- ASN1_TIME* after; |
205 |
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) |
206 |
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) |
207 |
- before = X509_get_notBefore(context->x509); |
208 |
- after = X509_get_notAfter(context->x509); |
209 |
- #else |
210 |
--- |
211 |
-2.14.1 |
212 |
- |
213 |
|
214 |
diff --git a/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch b/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch |
215 |
deleted file mode 100644 |
216 |
index 59887f698ec..00000000000 |
217 |
--- a/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch |
218 |
+++ /dev/null |
219 |
@@ -1,49 +0,0 @@ |
220 |
-From 088c3940d9b488e8a83b9cefaa7271f955d1971c Mon Sep 17 00:00:00 2001 |
221 |
-From: Bernhard Miklautz <bernhard.miklautz@××××××××.com> |
222 |
-Date: Wed, 14 Mar 2018 13:39:23 +0100 |
223 |
-Subject: [PATCH] fix nla: don't use server version |
224 |
- |
225 |
-FreeRDP currently only supports CredSSP protocol version 3. However the |
226 |
-current implementation always sent back the version received by the |
227 |
-server indicating that this version was supported. |
228 |
-With recent windows updates applied the protocol changed and this approach |
229 |
-doesn't work anymore (see |
230 |
-https://msdn.microsoft.com/en-us/library/mt752485.aspx for protocol changes). |
231 |
- |
232 |
-With this fix FreeRDP always sends version 3 as supported version. |
233 |
- |
234 |
-Credit goes to @mfleisz. |
235 |
- |
236 |
-Fixes #4449 |
237 |
---- |
238 |
- libfreerdp/core/nla.c | 6 +++++- |
239 |
- 1 file changed, 5 insertions(+), 1 deletion(-) |
240 |
- |
241 |
-diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c |
242 |
-index 47e087062..8a69f2f6e 100644 |
243 |
---- a/libfreerdp/core/nla.c |
244 |
-+++ b/libfreerdp/core/nla.c |
245 |
-@@ -1663,15 +1663,19 @@ BOOL nla_send(rdpNla* nla) |
246 |
- static int nla_decode_ts_request(rdpNla* nla, wStream* s) |
247 |
- { |
248 |
- int length; |
249 |
-+ UINT32 version = 0; |
250 |
- |
251 |
- /* TSRequest */ |
252 |
- if (!ber_read_sequence_tag(s, &length) || |
253 |
- !ber_read_contextual_tag(s, 0, &length, TRUE) || |
254 |
-- !ber_read_integer(s, &nla->version)) |
255 |
-+ !ber_read_integer(s, &version)) |
256 |
- { |
257 |
- return -1; |
258 |
- } |
259 |
- |
260 |
-+ if (version < nla->version) |
261 |
-+ nla->version = version; |
262 |
-+ |
263 |
- /* [1] negoTokens (NegoData) */ |
264 |
- if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE) |
265 |
- { |
266 |
--- |
267 |
-2.16.2 |
268 |
- |
269 |
|
270 |
diff --git a/net-misc/freerdp/files/2.0.0-rc1-libressl.patch b/net-misc/freerdp/files/2.0.0-rc1-libressl.patch |
271 |
deleted file mode 100644 |
272 |
index 76e2514ef2b..00000000000 |
273 |
--- a/net-misc/freerdp/files/2.0.0-rc1-libressl.patch |
274 |
+++ /dev/null |
275 |
@@ -1,35 +0,0 @@ |
276 |
-From bfe3af4c72b45e33321962644d864843e1c9ce3d Mon Sep 17 00:00:00 2001 |
277 |
-From: Greg V <greg@×××××××××××.technology> |
278 |
-Date: Fri, 1 Dec 2017 18:34:48 +0300 |
279 |
-Subject: [PATCH] Fix LibreSSL build |
280 |
- |
281 |
-LibreSSL does not support FIPS mode. |
282 |
---- |
283 |
- winpr/libwinpr/utils/ssl.c | 4 ++-- |
284 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
285 |
- |
286 |
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c |
287 |
-index f749939ac..194f82609 100644 |
288 |
---- a/winpr/libwinpr/utils/ssl.c |
289 |
-+++ b/winpr/libwinpr/utils/ssl.c |
290 |
-@@ -279,7 +279,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_ONCE once, PVOID param, PVO |
291 |
- |
292 |
- if (flags & WINPR_SSL_INIT_ENABLE_FIPS) |
293 |
- { |
294 |
--#if (OPENSSL_VERSION_NUMBER < 0x10001000L) |
295 |
-+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) |
296 |
- WLog_ERR(TAG, "Openssl fips mode ENable not available on openssl versions less than 1.0.1!"); |
297 |
- #else |
298 |
- WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled"); |
299 |
-@@ -348,7 +348,7 @@ BOOL winpr_CleanupSSL(DWORD flags) |
300 |
- |
301 |
- BOOL winpr_FIPSMode(void) |
302 |
- { |
303 |
--#if (OPENSSL_VERSION_NUMBER < 0x10001000L) |
304 |
-+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) |
305 |
- return FALSE; |
306 |
- #else |
307 |
- return (FIPS_mode() == 1); |
308 |
--- |
309 |
-2.15.1 |
310 |
- |
311 |
|
312 |
diff --git a/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch b/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch |
313 |
deleted file mode 100644 |
314 |
index b63771d0818..00000000000 |
315 |
--- a/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch |
316 |
+++ /dev/null |
317 |
@@ -1,25 +0,0 @@ |
318 |
-From 368989526c32cdf9d680a397fede3cb773fa2609 Mon Sep 17 00:00:00 2001 |
319 |
-From: Mike Gilbert <floppym@g.o> |
320 |
-Date: Fri, 28 Jul 2017 16:31:41 -0400 |
321 |
-Subject: [PATCH] Fix gstreamer-1.0 detection |
322 |
- |
323 |
---- |
324 |
- cmake/FindGStreamer_1_0.cmake | 2 +- |
325 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
326 |
- |
327 |
-diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake |
328 |
-index 3aa8fc6dc..6fbc0ecc5 100644 |
329 |
---- a/cmake/FindGStreamer_1_0.cmake |
330 |
-+++ b/cmake/FindGStreamer_1_0.cmake |
331 |
-@@ -59,7 +59,7 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library) |
332 |
- |
333 |
- string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}") |
334 |
- if ("${CMAKE_MATCH_2}" STREQUAL "") |
335 |
-- pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}") |
336 |
-+ pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GSTREAMER_1_0_MINIMUM_VERSION}") |
337 |
- else () |
338 |
- pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name}) |
339 |
- endif () |
340 |
--- |
341 |
-2.13.3 |
342 |
- |
343 |
|
344 |
diff --git a/net-misc/freerdp/files/freerdp-armfp.patch b/net-misc/freerdp/files/freerdp-armfp.patch |
345 |
deleted file mode 100644 |
346 |
index 1a367d5600c..00000000000 |
347 |
--- a/net-misc/freerdp/files/freerdp-armfp.patch |
348 |
+++ /dev/null |
349 |
@@ -1,84 +0,0 @@ |
350 |
-From 2355b54f8516a6e1c600df8f26ac7d56916bfd99 Mon Sep 17 00:00:00 2001 |
351 |
-From: Mike Gilbert <floppym@g.o> |
352 |
-Date: Fri, 1 May 2015 17:35:21 -0400 |
353 |
-Subject: [PATCH] Remove the ARM_FP_ABI option |
354 |
- |
355 |
-It's unclear why this option would be necessary, and it causes problems |
356 |
-when people do not match it to their toolchain and CFLAGS. |
357 |
- |
358 |
-To set the float abi, either use a toolchain with an appropriate default |
359 |
-or set the float-abi option in the CFLAGS environment variable. |
360 |
- |
361 |
-This should resolve #2586. |
362 |
---- |
363 |
- cmake/ConfigOptions.cmake | 6 ------ |
364 |
- libfreerdp/CMakeLists.txt | 4 ++-- |
365 |
- packaging/deb/freerdp-nightly/rules | 7 ------- |
366 |
- 3 files changed, 2 insertions(+), 15 deletions(-) |
367 |
- |
368 |
-diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake |
369 |
-index b51a46b..cef6ba6 100644 |
370 |
---- a/cmake/ConfigOptions.cmake |
371 |
-+++ b/cmake/ConfigOptions.cmake |
372 |
-@@ -29,12 +29,6 @@ if(TARGET_ARCH MATCHES "ARM") |
373 |
- else() |
374 |
- option(WITH_NEON "Enable NEON optimization." OFF) |
375 |
- endif() |
376 |
-- if (NOT DEFINED ARM_FP_ABI) |
377 |
-- set(ARM_FP_ABI "softfp" CACHE STRING "Floating point ABI to use on arm") |
378 |
-- else() |
379 |
-- set(ARM_FP_ABI ${ARM_FP_API} CACHE STRING "Floating point ABI to use on arm") |
380 |
-- endif() |
381 |
-- mark_as_advanced(ARM_FP_ABI) |
382 |
- else() |
383 |
- if(NOT APPLE) |
384 |
- option(WITH_IPP "Use Intel Performance Primitives." OFF) |
385 |
-diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt |
386 |
-index a1cbd9d..112b75a 100644 |
387 |
---- a/libfreerdp/CMakeLists.txt |
388 |
-+++ b/libfreerdp/CMakeLists.txt |
389 |
-@@ -156,7 +156,7 @@ if(WITH_SSE2) |
390 |
- endif() |
391 |
- |
392 |
- if(WITH_NEON) |
393 |
-- set_source_files_properties(${CODEC_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-mfpu=neon -mfloat-abi=${ARM_FP_ABI} -Wno-unused-variable" ) |
394 |
-+ set_source_files_properties(${CODEC_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-mfpu=neon -Wno-unused-variable" ) |
395 |
- set(CODEC_SRCS ${CODEC_SRCS} ${CODEC_NEON_SRCS}) |
396 |
- endif() |
397 |
- |
398 |
-@@ -236,7 +236,7 @@ if(WITH_SSE2) |
399 |
- endif() |
400 |
- elseif(WITH_NEON) |
401 |
- if(CMAKE_COMPILER_IS_GNUCC) |
402 |
-- set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon -mfloat-abi=${ARM_FP_ABI}") |
403 |
-+ set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon") |
404 |
- endif() |
405 |
- # TODO: Add MSVC equivalent |
406 |
- endif() |
407 |
-diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules |
408 |
-index 4366f63..44ceb56 100755 |
409 |
---- a/packaging/deb/freerdp-nightly/rules |
410 |
-+++ b/packaging/deb/freerdp-nightly/rules |
411 |
-@@ -1,11 +1,5 @@ |
412 |
- #!/usr/bin/make -f |
413 |
- |
414 |
--DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) |
415 |
--ifneq (,$(filter armhf,$(DEB_HOST_ARCH))) |
416 |
--ARM_FLOAT_ABI = -DARM_FP_ABI=hard |
417 |
--else |
418 |
--ARM_FLOAT_ABI = |
419 |
--endif |
420 |
- NULL = |
421 |
- |
422 |
- DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_SKIP_RPATH=FALSE \ |
423 |
-@@ -26,7 +20,6 @@ DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_SKIP_RPATH=FALSE \ |
424 |
- -DCMAKE_INSTALL_PREFIX=/opt/freerdp-nightly/ \ |
425 |
- -DCMAKE_INSTALL_INCLUDEDIR=include \ |
426 |
- -DCMAKE_INSTALL_LIBDIR=lib \ |
427 |
-- $(ARM_FLOAT_ABI) \ |
428 |
- $(NULL) |
429 |
- |
430 |
- %: |
431 |
--- |
432 |
-2.5.0 |
433 |
- |
434 |
|
435 |
diff --git a/net-misc/freerdp/files/freerdp-ffmpeg29.patch b/net-misc/freerdp/files/freerdp-ffmpeg29.patch |
436 |
deleted file mode 100644 |
437 |
index e4d81bd1c2a..00000000000 |
438 |
--- a/net-misc/freerdp/files/freerdp-ffmpeg29.patch |
439 |
+++ /dev/null |
440 |
@@ -1,42 +0,0 @@ |
441 |
-https://github.com/FreeRDP/FreeRDP/pull/2895 |
442 |
- |
443 |
-Index: freerdp-1.2.1_pre20150326/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c |
444 |
-=================================================================== |
445 |
---- freerdp-1.2.1_pre20150326.orig/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c |
446 |
-+++ freerdp-1.2.1_pre20150326/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c |
447 |
-@@ -102,7 +102,7 @@ static BOOL tsmf_ffmpeg_init_video_strea |
448 |
- mdecoder->codec_context->bit_rate = media_type->BitRate; |
449 |
- mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator; |
450 |
- mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator; |
451 |
-- mdecoder->frame = avcodec_alloc_frame(); |
452 |
-+ mdecoder->frame = av_frame_alloc(); |
453 |
- return TRUE; |
454 |
- } |
455 |
- |
456 |
-@@ -320,7 +320,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS |
457 |
- mdecoder->codec_context->width, mdecoder->codec_context->height); |
458 |
- mdecoder->decoded_data = malloc(mdecoder->decoded_size); |
459 |
- ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size); |
460 |
-- frame = avcodec_alloc_frame(); |
461 |
-+ frame = av_frame_alloc(); |
462 |
- avpicture_fill((AVPicture*) frame, mdecoder->decoded_data, |
463 |
- mdecoder->codec_context->pix_fmt, |
464 |
- mdecoder->codec_context->width, mdecoder->codec_context->height); |
465 |
-@@ -389,7 +389,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS |
466 |
- (int16_t *) dst, &frame_size, src, src_size); |
467 |
- #else |
468 |
- { |
469 |
-- AVFrame *decoded_frame = avcodec_alloc_frame(); |
470 |
-+ AVFrame *decoded_frame = av_frame_alloc(); |
471 |
- int got_frame = 0; |
472 |
- AVPacket pkt; |
473 |
- av_init_packet(&pkt); |
474 |
-@@ -469,7 +469,7 @@ static UINT32 tsmf_ffmpeg_get_decoded_fo |
475 |
- |
476 |
- switch (mdecoder->codec_context->pix_fmt) |
477 |
- { |
478 |
-- case PIX_FMT_YUV420P: |
479 |
-+ case AV_PIX_FMT_YUV420P: |
480 |
- return RDP_PIXFMT_I420; |
481 |
- default: |
482 |
- WLog_ERR(TAG, "unsupported pixel format %u", |
483 |
|
484 |
diff --git a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild |
485 |
deleted file mode 100644 |
486 |
index 0ead5f2d8dc..00000000000 |
487 |
--- a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild |
488 |
+++ /dev/null |
489 |
@@ -1,114 +0,0 @@ |
490 |
-# Copyright 1999-2017 Gentoo Foundation |
491 |
-# Distributed under the terms of the GNU General Public License v2 |
492 |
- |
493 |
-EAPI="5" |
494 |
- |
495 |
-inherit cmake-utils vcs-snapshot |
496 |
- |
497 |
-if [[ ${PV} != 9999* ]]; then |
498 |
- COMMIT="aa2181dcf2dd98693767ba738c5b2ad8c3d742d4" |
499 |
- SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
500 |
- KEYWORDS="alpha amd64 arm ppc ppc64 x86" |
501 |
-else |
502 |
- inherit git-r3 |
503 |
- SRC_URI="" |
504 |
- EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" |
505 |
-fi |
506 |
- |
507 |
-DESCRIPTION="Free implementation of the Remote Desktop Protocol" |
508 |
-HOMEPAGE="http://www.freerdp.com/" |
509 |
- |
510 |
-LICENSE="Apache-2.0" |
511 |
-SLOT="0/1.2" |
512 |
-IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav |
513 |
- libressl neon pulseaudio server smartcard test usb wayland X xinerama xv" |
514 |
- |
515 |
-RDEPEND=" |
516 |
- !libressl? ( dev-libs/openssl:0 ) |
517 |
- libressl? ( dev-libs/libressl ) |
518 |
- sys-libs/zlib:0 |
519 |
- alsa? ( media-libs/alsa-lib ) |
520 |
- cups? ( net-print/cups ) |
521 |
- client? ( |
522 |
- usb? ( |
523 |
- virtual/libudev:0= |
524 |
- sys-apps/util-linux:0= |
525 |
- dev-libs/dbus-glib:0= |
526 |
- virtual/libusb:1= |
527 |
- ) |
528 |
- X? ( |
529 |
- x11-libs/libXcursor |
530 |
- x11-libs/libXext |
531 |
- x11-libs/libXi |
532 |
- x11-libs/libXrender |
533 |
- xinerama? ( x11-libs/libXinerama ) |
534 |
- xv? ( x11-libs/libXv ) |
535 |
- ) |
536 |
- ) |
537 |
- ffmpeg? ( |
538 |
- libav? ( media-video/libav:0= ) |
539 |
- !libav? ( media-video/ffmpeg:0= ) |
540 |
- ) |
541 |
- gstreamer? ( |
542 |
- media-libs/gstreamer:1.0 |
543 |
- media-libs/gst-plugins-base:1.0 |
544 |
- x11-libs/libXrandr |
545 |
- ) |
546 |
- jpeg? ( virtual/jpeg:0 ) |
547 |
- pulseaudio? ( media-sound/pulseaudio ) |
548 |
- server? ( |
549 |
- X? ( |
550 |
- x11-libs/libXcursor |
551 |
- x11-libs/libXdamage |
552 |
- x11-libs/libXext |
553 |
- x11-libs/libXfixes |
554 |
- xinerama? ( x11-libs/libXinerama ) |
555 |
- ) |
556 |
- ) |
557 |
- smartcard? ( sys-apps/pcsc-lite ) |
558 |
- wayland? ( dev-libs/wayland ) |
559 |
- X? ( |
560 |
- x11-libs/libX11 |
561 |
- x11-libs/libxkbfile |
562 |
- ) |
563 |
-" |
564 |
-DEPEND="${RDEPEND} |
565 |
- virtual/pkgconfig |
566 |
- client? ( X? ( doc? ( |
567 |
- app-text/docbook-xml-dtd:4.1.2 |
568 |
- app-text/xmlto |
569 |
- ) ) ) |
570 |
-" |
571 |
- |
572 |
-DOCS=( README ) |
573 |
- |
574 |
-PATCHES=( |
575 |
- "${FILESDIR}/freerdp-armfp.patch" |
576 |
- "${FILESDIR}/freerdp-ffmpeg29.patch" |
577 |
- "${FILESDIR}/1.2.1-gstreamer.patch" |
578 |
-) |
579 |
- |
580 |
-src_configure() { |
581 |
- local mycmakeargs=( |
582 |
- $(cmake-utils_use_with alsa ALSA) |
583 |
- $(cmake-utils_use_with client CLIENT) |
584 |
- $(cmake-utils_use_with cups CUPS) |
585 |
- $(cmake-utils_use_with debug DEBUG_ALL) |
586 |
- $(cmake-utils_use_with doc MANPAGES) |
587 |
- $(cmake-utils_use_with ffmpeg FFMPEG) |
588 |
- $(cmake-utils_use_with gstreamer GSTREAMER_1_0) |
589 |
- $(cmake-utils_use_with jpeg JPEG) |
590 |
- $(cmake-utils_use_with neon NEON) |
591 |
- $(cmake-utils_use_with pulseaudio PULSE) |
592 |
- $(cmake-utils_use_with server SERVER) |
593 |
- $(cmake-utils_use_with smartcard PCSC) |
594 |
- $(cmake-utils_use_with cpu_flags_x86_sse2 SSE2) |
595 |
- $(cmake-utils_use usb CHANNEL_URBDRC) |
596 |
- $(cmake-utils_use_with X X11) |
597 |
- $(cmake-utils_use_with xinerama XINERAMA) |
598 |
- $(cmake-utils_use_with xv XV) |
599 |
- $(cmake-utils_use_build test TESTING) |
600 |
- $(cmake-utils_use_with wayland WAYLAND) |
601 |
- ) |
602 |
- cmake-utils_src_configure |
603 |
-} |
604 |
|
605 |
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild |
606 |
deleted file mode 100644 |
607 |
index 4d54e1eef9c..00000000000 |
608 |
--- a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild |
609 |
+++ /dev/null |
610 |
@@ -1,124 +0,0 @@ |
611 |
-# Copyright 1999-2017 Gentoo Foundation |
612 |
-# Distributed under the terms of the GNU General Public License v2 |
613 |
- |
614 |
-EAPI="6" |
615 |
- |
616 |
-inherit cmake-utils |
617 |
- |
618 |
-if [[ ${PV} != 9999 ]]; then |
619 |
- MY_PV="${PV/_/-}" |
620 |
- MY_P="FreeRDP-${MY_PV}" |
621 |
- S="${WORKDIR}/${MY_P}" |
622 |
- SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
623 |
- KEYWORDS="alpha amd64 arm ppc ppc64 x86" |
624 |
-else |
625 |
- inherit git-r3 |
626 |
- SRC_URI="" |
627 |
- EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" |
628 |
-fi |
629 |
- |
630 |
-DESCRIPTION="Free implementation of the Remote Desktop Protocol" |
631 |
-HOMEPAGE="http://www.freerdp.com/" |
632 |
- |
633 |
-LICENSE="Apache-2.0" |
634 |
-SLOT="0/2" |
635 |
-IUSE="alsa +client cpu_flags_x86_ssse3 cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" |
636 |
- |
637 |
-RDEPEND=" |
638 |
- !libressl? ( dev-libs/openssl:0= ) |
639 |
- libressl? ( dev-libs/libressl:0= ) |
640 |
- sys-libs/zlib:0 |
641 |
- alsa? ( media-libs/alsa-lib ) |
642 |
- cups? ( net-print/cups ) |
643 |
- client? ( |
644 |
- usb? ( |
645 |
- virtual/libudev:0= |
646 |
- sys-apps/util-linux:0= |
647 |
- dev-libs/dbus-glib:0= |
648 |
- virtual/libusb:1= |
649 |
- ) |
650 |
- X? ( |
651 |
- x11-libs/libXcursor |
652 |
- x11-libs/libXext |
653 |
- x11-libs/libXi |
654 |
- x11-libs/libXrender |
655 |
- xinerama? ( x11-libs/libXinerama ) |
656 |
- xv? ( x11-libs/libXv ) |
657 |
- ) |
658 |
- ) |
659 |
- ffmpeg? ( |
660 |
- libav? ( media-video/libav:0= ) |
661 |
- !libav? ( media-video/ffmpeg:0= ) |
662 |
- ) |
663 |
- gstreamer? ( |
664 |
- media-libs/gstreamer:1.0 |
665 |
- media-libs/gst-plugins-base:1.0 |
666 |
- x11-libs/libXrandr |
667 |
- ) |
668 |
- jpeg? ( virtual/jpeg:0 ) |
669 |
- openh264? ( media-libs/openh264 ) |
670 |
- pulseaudio? ( media-sound/pulseaudio ) |
671 |
- server? ( |
672 |
- X? ( |
673 |
- x11-libs/libXcursor |
674 |
- x11-libs/libXdamage |
675 |
- x11-libs/libXext |
676 |
- x11-libs/libXfixes |
677 |
- x11-libs/libXrandr |
678 |
- x11-libs/libXtst |
679 |
- xinerama? ( x11-libs/libXinerama ) |
680 |
- ) |
681 |
- ) |
682 |
- smartcard? ( sys-apps/pcsc-lite ) |
683 |
- systemd? ( sys-apps/systemd:0= ) |
684 |
- wayland? ( |
685 |
- dev-libs/wayland |
686 |
- x11-libs/libxkbcommon |
687 |
- ) |
688 |
- X? ( |
689 |
- x11-libs/libX11 |
690 |
- x11-libs/libxkbfile |
691 |
- ) |
692 |
-" |
693 |
-DEPEND="${RDEPEND} |
694 |
- virtual/pkgconfig |
695 |
- client? ( X? ( doc? ( |
696 |
- app-text/docbook-xml-dtd:4.1.2 |
697 |
- app-text/xmlto |
698 |
- ) ) ) |
699 |
-" |
700 |
- |
701 |
-DOCS=( README ) |
702 |
-PATCHES=( |
703 |
- "${FILESDIR}"/2.0.0-rc0-libressl.patch |
704 |
- "${FILESDIR}"/freerdp-Fix-gstreamer-1.0-detection.patch |
705 |
-) |
706 |
- |
707 |
-src_configure() { |
708 |
- local mycmakeargs=( |
709 |
- -DBUILD_TESTING=$(usex test) |
710 |
- -DCHANNEL_URBDRC=$(usex usb) |
711 |
- -DWITH_ALSA=$(usex alsa) |
712 |
- -DWITH_CCACHE=OFF |
713 |
- -DWITH_CLIENT=$(usex client) |
714 |
- -DWITH_CUPS=$(usex cups) |
715 |
- -DWITH_DEBUG_ALL=$(usex debug) |
716 |
- -DWITH_MANPAGES=$(usex doc) |
717 |
- -DWITH_FFMPEG=$(usex ffmpeg) |
718 |
- -DWITH_GSTREAMER_1_0=$(usex gstreamer) |
719 |
- -DWITH_JPEG=$(usex jpeg) |
720 |
- -DWITH_NEON=$(usex neon) |
721 |
- -DWITH_OPENH264=$(usex openh264) |
722 |
- -DWITH_PULSE=$(usex pulseaudio) |
723 |
- -DWITH_SERVER=$(usex server) |
724 |
- -DWITH_PCSC=$(usex smartcard) |
725 |
- -DWITH_LIBSYSTEMD=$(usex systemd) |
726 |
- # WITH_SSE2 actually enables code requiring SSSE3 |
727 |
- -DWITH_SSE2=$(usex cpu_flags_x86_ssse3) |
728 |
- -DWITH_X11=$(usex X) |
729 |
- -DWITH_XINERAMA=$(usex xinerama) |
730 |
- -DWITH_XV=$(usex xv) |
731 |
- -DWITH_WAYLAND=$(usex wayland) |
732 |
- ) |
733 |
- cmake-utils_src_configure |
734 |
-} |
735 |
|
736 |
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild |
737 |
deleted file mode 100644 |
738 |
index a84d3524129..00000000000 |
739 |
--- a/net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild |
740 |
+++ /dev/null |
741 |
@@ -1,123 +0,0 @@ |
742 |
-# Copyright 1999-2018 Gentoo Foundation |
743 |
-# Distributed under the terms of the GNU General Public License v2 |
744 |
- |
745 |
-EAPI="6" |
746 |
- |
747 |
-inherit cmake-utils |
748 |
- |
749 |
-if [[ ${PV} != 9999 ]]; then |
750 |
- MY_PV="${PV/_/-}" |
751 |
- MY_P="FreeRDP-${MY_PV}" |
752 |
- S="${WORKDIR}/${MY_P}" |
753 |
- SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
754 |
- KEYWORDS="alpha amd64 arm ~ppc ~ppc64 x86" |
755 |
-else |
756 |
- inherit git-r3 |
757 |
- SRC_URI="" |
758 |
- EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" |
759 |
-fi |
760 |
- |
761 |
-DESCRIPTION="Free implementation of the Remote Desktop Protocol" |
762 |
-HOMEPAGE="http://www.freerdp.com/" |
763 |
- |
764 |
-LICENSE="Apache-2.0" |
765 |
-SLOT="0/2" |
766 |
-IUSE="alsa +client cpu_flags_x86_ssse3 cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" |
767 |
- |
768 |
-RDEPEND=" |
769 |
- !libressl? ( dev-libs/openssl:0= ) |
770 |
- libressl? ( dev-libs/libressl:0= ) |
771 |
- sys-libs/zlib:0 |
772 |
- alsa? ( media-libs/alsa-lib ) |
773 |
- cups? ( net-print/cups ) |
774 |
- client? ( |
775 |
- usb? ( |
776 |
- virtual/libudev:0= |
777 |
- sys-apps/util-linux:0= |
778 |
- dev-libs/dbus-glib:0= |
779 |
- virtual/libusb:1= |
780 |
- ) |
781 |
- X? ( |
782 |
- x11-libs/libXcursor |
783 |
- x11-libs/libXext |
784 |
- x11-libs/libXi |
785 |
- x11-libs/libXrender |
786 |
- xinerama? ( x11-libs/libXinerama ) |
787 |
- xv? ( x11-libs/libXv ) |
788 |
- ) |
789 |
- ) |
790 |
- ffmpeg? ( |
791 |
- libav? ( media-video/libav:0= ) |
792 |
- !libav? ( media-video/ffmpeg:0= ) |
793 |
- ) |
794 |
- gstreamer? ( |
795 |
- media-libs/gstreamer:1.0 |
796 |
- media-libs/gst-plugins-base:1.0 |
797 |
- x11-libs/libXrandr |
798 |
- ) |
799 |
- jpeg? ( virtual/jpeg:0 ) |
800 |
- openh264? ( media-libs/openh264 ) |
801 |
- pulseaudio? ( media-sound/pulseaudio ) |
802 |
- server? ( |
803 |
- X? ( |
804 |
- x11-libs/libXcursor |
805 |
- x11-libs/libXdamage |
806 |
- x11-libs/libXext |
807 |
- x11-libs/libXfixes |
808 |
- x11-libs/libXrandr |
809 |
- x11-libs/libXtst |
810 |
- xinerama? ( x11-libs/libXinerama ) |
811 |
- ) |
812 |
- ) |
813 |
- smartcard? ( sys-apps/pcsc-lite ) |
814 |
- systemd? ( sys-apps/systemd:0= ) |
815 |
- wayland? ( |
816 |
- dev-libs/wayland |
817 |
- x11-libs/libxkbcommon |
818 |
- ) |
819 |
- X? ( |
820 |
- x11-libs/libX11 |
821 |
- x11-libs/libxkbfile |
822 |
- ) |
823 |
-" |
824 |
-DEPEND="${RDEPEND} |
825 |
- virtual/pkgconfig |
826 |
- client? ( X? ( doc? ( |
827 |
- app-text/docbook-xml-dtd:4.1.2 |
828 |
- app-text/xmlto |
829 |
- ) ) ) |
830 |
-" |
831 |
- |
832 |
-PATCHES=( |
833 |
- "${FILESDIR}/2.0.0-rc1-libressl.patch" |
834 |
- "${FILESDIR}/2.0.0-rc1-CredSSP-protocol-version.patch" |
835 |
-) |
836 |
- |
837 |
-src_configure() { |
838 |
- local mycmakeargs=( |
839 |
- -DBUILD_TESTING=$(usex test) |
840 |
- -DCHANNEL_URBDRC=$(usex usb) |
841 |
- -DWITH_ALSA=$(usex alsa) |
842 |
- -DWITH_CCACHE=OFF |
843 |
- -DWITH_CLIENT=$(usex client) |
844 |
- -DWITH_CUPS=$(usex cups) |
845 |
- -DWITH_DEBUG_ALL=$(usex debug) |
846 |
- -DWITH_MANPAGES=$(usex doc) |
847 |
- -DWITH_FFMPEG=$(usex ffmpeg) |
848 |
- -DWITH_GSTREAMER_1_0=$(usex gstreamer) |
849 |
- -DWITH_JPEG=$(usex jpeg) |
850 |
- -DWITH_NEON=$(usex neon) |
851 |
- -DWITH_OPENH264=$(usex openh264) |
852 |
- -DWITH_PULSE=$(usex pulseaudio) |
853 |
- -DWITH_SERVER=$(usex server) |
854 |
- -DWITH_PCSC=$(usex smartcard) |
855 |
- -DWITH_LIBSYSTEMD=$(usex systemd) |
856 |
- # WITH_SSE2 actually enables code requiring SSSE3 |
857 |
- -DWITH_SSE2=$(usex cpu_flags_x86_ssse3) |
858 |
- -DWITH_X11=$(usex X) |
859 |
- -DWITH_XINERAMA=$(usex xinerama) |
860 |
- -DWITH_XV=$(usex xv) |
861 |
- -DWITH_WAYLAND=$(usex wayland) |
862 |
- ) |
863 |
- cmake-utils_src_configure |
864 |
-} |
865 |
|
866 |
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc3-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc3-r1.ebuild |
867 |
deleted file mode 100644 |
868 |
index 0d86ec92947..00000000000 |
869 |
--- a/net-misc/freerdp/freerdp-2.0.0_rc3-r1.ebuild |
870 |
+++ /dev/null |
871 |
@@ -1,116 +0,0 @@ |
872 |
-# Copyright 1999-2018 Gentoo Foundation |
873 |
-# Distributed under the terms of the GNU General Public License v2 |
874 |
- |
875 |
-EAPI="6" |
876 |
- |
877 |
-inherit cmake-utils |
878 |
- |
879 |
-if [[ ${PV} != 9999 ]]; then |
880 |
- MY_P=${P/_/-} |
881 |
- S="${WORKDIR}/${MY_P}" |
882 |
- SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" |
883 |
- KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" |
884 |
-else |
885 |
- inherit git-r3 |
886 |
- SRC_URI="" |
887 |
- EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" |
888 |
-fi |
889 |
- |
890 |
-DESCRIPTION="Free implementation of the Remote Desktop Protocol" |
891 |
-HOMEPAGE="http://www.freerdp.com/" |
892 |
- |
893 |
-LICENSE="Apache-2.0" |
894 |
-SLOT="0/2" |
895 |
-IUSE="alsa +client cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" |
896 |
- |
897 |
-RDEPEND=" |
898 |
- !libressl? ( dev-libs/openssl:0= ) |
899 |
- libressl? ( dev-libs/libressl:0= ) |
900 |
- sys-libs/zlib:0 |
901 |
- alsa? ( media-libs/alsa-lib ) |
902 |
- cups? ( net-print/cups ) |
903 |
- client? ( |
904 |
- usb? ( |
905 |
- virtual/libudev:0= |
906 |
- sys-apps/util-linux:0= |
907 |
- dev-libs/dbus-glib:0= |
908 |
- virtual/libusb:1= |
909 |
- ) |
910 |
- X? ( |
911 |
- x11-libs/libXcursor |
912 |
- x11-libs/libXext |
913 |
- x11-libs/libXi |
914 |
- x11-libs/libXrender |
915 |
- xinerama? ( x11-libs/libXinerama ) |
916 |
- xv? ( x11-libs/libXv ) |
917 |
- ) |
918 |
- ) |
919 |
- ffmpeg? ( |
920 |
- libav? ( media-video/libav:0= ) |
921 |
- !libav? ( media-video/ffmpeg:0= ) |
922 |
- ) |
923 |
- gstreamer? ( |
924 |
- media-libs/gstreamer:1.0 |
925 |
- media-libs/gst-plugins-base:1.0 |
926 |
- x11-libs/libXrandr |
927 |
- ) |
928 |
- jpeg? ( virtual/jpeg:0 ) |
929 |
- openh264? ( media-libs/openh264 ) |
930 |
- pulseaudio? ( media-sound/pulseaudio ) |
931 |
- server? ( |
932 |
- X? ( |
933 |
- x11-libs/libXcursor |
934 |
- x11-libs/libXdamage |
935 |
- x11-libs/libXext |
936 |
- x11-libs/libXfixes |
937 |
- x11-libs/libXrandr |
938 |
- x11-libs/libXtst |
939 |
- xinerama? ( x11-libs/libXinerama ) |
940 |
- ) |
941 |
- ) |
942 |
- smartcard? ( sys-apps/pcsc-lite ) |
943 |
- systemd? ( sys-apps/systemd:0= ) |
944 |
- wayland? ( |
945 |
- dev-libs/wayland |
946 |
- x11-libs/libxkbcommon |
947 |
- ) |
948 |
- X? ( |
949 |
- x11-libs/libX11 |
950 |
- x11-libs/libxkbfile |
951 |
- ) |
952 |
-" |
953 |
-DEPEND="${RDEPEND} |
954 |
- virtual/pkgconfig |
955 |
- client? ( X? ( doc? ( |
956 |
- app-text/docbook-xml-dtd:4.1.2 |
957 |
- app-text/xmlto |
958 |
- ) ) ) |
959 |
-" |
960 |
- |
961 |
-src_configure() { |
962 |
- local mycmakeargs=( |
963 |
- -DBUILD_TESTING=$(usex test) |
964 |
- -DCHANNEL_URBDRC=$(usex usb) |
965 |
- -DWITH_ALSA=$(usex alsa) |
966 |
- -DWITH_CCACHE=OFF |
967 |
- -DWITH_CLIENT=$(usex client) |
968 |
- -DWITH_CUPS=$(usex cups) |
969 |
- -DWITH_DEBUG_ALL=$(usex debug) |
970 |
- -DWITH_MANPAGES=$(usex doc) |
971 |
- -DWITH_FFMPEG=$(usex ffmpeg) |
972 |
- -DWITH_DSP_FFMPEG=$(usex ffmpeg) |
973 |
- -DWITH_GSTREAMER_1_0=$(usex gstreamer) |
974 |
- -DWITH_JPEG=$(usex jpeg) |
975 |
- -DWITH_NEON=$(usex neon) |
976 |
- -DWITH_OPENH264=$(usex openh264) |
977 |
- -DWITH_PULSE=$(usex pulseaudio) |
978 |
- -DWITH_SERVER=$(usex server) |
979 |
- -DWITH_PCSC=$(usex smartcard) |
980 |
- -DWITH_LIBSYSTEMD=$(usex systemd) |
981 |
- -DWITH_X11=$(usex X) |
982 |
- -DWITH_XINERAMA=$(usex xinerama) |
983 |
- -DWITH_XV=$(usex xv) |
984 |
- -DWITH_WAYLAND=$(usex wayland) |
985 |
- ) |
986 |
- cmake-utils_src_configure |
987 |
-} |
988 |
|
989 |
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc3.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc3.ebuild |
990 |
deleted file mode 100644 |
991 |
index 48abe1a3fc7..00000000000 |
992 |
--- a/net-misc/freerdp/freerdp-2.0.0_rc3.ebuild |
993 |
+++ /dev/null |
994 |
@@ -1,115 +0,0 @@ |
995 |
-# Copyright 1999-2018 Gentoo Foundation |
996 |
-# Distributed under the terms of the GNU General Public License v2 |
997 |
- |
998 |
-EAPI="6" |
999 |
- |
1000 |
-inherit cmake-utils |
1001 |
- |
1002 |
-if [[ ${PV} != 9999 ]]; then |
1003 |
- MY_P=${P/_/-} |
1004 |
- S="${WORKDIR}/${MY_P}" |
1005 |
- SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" |
1006 |
- KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" |
1007 |
-else |
1008 |
- inherit git-r3 |
1009 |
- SRC_URI="" |
1010 |
- EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" |
1011 |
-fi |
1012 |
- |
1013 |
-DESCRIPTION="Free implementation of the Remote Desktop Protocol" |
1014 |
-HOMEPAGE="http://www.freerdp.com/" |
1015 |
- |
1016 |
-LICENSE="Apache-2.0" |
1017 |
-SLOT="0/2" |
1018 |
-IUSE="alsa +client cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" |
1019 |
- |
1020 |
-RDEPEND=" |
1021 |
- !libressl? ( dev-libs/openssl:0= ) |
1022 |
- libressl? ( dev-libs/libressl:0= ) |
1023 |
- sys-libs/zlib:0 |
1024 |
- alsa? ( media-libs/alsa-lib ) |
1025 |
- cups? ( net-print/cups ) |
1026 |
- client? ( |
1027 |
- usb? ( |
1028 |
- virtual/libudev:0= |
1029 |
- sys-apps/util-linux:0= |
1030 |
- dev-libs/dbus-glib:0= |
1031 |
- virtual/libusb:1= |
1032 |
- ) |
1033 |
- X? ( |
1034 |
- x11-libs/libXcursor |
1035 |
- x11-libs/libXext |
1036 |
- x11-libs/libXi |
1037 |
- x11-libs/libXrender |
1038 |
- xinerama? ( x11-libs/libXinerama ) |
1039 |
- xv? ( x11-libs/libXv ) |
1040 |
- ) |
1041 |
- ) |
1042 |
- ffmpeg? ( |
1043 |
- libav? ( media-video/libav:0= ) |
1044 |
- !libav? ( media-video/ffmpeg:0= ) |
1045 |
- ) |
1046 |
- gstreamer? ( |
1047 |
- media-libs/gstreamer:1.0 |
1048 |
- media-libs/gst-plugins-base:1.0 |
1049 |
- x11-libs/libXrandr |
1050 |
- ) |
1051 |
- jpeg? ( virtual/jpeg:0 ) |
1052 |
- openh264? ( media-libs/openh264 ) |
1053 |
- pulseaudio? ( media-sound/pulseaudio ) |
1054 |
- server? ( |
1055 |
- X? ( |
1056 |
- x11-libs/libXcursor |
1057 |
- x11-libs/libXdamage |
1058 |
- x11-libs/libXext |
1059 |
- x11-libs/libXfixes |
1060 |
- x11-libs/libXrandr |
1061 |
- x11-libs/libXtst |
1062 |
- xinerama? ( x11-libs/libXinerama ) |
1063 |
- ) |
1064 |
- ) |
1065 |
- smartcard? ( sys-apps/pcsc-lite ) |
1066 |
- systemd? ( sys-apps/systemd:0= ) |
1067 |
- wayland? ( |
1068 |
- dev-libs/wayland |
1069 |
- x11-libs/libxkbcommon |
1070 |
- ) |
1071 |
- X? ( |
1072 |
- x11-libs/libX11 |
1073 |
- x11-libs/libxkbfile |
1074 |
- ) |
1075 |
-" |
1076 |
-DEPEND="${RDEPEND} |
1077 |
- virtual/pkgconfig |
1078 |
- client? ( X? ( doc? ( |
1079 |
- app-text/docbook-xml-dtd:4.1.2 |
1080 |
- app-text/xmlto |
1081 |
- ) ) ) |
1082 |
-" |
1083 |
- |
1084 |
-src_configure() { |
1085 |
- local mycmakeargs=( |
1086 |
- -DBUILD_TESTING=$(usex test) |
1087 |
- -DCHANNEL_URBDRC=$(usex usb) |
1088 |
- -DWITH_ALSA=$(usex alsa) |
1089 |
- -DWITH_CCACHE=OFF |
1090 |
- -DWITH_CLIENT=$(usex client) |
1091 |
- -DWITH_CUPS=$(usex cups) |
1092 |
- -DWITH_DEBUG_ALL=$(usex debug) |
1093 |
- -DWITH_MANPAGES=$(usex doc) |
1094 |
- -DWITH_FFMPEG=$(usex ffmpeg) |
1095 |
- -DWITH_GSTREAMER_1_0=$(usex gstreamer) |
1096 |
- -DWITH_JPEG=$(usex jpeg) |
1097 |
- -DWITH_NEON=$(usex neon) |
1098 |
- -DWITH_OPENH264=$(usex openh264) |
1099 |
- -DWITH_PULSE=$(usex pulseaudio) |
1100 |
- -DWITH_SERVER=$(usex server) |
1101 |
- -DWITH_PCSC=$(usex smartcard) |
1102 |
- -DWITH_LIBSYSTEMD=$(usex systemd) |
1103 |
- -DWITH_X11=$(usex X) |
1104 |
- -DWITH_XINERAMA=$(usex xinerama) |
1105 |
- -DWITH_XV=$(usex xv) |
1106 |
- -DWITH_WAYLAND=$(usex wayland) |
1107 |
- ) |
1108 |
- cmake-utils_src_configure |
1109 |
-} |