Commit 53ba93a4 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

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: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: default avatarSamuel Martin <s.martin49@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 93c6c951

package/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -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"

package/freerdp/Config.in

+1 −5
Original line number Diff line number Diff line 
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

package/freerdp/freerdp.mk

+15 −2
Original line number Diff line number Diff line
@@ -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