From patchwork Mon Jun 2 20:27:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 355054 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id BCBFA1400D2 for ; Tue, 3 Jun 2014 06:28:07 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DD1198C256; Mon, 2 Jun 2014 20:28:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7qgFn3hG0qHU; Mon, 2 Jun 2014 20:28:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1F4A88CECD; Mon, 2 Jun 2014 20:27:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B54691BF979 for ; Mon, 2 Jun 2014 20:27:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B16648BEE4 for ; Mon, 2 Jun 2014 20:27:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SzNy4wnoqNum for ; Mon, 2 Jun 2014 20:27:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by fraxinus.osuosl.org (Postfix) with ESMTPS id D20748BEBF for ; Mon, 2 Jun 2014 20:27:39 +0000 (UTC) Received: by mail-wg0-f42.google.com with SMTP id y10so5603867wgg.1 for ; Mon, 02 Jun 2014 13:27:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Xa1KB/BZhfp4Sdeh93RLmTL9XMdl9sW3sxNlCHMoaAM=; b=XCX4mwj/oRo5pu+e1F6IzoDvpDqLxopiwiWz0kZKHx6HJa6X9G/C2vTJ3uYoGQED5+ QTRDGG3v1xzjZSdrqA0Qmj+7SNVHgedBzXmCMnbck25wBdCdDq2W8tT9C42A2IRhHDmQ YSSBaQ4Qn/qkaMYC7Z6Nb9quqacBCoYt/xQqgst5DrJ+UUDRVoVyf2MQ6iR1xkLw+cI8 XjMguvKx/F8+nBAY/dzHiSPENm3yI1LFm87BzL/bzLxuRWYoXSrPs2N8+KADoXA+WxSU Fv4qMWSYgaK9Ml0Qrg90KeSY4eajSIjYRN7LKYfmpMrsRRRrcgtWmdRTD8tYJZSc4615 exjA== X-Received: by 10.194.92.176 with SMTP id cn16mr52402921wjb.43.1401740858207; Mon, 02 Jun 2014 13:27:38 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id vc2sm38088847wjc.2.2014.06.02.13.27.36 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Jun 2014 13:27:37 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 2 Jun 2014 22:27:27 +0200 Message-Id: <17eef943e634d0f930234f026b8b2eb1fdce19a2.1401740805.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 6/7] package/freerdp: add options to enable/disable server and/or client X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: "Yann E. MORIN" Building the client or the server requires an X.Org stack. Since freerdp can also be used for weston (wayland-based, hence no X.Org stack), we may want to disable the client and server. Conversely, with on an X.Org stack, we may want to enable either or none if we're just interested in the library. Add two options, one to enable the server, the other the client. Signed-off-by: "Yann E. MORIN" --- package/freerdp/Config.in | 18 ++++++++++++++++-- package/freerdp/freerdp.mk | 12 ++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/package/freerdp/Config.in b/package/freerdp/Config.in index 81a67ea..0c2edc5 100644 --- a/package/freerdp/Config.in +++ b/package/freerdp/Config.in @@ -6,16 +6,30 @@ config BR2_PACKAGE_FREERDP FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), released under the Apache license + This only installs the freerdp library. + http://www.freerdp.com/ if BR2_PACKAGE_FREERDP config BR2_PACKAGE_FREERDP_NEEDS_XLIBS - def_bool y - depends on BR2_PACKAGE_XORG7 + bool select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXCURSOR +config BR2_PACKAGE_FREERDP_SERVER + bool "build server" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_FREERDP_X_LIBS + +config BR2_PACKAGE_FREERDP_CLIENT + bool "build client" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_FREERDP_X_LIBS + +comment "freerdp server and client needs X.Org" + depends on !BR2_PACKAGE_XORG7 + endif diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index aef9350..80e4945 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -23,6 +23,18 @@ else FREERDP_CONF_OPT += -DWITH_X11=OFF endif +ifeq ($(BR2_PACKAGE_FREERDP_SERVER),y) +FREERDP_CONF_OPT += -DWITH_SERVER=ON -DWITH_SERVER_INTERFACE=ON +else +FREERDP_CONF_OPT += -DWITH_SERVER=OFF -DWITH_SERVER_INTERFACE=OFF +endif + +ifeq ($(BR2_PACKAGE_FREERDP_CLIENT),y) +FREERDP_CONF_OPT += -DWITH_CLIENT=ON -DWITH_CLIENT_INTERFACE=ON +else +FREERDP_CONF_OPT += -DWITH_CLIENT=OFF -DWITH_CLIENT_INTERFACE=OFF +endif + ifeq ($(BR2_PACKAGE_CUPS),y) FREERDP_CONF_OPT += -DWITH_CUPS=ON FREERDP_DEPENDENCIES += cups