From patchwork Mon Jun 2 20:27:25 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: 355052 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 EB29F1400D2 for ; Tue, 3 Jun 2014 06:27:57 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1B7308BFC4; Mon, 2 Jun 2014 20:27:57 +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 62jqrQCH1Fs9; Mon, 2 Jun 2014 20:27:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 4C8678CBE4; Mon, 2 Jun 2014 20:27:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 552CF1BF979 for ; Mon, 2 Jun 2014 20:27:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5321189499 for ; Mon, 2 Jun 2014 20:27:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5hwU4KPw1eUx for ; Mon, 2 Jun 2014 20:27:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by hemlock.osuosl.org (Postfix) with ESMTPS id A647F89262 for ; Mon, 2 Jun 2014 20:27:36 +0000 (UTC) Received: by mail-we0-f171.google.com with SMTP id w62so5697180wes.2 for ; Mon, 02 Jun 2014 13:27:35 -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=lh1Oe6A+coX8RT+KTUQCIJrHDah6fX/tDxN+tnJJq/U=; b=GPu6S7fBeBKIQzL1U9wWZ7jwV2LVypYv5y6gXD8LLWQ+cPPXcZgEmYPRtMvfTPc1k2 D5korwqmNamx1BxBezIA1Q7XrcAaDR71raCkd7dgHBvv9qvSJLmdqEfAI9KVvV4fQVSg JEuKP4JrabN5+ZET2tcvqFBFZTxeyS/YUwjPaDUJd7taAU9N6pW9dz6ZG0nvmi4pY4Cv xyPXqElt9hYGubDLGwCNQbsGrZpitaEC5nFO1sApAkiUJFfFcQatOCRH5De2LlhT8j2i uIk9g9a6ink8ocAk7164pgUHFqjQPhGpnsGyIbzokbji+DCCSwLMNZVWjDM0xqb50Gwh wtUg== X-Received: by 10.180.210.238 with SMTP id mx14mr25171537wic.61.1401740855036; Mon, 02 Jun 2014 13:27:35 -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.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Jun 2014 13:27:34 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 2 Jun 2014 22:27:25 +0200 Message-Id: <46fa13d6e2a56f898fb7aa495476d50d4b0550d2.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 4/7] package/freerdp: not forcibly depend on X.Org 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" It is possible to build the libfreerdp standalone, without X.Org. Having a libfreerdp will be usefull for the weston RDP compositor. Re-order the menuconfig, as freerdp is no longer an X-only application. Signed-off-by: "Yann E. MORIN" --- package/Config.in | 2 +- package/freerdp/Config.in | 17 ++++++++++++----- package/freerdp/freerdp.mk | 18 ++++++++++++++---- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/package/Config.in b/package/Config.in index 1706197..4b97cde 100644 --- a/package/Config.in +++ b/package/Config.in @@ -190,6 +190,7 @@ endif source "package/fb-test-app/Config.in" source "package/fbterm/Config.in" source "package/fbv/Config.in" +source "package/freerdp/Config.in" source "package/imagemagick/Config.in" source "package/linux-fusion/Config.in" source "package/lite/Config.in" @@ -228,7 +229,6 @@ source "package/apitrace/Config.in" source "package/dillo/Config.in" source "package/docker/Config.in" source "package/feh/Config.in" -source "package/freerdp/Config.in" source "package/gmpc/Config.in" source "package/gob2/Config.in" source "package/gqview/Config.in" diff --git a/package/freerdp/Config.in b/package/freerdp/Config.in index c5ff769..81a67ea 100644 --- a/package/freerdp/Config.in +++ b/package/freerdp/Config.in @@ -1,14 +1,21 @@ config BR2_PACKAGE_FREERDP bool "freerdp" select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_ZLIB - depends on BR2_PACKAGE_XORG7 help FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), released under the Apache license http://www.freerdp.com/ + +if BR2_PACKAGE_FREERDP + +config BR2_PACKAGE_FREERDP_NEEDS_XLIBS + def_bool y + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXT + select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXCURSOR + +endif diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index e92067c..95430bb 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,13 +4,23 @@ # ################################################################################ -FREERDP_VERSION = 1.0.1 -FREERDP_SITE = https://github.com/downloads/FreeRDP/FreeRDP -FREERDP_DEPENDENCIES = openssl zlib \ - xlib_libX11 xlib_libXt xlib_libXext xlib_libXcursor +# Changeset on the stable-1.1 branch +FREERDP_VERSION = 01865f0e284ce34bb5f38842b34dc80f08b58749 +FREERDP_SITE = https://github.com/FreeRDP/FreeRDP +FREERDP_SITE_METHOD = git +FREERDP_DEPENDENCIES = openssl zlib FREERDP_LICENSE = Apache-2.0 FREEDRP_LICENSE_FILES = LICENSE +FREERDP_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_FREERDP_NEEDS_XLIBS),y) +FREERDP_DEPENDENCIES += xlib_libX11 xlib_libXt xlib_libXext xlib_libXcursor +FREERDP_CONF_OPT += -DWITH_X11=ON +else +FREERDP_CONF_OPT += -DWITH_X11=OFF +endif + ifeq ($(BR2_PACKAGE_CUPS),y) FREERDP_CONF_OPT += -DWITH_CUPS=ON FREERDP_DEPENDENCIES += cups