From 96e8b00f72260808c4bf3569d1703b961b3aa3af Mon Sep 17 00:00:00 2001 From: sergiotarxz Date: Fri, 13 May 2022 02:47:13 +0200 Subject: [PATCH] Adding scanner again and a patch to find the correct wayland-scanner --- x11-packages/libwayland/build.sh | 2 +- x11-packages/libwayland/libwayland.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 x11-packages/libwayland/libwayland.patch diff --git a/x11-packages/libwayland/build.sh b/x11-packages/libwayland/build.sh index e459ae6e1..9e8427bd9 100644 --- a/x11-packages/libwayland/build.sh +++ b/x11-packages/libwayland/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://wayland.freedesktop.org/releases/wayland-${TERMUX_PKG_ TERMUX_PKG_SHA256=b8a034154c7059772e0fdbd27dbfcda6c732df29cae56a82274f6ec5d7cd8725 TERMUX_PKG_DEPENDS="libandroid-support, libffi, libxml2, libexpat" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" - -Dscanner=false + -Dscanner=true -Dlibraries=true -Ddocumentation=false -Dtests=false diff --git a/x11-packages/libwayland/libwayland.patch b/x11-packages/libwayland/libwayland.patch new file mode 100644 index 000000000..89e5b4350 --- /dev/null +++ b/x11-packages/libwayland/libwayland.patch @@ -0,0 +1,13 @@ +diff --git a/src/meson.build b/src/meson.build +index a601724..d82a6b3 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -75,7 +75,7 @@ endif + + if meson.is_cross_build() or not get_option('scanner') + scanner_dep = dependency('wayland-scanner', native: true, version: meson.project_version()) +- wayland_scanner_for_build = find_program(scanner_dep.get_variable(pkgconfig: 'wayland_scanner')) ++ wayland_scanner_for_build = '/usr/bin/wayland-scanner' + else + wayland_scanner_for_build = wayland_scanner + endif