diff options
Diffstat (limited to 'net-misc/freerdp')
| -rw-r--r-- | net-misc/freerdp/Manifest | 9 | ||||
| -rw-r--r-- | net-misc/freerdp/files/2.0.0-backports.patch | 94 | ||||
| -rw-r--r-- | net-misc/freerdp/freerdp-2.1.1.ebuild (renamed from net-misc/freerdp/freerdp-2.0.0-r1.ebuild) | 53 | ||||
| -rw-r--r-- | net-misc/freerdp/metadata.xml | 1 |
4 files changed, 28 insertions, 129 deletions
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index 5424706184d1..56b2b37896aa 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,8 +1,7 @@ -AUX 2.0.0-backports.patch 3717 BLAKE2B a80d2fd291f4a2c94253cc41b50610b0f6116181853fd8ca07c88b17c816156f69a168347633651b23bdd8e6d65e583e03d1f7f8e9d8d26e04daee34a165506e SHA512 e8fab560145ed73d28aaeb93cbf8ada68a76ab7ee3e0cbb9f65f157a935a1c312bc6e9c188e4bca83b1e64d00af93fa39b9ab0d1fdb558936aa2d2b0738155a5 -DIST freerdp-2.0.0.tar.gz 6857730 BLAKE2B 2873a228b82874d3efae3ea922c83c7d32692ae17da2b7b85a9dd570d8d3f4df7f4943920474cb6711c32c6e8863429a165a6f4b65c834fda1320bcb804b38db SHA512 4babb7b3a5e7b39b89c4e1dbcd5a58b5fbfb8d48083dbafc2c6455d8b739f4c444715286cc10f2f7446f96053d3f5ff4ac2cff1af9708cbc48ef07a6fee5bee6 -DIST freerdp-2.1.0.tar.gz 21772624 BLAKE2B d3491cb9f08a34fd5b2a5b00b46494e4e0524715d73ad46e92812578fbe9843504d937dc634f1597a7f0785494fd2c68f964125b438328105e4db41191eeb166 SHA512 c0abecf3d52bf8388538f0bb60a0852b6f92c9172feda06efa96eb49a354913c7a10b9852efb0de6e545658043d0d3568cb79a54fc1d324a14e8ed2c9c9e6e3b -EBUILD freerdp-2.0.0-r1.ebuild 2942 BLAKE2B 0f2aa9737cfd68caf4012beb385e25ac6464fc067eb40ebeb2f3c2196183c192cb85f1d92e2947f1a5555d9d280d68e8b960dd9bbc50105472003df97c62f758 SHA512 0a4e542307b57033c840d8e0b2c59b2befae7dc732e82f58e4af13fe56088efe01459f09315487e53d3c0aea55cde722a13e4e44efd804de19a8b5fc3b69c692 +DIST freerdp-2.1.0.tar.gz 6869116 BLAKE2B c9cab4b571b288450efa5c5666f8cb64ca9e37dfd342d5e66c256b0fca151b20b3f9b1027a12f8fe9cbae186d95c8cb4d28c90deeadcacc3c158f50a3e713747 SHA512 86d72419d012c52a3dfa071d50bac96ddb3a1423bf35252fdef72676f8b2830b65c9e0511dea2d7b9a69e7783a3d1eacbd2f868b08836742dec7542c77a39405 +DIST freerdp-2.1.1.tar.gz 6871637 BLAKE2B b0c01fb074f28aa569d934797d4fb8451edcb90d7f5eba9e47b7ec844cc95eda143c3d851b86ef72e233e8bde8ebc3e1c4a7d3d549d0de54f774ec1fee62e8cd SHA512 6f0cff79690ca550237c6e31f5ab361246a6d12ac765e85b752d474aceaf1390d8c5f2b21aba028927459892a045e5073e143705e6f2256a2a7c8744dcf3f95b EBUILD freerdp-2.1.0.ebuild 2862 BLAKE2B 8b56772f76dd55965acac75cf9abf4d777a008b9473da979f776f63399e4ed662801ca3490d2675d329cf8a0f4330f99c4ad5000d01372f0041aba7fe7bbd6eb SHA512 e16deeb57e4582d7b81f1824332f1449a1204a096f587ddb6253c47606cf988bf09acd546e26e8509b21beb855034908ea035c61ea2a2894c39076a43d84b96d +EBUILD freerdp-2.1.1.ebuild 2841 BLAKE2B 293de05f1b826d2cc47bb44c526cc0b970508d78696e3adbdccaf7246367c0ef8ed7af0eac8da87951109655009c4b713c9a22f96bb8a146738dcefb96fe3b73 SHA512 8d63380fd33e2712bc19e0198bb301dca159ab70a978d04b65a1d2e8546f98b6397fece095c7853da05ebf51116566c2a3cd09e883ab7fa0b1b5407bbc337f6f 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 +MISC metadata.xml 481 BLAKE2B b7102d2ff331d4c991dbd2d20b3bd33d375fe5f332ab48f2c3401a579e584cdc4c84795a286c18536b82cd88b7b9991b3559774a937ac59ad8ccc21b91241f60 SHA512 47db413f3b78632acc874d8e67ef8231551a6074cb2269760fb780f1a86dc334bf7675550fed7a95e98a92470e3d70cfedb10f98f6ec686e785dd67615e93db7 diff --git a/net-misc/freerdp/files/2.0.0-backports.patch b/net-misc/freerdp/files/2.0.0-backports.patch deleted file mode 100644 index a1cf36539fd4..000000000000 --- a/net-misc/freerdp/files/2.0.0-backports.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 42d40261c58307508299deae58a75ef08d14283d Mon Sep 17 00:00:00 2001 -From: akallabeth <akallabeth@posteo.net> -Date: Fri, 10 Apr 2020 14:11:15 +0200 -Subject: [PATCH] Fixed return type for subsystem entry - ---- - channels/client/CMakeLists.txt | 2 +- - channels/client/tables.h | 2 +- - channels/urbdrc/client/libusb/libusb_udevman.c | 6 +++--- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt -index a0d3a73581..eb0c80f129 100644 ---- a/channels/client/CMakeLists.txt -+++ b/channels/client/CMakeLists.txt -@@ -97,7 +97,7 @@ foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES}) - set(STATIC_SUBSYSTEM_ENTRY "${STATIC_SUBSYSTEM_NAME}_freerdp_${STATIC_MODULE_CHANNEL}_client_subsystem_entry") - endif() - set(SUBSYSTEM_TABLE "${SUBSYSTEM_TABLE}\n\t{ \"${STATIC_SUBSYSTEM_NAME}\", \"${STATIC_SUBSYSTEM_TYPE}\", ${STATIC_SUBSYSTEM_ENTRY} },") -- set(SUBSYSTEM_IMPORT "extern void ${STATIC_SUBSYSTEM_ENTRY}(void);") -+ set(SUBSYSTEM_IMPORT "extern UINT ${STATIC_SUBSYSTEM_ENTRY}(void*);") - set(CLIENT_STATIC_SUBSYSTEM_IMPORTS "${CLIENT_STATIC_SUBSYSTEM_IMPORTS}\n${SUBSYSTEM_IMPORT}") - endforeach() - set(SUBSYSTEM_TABLE "${SUBSYSTEM_TABLE}\n\t{ NULL, NULL, NULL }\n};") -diff --git a/channels/client/tables.h b/channels/client/tables.h -index fd998a6ae1..b6b3f9ca27 100644 ---- a/channels/client/tables.h -+++ b/channels/client/tables.h -@@ -37,7 +37,7 @@ struct _STATIC_SUBSYSTEM_ENTRY - { - const char* name; - const char* type; -- void (*entry)(void); -+ UINT (*entry)(); - }; - typedef struct _STATIC_SUBSYSTEM_ENTRY STATIC_SUBSYSTEM_ENTRY; - -diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c -index 67360ad430..7509326c22 100644 ---- a/channels/urbdrc/client/libusb/libusb_udevman.c -+++ b/channels/urbdrc/client/libusb/libusb_udevman.c -@@ -861,9 +861,9 @@ static DWORD poll_thread(LPVOID lpThreadParameter) - #else - #define freerdp_urbdrc_client_subsystem_entry FREERDP_API freerdp_urbdrc_client_subsystem_entry - #endif --int freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints) -+UINT freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints) - { -- int rc; -+ UINT rc; - UINT status; - UDEVMAN* udevman; - ADDIN_ARGV* args = pEntryPoints->args; -@@ -922,5 +922,5 @@ int freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS p - return 0; - fail: - udevman_free(&udevman->iface); -- return -1; -+ return ERROR_INTERNAL_ERROR; - } -From aa39e08c29a43c2353b9f158edb0b113c7e0751f Mon Sep 17 00:00:00 2001 -From: akallabeth <akallabeth@posteo.net> -Date: Fri, 10 Apr 2020 14:16:19 +0200 -Subject: [PATCH] Fixed URBDRC DEVICE_ADD_FLAG definitions - ---- - channels/urbdrc/client/urbdrc_main.h | 14 ++++++-------- - 1 file changed, 6 insertions(+), 8 deletions(-) - -diff --git a/channels/urbdrc/client/urbdrc_main.h b/channels/urbdrc/client/urbdrc_main.h -index 5ec839983b..749aaf8727 100644 ---- a/channels/urbdrc/client/urbdrc_main.h -+++ b/channels/urbdrc/client/urbdrc_main.h -@@ -222,14 +222,12 @@ struct _IUDEVMAN - UINT32 status; - }; - --enum --{ -- DEVICE_ADD_FLAG_BUS, -- DEVICE_ADD_FLAG_DEV, -- DEVICE_ADD_FLAG_VENDOR, -- DEVICE_ADD_FLAG_PRODUCT, -- DEVICE_ADD_FLAG_REGISTER --} device_add_flag_t; -+#define DEVICE_ADD_FLAG_BUS 0x01 -+#define DEVICE_ADD_FLAG_DEV 0x02 -+#define DEVICE_ADD_FLAG_VENDOR 0x04 -+#define DEVICE_ADD_FLAG_PRODUCT 0x08 -+#define DEVICE_ADD_FLAG_REGISTER 0x10 -+ - #define DEVICE_ADD_FLAG_ALL \ - (DEVICE_ADD_FLAG_BUS | DEVICE_ADD_FLAG_DEV | DEVICE_ADD_FLAG_VENDOR | \ - DEVICE_ADD_FLAG_PRODUCT | DEVICE_ADD_FLAG_REGISTER) diff --git a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild b/net-misc/freerdp/freerdp-2.1.1.ebuild index d4c577fb18e5..80ed08a506c6 100644 --- a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild +++ b/net-misc/freerdp/freerdp-2.1.1.ebuild @@ -5,14 +5,16 @@ EAPI=7 inherit cmake -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 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/_/-} + 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 +22,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 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,21 +31,19 @@ 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= + ) + 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? ( @@ -82,23 +82,18 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - client? ( X? ( doc? ( + X? ( doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto - ) ) ) + ) ) " -PATCHES=( - "${FILESDIR}"/2.0.0-backports.patch -) - src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test ON OFF) -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/metadata.xml b/net-misc/freerdp/metadata.xml index 22b0a0566617..16127826173c 100644 --- a/net-misc/freerdp/metadata.xml +++ b/net-misc/freerdp/metadata.xml @@ -6,7 +6,6 @@ <name>Mike Gilbert</name> </maintainer> <use> - <flag name="client">Build client binaries</flag> <flag name="openh264">Enable H.264 support using <pkg>media-libs/openh264</pkg></flag> <flag name="server">Build server binaries</flag> </use> |