瀏覽代碼

package/freerdp: fix build of wayland client

Currently, FreeRDP uses pkg-config to find whether wayland is available.
When it is, it gets the CFLAGS and LDFLAGS and so on from pkg-config,
which is OK.

But I also gets the path to the wayland scanner from pkg-config. And
this points to the target one, when we really need the host one.

So we force-feed the correct path as a configure option.

Furthermore, wayland support needs libxkbcommon, so add this missing
dependency as well.

Fixes:
    http://autobuild.buildroot.org/results/bdfe233ade36a56d0f65ef3c3d1698fca548beed/

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Yann E. MORIN 7 年之前
父節點
當前提交
c2824fba2f
共有 2 個文件被更改,包括 5 次插入2 次删除
  1. 1 0
      package/freerdp/Config.in
  2. 4 2
      package/freerdp/freerdp.mk

+ 1 - 0
package/freerdp/Config.in

@@ -81,6 +81,7 @@ config BR2_PACKAGE_FREERDP_CLIENT_WL
 	bool "wayland client"
 	default y
 	depends on BR2_PACKAGE_WAYLAND
+	select BR2_PACKAGE_LIBXKBCOMMON
 
 endif
 

+ 4 - 2
package/freerdp/freerdp.mk

@@ -199,8 +199,10 @@ FREERDP_CONF_OPTS += -DWITH_XV=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_WAYLAND),y)
-FREERDP_DEPENDENCIES += wayland
-FREERDP_CONF_OPTS += -DWITH_WAYLAND=ON
+FREERDP_DEPENDENCIES += wayland libxkbcommon
+FREERDP_CONF_OPTS += \
+	-DWITH_WAYLAND=ON \
+	-DWAYLAND_SCANNER=$(HOST_DIR)/bin/wayland-scanner
 else
 FREERDP_CONF_OPTS += -DWITH_WAYLAND=OFF
 endif