0001-Fix-do-configure-error.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. diff --git a/src/meson.build b/src/meson.build
  2. index 35813c5..cfef036 100644
  3. --- a/src/meson.build
  4. +++ b/src/meson.build
  5. @@ -1,5 +1,15 @@
  6. prog_python = find_program('python3')
  7. +pymodule = import('python3')
  8. +py3 = pymodule.find_python()
  9. +
  10. +res = run_command(py3, '-c', 'import os; print(os.environ["STAGING_DIR_HOST"])', check: false)
  11. +if res.returncode() == 0
  12. + sysroot = res.stdout().strip()
  13. +else
  14. + sysroot = ''
  15. +endif
  16. +
  17. vulkan_hpp = join_paths([
  18. vulkan_dep.get_pkgconfig_variable('includedir'),
  19. 'vulkan',
  20. @@ -9,7 +19,7 @@ vulkan_hpp = join_paths([
  21. format_map_gen_h = custom_target(
  22. 'format_map_gen.h',
  23. output: 'format_map_gen.h',
  24. - input: vulkan_hpp,
  25. + input: sysroot + vulkan_hpp,
  26. command: [prog_python, files('gen_format_map.py'), '@INPUT@', '@OUTPUT@']
  27. )
  28. @@ -87,7 +97,7 @@ if build_xcb_ws
  29. endif
  30. if build_wayland_ws
  31. - wayland_scanner = find_program(wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner'))
  32. + wayland_scanner = find_program('wayland-scanner')
  33. wayland_protocols_dir = wayland_protocols_dep.get_pkgconfig_variable('pkgdatadir')
  34. xdg_shell_xml_path = wayland_protocols_dir + '/stable/xdg-shell/xdg-shell.xml'