CVS commit: pkgsrc/devel/meson

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr 29 10:46:11 UTC 2025

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

Log Message:
meson: update to 1.8.0.

New argument android_exe_type for executables
Changes to the b_sanitize option
New C standard c2y (and gnu2y)
i18n module xgettext
version_compare now accept multiple compare strings
Improvements to Objective-C and Objective-C++
Per project subproject options rewrite
Subproject specific values can be removed with -U
objects added correctly to Rust executables
rust.test now supports link_whole
Meson can run "rustdoc" on Rust projects
The Wayland module is stable
New swift_std compiler option
New option to execute a slice of tests
Valgrind now fails tests if errors are found


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/meson/PLIST
cvs rdiff -u -r1.66 -r1.67 pkgsrc/devel/meson/distinfo
cvs rdiff -u -r1.8 -r1.9 \
    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.77 pkgsrc/devel/meson/Makefile:1.78
--- pkgsrc/devel/meson/Makefile:1.77    Mon Apr 21 09:23:45 2025
+++ pkgsrc/devel/meson/Makefile Tue Apr 29 10:46:11 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.77 2025/04/21 09:23:45 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2025/04/29 10:46:11 wiz Exp $
 
-DISTNAME=      meson-1.7.2
-PKGREVISION=   2
+DISTNAME=      meson-1.8.0
 CATEGORIES=    devel python
 #MASTER_SITES= ${MASTER_SITE_PYPI:=m/meson/}
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mesonbuild/}
@@ -37,10 +36,11 @@ REPLACE_PYTHON+=    test\ cases/common/14\ 
 REPLACE_PYTHON+=       test\ cases/windows/8\ find\ program/test-script
 REPLACE_PYTHON+=       tools/*.py
 
-# as of 1.7.2
-# Total passed tests:  463
-# Total failed tests:  51
-# Total skipped tests: 105
+# as of 1.8.0
+# Total passed tests:  479
+# Total failed tests:  38
+# Total skipped tests: 106
+
 do-test:
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} run_tests.py
 

Index: pkgsrc/devel/meson/PLIST
diff -u pkgsrc/devel/meson/PLIST:1.22 pkgsrc/devel/meson/PLIST:1.23
--- pkgsrc/devel/meson/PLIST:1.22       Sat Apr 12 10:40:26 2025
+++ pkgsrc/devel/meson/PLIST    Tue Apr 29 10:46:11 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2025/04/12 10:40:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2025/04/29 10:46:11 wiz Exp $
 bin/meson
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
 ${PYSITELIB}/${WHEEL_INFODIR}/RECORD
@@ -566,6 +566,9 @@ ${PYSITELIB}/mesonbuild/scripts/coverage
 ${PYSITELIB}/mesonbuild/scripts/delwithsuffix.py
 ${PYSITELIB}/mesonbuild/scripts/delwithsuffix.pyc
 ${PYSITELIB}/mesonbuild/scripts/delwithsuffix.pyo
+${PYSITELIB}/mesonbuild/scripts/depaccumulate.py
+${PYSITELIB}/mesonbuild/scripts/depaccumulate.pyc
+${PYSITELIB}/mesonbuild/scripts/depaccumulate.pyo
 ${PYSITELIB}/mesonbuild/scripts/depfixer.py
 ${PYSITELIB}/mesonbuild/scripts/depfixer.pyc
 ${PYSITELIB}/mesonbuild/scripts/depfixer.pyo
@@ -614,6 +617,9 @@ ${PYSITELIB}/mesonbuild/scripts/reprotes
 ${PYSITELIB}/mesonbuild/scripts/run_tool.py
 ${PYSITELIB}/mesonbuild/scripts/run_tool.pyc
 ${PYSITELIB}/mesonbuild/scripts/run_tool.pyo
+${PYSITELIB}/mesonbuild/scripts/rustdoc.py
+${PYSITELIB}/mesonbuild/scripts/rustdoc.pyc
+${PYSITELIB}/mesonbuild/scripts/rustdoc.pyo
 ${PYSITELIB}/mesonbuild/scripts/scanbuild.py
 ${PYSITELIB}/mesonbuild/scripts/scanbuild.pyc
 ${PYSITELIB}/mesonbuild/scripts/scanbuild.pyo

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.66 pkgsrc/devel/meson/distinfo:1.67
--- pkgsrc/devel/meson/distinfo:1.66    Mon Apr 21 09:23:45 2025
+++ pkgsrc/devel/meson/distinfo Tue Apr 29 10:46:11 2025
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.66 2025/04/21 09:23:45 wiz Exp $
+$NetBSD: distinfo,v 1.67 2025/04/29 10:46:11 wiz Exp $
 
-BLAKE2s (meson-1.7.2.tar.gz) = 78f41f30e60e45e8f31f2ff8712e725a96606d890d0d68459fcea304860cd7a5
-SHA512 (meson-1.7.2.tar.gz) = 91ddf5421f2808f9f011c2d7f5f2cf9767cf26128821251bae454fc9f36b986ec19d7713b0a938abaaa6300b7f9f06491a91da42080e3811f5271076669da400
-Size (meson-1.7.2.tar.gz) = 4857152 bytes
+BLAKE2s (meson-1.8.0.tar.gz) = 610c65a0566e07aec25af329cac56c6bc0524b27840219d6be8f3bec1ca428aa
+SHA512 (meson-1.8.0.tar.gz) = b5562fdfa1e19dff778a85500575d4f7823be3b64b409c9d86a372c8caa14f5170b38f9adc0bebddec1bbf73c67195d7bfaecdde0bb0287504d5b9c20ad510fd
+Size (meson-1.8.0.tar.gz) = 4897938 bytes
 SHA1 (patch-mesonbuild_compilers_detect.py) = e0d29a213c558a3f753366233c1db627f1637ed1
 SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = 34c2f6f215d5aed1d6c422187f733d0d488ebb4f
 SHA1 (patch-mesonbuild_dependencies_dev.py) = 2165f1ee4ad5d9689eb2fb7e94841503336070b9
 SHA1 (patch-mesonbuild_linkers_linkers.py) = 2f0880543dbd51604e5ec152478d05517221657b
-SHA1 (patch-mesonbuild_modules_pkgconfig.py) = b0c1adc0c4f30d06a8e9854fd0e93ebde126e8ff
+SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 658fec01fe368d63434ad497d814107dc159a996
 SHA1 (patch-mesonbuild_scripts_depfixer.py) = 0abd3326f7872e4d53006ff3de5716007c8f22b7

Index: pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py
diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.8 pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.9
--- pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.8        Tue Oct 22 09:42:05 2024
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py    Tue Apr 29 10:46:11 2025
@@ -1,16 +1,22 @@
-$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.8 2024/10/22 09:42:05 wiz Exp $
+$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.9 2025/04/29 10:46:11 wiz Exp $
 
 Revert https://github.com/mesonbuild/meson/commit/aba8792 that introduced
 a condition to match FreeBSD path norm for pkg-config files.
 
---- mesonbuild/modules/pkgconfig.py.orig       2024-10-20 18:20:39.000000000 +0000
+Also undo haiku-specific change.
+
+--- mesonbuild/modules/pkgconfig.py.orig       2025-04-28 15:36:57.000000000 +0000
 +++ mesonbuild/modules/pkgconfig.py
-@@ -701,7 +701,7 @@ class PkgConfigModule(NewExtensionModule
-         pcfile = filebase + '.pc'
+@@ -702,10 +702,10 @@ class PkgConfigModule(NewExtensionModule
          pkgroot = pkgroot_name = kwargs['install_dir'] or default_install_dir
          if pkgroot is None:
--            if mesonlib.is_freebsd():
+             m = state.environment.machines.host
+-            if m.is_freebsd():
 +            if False:
-                 pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('prefix'))), 'libdata', 'pkgconfig')
+                 pkgroot = os.path.join(_as_str(state.environment.coredata.optstore.get_value_for(OptionKey('prefix'))), 'libdata', 'pkgconfig')
                  pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig')
-             elif mesonlib.is_haiku():
+-            elif m.is_haiku():
++            elif False:
+                 pkgroot = os.path.join(_as_str(state.environment.coredata.optstore.get_value_for(OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig')
+                 pkgroot_name = os.path.join('{prefix}', 'develop', 'lib', 'pkgconfig')
+             else: