From patchwork Sat Sep 20 17:09:51 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: 391522 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id D813414012F for ; Sun, 21 Sep 2014 03:10:37 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7EBA532CC6; Sat, 20 Sep 2014 17:10:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PEFLnlQ3BFZq; Sat, 20 Sep 2014 17:10:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id CBD6232CD8; Sat, 20 Sep 2014 17:10:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6CBD11C107C for ; Sat, 20 Sep 2014 17:10:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 50B0291904 for ; Sat, 20 Sep 2014 17:10:21 +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 ZuJnmytmzM9r for ; Sat, 20 Sep 2014 17:10:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by whitealder.osuosl.org (Postfix) with ESMTPS id DC59D918A3 for ; Sat, 20 Sep 2014 17:10:05 +0000 (UTC) Received: by mail-we0-f182.google.com with SMTP id q59so1080998wes.27 for ; Sat, 20 Sep 2014 10:10:04 -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=43WoEtLj7bGBGQlStiPvu9PnDiVK09c6yP00JH8o9dU=; b=onKdX4FUYezd3yRagS3YKPlMcW2gIqYwoPzlQDKcxO2cDcEoCF033a5x/B/Bu3gRUb 3UbOKfENriaSCBqwLtayhlfXmzHXyaVlaXVZbiVq9/6BGocdSdnFaTNJbP41/Qp/6tk/ /D9Ll0OvnG0CFUOfr1vT4/vs73wzepnQuVVIIP6OgXWsYJMtC0MX+tv5E0ru4nGDlL4N avZTV2ZlYT3IGI+IlyU5z6sFmSKQPllLFhrbDGpm7eBa3oaqEYSA6J04S/n6eDYY7e89 NxQzzC3s9BGZ2Cb9+nWFbPSZ3H2hnM1baIN14ExQOE+/lwiqLbg6rAr3FPftfsTQrIP8 5RkA== X-Received: by 10.194.216.74 with SMTP id oo10mr346312wjc.126.1411233004212; Sat, 20 Sep 2014 10:10:04 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id fl6sm5959581wib.21.2014.09.20.10.10.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 20 Sep 2014 10:10:03 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 20 Sep 2014 19:09:51 +0200 Message-Id: <333b5e0a1cbbc14716d1cbdd0ff9f35c3dc21966.1411232859.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 05/10] package/freerdp: add options to enable/disable server and/or client X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" 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 6df567f..486a611 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -20,6 +20,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