head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.22
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.20
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.18
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.16
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.14
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.12
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.10
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.8
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.6
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.4
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.2
	pkgsrc-2023Q3-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2023.06.27.10.42.07;	author riastradh;	state Exp;
branches;
next	;
commitid	luLW4vRhElJYCzuE;


desc
@@


1.1
log
@devel/wayland: Make this cross-compile.

For cross-compilation, it depends on a native build of itself, for
the wayland-scanner tool.  This, in turn, requires a patch to the
meson files to allow it to be passed as a parameter (rather than
discovered through cmake or pkg-config, which are generally limited
to references into the cross-destdir).

(If someone can figure out how to spell `./configure
ac_cv_foo_path=...' in meson to obviate the need for that patch,
please do so!  I searched around in the manual and I couldn't find
any way to cause something like override_find_program to happen from
a command-line argument or environment variable.)
@
text
@$NetBSD$

When cross-compiling, let the caller (the pkgsrc Makefile) specify the
exact path to wayland-scanner rather than flailing around with
pkgconfig or cmake to (not) find it.

--- src/meson.build.orig	2022-06-30 21:59:11.000000000 +0000
+++ src/meson.build
@@@@ -78,8 +78,7 @@@@ if get_option('scanner')
 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 = find_program(get_option('cross_scanner'))
 else
 	wayland_scanner_for_build = wayland_scanner
 endif
@