CVS commit: pkgsrc/devel/meson

"Thomas Klausner" <[email protected]>
Newsgroups gmane.os.netbsd.devel.pkgsrc.cvs
Message-ID <[email protected]> 
Module Name:	pkgsrc
Committed By:	wiz
Date:		Tue Aug 11 11:43:06 UTC 2026

Modified Files:
	pkgsrc/devel/meson: Makefile PLIST build.mk distinfo
	pkgsrc/devel/meson/patches: patch-mesonbuild_linkers_linkers.py
	    patch-mesonbuild_scripts_depfixer.py

Log Message:
meson: update to 1.12.0.

# New features
## Custom dependency for atomic now works on MSVC
## Support for CACHEDIR.TAG specification
## New `clippy-json` Ninja Target For rust-analyzer
## Add a new `default()` function and object
## Delay install script errors to install time
## `find_program()` now respects `--force-fallback-for`
## `fs.copyfile()` now has a `build_subdir` argument
## Added `depends` kwarg to `generator.process()`
## Added `msgfmt_args` arg to `i18n.gettext()`
## `include_directories` object now has a `to_list()` method
## Added integer base conversions to `str.to_int()` and `int.to_string()`
## Multiple positional arguments for `meson wrap install`
## `meson format` allows `--recursive` with `--check-diff`
## New `--subprojects` option for `meson format`
## OpenHarmony (OHOS) is now recognized as an Android subsystem
## External programs as inputs and dependencies to custom targets
## External programs as dependencies to tests
## Support for Python 3.7, 3.8, and 3.9 dropped
## More types of generated files allowed by `qt.preprocess()`
## The Rust module includes a basic wrapper for cbindgen
## Non-default members of Cargo workspaces can now be built
## `subproject()` and `meson.override_find_program()` now support the `native` keyword argument
## `meson test` now accepts `--exclude`
## Vala cross compilation changes
## `werror=true` now applies to the linker as well
## Added `win_subsystem` to `shared_library()` and `shared_module()`
## `i18n.xgettext()` recursive option now includes "private" dependencies


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/meson/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/meson/build.mk
cvs rdiff -u -r1.81 -r1.82 pkgsrc/devel/meson/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/meson/patches/patch-mesonbuild_linkers_linkers.py
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
(unnamed) (text/x-diff, 8.1 KB) 
Modified files:

Index: pkgsrc/devel/meson/Makefile
diff -u pkgsrc/devel/meson/Makefile:1.94 pkgsrc/devel/meson/Makefile:1.95
--- pkgsrc/devel/meson/Makefile:1.94	Mon Jul 13 06:33:01 2026
+++ pkgsrc/devel/meson/Makefile	Tue Aug 11 11:43:05 2026
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.94 2026/07/13 06:33:01 adam Exp $
+# $NetBSD: Makefile,v 1.95 2026/08/11 11:43:05 wiz Exp $
 #
 # Release notes in markdown format:
 # https://github.com/mesonbuild/meson/tree/master/docs/markdown/
 
-DISTNAME=	meson-1.11.2
+DISTNAME=	meson-1.12.0
 CATEGORIES=	devel python
 #MASTER_SITES=	${MASTER_SITE_PYPI:=m/meson/}
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mesonbuild/}
@@ -39,10 +39,10 @@ REPLACE_PYTHON+=	test\ cases/common/14\ 
 REPLACE_PYTHON+=	test\ cases/windows/8\ find\ program/test-script
 REPLACE_PYTHON+=	tools/*.py
 
-# as of 1.11.0
-# Total passed tests:  503
-# Total failed tests:  13
-# Total skipped tests: 113
+# as of 1.12.0
+# Total passed tests:  528
+# Total failed tests:  14
+# Total skipped tests: 114
 
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} run_tests.py

Index: pkgsrc/devel/meson/PLIST
diff -u pkgsrc/devel/meson/PLIST:1.26 pkgsrc/devel/meson/PLIST:1.27
--- pkgsrc/devel/meson/PLIST:1.26	Sun Apr 19 17:14:21 2026
+++ pkgsrc/devel/meson/PLIST	Tue Aug 11 11:43:05 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2026/04/19 17:14:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.27 2026/08/11 11:43:05 wiz Exp $
 bin/meson
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
 ${PYSITELIB}/${WHEEL_INFODIR}/RECORD
@@ -331,6 +331,9 @@ ${PYSITELIB}/mesonbuild/interpreter/__in
 ${PYSITELIB}/mesonbuild/interpreter/compiler.py
 ${PYSITELIB}/mesonbuild/interpreter/compiler.pyc
 ${PYSITELIB}/mesonbuild/interpreter/compiler.pyo
+${PYSITELIB}/mesonbuild/interpreter/decorators.py
+${PYSITELIB}/mesonbuild/interpreter/decorators.pyc
+${PYSITELIB}/mesonbuild/interpreter/decorators.pyo
 ${PYSITELIB}/mesonbuild/interpreter/dependencyfallbacks.py
 ${PYSITELIB}/mesonbuild/interpreter/dependencyfallbacks.pyc
 ${PYSITELIB}/mesonbuild/interpreter/dependencyfallbacks.pyo

Index: pkgsrc/devel/meson/build.mk
diff -u pkgsrc/devel/meson/build.mk:1.34 pkgsrc/devel/meson/build.mk:1.35
--- pkgsrc/devel/meson/build.mk:1.34	Mon Jul 27 12:27:28 2026
+++ pkgsrc/devel/meson/build.mk	Tue Aug 11 11:43:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.34 2026/07/27 12:27:28 wiz Exp $
+# $NetBSD: build.mk,v 1.35 2026/08/11 11:43:05 wiz Exp $
 
 MESON_REQD?=	0
 .for version in ${MESON_REQD}
@@ -36,15 +36,15 @@ MESON_NATIVE_ARGS+=	--native-file ${MESO
 
 # pass CFLAGS/LDFLAGS/CXXFLAGS the recommended way
 # https://mesonbuild.com/Reference-tables.html#language-arguments-parameter-names
-.for lang in ${USE_LANGUAGES}
-.if ${lang} == "c"
+.  for lang in ${USE_LANGUAGES}
+.    if ${lang} == "c"
 MESON_ARGS+=		-Dc_args=${CFLAGS:Q}\ ${CPPFLAGS:Q}
 MESON_ARGS+=		-Dc_link_args=${LDFLAGS:Q}
-.elif ${lang} == "c++"
+.    elif ${lang} == "c++"
 MESON_ARGS+=		-Dcpp_args=${CXXFLAGS:Q}\ ${CPPFLAGS:Q}
 MESON_ARGS+=		-Dcpp_link_args=${LDFLAGS:Q}
-.endif
-.endfor
+.    endif
+.  endfor
 
 meson-configure: ${MESON_NATIVE_FILE}
 ${MESON_NATIVE_FILE}:

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.81 pkgsrc/devel/meson/distinfo:1.82
--- pkgsrc/devel/meson/distinfo:1.81	Mon Jul 13 06:33:01 2026
+++ pkgsrc/devel/meson/distinfo	Tue Aug 11 11:43:05 2026
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.81 2026/07/13 06:33:01 adam Exp $
+$NetBSD: distinfo,v 1.82 2026/08/11 11:43:05 wiz Exp $
 
-BLAKE2s (meson-1.11.2.tar.gz) = 57f64c42043c1194c6f4303d77f6ec87e6816a91373eaf9c582376f7739ed45c
-SHA512 (meson-1.11.2.tar.gz) = b6e1fecb3502dfdae6ab7859531cf3db9ce4e2b205cbef3493feb38a44c91bd5ad5d062ab10e8127867a673dd66ef4cd28c4fbdc19fc305010d042fd16dbcfb3
-Size (meson-1.11.2.tar.gz) = 5027842 bytes
+BLAKE2s (meson-1.12.0.tar.gz) = 8672cd3848ffbd31da2add5c25ee2dd4ca9e2ee9fce7ecf4edbc53ef6ceb0a76
+SHA512 (meson-1.12.0.tar.gz) = 544ded6f311f22f2a499d82903a45f7dc81f1e86b7bfa0a2effe12b5cbcc8cf8f707d566dd47f4f151cab5ceff84822a4cd16cf1ea55dc9a05667f0ea9094f11
+Size (meson-1.12.0.tar.gz) = 5083711 bytes
 SHA1 (patch-mesonbuild_compilers_detect.py) = 0a7cd04f18f85c56e90f2ee72e6d0fdef9b132b6
 SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = 34c2f6f215d5aed1d6c422187f733d0d488ebb4f
 SHA1 (patch-mesonbuild_dependencies_dev.py) = 9ee6c7d85dce4d425a0858b5a444aac79e8c10b5
-SHA1 (patch-mesonbuild_linkers_linkers.py) = 2f0880543dbd51604e5ec152478d05517221657b
+SHA1 (patch-mesonbuild_linkers_linkers.py) = 904fb94872e92870c9bdc5641533d9310761775a
 SHA1 (patch-mesonbuild_modules_pkgconfig.py) = df5c55ed97c78e397be07a234e99d2707ff10808
-SHA1 (patch-mesonbuild_scripts_depfixer.py) = 0abd3326f7872e4d53006ff3de5716007c8f22b7
+SHA1 (patch-mesonbuild_scripts_depfixer.py) = 1a374a0d636a187ae09d709566eeeacec4264547

Index: pkgsrc/devel/meson/patches/patch-mesonbuild_linkers_linkers.py
diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_linkers_linkers.py:1.2 pkgsrc/devel/meson/patches/patch-mesonbuild_linkers_linkers.py:1.3
--- pkgsrc/devel/meson/patches/patch-mesonbuild_linkers_linkers.py:1.2	Mon Apr 21 09:23:45 2025
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_linkers_linkers.py	Tue Aug 11 11:43:05 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-mesonbuild_linkers_linkers.py,v 1.2 2025/04/21 09:23:45 wiz Exp $
+$NetBSD: patch-mesonbuild_linkers_linkers.py,v 1.3 2026/08/11 11:43:05 wiz Exp $
 
 1. Avoid thin archives on SunOS.
 2. Always use absolute rpaths (per pkgsrc policy)
 
---- mesonbuild/linkers/linkers.py.orig	2025-04-03 17:13:56.000000000 +0000
+--- mesonbuild/linkers/linkers.py.orig	2026-08-10 20:56:48.000000000 +0000
 +++ mesonbuild/linkers/linkers.py
-@@ -372,7 +372,7 @@ class ArLinker(ArLikeLinker, StaticLinke
+@@ -404,7 +404,7 @@ class ArLinker(ArLikeLinker, StaticLinker):
          thinargs = ''
          if '[D]' in stdo:
              stdargs += 'D'
@@ -14,12 +14,12 @@ $NetBSD: patch-mesonbuild_linkers_linker
              thinargs = 'T'
          self.std_args = [stdargs]
          self.std_thin_args = [stdargs + thinargs]
-@@ -756,7 +756,7 @@ class GnuLikeDynamicLinkerMixin(DynamicL
+@@ -821,7 +821,7 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase):
          # ...instead of just one single looooong option, like this:
          #
          #   -Wl,-rpath-link,/path/to/folder1:/path/to/folder2:...
 -        if self.id in {'ld.bfd', 'ld.gold'} and mesonlib.version_compare(self.version, '<2.28'):
 +        if self.id in {'ld.bfd', 'ld.gold'} and mesonlib.version_compare(self.version, '<2.28') or True:
              for p in rpath_paths:
-                 args.extend(self._apply_prefix('-rpath-link,' + os.path.join(build_dir, p)))
+                 args.extend(self._apply_prefix(['-rpath-link', os.path.join(build_dir, p)]))
  

Index: pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py
diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py:1.4 pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py:1.5
--- pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py:1.4	Wed Jul 13 03:57:22 2022
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py	Tue Aug 11 11:43:05 2026
@@ -1,15 +1,15 @@
-$NetBSD: patch-mesonbuild_scripts_depfixer.py,v 1.4 2022/07/13 03:57:22 triaxx Exp $
+$NetBSD: patch-mesonbuild_scripts_depfixer.py,v 1.5 2026/08/11 11:43:05 wiz Exp $
 
-Do not touch rpath for ELF.
+Do not remove rpaths for ELF.
 
---- mesonbuild/scripts/depfixer.py.orig	2020-09-17 22:00:44.000000000 +0000
+--- mesonbuild/scripts/depfixer.py.orig	2026-08-11 11:28:11.685123152 +0000
 +++ mesonbuild/scripts/depfixer.py
-@@ -482,8 +482,6 @@ def fix_rpath(fname: str, rpath_dirs_to_
+@@ -824,8 +824,6 @@ def fix_rpath(fname: str, rpath_dirs_to_remove: T.Set[
              return
-         if isinstance(new_rpath, str):
-             new_rpath = new_rpath.encode('utf8')
--        fix_elf(fname, rpath_dirs_to_remove, new_rpath, verbose)
--        return
+         if system == 'aix':
+             fix_aix(fname, rpath_dirs_to_remove, new_rpath, verbose)
+-        else:
+-            fix_elf(fname, rpath_dirs_to_remove, new_rpath, verbose)
+         return
      except SystemExit as e:
          if isinstance(e.code, int) and e.code == 0:
-             pass
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.