From 831c7604c3b6fb86d1ecfd88ec02bc926262af3e Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Sat, 17 Sep 2022 11:45:21 +0900
Subject: [PATCH] {lib,x}wayland: Fix build

---
 x11-packages/libwayland/build.sh               | 18 +++++++++++++++++-
 .../libwayland-cross-scanner.subpackage.sh     |  4 ++++
 x11-packages/xwayland/build.sh                 |  5 ++++-
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 x11-packages/libwayland/libwayland-cross-scanner.subpackage.sh

diff --git a/x11-packages/libwayland/build.sh b/x11-packages/libwayland/build.sh
index 30ef669c12..e2111d3ce8 100644
--- a/x11-packages/libwayland/build.sh
+++ b/x11-packages/libwayland/build.sh
@@ -3,14 +3,30 @@ TERMUX_PKG_DESCRIPTION="Wayland protocol library"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.17.0
-TERMUX_PKG_REVISION=9
+TERMUX_PKG_REVISION=10
 TERMUX_PKG_SRCURL=https://wayland.freedesktop.org/releases/wayland-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4
 TERMUX_PKG_DEPENDS="libandroid-support, libffi, libxml2, libexpat"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-documentation --with-host-scanner"
+TERMUX_PKG_HOSTBUILD=true
+TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="
+--disable-libraries
+--disable-documentation
+--disable-dtd-validation
+--prefix=$TERMUX_PREFIX/opt/$TERMUX_PKG_NAME/cross
+"
+
+termux_step_host_build() {
+	"$TERMUX_PKG_SRCDIR/configure" ${TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS}
+	make -j "$TERMUX_MAKE_PROCESSES"
+	make install
+}
 
 termux_step_pre_configure() {
 	autoreconf -fi
+
+	_HOST_PREFIX=$TERMUX_PREFIX/opt/$TERMUX_PKG_NAME/cross
+	export PATH=${_HOST_PREFIX}/bin:$PATH
 }
 
 termux_step_post_make_install() {
diff --git a/x11-packages/libwayland/libwayland-cross-scanner.subpackage.sh b/x11-packages/libwayland/libwayland-cross-scanner.subpackage.sh
new file mode 100644
index 0000000000..b9ee8f02d2
--- /dev/null
+++ b/x11-packages/libwayland/libwayland-cross-scanner.subpackage.sh
@@ -0,0 +1,4 @@
+TERMUX_SUBPKG_DESCRIPTION="wayland-scanner for host (NOT for Termux)"
+TERMUX_SUBPKG_INCLUDE="
+opt/$TERMUX_PKG_NAME/cross/*
+"
diff --git a/x11-packages/xwayland/build.sh b/x11-packages/xwayland/build.sh
index 23bafa5a0b..4b44388933 100644
--- a/x11-packages/xwayland/build.sh
+++ b/x11-packages/xwayland/build.sh
@@ -3,12 +3,15 @@ TERMUX_PKG_DESCRIPTION="Wayland X11 server"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.20.5
-TERMUX_PKG_REVISION=14
+TERMUX_PKG_REVISION=15
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d
 TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpciaccess, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, openssl, xkeyboard-config, xorg-xkbcomp, libwayland, libwayland-protocols, libepoxy"
+TERMUX_PKG_BUILD_DEPENDS="libwayland-cross-scanner"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+ac_cv_path_RAWCPP=/usr/bin/cpp
+ac_cv_path_WAYLAND_SCANNER=$TERMUX_PREFIX/opt/libwayland/cross/bin/wayland-scanner
 --enable-composite
 --enable-mitshm
 --enable-xres