CVS commit: pkgsrc/devel/meson

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/meson
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Fri, 19 Jul 2024 07:26:38 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jul 19 07:26:38 UTC 2024

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

Log Message:
meson: updates to 1.5.0

1.5.0

Support for bztar in meson dist
Cargo dependencies names now include the API version
Added support Cargo.lock file
Meson now propagates its build type to CMake
compiler.run() method is now available for all languages
dependencies created by compiler.find_library implement the name() method
New version_argument kwarg for find_program
Meson configure handles changes to options in more cases
New meson format command
Added support for GCC's null_terminated_string_arg function attribute
A new dependency for ObjFW is now supported
Support of indexed @PLAINNAME@ and @BASENAME@
Required kwarg on more compiler methods
The Meson test program supports a new "--interactive" argument
meson test now sets the MESON_TEST_ITERATION environment variable
The Meson test program supports a new "--max-lines" argument
Basic support for TI Arm Clang (tiarmclang)
Support for Texas Instruments C6000 C/C++ compiler
Wayland stable protocols can be versioned


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/meson/PLIST
cvs rdiff -u -r1.57 -r1.58 pkgsrc/devel/meson/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.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.66 pkgsrc/devel/meson/Makefile:1.67
--- pkgsrc/devel/meson/Makefile:1.66    Fri May 31 04:22:41 2024
+++ pkgsrc/devel/meson/Makefile Fri Jul 19 07:26:37 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2024/05/31 04:22:41 adam Exp $
+# $NetBSD: Makefile,v 1.67 2024/07/19 07:26:37 adam Exp $
 
-DISTNAME=      meson-1.4.1
+DISTNAME=      meson-1.5.0
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}
 

Index: pkgsrc/devel/meson/PLIST
diff -u pkgsrc/devel/meson/PLIST:1.18 pkgsrc/devel/meson/PLIST:1.19
--- pkgsrc/devel/meson/PLIST:1.18       Sat Dec 30 16:29:34 2023
+++ pkgsrc/devel/meson/PLIST    Fri Jul 19 07:26:37 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2023/12/30 16:29:34 wiz Exp $
+@comment $NetBSD: PLIST,v 1.19 2024/07/19 07:26:37 adam Exp $
 bin/meson
 ${PYSITELIB}/${WHEEL_INFODIR}/COPYING
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
@@ -166,6 +166,9 @@ ${PYSITELIB}/mesonbuild/compilers/java.p
 ${PYSITELIB}/mesonbuild/compilers/mixins/__init__.py
 ${PYSITELIB}/mesonbuild/compilers/mixins/__init__.pyc
 ${PYSITELIB}/mesonbuild/compilers/mixins/__init__.pyo
+${PYSITELIB}/mesonbuild/compilers/mixins/apple.py
+${PYSITELIB}/mesonbuild/compilers/mixins/apple.pyc
+${PYSITELIB}/mesonbuild/compilers/mixins/apple.pyo
 ${PYSITELIB}/mesonbuild/compilers/mixins/arm.py
 ${PYSITELIB}/mesonbuild/compilers/mixins/arm.pyc
 ${PYSITELIB}/mesonbuild/compilers/mixins/arm.pyo
@@ -391,6 +394,9 @@ ${PYSITELIB}/mesonbuild/linkers/detect.p
 ${PYSITELIB}/mesonbuild/linkers/linkers.py
 ${PYSITELIB}/mesonbuild/linkers/linkers.pyc
 ${PYSITELIB}/mesonbuild/linkers/linkers.pyo
+${PYSITELIB}/mesonbuild/machinefile.py
+${PYSITELIB}/mesonbuild/machinefile.pyc
+${PYSITELIB}/mesonbuild/machinefile.pyo
 ${PYSITELIB}/mesonbuild/mcompile.py
 ${PYSITELIB}/mesonbuild/mcompile.pyc
 ${PYSITELIB}/mesonbuild/mcompile.pyo
@@ -412,6 +418,9 @@ ${PYSITELIB}/mesonbuild/mesonlib.pyo
 ${PYSITELIB}/mesonbuild/mesonmain.py
 ${PYSITELIB}/mesonbuild/mesonmain.pyc
 ${PYSITELIB}/mesonbuild/mesonmain.pyo
+${PYSITELIB}/mesonbuild/mformat.py
+${PYSITELIB}/mesonbuild/mformat.pyc
+${PYSITELIB}/mesonbuild/mformat.pyo
 ${PYSITELIB}/mesonbuild/minit.py
 ${PYSITELIB}/mesonbuild/minit.pyc
 ${PYSITELIB}/mesonbuild/minit.pyo
@@ -427,6 +436,9 @@ ${PYSITELIB}/mesonbuild/mlog.pyo
 ${PYSITELIB}/mesonbuild/modules/__init__.py
 ${PYSITELIB}/mesonbuild/modules/__init__.pyc
 ${PYSITELIB}/mesonbuild/modules/__init__.pyo
+${PYSITELIB}/mesonbuild/modules/_qt.py
+${PYSITELIB}/mesonbuild/modules/_qt.pyc
+${PYSITELIB}/mesonbuild/modules/_qt.pyo
 ${PYSITELIB}/mesonbuild/modules/cmake.py
 ${PYSITELIB}/mesonbuild/modules/cmake.pyc
 ${PYSITELIB}/mesonbuild/modules/cmake.pyo
@@ -472,9 +484,6 @@ ${PYSITELIB}/mesonbuild/modules/python.p
 ${PYSITELIB}/mesonbuild/modules/python3.py
 ${PYSITELIB}/mesonbuild/modules/python3.pyc
 ${PYSITELIB}/mesonbuild/modules/python3.pyo
-${PYSITELIB}/mesonbuild/modules/qt.py
-${PYSITELIB}/mesonbuild/modules/qt.pyc
-${PYSITELIB}/mesonbuild/modules/qt.pyo
 ${PYSITELIB}/mesonbuild/modules/qt4.py
 ${PYSITELIB}/mesonbuild/modules/qt4.pyc
 ${PYSITELIB}/mesonbuild/modules/qt4.pyo
@@ -517,6 +526,9 @@ ${PYSITELIB}/mesonbuild/munstable_coreda
 ${PYSITELIB}/mesonbuild/optinterpreter.py
 ${PYSITELIB}/mesonbuild/optinterpreter.pyc
 ${PYSITELIB}/mesonbuild/optinterpreter.pyo
+${PYSITELIB}/mesonbuild/options.py
+${PYSITELIB}/mesonbuild/options.pyc
+${PYSITELIB}/mesonbuild/options.pyo
 ${PYSITELIB}/mesonbuild/programs.py
 ${PYSITELIB}/mesonbuild/programs.pyc
 ${PYSITELIB}/mesonbuild/programs.pyo

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.57 pkgsrc/devel/meson/distinfo:1.58
--- pkgsrc/devel/meson/distinfo:1.57    Fri May 31 04:22:41 2024
+++ pkgsrc/devel/meson/distinfo Fri Jul 19 07:26:37 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.57 2024/05/31 04:22:41 adam Exp $
+$NetBSD: distinfo,v 1.58 2024/07/19 07:26:37 adam Exp $
 
-BLAKE2s (meson-1.4.1.tar.gz) = f4bd099fa74d5113a08cfd338044c833206295b6f1e79ea157c1d06d2d602e48
-SHA512 (meson-1.4.1.tar.gz) = 2616bcca70d5554407d4852aa3494e05e53aa8a33f58859ada42750221922fcb6ea7f3452844883f4800d77eed4a7289b061324871218f052219b3caa02dcc9e
-Size (meson-1.4.1.tar.gz) = 2235558 bytes
-SHA1 (patch-mesonbuild_compilers_detect.py) = 433c20bcf613817f0df9a73859909f8c257af243
+BLAKE2s (meson-1.5.0.tar.gz) = 2b8c5263d7320e499835e160e6e8efd47bab75aa2e6f8bebdf15bdfb7372a8f0
+SHA512 (meson-1.5.0.tar.gz) = f0a25cf134949739c698eddaea602bf7852866b3fee3d2c11c1e6b6e48c944cf92abc3d171a2e42e21077edc01f1e7079d451f5624e2b6131382e114e814db3e
+Size (meson-1.5.0.tar.gz) = 2257170 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

Index: pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py
diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py:1.5 pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py:1.6
--- pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py:1.5 Tue Oct  3 01:21:36 2023
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py     Fri Jul 19 07:26:38 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-mesonbuild_compilers_detect.py,v 1.5 2023/10/03 01:21:36 gutteridge Exp $
+$NetBSD: patch-mesonbuild_compilers_detect.py,v 1.6 2024/07/19 07:26:38 adam Exp $
 
 Specify c++ language when making CXX parse standard input.
 Fixes problem where graphics/MesaLib fails to build due to:
@@ -8,9 +8,9 @@ Fixes problem where graphics/MesaLib fai
 
 Also account for multiple versions of cython in pkgsrc.
 
---- mesonbuild/compilers/detect.py.orig        2023-07-21 20:36:13.000000000 +0000
+--- mesonbuild/compilers/detect.py.orig        2024-06-24 16:26:41.000000000 +0000
 +++ mesonbuild/compilers/detect.py
-@@ -80,7 +80,7 @@ defaults['cuda'] = ['nvcc']
+@@ -68,7 +68,7 @@ defaults['cuda'] = ['nvcc']
  defaults['rust'] = ['rustc']
  defaults['swift'] = ['swiftc']
  defaults['vala'] = ['valac']
@@ -19,27 +19,27 @@ Also account for multiple versions of cy
  defaults['static_linker'] = ['ar', 'gar']
  defaults['strip'] = ['strip']
  defaults['vs_static_linker'] = ['lib']
-@@ -1318,7 +1318,10 @@ def _get_gnu_compiler_defines(compiler: 
-     """
+@@ -1346,7 +1346,10 @@ def _get_gnu_compiler_defines(compiler:
+ 
      # Arguments to output compiler pre-processor defines to stdout
      # gcc, g++, and gfortran all support these arguments
--    args = compiler + ['-E', '-dM', '-']
-+    args = compiler + ['-E', '-dM']
+-    baseline_test_args = ['-E', '-dM', '-']
++    baseline_test_args = ['-E', '-dM']
 +    if compiler[0].endswith('++'):
-+        args += ['-x', 'c++']
-+    args += ['-']
-     mlog.debug(f'Running command: {join_args(args)}')
-     p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)
-     if p.returncode != 0:
-@@ -1345,7 +1348,10 @@ def _get_clang_compiler_defines(compiler
-     """
-     Get the list of Clang pre-processor defines
-     """
--    args = compiler + ['-E', '-dM', '-']
-+    args = compiler + ['-E', '-dM']
++        baseline_test_args += ['-x', 'c++']
++    baseline_test_args += ['-']
+     try:
+         # We assume that when _get_gnu_compiler_defines is called, it's
+         # close enough to a GCCish compiler so we reuse the _LANG_MAP
+@@ -1398,7 +1401,10 @@ def _get_clang_compiler_defines(compiler
+         return output
+ 
+     # Arguments to output compiler pre-processor defines to stdout
+-    baseline_test_args = ['-E', '-dM', '-']
++    baseline_test_args = ['-E', '-dM']
 +    if compiler[0].endswith('++'):
-+        args += ['-x', 'c++']
-+    args += ['-']
-     mlog.debug(f'Running command: {join_args(args)}')
-     p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)
-     if p.returncode != 0:
++        baseline_test_args += ['-x', 'c++']
++    baseline_test_args += ['-']
+     try:
+         # We assume that when _get_clang_compiler_defines is called, it's
+         # close enough to a Clangish compiler so we reuse the _LANG_MAP

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/devel
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/devel
Indexes:

Home | Main Index | Thread Index | Old Index