CVS commit: pkgsrc/devel/meson

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr 19 17:14:21 UTC 2026

Modified Files:
        pkgsrc/devel/meson: Makefile PLIST distinfo
        pkgsrc/devel/meson/patches: patch-mesonbuild_dependencies_dev.py
            patch-mesonbuild_modules_pkgconfig.py

Log Message:
meson: update to 1.11.0.

# New features
## BuildTarget(install_dir) length > 1 replaced with keywords
## Cargo workspace object
## Cython no longer requires explicitly enabling C or C++
## Deduplication of OpenMP linker arguments
## `meson dist` now accepts `-j`/`--num-processes`
## Deprecate `should_fail` and rename it to `expected_fail`, also introduce `expected_exitcode`
## The external_project module uses the cygpath command to convert paths
## install_man and install_headers: add support for install_tag kwarg
## Added `link_early_args` to targets performing linking
## Machine files now expand `~` as the user's home directory
## `meson format` file sorting is now disabled by default and uses natural sorting
## `-Db_lto` and `-Db_pgo` now supported for MSVC
## Last major version supporting Python 3.7, 3.8, and 3.9
## Python extension modules default to C ABI for Rust
## Meson now defines `QT_DEBUG` or `QT_NO_DEBUG` depending on build type
## `compiler_target()` method in the Rust module
## Change to handling of linker arguments for Rust
## XC32 support now aware of v5.00 features
## windows.compile_resources now detects header changes with rc.exe
## Added `implicit_include_directories` argument to `windows.compile_resources`


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/meson/PLIST
cvs rdiff -u -r1.78 -r1.79 pkgsrc/devel/meson/distinfo
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py

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

Modified files:

Index: pkgsrc/devel/meson/Makefile
diff -u pkgsrc/devel/meson/Makefile:1.90 pkgsrc/devel/meson/Makefile:1.91
--- pkgsrc/devel/meson/Makefile:1.90    Thu Mar 26 06:28:03 2026
+++ pkgsrc/devel/meson/Makefile Sun Apr 19 17:14:21 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.90 2026/03/26 06:28:03 adam Exp $
+# $NetBSD: Makefile,v 1.91 2026/04/19 17:14:21 wiz Exp $
 
-DISTNAME=      meson-1.10.2
+DISTNAME=      meson-1.11.0
 CATEGORIES=    devel python
 #MASTER_SITES= ${MASTER_SITE_PYPI:=m/meson/}
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mesonbuild/}
@@ -36,10 +36,10 @@ REPLACE_PYTHON+=    test\ cases/common/14\ 
 REPLACE_PYTHON+=       test\ cases/windows/8\ find\ program/test-script
 REPLACE_PYTHON+=       tools/*.py
 
-# as of 1.10.1
-# Total passed tests:  492
-# Total failed tests:  36
-# Total skipped tests: 107
+# as of 1.11.0
+# Total passed tests:  503
+# Total failed tests:  13
+# Total skipped tests: 113
 
 do-test:
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} run_tests.py

Index: pkgsrc/devel/meson/PLIST
diff -u pkgsrc/devel/meson/PLIST:1.25 pkgsrc/devel/meson/PLIST:1.26
--- pkgsrc/devel/meson/PLIST:1.25       Sat Dec 20 22:49:17 2025
+++ pkgsrc/devel/meson/PLIST    Sun Apr 19 17:14:21 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2025/12/20 22:49:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.26 2026/04/19 17:14:21 wiz Exp $
 bin/meson
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
 ${PYSITELIB}/${WHEEL_INFODIR}/RECORD
@@ -629,6 +629,9 @@ ${PYSITELIB}/mesonbuild/scripts/pycompil
 ${PYSITELIB}/mesonbuild/scripts/python_info.py
 ${PYSITELIB}/mesonbuild/scripts/python_info.pyc
 ${PYSITELIB}/mesonbuild/scripts/python_info.pyo
+${PYSITELIB}/mesonbuild/scripts/rc.py
+${PYSITELIB}/mesonbuild/scripts/rc.pyc
+${PYSITELIB}/mesonbuild/scripts/rc.pyo
 ${PYSITELIB}/mesonbuild/scripts/regen_checker.py
 ${PYSITELIB}/mesonbuild/scripts/regen_checker.pyc
 ${PYSITELIB}/mesonbuild/scripts/regen_checker.pyo

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.78 pkgsrc/devel/meson/distinfo:1.79
--- pkgsrc/devel/meson/distinfo:1.78    Thu Mar 26 06:28:03 2026
+++ pkgsrc/devel/meson/distinfo Sun Apr 19 17:14:21 2026
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.78 2026/03/26 06:28:03 adam Exp $
+$NetBSD: distinfo,v 1.79 2026/04/19 17:14:21 wiz Exp $
 
-BLAKE2s (meson-1.10.2.tar.gz) = 8c601eb9977b0f4a6ebccc171df76194b7fc66a41a0a2f17567a02131f107603
-SHA512 (meson-1.10.2.tar.gz) = baa5cfbb0a1d870183a19afb7d96214258a4df8b18a4b4c4ca28d3b829d20c56f17eb0579e59367d5f303bc3e107f35e2ff4337471273745c8fc5e8232a02427
-Size (meson-1.10.2.tar.gz) = 4980077 bytes
+BLAKE2s (meson-1.11.0.tar.gz) = 9afce17f8b1aed1e53459df0d74fd4a298bee4ffa3f77469fef513e35291ef17
+SHA512 (meson-1.11.0.tar.gz) = 8c728df3679d71df138c217b1f7fe59fcc451a7f0e873aef3dd4ec2d1b9bed096daee3e55865fe194cbfe30d02acf613c2a9eb0af14e4975f96ca8a072c21c34
+Size (meson-1.11.0.tar.gz) = 5025427 bytes
 SHA1 (patch-mesonbuild_compilers_detect.py) = 0a7cd04f18f85c56e90f2ee72e6d0fdef9b132b6
 SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = 34c2f6f215d5aed1d6c422187f733d0d488ebb4f
-SHA1 (patch-mesonbuild_dependencies_dev.py) = 0170c709b5b40c16ad3297fcc8713c51918fdea0
+SHA1 (patch-mesonbuild_dependencies_dev.py) = 9ee6c7d85dce4d425a0858b5a444aac79e8c10b5
 SHA1 (patch-mesonbuild_linkers_linkers.py) = 2f0880543dbd51604e5ec152478d05517221657b
-SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 658fec01fe368d63434ad497d814107dc159a996
+SHA1 (patch-mesonbuild_modules_pkgconfig.py) = df5c55ed97c78e397be07a234e99d2707ff10808
 SHA1 (patch-mesonbuild_scripts_depfixer.py) = 0abd3326f7872e4d53006ff3de5716007c8f22b7

Index: pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py
diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py:1.7 pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py:1.8
--- pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py:1.7 Sat Dec 20 22:49:17 2025
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py     Sun Apr 19 17:14:21 2026
@@ -1,13 +1,13 @@
-$NetBSD: patch-mesonbuild_dependencies_dev.py,v 1.7 2025/12/20 22:49:17 wiz Exp $
+$NetBSD: patch-mesonbuild_dependencies_dev.py,v 1.8 2026/04/19 17:14:21 wiz Exp $
 
 Allow handling different versions of LLVM in pkgsrc using LLVM_CONFIG_PATH.
 
---- mesonbuild/dependencies/dev.py.orig        2025-12-08 16:48:27.000000000 +0000
+--- mesonbuild/dependencies/dev.py.orig        2026-04-13 14:03:15.000000000 +0000
 +++ mesonbuild/dependencies/dev.py
-@@ -188,7 +188,10 @@ class LLVMDependencyConfigTool(ConfigToo
-     __cpp_blacklist = {'-DNDEBUG'}
+@@ -192,7 +192,10 @@ class LLVMDependencyConfigTool(ConfigToolDependency):
  
      def __init__(self, name: str, environment: 'Environment', kwargs: DependencyObjectKWs):
+         kwargs['language'] = 'cpp'
 -        self.tools = get_llvm_tool_names('llvm-config')
 +        if 'LLVM_CONFIG_PATH' in os.environ:
 +            self.tools = [os.environ['LLVM_CONFIG_PATH']]

Index: pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py
diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.9 pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.10
--- pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.9        Tue Apr 29 10:46:11 2025
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py    Sun Apr 19 17:14:21 2026
@@ -1,14 +1,14 @@
-$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.9 2025/04/29 10:46:11 wiz Exp $
+$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.10 2026/04/19 17:14:21 wiz Exp $
 
 Revert https://github.com/mesonbuild/meson/commit/aba8792 that introduced
 a condition to match FreeBSD path norm for pkg-config files.
 
 Also undo haiku-specific change.
 
---- mesonbuild/modules/pkgconfig.py.orig       2025-04-28 15:36:57.000000000 +0000
+--- mesonbuild/modules/pkgconfig.py.orig       2026-04-13 14:03:15.000000000 +0000
 +++ mesonbuild/modules/pkgconfig.py
-@@ -702,10 +702,10 @@ class PkgConfigModule(NewExtensionModule
-         pkgroot = pkgroot_name = kwargs['install_dir'] or default_install_dir
+@@ -778,10 +778,10 @@ class PkgConfigModule(NewExtensionModule):
+             pkgroot_name = pkgroot.optname
          if pkgroot is None:
              m = state.environment.machines.host
 -            if m.is_freebsd():