jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 21:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/freerdp: introduce the wayland client

Browse Source 
[Peter: use 'depends on' for wayland to match X11 client]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2015-09-06 21:54:22 +02:00 committed by Peter Korsgaard
parent 4d131b4da9
commit e01e5ddca6
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/freerdp/Config.in
View File

@ -72,6 +72,11 @@ config BR2_PACKAGE_FREERDP_CLIENT_X11
comment "server and X11 client need X.Org" comment "server and X11 client need X.Org"
depends on !BR2_PACKAGE_XORG7 depends on !BR2_PACKAGE_XORG7
config BR2_PACKAGE_FREERDP_CLIENT_WL
bool "wayland client"
default y
depends on BR2_PACKAGE_WAYLAND
endif endif
comment "freerdp needs a toolchain w/ wchar, dynamic library, threads" comment "freerdp needs a toolchain w/ wchar, dynamic library, threads"

22
package/freerdp/freerdp.mk
View File

@ -85,12 +85,12 @@ ifeq ($(BR2_PACKAGE_FREERDP_SERVER),y)
FREERDP_CONF_OPTS += -DWITH_SERVER=ON FREERDP_CONF_OPTS += -DWITH_SERVER=ON
endif endif
ifeq ($(BR2_PACKAGE_FREERDP_CLIENT_X11),y) ifneq ($(BR2_PACKAGE_FREERDP_CLIENT_X11)$(BR2_PACKAGE_FREERDP_CLIENT_WL),)
FREERDP_CONF_OPTS += -DWITH_CLIENT=ON FREERDP_CONF_OPTS += -DWITH_CLIENT=ON
endif endif
#--------------------------------------- #---------------------------------------
# X.Org libs for client and/or server # Libraries for client and/or server
# The FreeRDP buildsystem uses non-orthogonal options. For example it # The FreeRDP buildsystem uses non-orthogonal options. For example it
# is not possible to build the server and the wayland client without # is not possible to build the server and the wayland client without
@ -191,6 +191,13 @@ else
FREERDP_CONF_OPTS += -DWITH_XV=OFF FREERDP_CONF_OPTS += -DWITH_XV=OFF
endif endif
ifeq ($(BR2_PACKAGE_WAYLAND),y)
FREERDP_DEPENDENCIES += wayland
FREERDP_CONF_OPTS += -DWITH_WAYLAND=ON
else
FREERDP_CONF_OPTS += -DWITH_WAYLAND=OFF
endif
#--------------------------------------- #---------------------------------------
# Post-install hooks to cleanup and install missing stuff # Post-install hooks to cleanup and install missing stuff
@ -218,14 +225,21 @@ endef
FREERDP_POST_INSTALL_STAGING_HOOKS += FREERDP_RM_CLIENT_X11_LIB FREERDP_POST_INSTALL_STAGING_HOOKS += FREERDP_RM_CLIENT_X11_LIB
endif # ! X client endif # ! X client
# Wayland client is always built as soon as wayland is enabled, so
# manually remove it if the user does not want it.
ifeq ($(BR2_PACKAGE_FREERDP_CLIENT_WL),)
define FREERDP_RM_CLIENT_WL
rm -f $(TARGET_DIR)/usr/bin/wlfreerdp
endef
FREERDP_POST_INSTALL_TARGET_HOOKS += FREERDP_RM_CLIENT_WL
endif
# Remove static libraries in unusual dir # Remove static libraries in unusual dir
define FREERDP_CLEANUP define FREERDP_CLEANUP
rm -rf $(TARGET_DIR)/usr/lib/freerdp rm -rf $(TARGET_DIR)/usr/lib/freerdp
endef endef
FREERDP_POST_INSTALL_TARGET_HOOKS += FREERDP_CLEANUP FREERDP_POST_INSTALL_TARGET_HOOKS += FREERDP_CLEANUP
FREERDP_CONF_OPTS += -DWITH_WAYLAND=OFF
# Install the server key and certificate, so that a client can connect. # Install the server key and certificate, so that a client can connect.
# A user can override them with its own in a post-build script, if needed. # A user can override them with its own in a post-build script, if needed.
# We install them even if the server is not enabled, since another server # We install them even if the server is not enabled, since another server