CVS commit: pkgsrc/devel/meson

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Oct 22 09:42:05 UTC 2024

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

Log Message:
meson: update to 1.6.0.

Support for OpenXL compiler in AIX.
alias_target of both_libraries
Default to printing deprecations when no minimum version is specified.
Cargo subprojects is experimental
Dependencies from CMake subprojects now use only PUBLIC link flags
New built-in option for default both_libraries
New as_static and as_shared methods on internal dependencies
Support for DIA SDK
Support for LLVM-based flang compiler
nvc and nvc++ now support setting std
Tools can be selected when calling has_tools() on the Qt modules
Simple tool to test build reproducibility
Support for variable in system dependencies
test() and benchmark() functions accept new types
Zig 0.11 can be used as a C/C++ compiler frontend


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/meson/PLIST
cvs rdiff -u -r1.60 -r1.61 pkgsrc/devel/meson/distinfo
cvs rdiff -u -r1.7 -r1.8 \
    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.69 pkgsrc/devel/meson/Makefile:1.70
--- pkgsrc/devel/meson/Makefile:1.69    Sun Sep 22 15:26:06 2024
+++ pkgsrc/devel/meson/Makefile Tue Oct 22 09:42:05 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2024/09/22 15:26:06 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2024/10/22 09:42:05 wiz Exp $
 
-DISTNAME=      meson-1.5.2
+DISTNAME=      meson-1.6.0
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}
 
@@ -16,8 +16,6 @@ DEPENDS+=     ninja-build>=1.7:../../devel/n
 CONFLICTS+=    py[0-9]*-meson-[0-9]*
 SUPERSEDES+=   py[0-9]*-meson-[0-9]*
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 USE_LANGUAGES= c c++ # c++ for tests
 # XXX only needed for tests, but itstool:test didn't work
 USE_TOOLS+=    itstool
@@ -38,9 +36,9 @@ REPLACE_PYTHON+=      test\ cases/common/14\ 
 REPLACE_PYTHON+=       test\ cases/windows/8\ find\ program/test-script
 REPLACE_PYTHON+=       tools/*.py
 
-# Total passed tests:  448
-# Total failed tests:  39
-# Total skipped tests: 95
+# Total passed tests:  476
+# Total failed tests:  38
+# Total skipped tests: 101
 do-test:
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} run_tests.py
 

Index: pkgsrc/devel/meson/PLIST
diff -u pkgsrc/devel/meson/PLIST:1.19 pkgsrc/devel/meson/PLIST:1.20
--- pkgsrc/devel/meson/PLIST:1.19       Fri Jul 19 07:26:37 2024
+++ pkgsrc/devel/meson/PLIST    Tue Oct 22 09:42:05 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2024/07/19 07:26:37 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2024/10/22 09:42:05 wiz Exp $
 bin/meson
 ${PYSITELIB}/${WHEEL_INFODIR}/COPYING
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
@@ -602,6 +602,9 @@ ${PYSITELIB}/mesonbuild/scripts/python_i
 ${PYSITELIB}/mesonbuild/scripts/regen_checker.py
 ${PYSITELIB}/mesonbuild/scripts/regen_checker.pyc
 ${PYSITELIB}/mesonbuild/scripts/regen_checker.pyo
+${PYSITELIB}/mesonbuild/scripts/reprotest.py
+${PYSITELIB}/mesonbuild/scripts/reprotest.pyc
+${PYSITELIB}/mesonbuild/scripts/reprotest.pyo
 ${PYSITELIB}/mesonbuild/scripts/run_tool.py
 ${PYSITELIB}/mesonbuild/scripts/run_tool.pyc
 ${PYSITELIB}/mesonbuild/scripts/run_tool.pyo

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.60 pkgsrc/devel/meson/distinfo:1.61
--- pkgsrc/devel/meson/distinfo:1.60    Sun Sep 22 15:26:06 2024
+++ pkgsrc/devel/meson/distinfo Tue Oct 22 09:42:05 2024
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.60 2024/09/22 15:26:06 wiz Exp $
+$NetBSD: distinfo,v 1.61 2024/10/22 09:42:05 wiz Exp $
 
-BLAKE2s (meson-1.5.2.tar.gz) = e22980a853bf850fbf29401c973da7b22a122edb743a36009e40a0f9d3202403
-SHA512 (meson-1.5.2.tar.gz) = 9f601bdadaf2dae312ff02caa9dcd3fe13659a101e601417bdb908d8b91cdd4a12302433b00c188c1562287a06ada656044d79821d0beb0e0e41c63ab5d48112
-Size (meson-1.5.2.tar.gz) = 2265788 bytes
+BLAKE2s (meson-1.6.0.tar.gz) = 361d104ddaa88be101a84cba23120872afdbf22a6b211760aa1e8e58ff8ba38a
+SHA512 (meson-1.6.0.tar.gz) = 8805f07d0cfe2050305eff009b20973bfe3aab808a263479ed98a31fa026c1a378285928c2dd058e4224abc1b347aeee5c1628c964375135e9b4647819a119bc
+Size (meson-1.6.0.tar.gz) = 2277602 bytes
 SHA1 (patch-mesonbuild_compilers_detect.py) = bcced0a5a900b776495c8707231e376c7f233e78
 SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = 34c2f6f215d5aed1d6c422187f733d0d488ebb4f
 SHA1 (patch-mesonbuild_dependencies_dev.py) = 2165f1ee4ad5d9689eb2fb7e94841503336070b9
 SHA1 (patch-mesonbuild_linkers_linkers.py) = 4ca793f71aac2119f94464bb2beb83ed3da3e9a0
-SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 9ff9b4d5106b9db26850ad7592fe0bddb89dd043
+SHA1 (patch-mesonbuild_modules_pkgconfig.py) = b0c1adc0c4f30d06a8e9854fd0e93ebde126e8ff
 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.7 pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.8
--- pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.7        Fri Feb 24 08:19:00 2023
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py    Tue Oct 22 09:42:05 2024
@@ -1,16 +1,16 @@
-$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.7 2023/02/24 08:19:00 adam Exp $
+$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.8 2024/10/22 09:42:05 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       2023-02-23 22:07:07.000000000 +0000
+--- mesonbuild/modules/pkgconfig.py.orig       2024-10-20 18:20:39.000000000 +0000
 +++ mesonbuild/modules/pkgconfig.py
-@@ -696,7 +696,7 @@ class PkgConfigModule(NewExtensionModule
+@@ -701,7 +701,7 @@ class PkgConfigModule(NewExtensionModule
          pcfile = filebase + '.pc'
          pkgroot = pkgroot_name = kwargs['install_dir'] or default_install_dir
          if pkgroot is None:
 -            if mesonlib.is_freebsd():
 +            if False:
-                 pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'libdata', 'pkgconfig')
+                 pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('prefix'))), 'libdata', 'pkgconfig')
                  pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig')
              elif mesonlib.is_haiku():