diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2015-02-21 23:36:19 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-02-22 10:48:34 +0100 |
| commit | 53ba93a473b77b208743446c0b85843ef10ef009 (patch) | |
| tree | a9d793a5d6d858d0fe93624fd570e019b3914997 /package | |
| parent | 93c6c95198aad0fb50fee6cb2b9d2155355c2a7f (diff) | |
package/freerdp: do not forcibly depend on X.Org
It is possible to build the libfreerdp standalone, without X.Org.
Having a libfreerdp will be usefull for the weston RDP compositor.
So, only select the strictly required X.Org library if X.Org is enabled,
and only build with Xcursor if it is enabled. Drop dependency on other
X.Org libraries, as they are not strictly required (or get pulled as
dependencies of the mandatory libXext).
Re-order the menuconfig, as freerdp is no longer an X-only application.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package')
| -rw-r--r-- | package/Config.in | 2 | ||||
| -rw-r--r-- | package/freerdp/Config.in | 6 | ||||
| -rw-r--r-- | package/freerdp/freerdp.mk | 17 |
3 files changed, 17 insertions, 8 deletions
diff --git a/package/Config.in b/package/Config.in index 3b07ab565..222ea38cc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -207,6 +207,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" @@ -244,7 +245,6 @@ comment "X applications" 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/gqview/Config.in" source "package/gtkperf/Config.in" diff --git a/package/freerdp/Config.in b/package/freerdp/Config.in index c5ff76902..09efbc089 100644 --- a/package/freerdp/Config.in +++ b/package/freerdp/Config.in @@ -1,12 +1,8 @@ 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 + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 help FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), released under the Apache license diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 5bfdeec23..0dbf8a4fb 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -7,8 +7,7 @@ # Changeset on the stable-1.1 branch FREERDP_VERSION = b21ff842ef3de5837513042dc30488b12bd9cf9d FREERDP_SITE = $(call github,FreeRDP,FreeRDP,$(FREERDP_VERSION)) -FREERDP_DEPENDENCIES = openssl zlib \ - xlib_libX11 xlib_libXt xlib_libXext xlib_libXcursor +FREERDP_DEPENDENCIES = openssl zlib FREERDP_LICENSE = Apache-2.0 FREERDP_LICENSE_FILES = LICENSE @@ -49,6 +48,20 @@ else FREERDP_CONF_OPTS += -DWITH_PULSEAUDIO=OFF endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT),y) +FREERDP_DEPENDENCIES += xlib_libXext +FREERDP_CONF_OPTS += -DWITH_X11=ON +else +FREERDP_CONF_OPTS += -DWITH_X11=OFF +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) +FREERDP_CONF_OPTS += -DWITH_XCURSOR=ON +FREERDP_DEPENDENCIES += xlib_libXcursor +else +FREERDP_CONF_OPTS += -DWITH_XCURSOR=OFF +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) FREERDP_CONF_OPTS += -DWITH_XI=ON FREERDP_DEPENDENCIES += xlib_libXi |