CVS commit: pkgsrc/sysutils/xentools418

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Dec 30 18:52:38 UTC 2023

Modified Files:
        pkgsrc/sysutils/xentools418: distinfo
Added Files:
        pkgsrc/sysutils/xentools418/patches:
            patch-tools_qemu-xen_meson_mesonbuild_dependencies_ui.py

Log Message:
sysutils/xentools418: Force-disable sdl2-config

Resolves failure to build when SDL2 is installed.

Patch tested on netbsd-10 amd64 dom0, which booted and created a domU.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/xentools418/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_meson_mesonbuild_dependencies_ui.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/xentools418/distinfo
diff -u pkgsrc/sysutils/xentools418/distinfo:1.1 pkgsrc/sysutils/xentools418/distinfo:1.2
--- pkgsrc/sysutils/xentools418/distinfo:1.1    Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/distinfo        Sat Dec 30 18:52:38 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2023/12/30 18:52:38 gdt Exp $
 
 BLAKE2s (xen418/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = 82256e7e5d45980590a6493e17a4e133ff63fa28f00aff1963db96371e702448
 SHA512 (xen418/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = e1c11e37f53aab0cc6a3ceaace0b8417f07009b1f20ff8572320895fef24f1a796ade041094a024eb24c988b9bed404c556a1fdde809bba89fb49f0e0ff45a57
@@ -57,6 +57,7 @@ SHA1 (patch-tools_qemu-xen-traditional_n
 SHA1 (patch-tools_qemu-xen-traditional_xen-hooks.mak) = bc59cb87742036dfa75869572b21b58dd5a2c5ee
 SHA1 (patch-tools_qemu-xen_audio_audio.c) = d6a857ae398cb218d8ae4219f6b905bd8d7c0b0b
 SHA1 (patch-tools_qemu-xen_bios_optionrom_Makefile) = b05db9e1fddbd8e02f8882c2a8d89889f4289b74
+SHA1 (patch-tools_qemu-xen_meson_mesonbuild_dependencies_ui.py) = 3e8f5ef12a16ce74dae76618837c7dad67d25f79
 SHA1 (patch-tools_qemu-xen_net_tap-bsd.c) = 1d143fcc75ba21c78d7b44a191fd265c76a235e6
 SHA1 (patch-tools_qemu-xen_net_tap.c) = 8fdcbefcd38c15ddd65f6df62e0e410e325bae4e
 SHA1 (patch-tools_xenpaging_xenpaging.c) = 3ade1afeb17210632ca350cdbb649f30d4697493

Added files:

Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_meson_mesonbuild_dependencies_ui.py
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_meson_mesonbuild_dependencies_ui.py:1.1
--- /dev/null   Sat Dec 30 18:52:38 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_meson_mesonbuild_dependencies_ui.py        Sat Dec 30 18:52:38 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-tools_qemu-xen_meson_mesonbuild_dependencies_ui.py,v 1.1 2023/12/30 18:52:38 gdt Exp $
+
+Force off looking for sdl2-config because we do not buildlink it.
+Resolves failure to build when SDL2 is installed.
+
+Not submitted upstream because while lack of --disable-sdl2 is a bug,
+they are unlikely to see it that way.
+
+--- tools/qemu-xen/meson/mesonbuild/dependencies/ui.py.orig    2022-06-02 11:40:57.000000000 +0000
++++ tools/qemu-xen/meson/mesonbuild/dependencies/ui.py
+@@ -132,8 +132,8 @@ class GnuStepDependency(ConfigToolDepend
+ 
+ class SDL2DependencyConfigTool(ConfigToolDependency):
+ 
+-    tools = ['sdl2-config']
+-    tool_name = 'sdl2-config'
++    tools = ['sdl2-config-FAIL']
++    tool_name = 'sdl2-config-FAIL'
+ 
+     def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any]):
+         super().__init__(name, environment, kwargs)