From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- net-misc/freerdp/Manifest | 19 +--- net-misc/freerdp/files/1.2.1-gstreamer.patch | 71 ------------ net-misc/freerdp/files/2.0.0-rc0-libressl.patch | 89 --------------- .../files/2.0.0-rc1-CredSSP-protocol-version.patch | 49 -------- net-misc/freerdp/files/2.0.0-rc1-libressl.patch | 35 ------ net-misc/freerdp/files/2.0.0-rc4-libressl.patch | 47 ++++++++ .../freerdp-Fix-gstreamer-1.0-detection.patch | 25 ----- net-misc/freerdp/files/freerdp-armfp.patch | 84 -------------- net-misc/freerdp/files/freerdp-ffmpeg29.patch | 42 ------- .../freerdp/freerdp-1.2.1_pre20150326-r1.ebuild | 114 ------------------- net-misc/freerdp/freerdp-2.0.0_rc0.ebuild | 124 --------------------- net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild | 123 -------------------- net-misc/freerdp/freerdp-2.0.0_rc3-r1.ebuild | 116 ------------------- net-misc/freerdp/freerdp-2.0.0_rc3.ebuild | 115 ------------------- net-misc/freerdp/freerdp-2.0.0_rc4.ebuild | 120 ++++++++++++++++++++ 15 files changed, 170 insertions(+), 1003 deletions(-) delete mode 100644 net-misc/freerdp/files/1.2.1-gstreamer.patch delete mode 100644 net-misc/freerdp/files/2.0.0-rc0-libressl.patch delete mode 100644 net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch delete mode 100644 net-misc/freerdp/files/2.0.0-rc1-libressl.patch create mode 100644 net-misc/freerdp/files/2.0.0-rc4-libressl.patch delete mode 100644 net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch delete mode 100644 net-misc/freerdp/files/freerdp-armfp.patch delete mode 100644 net-misc/freerdp/files/freerdp-ffmpeg29.patch delete mode 100644 net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild delete mode 100644 net-misc/freerdp/freerdp-2.0.0_rc0.ebuild delete mode 100644 net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild delete mode 100644 net-misc/freerdp/freerdp-2.0.0_rc3-r1.ebuild delete mode 100644 net-misc/freerdp/freerdp-2.0.0_rc3.ebuild create mode 100644 net-misc/freerdp/freerdp-2.0.0_rc4.ebuild (limited to 'net-misc/freerdp') diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index 04e1843d8866..a2835d54ec80 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,21 +1,8 @@ -AUX 1.2.1-gstreamer.patch 3675 BLAKE2B 7e9ead69d46288a96e060451ed17e445e0feb27886d248e761b9bb0a2f25ba4b2c266e3cf9fd5a91429e3ea38cf78dec94c4a8b4fc6e2e2e23e8eeea3c718206 SHA512 758675e9f9292acc9877c37e240c8144a2e4f2f0440f9a75b64895f0f8514bb991cab4295250107b85df2058f07988c93f399690c8e06dbcfcb023d9dfde921e -AUX 2.0.0-rc0-libressl.patch 3404 BLAKE2B 0365d3235e939917d4bc53ae4561d2085c4b7a99b8c585eddb8e5dea26a5038ea0a7f09b7ce1571516a4ce9e93b29113f2d35a1ff535a9a40a484352867bcb23 SHA512 b7b1018da4469de6c688e5894b200ec6846090e7e04ccd3e8e38b6f500832e75ffb30eef84845628eb26ed9ca64a4768dfd5c6a2f44d1fd13ad58b60074be21b -AUX 2.0.0-rc1-CredSSP-protocol-version.patch 1474 BLAKE2B de37ed627f146807b6aa1a61c766d2909fe056ce0da5e5012d1a6503c6c92a5fc5ba03f82edaa4259d16e55bf8556eb7b9758663b672c5eae17b82034a441693 SHA512 c25f07d162817de0666bf9cfa296580c74b19b3326e1a009123dcf133fb67a876d3bcc99c23b09e96e3072f2811bec236f619b9eec0189b31dcb1e51c8ea1102 -AUX 2.0.0-rc1-libressl.patch 1196 BLAKE2B 73d75cb75f2ec3b7e4fe8a4f410f76ec69be4bae256dbed641796000a023c9f9516ec0815d3bdf968fab0fb92a12a8756221afd528280074aa7e96a8b39e8827 SHA512 e1404580a644253ef681a51c187fd8a3e983aa406276bf8420af7b5bdff2a42446e6ebd3c922d08fe0481ad1f7edf1a648d4be6eaa0fb6f2be4af8fd27aad7e0 AUX 2.0.0-rc2-primitives.patch 1493 BLAKE2B 6799a594c5e88ef92893d490137be0d5414b4f5856b64899b14c97a76d685c8a663211aca51018e77cd3c8ba30e24203dcc895dcdb830f324353a2b8edc43aae SHA512 01a4d68493709352faf62d222b62e0368fca368f2b6e9ffff648af999d419675ab02fad2c8a9a9fb6149abca9bedbe35a35018dbeb82784d993fd09e3df62ab2 -AUX freerdp-Fix-gstreamer-1.0-detection.patch 989 BLAKE2B 97989faf7984ed4b2f5720e45c590fb2f7751b6ebb18b244bf4e328d46856fc954020842aba49af75ac4bc2759f34687d95177ae8d7d7dfdef64a09f024f8315 SHA512 50fb859ce7dfb2af89efe5f40f0cf318da3fd32503b51e133e296420bde16bbc090f0aa10f6df09dce5ff9769e79fcabc1535f89413d962b7b06f6461dfcfb77 -AUX freerdp-armfp.patch 2930 BLAKE2B 33f324a88bcaa0f5340e9becdbc4c50589d8ecbc57c2f74da471b1b472e3b9895b8d26884df2b7d559c1b51b7e1d49450e710587d8b9a529755501af67e3c25f SHA512 57dd03e82b822fed95a5379aa79ada99910ef6c2a9cfaab1dc721181f76aa249d839576d31aa83e3568a37abc5b81a3ff8c5c2d0d15e6a5e457d254660581a48 -AUX freerdp-ffmpeg29.patch 1778 BLAKE2B a34acaa93eb59c01623151989ef8dd97e0aecc394219249d33ab6815b295e105a5d7db4baeca44a4a43f53665919a65466f9423b002e40648b02aaf6c1ea879b SHA512 c58acc5ddab34fe664d38649b7271ad793430cb1c9ad8e6b78f1924a8b70e1b8d76c426fb633cf6dd97fe3277664649fd7254e2e4377330c64234d23f1b26fd1 -DIST FreeRDP-2.0.0-rc0.tar.gz 6486529 BLAKE2B 6d9bf0e88c925f2184f87696b78a374c5fb24ecb3014515e077825805191fcb2e58b930ef4eccb797d496d142024357ca7562426e990a65cd3c54c58de3cc525 SHA512 d3eb0d5d23aa2a4d0277414f13a984d40aba051102c5af1e5ade975cdb469ef3549b145cd4339415fc33f056044929cfac71884512ea77a1e718d70d5b21b9dd -DIST FreeRDP-2.0.0-rc1.tar.gz 6530403 BLAKE2B 5e276c3d1153f04512dba4bf09807751ca70ece3496c1ba00766b04369fffde8d86ad446345f0eab0fea4641708b7f985f95ea4a6001107163ee60e35822a955 SHA512 5d8fd7d6900feac1e42bfc0ebc111524205c3baa093958ced42d03635076ae7d88cd86439a22ff0656bc53f0302daee5a114a4ac26328ae598ee086490926182 -DIST freerdp-1.2.1_pre20150326.tar.gz 6146857 BLAKE2B 8ead05b89e129ba09b046f545073d128ca1d44dac7248c23bc543094f0fd23f336c890367945e7fce4def98c4ce1e01c4e5a970e92f3d4f74d08daf3cf0a8c6a SHA512 ca1499d56ecb9c9bc624de2ecc976eb9633b795050ac01e16fcc9e0a8951d274cc63644a0e2b830e75f66de894f6a22274864fd20a9351834f6d664874e65ec8 +AUX 2.0.0-rc4-libressl.patch 1770 BLAKE2B a0f9c5938ecc9ee6f7ec3d67f0a285285c5dc42b95b7c452f461d4fe96cd9ab26c3062426d2cf22e5ebe72d26befab25730573c22419020176cbabd97e8e35aa SHA512 c27ebee51e88e94b845f633d1c4c6eeff19bda977ac98cd25ae1e9eb589c68499e97eb2fb4fdfdb1f5dbbaf71653d657b3dfe8805c78460c6fdcdf80261ebb0d DIST freerdp-2.0.0-rc2.tar.gz 6611081 BLAKE2B 564abd6289f0c9d3947b9074111ade8c2e7b6e6dce9af8a06ef1772d0e76822c5df80932a5cbac2f23c4d2a76d4796c12bd4fa067c6ef21ea84a1b8423be1ce3 SHA512 cb765b3b9559c4877be4c10e5df9e95d11a0184ce34e89564097c3234f859de8e82b6de6217396628e5f70c85c40c65ccd75f9b0f7f89daaed7e0e971a833589 -DIST freerdp-2.0.0-rc3.tar.gz 6575186 BLAKE2B a99b54ca284d1c5c61104e22edd6bb4bc435ed1d5b95a84f089c06e6d49c14987be24c5e6b08e02f7df4a56230159c827b8ada24f68ff0188e74c0386507d691 SHA512 0019daadd5f0071d983053c554834392a751ec3bcde2ed96d4c0fceb7c32a319b9bbfeb68ff9b15216f7db479c883b461e7c51e612c99626dd09af5a68ff96f5 -EBUILD freerdp-1.2.1_pre20150326-r1.ebuild 2786 BLAKE2B fe5e87301c14a9f29b33ca4994abd5deeded6938631ed184139d452b49b98b957f03c57e709a4df6cda2627a773e6cc0bb7699bcba522aba7aa8548b4cafade9 SHA512 57788c008c8d32a69ae90ce741cca7b12d7b8d0808fd4e151bd99febb70b7d7d016dc6d586eaf9dfc3ef888cec0b752c0eb9805610ac6910dbd0808914bb5900 -EBUILD freerdp-2.0.0_rc0.ebuild 2907 BLAKE2B 1c4ff670b1e7db50ca56af231ce54a080095f8fce142bcb96cabf2908ff71ff11159e691a7e21fab5fd7e436f28ad644af6f710958c92a1908b77dfc7deb9407 SHA512 dc9b9e146822c84ed51e2221f10ba500ec51392f21f9d75fa3c10f1408c6f3fc266fdbc5f11bbf5dde566699e0e01ffd7bb0e85c072baa774e2933338fd2e9f2 -EBUILD freerdp-2.0.0_rc1-r1.ebuild 2892 BLAKE2B db7a01064767e64c2a7a70da24f61c41a02f0eb471f0f54092401a8b15865fcea61e9cde7e92e811a38e91ac90442523fc507ebb12a5df49c3fc82d94442fde1 SHA512 20910eaf36b9a4eb38231f96dc30443e760eae0f794d28a98f3187e424500e651f715ff79edb05400fea962a9d99cbc4c2ac32955391ac762e822eec666452fa +DIST freerdp-2.0.0-rc4.tar.gz 6662044 BLAKE2B 50bc72336841e421b8fd89ce4f2be6a0b1a9f052933c4cd5bad33261689e6a6b54bc5563fb1ace8cc7a2271990c0ff4c7fe239243f5d75140af497ee6ff9bcd6 SHA512 63cf89aecc6d7ac55db8c7aca60f4ba29cfa54ad70d0fa87fdab011cd16500a3d184659119cd08b7596b7236346db3b61b46282c5325d7f0ca6da09b42d0df20 EBUILD freerdp-2.0.0_rc2-r1.ebuild 2664 BLAKE2B 8612caa8fd82f99e1e6369ea991dd25270b9d7d104825038d6f0bc11983d43b84ac0ca15b02ad112072ab654b10f68372bd949b171ca0f9282dd0971be6b6389 SHA512 0c17d9a07ef8a13bfa8462eac1b3f19c3741e156e1dfd4e5fad41158cbd65bd18403b55cef9a04d0f3f5fb4c53a75c1f34b3405e86210823916eb2a10d6510be -EBUILD freerdp-2.0.0_rc3-r1.ebuild 2650 BLAKE2B 9366eac7edf2dc9ab3ce1b7bab9804bca0faf93822e2f4263d94ef49fe23125e0404b940234f8ecbb2b43da9e9e4ba02260cf8aabc826c61c580031db60203f0 SHA512 f462a8d947212addd7e406992f1ee5d09a65ff7cdfb2aa5156012c715149f5a0e7fedbf18da5ab1633ae0794426c081387717357cf4d5c25fabbb895a7fc664b -EBUILD freerdp-2.0.0_rc3.ebuild 2615 BLAKE2B 6987e6d5cb42d17359e6403b61bd44417da1e61be7fe4495e6aec26306a75f1d53faad0f89a2ffe632a63c486988c4e8991196dc7ddb28dcf936870e6b289259 SHA512 e5215b3905e2cfc280d9b6f44a026b65df7cafdb9d50611dd857e09c796556eafeebeb1f38c582c6afa9083508ef571887dc8c9668b9d69ceb59cda86169518f +EBUILD freerdp-2.0.0_rc4.ebuild 2696 BLAKE2B aff4ef66a714733ac5eae705f01d9bf2e237f41ebaa78e6541a9d90e6b80a2d9b81a9d5c5b872a78de8f80b175d06c6f47b48d965bd5661cb6d036159ee7786a SHA512 f8929b63953bba9d22f29af069da0af4da9631ab6de613bcd486241311932aeed457405fab0f6676a5747cc036b90d2ee2c1205cce7e69e6edec8d73bc1b4002 EBUILD freerdp-9999.ebuild 2650 BLAKE2B 9366eac7edf2dc9ab3ce1b7bab9804bca0faf93822e2f4263d94ef49fe23125e0404b940234f8ecbb2b43da9e9e4ba02260cf8aabc826c61c580031db60203f0 SHA512 f462a8d947212addd7e406992f1ee5d09a65ff7cdfb2aa5156012c715149f5a0e7fedbf18da5ab1633ae0794426c081387717357cf4d5c25fabbb895a7fc664b MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0 diff --git a/net-misc/freerdp/files/1.2.1-gstreamer.patch b/net-misc/freerdp/files/1.2.1-gstreamer.patch deleted file mode 100644 index cafe9702210a..000000000000 --- a/net-misc/freerdp/files/1.2.1-gstreamer.patch +++ /dev/null @@ -1,71 +0,0 @@ -From bea27fd919b64ee8d97996409e279e1e83d13594 Mon Sep 17 00:00:00 2001 -From: Jean-Louis Dupond -Date: Sun, 4 Oct 2015 18:17:33 +0200 -Subject: [PATCH] FindGStreamer_1_0: fix build failure for new gstreamer - versions - ---- - cmake/FindGStreamer_1_0.cmake | 30 +++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake -index f7bf990..3aa8fc6 100644 ---- a/cmake/FindGStreamer_1_0.cmake -+++ b/cmake/FindGStreamer_1_0.cmake -@@ -53,17 +53,17 @@ set(GSTREAMER_1_0_MINIMUM_VERSION 1.0.5) - # Helper macro to find a Gstreamer plugin (or Gstreamer itself) - # _component_prefix is prepended to the _INCLUDE_DIRS and _LIBRARIES variables (eg. "GSTREAMER_1_0_AUDIO") - # _pkgconfig_name is the component's pkg-config name (eg. "gstreamer-1.0", or "gstreamer-video-1.0"). --# _header is the component's header, relative to the gstreamer-1.0 directory (eg. "gst/gst.h"). - # _library is the component's library name (eg. "gstreamer-1.0" or "gstvideo-1.0") --macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library) -+macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library) - # FIXME: The QUIET keyword can be used once we require CMake 2.8.2. -- pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name}) - -- find_path(${_component_prefix}_INCLUDE_DIRS -- NAMES ${_header} -- HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR} -- PATH_SUFFIXES gstreamer-1.0 -- ) -+ string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}") -+ if ("${CMAKE_MATCH_2}" STREQUAL "") -+ pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}") -+ else () -+ pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name}) -+ endif () -+ set(${_component_prefix}_INCLUDE_DIRS ${PC_${_component_prefix}_INCLUDE_DIRS}) - - find_library(${_component_prefix}_LIBRARIES - NAMES ${_library} gstreamer_android -@@ -78,8 +78,8 @@ endmacro() - # 1.1. Find headers and libraries - set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR}) - find_package(Glib REQUIRED) --FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0) --FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0) -+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0) -+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gstbase-1.0) - - # 1.2. Check Gstreamer version - if (GSTREAMER_1_0_INCLUDE_DIRS) -@@ -110,11 +110,11 @@ endif () - # 2. Find Gstreamer plugins - # ------------------------- - --FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 gst/app/gstappsink.h gstapp-1.0) --FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 gst/audio/audio.h gstaudio-1.0) --FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gst/fft/gstfft.h gstfft-1.0) --FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 gst/pbutils/pbutils.h gstpbutils-1.0) --FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 gst/video/video.h gstvideo-1.0) -+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 gstapp-1.0) -+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 gstaudio-1.0) -+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gstfft-1.0) -+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 gstpbutils-1.0) -+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 gstvideo-1.0) - - # ------------------------------------------------ - # 3. Process the COMPONENTS passed to FIND_PACKAGE --- -2.6.3 - diff --git a/net-misc/freerdp/files/2.0.0-rc0-libressl.patch b/net-misc/freerdp/files/2.0.0-rc0-libressl.patch deleted file mode 100644 index 9e565e5b05db..000000000000 --- a/net-misc/freerdp/files/2.0.0-rc0-libressl.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 9bf9ff9e8a548ecb5306d0142e75cdc274e93ba1 Mon Sep 17 00:00:00 2001 -From: Valery Kartel -Date: Wed, 26 Jul 2017 17:12:14 +0300 -Subject: [PATCH] Fix build with LibreSSL - ---- - libfreerdp/crypto/crypto.c | 2 +- - winpr/libwinpr/utils/ssl.c | 6 +++--- - winpr/tools/makecert/makecert.c | 6 +++--- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c -index 15e65d534..f3bb595b8 100644 ---- a/libfreerdp/crypto/crypto.c -+++ b/libfreerdp/crypto/crypto.c -@@ -388,7 +388,7 @@ BOOL x509_verify_certificate(CryptoCert cert, char* certificate_store_path) - if (cert_ctx == NULL) - goto end; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - OpenSSL_add_all_algorithms(); - #else - OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ -diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c -index b674e21d5..78cbab1d8 100644 ---- a/winpr/libwinpr/utils/ssl.c -+++ b/winpr/libwinpr/utils/ssl.c -@@ -255,7 +255,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_ONCE once, PVOID param, PVO - } - #endif - /* SSL_load_error_strings() is void */ --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - SSL_load_error_strings(); - /* SSL_library_init() always returns "1" */ - SSL_library_init(); -@@ -296,7 +296,7 @@ BOOL winpr_CleanupSSL(DWORD flags) - #ifdef WINPR_OPENSSL_LOCKING_REQUIRED - _winpr_openssl_cleanup_locking(); - #endif --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - CRYPTO_cleanup_all_ex_data(); - ERR_free_strings(); - EVP_cleanup(); -@@ -307,7 +307,7 @@ BOOL winpr_CleanupSSL(DWORD flags) - #ifdef WINPR_OPENSSL_LOCKING_REQUIRED - if (flags & WINPR_SSL_CLEANUP_THREAD) - { --#if (OPENSSL_VERSION_NUMBER < 0x10000000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER) - ERR_remove_state(0); - #else - ERR_remove_thread_state(NULL); -diff --git a/winpr/tools/makecert/makecert.c b/winpr/tools/makecert/makecert.c -index a9efb352c..c9e38200a 100644 ---- a/winpr/tools/makecert/makecert.c -+++ b/winpr/tools/makecert/makecert.c -@@ -620,7 +620,7 @@ int makecert_context_output_certificate_file(MAKECERT_CONTEXT* context, char* pa - printf("Using default export password \"password\"\n"); - } - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - OpenSSL_add_all_algorithms(); - OpenSSL_add_all_ciphers(); - OpenSSL_add_all_digests(); -@@ -1008,7 +1008,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv) - key_length = atoi(arg->Value); - } - --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - context->rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL); - #else - { -@@ -1043,7 +1043,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv) - { - ASN1_TIME* before; - ASN1_TIME* after; --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - before = X509_get_notBefore(context->x509); - after = X509_get_notAfter(context->x509); - #else --- -2.14.1 - 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 deleted file mode 100644 index 59887f698ec9..000000000000 --- a/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 088c3940d9b488e8a83b9cefaa7271f955d1971c Mon Sep 17 00:00:00 2001 -From: Bernhard Miklautz -Date: Wed, 14 Mar 2018 13:39:23 +0100 -Subject: [PATCH] fix nla: don't use server version - -FreeRDP currently only supports CredSSP protocol version 3. However the -current implementation always sent back the version received by the -server indicating that this version was supported. -With recent windows updates applied the protocol changed and this approach -doesn't work anymore (see -https://msdn.microsoft.com/en-us/library/mt752485.aspx for protocol changes). - -With this fix FreeRDP always sends version 3 as supported version. - -Credit goes to @mfleisz. - -Fixes #4449 ---- - libfreerdp/core/nla.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c -index 47e087062..8a69f2f6e 100644 ---- a/libfreerdp/core/nla.c -+++ b/libfreerdp/core/nla.c -@@ -1663,15 +1663,19 @@ BOOL nla_send(rdpNla* nla) - static int nla_decode_ts_request(rdpNla* nla, wStream* s) - { - int length; -+ UINT32 version = 0; - - /* TSRequest */ - if (!ber_read_sequence_tag(s, &length) || - !ber_read_contextual_tag(s, 0, &length, TRUE) || -- !ber_read_integer(s, &nla->version)) -+ !ber_read_integer(s, &version)) - { - return -1; - } - -+ if (version < nla->version) -+ nla->version = version; -+ - /* [1] negoTokens (NegoData) */ - if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE) - { --- -2.16.2 - diff --git a/net-misc/freerdp/files/2.0.0-rc1-libressl.patch b/net-misc/freerdp/files/2.0.0-rc1-libressl.patch deleted file mode 100644 index 76e2514ef2b0..000000000000 --- a/net-misc/freerdp/files/2.0.0-rc1-libressl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From bfe3af4c72b45e33321962644d864843e1c9ce3d Mon Sep 17 00:00:00 2001 -From: Greg V -Date: Fri, 1 Dec 2017 18:34:48 +0300 -Subject: [PATCH] Fix LibreSSL build - -LibreSSL does not support FIPS mode. ---- - winpr/libwinpr/utils/ssl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c -index f749939ac..194f82609 100644 ---- a/winpr/libwinpr/utils/ssl.c -+++ b/winpr/libwinpr/utils/ssl.c -@@ -279,7 +279,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_ONCE once, PVOID param, PVO - - if (flags & WINPR_SSL_INIT_ENABLE_FIPS) - { --#if (OPENSSL_VERSION_NUMBER < 0x10001000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) - WLog_ERR(TAG, "Openssl fips mode ENable not available on openssl versions less than 1.0.1!"); - #else - WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled"); -@@ -348,7 +348,7 @@ BOOL winpr_CleanupSSL(DWORD flags) - - BOOL winpr_FIPSMode(void) - { --#if (OPENSSL_VERSION_NUMBER < 0x10001000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) - return FALSE; - #else - return (FIPS_mode() == 1); --- -2.15.1 - diff --git a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch new file mode 100644 index 000000000000..f666e0d4d671 --- /dev/null +++ b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch @@ -0,0 +1,47 @@ +From 649f49fa61ca98a05b26c3b2a26a1c30ca24ea26 Mon Sep 17 00:00:00 2001 +From: Armin Novak +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 +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 + 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 deleted file mode 100644 index b63771d08187..000000000000 --- a/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 368989526c32cdf9d680a397fede3cb773fa2609 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Fri, 28 Jul 2017 16:31:41 -0400 -Subject: [PATCH] Fix gstreamer-1.0 detection - ---- - cmake/FindGStreamer_1_0.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake -index 3aa8fc6dc..6fbc0ecc5 100644 ---- a/cmake/FindGStreamer_1_0.cmake -+++ b/cmake/FindGStreamer_1_0.cmake -@@ -59,7 +59,7 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library) - - string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}") - if ("${CMAKE_MATCH_2}" STREQUAL "") -- pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}") -+ pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GSTREAMER_1_0_MINIMUM_VERSION}") - else () - pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name}) - endif () --- -2.13.3 - diff --git a/net-misc/freerdp/files/freerdp-armfp.patch b/net-misc/freerdp/files/freerdp-armfp.patch deleted file mode 100644 index 1a367d5600c3..000000000000 --- a/net-misc/freerdp/files/freerdp-armfp.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 2355b54f8516a6e1c600df8f26ac7d56916bfd99 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Fri, 1 May 2015 17:35:21 -0400 -Subject: [PATCH] Remove the ARM_FP_ABI option - -It's unclear why this option would be necessary, and it causes problems -when people do not match it to their toolchain and CFLAGS. - -To set the float abi, either use a toolchain with an appropriate default -or set the float-abi option in the CFLAGS environment variable. - -This should resolve #2586. ---- - cmake/ConfigOptions.cmake | 6 ------ - libfreerdp/CMakeLists.txt | 4 ++-- - packaging/deb/freerdp-nightly/rules | 7 ------- - 3 files changed, 2 insertions(+), 15 deletions(-) - -diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake -index b51a46b..cef6ba6 100644 ---- a/cmake/ConfigOptions.cmake -+++ b/cmake/ConfigOptions.cmake -@@ -29,12 +29,6 @@ if(TARGET_ARCH MATCHES "ARM") - else() - option(WITH_NEON "Enable NEON optimization." OFF) - endif() -- if (NOT DEFINED ARM_FP_ABI) -- set(ARM_FP_ABI "softfp" CACHE STRING "Floating point ABI to use on arm") -- else() -- set(ARM_FP_ABI ${ARM_FP_API} CACHE STRING "Floating point ABI to use on arm") -- endif() -- mark_as_advanced(ARM_FP_ABI) - else() - if(NOT APPLE) - option(WITH_IPP "Use Intel Performance Primitives." OFF) -diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt -index a1cbd9d..112b75a 100644 ---- a/libfreerdp/CMakeLists.txt -+++ b/libfreerdp/CMakeLists.txt -@@ -156,7 +156,7 @@ if(WITH_SSE2) - endif() - - if(WITH_NEON) -- set_source_files_properties(${CODEC_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-mfpu=neon -mfloat-abi=${ARM_FP_ABI} -Wno-unused-variable" ) -+ set_source_files_properties(${CODEC_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-mfpu=neon -Wno-unused-variable" ) - set(CODEC_SRCS ${CODEC_SRCS} ${CODEC_NEON_SRCS}) - endif() - -@@ -236,7 +236,7 @@ if(WITH_SSE2) - endif() - elseif(WITH_NEON) - if(CMAKE_COMPILER_IS_GNUCC) -- set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon -mfloat-abi=${ARM_FP_ABI}") -+ set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon") - endif() - # TODO: Add MSVC equivalent - endif() -diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules -index 4366f63..44ceb56 100755 ---- a/packaging/deb/freerdp-nightly/rules -+++ b/packaging/deb/freerdp-nightly/rules -@@ -1,11 +1,5 @@ - #!/usr/bin/make -f - --DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) --ifneq (,$(filter armhf,$(DEB_HOST_ARCH))) --ARM_FLOAT_ABI = -DARM_FP_ABI=hard --else --ARM_FLOAT_ABI = --endif - NULL = - - DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_SKIP_RPATH=FALSE \ -@@ -26,7 +20,6 @@ DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_SKIP_RPATH=FALSE \ - -DCMAKE_INSTALL_PREFIX=/opt/freerdp-nightly/ \ - -DCMAKE_INSTALL_INCLUDEDIR=include \ - -DCMAKE_INSTALL_LIBDIR=lib \ -- $(ARM_FLOAT_ABI) \ - $(NULL) - - %: --- -2.5.0 - diff --git a/net-misc/freerdp/files/freerdp-ffmpeg29.patch b/net-misc/freerdp/files/freerdp-ffmpeg29.patch deleted file mode 100644 index e4d81bd1c2aa..000000000000 --- a/net-misc/freerdp/files/freerdp-ffmpeg29.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://github.com/FreeRDP/FreeRDP/pull/2895 - -Index: freerdp-1.2.1_pre20150326/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c -=================================================================== ---- freerdp-1.2.1_pre20150326.orig/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c -+++ freerdp-1.2.1_pre20150326/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c -@@ -102,7 +102,7 @@ static BOOL tsmf_ffmpeg_init_video_strea - mdecoder->codec_context->bit_rate = media_type->BitRate; - mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator; - mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator; -- mdecoder->frame = avcodec_alloc_frame(); -+ mdecoder->frame = av_frame_alloc(); - return TRUE; - } - -@@ -320,7 +320,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS - mdecoder->codec_context->width, mdecoder->codec_context->height); - mdecoder->decoded_data = malloc(mdecoder->decoded_size); - ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size); -- frame = avcodec_alloc_frame(); -+ frame = av_frame_alloc(); - avpicture_fill((AVPicture*) frame, mdecoder->decoded_data, - mdecoder->codec_context->pix_fmt, - mdecoder->codec_context->width, mdecoder->codec_context->height); -@@ -389,7 +389,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS - (int16_t *) dst, &frame_size, src, src_size); - #else - { -- AVFrame *decoded_frame = avcodec_alloc_frame(); -+ AVFrame *decoded_frame = av_frame_alloc(); - int got_frame = 0; - AVPacket pkt; - av_init_packet(&pkt); -@@ -469,7 +469,7 @@ static UINT32 tsmf_ffmpeg_get_decoded_fo - - switch (mdecoder->codec_context->pix_fmt) - { -- case PIX_FMT_YUV420P: -+ case AV_PIX_FMT_YUV420P: - return RDP_PIXFMT_I420; - default: - WLog_ERR(TAG, "unsupported pixel format %u", diff --git a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild deleted file mode 100644 index 0ead5f2d8dc9..000000000000 --- a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -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" -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/1.2" -IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav - libressl neon pulseaudio server smartcard test usb wayland X xinerama xv" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - 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 ) - pulseaudio? ( media-sound/pulseaudio ) - server? ( - X? ( - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - xinerama? ( x11-libs/libXinerama ) - ) - ) - smartcard? ( sys-apps/pcsc-lite ) - wayland? ( dev-libs/wayland ) - 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 - ) ) ) -" - -DOCS=( README ) - -PATCHES=( - "${FILESDIR}/freerdp-armfp.patch" - "${FILESDIR}/freerdp-ffmpeg29.patch" - "${FILESDIR}/1.2.1-gstreamer.patch" -) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_with alsa ALSA) - $(cmake-utils_use_with client CLIENT) - $(cmake-utils_use_with cups CUPS) - $(cmake-utils_use_with debug DEBUG_ALL) - $(cmake-utils_use_with doc MANPAGES) - $(cmake-utils_use_with ffmpeg FFMPEG) - $(cmake-utils_use_with gstreamer GSTREAMER_1_0) - $(cmake-utils_use_with jpeg JPEG) - $(cmake-utils_use_with neon NEON) - $(cmake-utils_use_with pulseaudio PULSE) - $(cmake-utils_use_with server SERVER) - $(cmake-utils_use_with smartcard PCSC) - $(cmake-utils_use_with cpu_flags_x86_sse2 SSE2) - $(cmake-utils_use usb CHANNEL_URBDRC) - $(cmake-utils_use_with X X11) - $(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 -} diff --git a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild deleted file mode 100644 index 4d54e1eef9c0..000000000000 --- a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -if [[ ${PV} != 9999 ]]; then - MY_PV="${PV/_/-}" - MY_P="FreeRDP-${MY_PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="alpha amd64 arm 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_x86_ssse3 cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" - -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 - ) ) ) -" - -DOCS=( README ) -PATCHES=( - "${FILESDIR}"/2.0.0-rc0-libressl.patch - "${FILESDIR}"/freerdp-Fix-gstreamer-1.0-detection.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_GSTREAMER_1_0=$(usex gstreamer) - -DWITH_JPEG=$(usex jpeg) - -DWITH_NEON=$(usex neon) - -DWITH_OPENH264=$(usex openh264) - -DWITH_PULSE=$(usex pulseaudio) - -DWITH_SERVER=$(usex server) - -DWITH_PCSC=$(usex smartcard) - -DWITH_LIBSYSTEMD=$(usex systemd) - # WITH_SSE2 actually enables code requiring SSSE3 - -DWITH_SSE2=$(usex cpu_flags_x86_ssse3) - -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_rc1-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild deleted file mode 100644 index a84d3524129b..000000000000 --- a/net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -if [[ ${PV} != 9999 ]]; then - MY_PV="${PV/_/-}" - MY_P="FreeRDP-${MY_PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="alpha amd64 arm ~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_x86_ssse3 cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" - -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-rc1-libressl.patch" - "${FILESDIR}/2.0.0-rc1-CredSSP-protocol-version.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_GSTREAMER_1_0=$(usex gstreamer) - -DWITH_JPEG=$(usex jpeg) - -DWITH_NEON=$(usex neon) - -DWITH_OPENH264=$(usex openh264) - -DWITH_PULSE=$(usex pulseaudio) - -DWITH_SERVER=$(usex server) - -DWITH_PCSC=$(usex smartcard) - -DWITH_LIBSYSTEMD=$(usex systemd) - # WITH_SSE2 actually enables code requiring SSSE3 - -DWITH_SSE2=$(usex cpu_flags_x86_ssse3) - -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_rc3-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc3-r1.ebuild deleted file mode 100644 index 0d86ec929470..000000000000 --- a/net-misc/freerdp/freerdp-2.0.0_rc3-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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" - KEYWORDS="~alpha ~amd64 ~arm ~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 cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" - -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 - ) ) ) -" - -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 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_rc3.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc3.ebuild deleted file mode 100644 index 48abe1a3fc71..000000000000 --- a/net-misc/freerdp/freerdp-2.0.0_rc3.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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" - KEYWORDS="~alpha ~amd64 ~arm ~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 cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" - -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 - ) ) ) -" - -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_GSTREAMER_1_0=$(usex gstreamer) - -DWITH_JPEG=$(usex jpeg) - -DWITH_NEON=$(usex 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.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild new file mode 100644 index 000000000000..01b6f127c5bc --- /dev/null +++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2018 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" + KEYWORDS="alpha amd64 arm ~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 cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" + +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 +) + +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 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 +} -- cgit v1.2.3