CVS commit: pkgsrc/devel/meson

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Sep 27 18:50:06 UTC 2021

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

Log Message:
meson: updated to 0.59.1

0.59.0:
Unescaped variables in pkgconfig files
The custom_target() function now accepts a feed argument
Separate functions for qt preprocess
Cython as as first class language
Support for the Wine Resource Compiler
New vs2012 and vs2013 backend options
Developer environment
Fs Module now accepts files objects
Compiler argument checking for get_supported_arguments
New custom dependency for libintl
Parallelized meson subprojects commands
Using Vala no longer requires C in the project languages
The import() function gains required and disabler arguments
Objective C/C++ standard versions
Qt.preprocess source arguments deprecated
New build target methods
Automatically set up Visual Studio environment
gnome.compile_schemas() sets GSETTINGS_SCHEMA_DIR into devenv
update_desktop_database added to gnome.post_install()


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/meson/PLIST
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/meson/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/devel/meson/patches/patch-mesonbuild_environment.py
cvs rdiff -u -r1.2 -r1.3 \
    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.27 pkgsrc/devel/meson/Makefile:1.28
--- pkgsrc/devel/meson/Makefile:1.27    Mon Jun  7 18:58:55 2021
+++ pkgsrc/devel/meson/Makefile Mon Sep 27 18:50:06 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2021/06/07 18:58:55 adam Exp $
+# $NetBSD: Makefile,v 1.28 2021/09/27 18:50:06 adam Exp $
 
-DISTNAME=      meson-0.58.1
+DISTNAME=      meson-0.59.1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}
 

Index: pkgsrc/devel/meson/PLIST
diff -u pkgsrc/devel/meson/PLIST:1.10 pkgsrc/devel/meson/PLIST:1.11
--- pkgsrc/devel/meson/PLIST:1.10       Tue May  4 18:54:29 2021
+++ pkgsrc/devel/meson/PLIST    Mon Sep 27 18:50:06 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2021/05/04 18:54:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2021/09/27 18:50:06 adam Exp $
 bin/meson
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -9,6 +9,12 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.tx
 ${PYSITELIB}/mesonbuild/__init__.py
 ${PYSITELIB}/mesonbuild/__init__.pyc
 ${PYSITELIB}/mesonbuild/__init__.pyo
+${PYSITELIB}/mesonbuild/_pathlib.py
+${PYSITELIB}/mesonbuild/_pathlib.pyc
+${PYSITELIB}/mesonbuild/_pathlib.pyo
+${PYSITELIB}/mesonbuild/_typing.py
+${PYSITELIB}/mesonbuild/_typing.pyc
+${PYSITELIB}/mesonbuild/_typing.pyo
 ${PYSITELIB}/mesonbuild/arglist.py
 ${PYSITELIB}/mesonbuild/arglist.pyc
 ${PYSITELIB}/mesonbuild/arglist.pyo
@@ -42,6 +48,12 @@ ${PYSITELIB}/mesonbuild/backend/ninjabac
 ${PYSITELIB}/mesonbuild/backend/vs2010backend.py
 ${PYSITELIB}/mesonbuild/backend/vs2010backend.pyc
 ${PYSITELIB}/mesonbuild/backend/vs2010backend.pyo
+${PYSITELIB}/mesonbuild/backend/vs2012backend.py
+${PYSITELIB}/mesonbuild/backend/vs2012backend.pyc
+${PYSITELIB}/mesonbuild/backend/vs2012backend.pyo
+${PYSITELIB}/mesonbuild/backend/vs2013backend.py
+${PYSITELIB}/mesonbuild/backend/vs2013backend.pyc
+${PYSITELIB}/mesonbuild/backend/vs2013backend.pyo
 ${PYSITELIB}/mesonbuild/backend/vs2015backend.py
 ${PYSITELIB}/mesonbuild/backend/vs2015backend.pyc
 ${PYSITELIB}/mesonbuild/backend/vs2015backend.pyo
@@ -105,9 +117,15 @@ ${PYSITELIB}/mesonbuild/compilers/cs.pyo
 ${PYSITELIB}/mesonbuild/compilers/cuda.py
 ${PYSITELIB}/mesonbuild/compilers/cuda.pyc
 ${PYSITELIB}/mesonbuild/compilers/cuda.pyo
+${PYSITELIB}/mesonbuild/compilers/cython.py
+${PYSITELIB}/mesonbuild/compilers/cython.pyc
+${PYSITELIB}/mesonbuild/compilers/cython.pyo
 ${PYSITELIB}/mesonbuild/compilers/d.py
 ${PYSITELIB}/mesonbuild/compilers/d.pyc
 ${PYSITELIB}/mesonbuild/compilers/d.pyo
+${PYSITELIB}/mesonbuild/compilers/detect.py
+${PYSITELIB}/mesonbuild/compilers/detect.pyc
+${PYSITELIB}/mesonbuild/compilers/detect.pyo
 ${PYSITELIB}/mesonbuild/compilers/fortran.py
 ${PYSITELIB}/mesonbuild/compilers/fortran.pyc
 ${PYSITELIB}/mesonbuild/compilers/fortran.pyo
@@ -186,15 +204,33 @@ ${PYSITELIB}/mesonbuild/dependencies/bas
 ${PYSITELIB}/mesonbuild/dependencies/boost.py
 ${PYSITELIB}/mesonbuild/dependencies/boost.pyc
 ${PYSITELIB}/mesonbuild/dependencies/boost.pyo
+${PYSITELIB}/mesonbuild/dependencies/cmake.py
+${PYSITELIB}/mesonbuild/dependencies/cmake.pyc
+${PYSITELIB}/mesonbuild/dependencies/cmake.pyo
 ${PYSITELIB}/mesonbuild/dependencies/coarrays.py
 ${PYSITELIB}/mesonbuild/dependencies/coarrays.pyc
 ${PYSITELIB}/mesonbuild/dependencies/coarrays.pyo
+${PYSITELIB}/mesonbuild/dependencies/configtool.py
+${PYSITELIB}/mesonbuild/dependencies/configtool.pyc
+${PYSITELIB}/mesonbuild/dependencies/configtool.pyo
 ${PYSITELIB}/mesonbuild/dependencies/cuda.py
 ${PYSITELIB}/mesonbuild/dependencies/cuda.pyc
 ${PYSITELIB}/mesonbuild/dependencies/cuda.pyo
+${PYSITELIB}/mesonbuild/dependencies/detect.py
+${PYSITELIB}/mesonbuild/dependencies/detect.pyc
+${PYSITELIB}/mesonbuild/dependencies/detect.pyo
 ${PYSITELIB}/mesonbuild/dependencies/dev.py
 ${PYSITELIB}/mesonbuild/dependencies/dev.pyc
 ${PYSITELIB}/mesonbuild/dependencies/dev.pyo
+${PYSITELIB}/mesonbuild/dependencies/dub.py
+${PYSITELIB}/mesonbuild/dependencies/dub.pyc
+${PYSITELIB}/mesonbuild/dependencies/dub.pyo
+${PYSITELIB}/mesonbuild/dependencies/factory.py
+${PYSITELIB}/mesonbuild/dependencies/factory.pyc
+${PYSITELIB}/mesonbuild/dependencies/factory.pyo
+${PYSITELIB}/mesonbuild/dependencies/framework.py
+${PYSITELIB}/mesonbuild/dependencies/framework.pyc
+${PYSITELIB}/mesonbuild/dependencies/framework.pyo
 ${PYSITELIB}/mesonbuild/dependencies/hdf5.py
 ${PYSITELIB}/mesonbuild/dependencies/hdf5.pyc
 ${PYSITELIB}/mesonbuild/dependencies/hdf5.pyo
@@ -204,6 +240,9 @@ ${PYSITELIB}/mesonbuild/dependencies/mis
 ${PYSITELIB}/mesonbuild/dependencies/mpi.py
 ${PYSITELIB}/mesonbuild/dependencies/mpi.pyc
 ${PYSITELIB}/mesonbuild/dependencies/mpi.pyo
+${PYSITELIB}/mesonbuild/dependencies/pkgconfig.py
+${PYSITELIB}/mesonbuild/dependencies/pkgconfig.pyc
+${PYSITELIB}/mesonbuild/dependencies/pkgconfig.pyo
 ${PYSITELIB}/mesonbuild/dependencies/platform.py
 ${PYSITELIB}/mesonbuild/dependencies/platform.pyc
 ${PYSITELIB}/mesonbuild/dependencies/platform.pyo
@@ -231,21 +270,54 @@ ${PYSITELIB}/mesonbuild/interpreter/__in
 ${PYSITELIB}/mesonbuild/interpreter/compiler.py
 ${PYSITELIB}/mesonbuild/interpreter/compiler.pyc
 ${PYSITELIB}/mesonbuild/interpreter/compiler.pyo
+${PYSITELIB}/mesonbuild/interpreter/dependencyfallbacks.py
+${PYSITELIB}/mesonbuild/interpreter/dependencyfallbacks.pyc
+${PYSITELIB}/mesonbuild/interpreter/dependencyfallbacks.pyo
 ${PYSITELIB}/mesonbuild/interpreter/interpreter.py
 ${PYSITELIB}/mesonbuild/interpreter/interpreter.pyc
 ${PYSITELIB}/mesonbuild/interpreter/interpreter.pyo
 ${PYSITELIB}/mesonbuild/interpreter/interpreterobjects.py
 ${PYSITELIB}/mesonbuild/interpreter/interpreterobjects.pyc
 ${PYSITELIB}/mesonbuild/interpreter/interpreterobjects.pyo
+${PYSITELIB}/mesonbuild/interpreter/kwargs.py
+${PYSITELIB}/mesonbuild/interpreter/kwargs.pyc
+${PYSITELIB}/mesonbuild/interpreter/kwargs.pyo
 ${PYSITELIB}/mesonbuild/interpreter/mesonmain.py
 ${PYSITELIB}/mesonbuild/interpreter/mesonmain.pyc
 ${PYSITELIB}/mesonbuild/interpreter/mesonmain.pyo
-${PYSITELIB}/mesonbuild/interpreterbase.py
-${PYSITELIB}/mesonbuild/interpreterbase.pyc
-${PYSITELIB}/mesonbuild/interpreterbase.pyo
-${PYSITELIB}/mesonbuild/linkers.py
-${PYSITELIB}/mesonbuild/linkers.pyc
-${PYSITELIB}/mesonbuild/linkers.pyo
+${PYSITELIB}/mesonbuild/interpreterbase/__init__.py
+${PYSITELIB}/mesonbuild/interpreterbase/__init__.pyc
+${PYSITELIB}/mesonbuild/interpreterbase/__init__.pyo
+${PYSITELIB}/mesonbuild/interpreterbase/_unholder.py
+${PYSITELIB}/mesonbuild/interpreterbase/_unholder.pyc
+${PYSITELIB}/mesonbuild/interpreterbase/_unholder.pyo
+${PYSITELIB}/mesonbuild/interpreterbase/baseobjects.py
+${PYSITELIB}/mesonbuild/interpreterbase/baseobjects.pyc
+${PYSITELIB}/mesonbuild/interpreterbase/baseobjects.pyo
+${PYSITELIB}/mesonbuild/interpreterbase/decorators.py
+${PYSITELIB}/mesonbuild/interpreterbase/decorators.pyc
+${PYSITELIB}/mesonbuild/interpreterbase/decorators.pyo
+${PYSITELIB}/mesonbuild/interpreterbase/disabler.py
+${PYSITELIB}/mesonbuild/interpreterbase/disabler.pyc
+${PYSITELIB}/mesonbuild/interpreterbase/disabler.pyo
+${PYSITELIB}/mesonbuild/interpreterbase/exceptions.py
+${PYSITELIB}/mesonbuild/interpreterbase/exceptions.pyc
+${PYSITELIB}/mesonbuild/interpreterbase/exceptions.pyo
+${PYSITELIB}/mesonbuild/interpreterbase/helpers.py
+${PYSITELIB}/mesonbuild/interpreterbase/helpers.pyc
+${PYSITELIB}/mesonbuild/interpreterbase/helpers.pyo
+${PYSITELIB}/mesonbuild/interpreterbase/interpreterbase.py
+${PYSITELIB}/mesonbuild/interpreterbase/interpreterbase.pyc
+${PYSITELIB}/mesonbuild/interpreterbase/interpreterbase.pyo
+${PYSITELIB}/mesonbuild/linkers/__init__.py
+${PYSITELIB}/mesonbuild/linkers/__init__.pyc
+${PYSITELIB}/mesonbuild/linkers/__init__.pyo
+${PYSITELIB}/mesonbuild/linkers/detect.py
+${PYSITELIB}/mesonbuild/linkers/detect.pyc
+${PYSITELIB}/mesonbuild/linkers/detect.pyo
+${PYSITELIB}/mesonbuild/linkers/linkers.py
+${PYSITELIB}/mesonbuild/linkers/linkers.pyc
+${PYSITELIB}/mesonbuild/linkers/linkers.pyo
 ${PYSITELIB}/mesonbuild/mcompile.py
 ${PYSITELIB}/mesonbuild/mcompile.pyc
 ${PYSITELIB}/mesonbuild/mcompile.pyo

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.24 pkgsrc/devel/meson/distinfo:1.25
--- pkgsrc/devel/meson/distinfo:1.24    Mon Jun  7 18:58:55 2021
+++ pkgsrc/devel/meson/distinfo Mon Sep 27 18:50:06 2021
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.24 2021/06/07 18:58:55 adam Exp $
+$NetBSD: distinfo,v 1.25 2021/09/27 18:50:06 adam Exp $
 
-SHA1 (meson-0.58.1.tar.gz) = 0ffbe701153477835b849ecb1a54663820b1cb61
-RMD160 (meson-0.58.1.tar.gz) = e6ee2222b6ca6781a176a5f50bc6c61db6e76841
-SHA512 (meson-0.58.1.tar.gz) = 64ac1a9bcc642fb6d37c4b677d8b7db16d821f852f927a980d3fb1c149d680b7ff2c8d03676c6772666d46a33b6ce8674220433d302fcd92d13d9818558d6453
-Size (meson-0.58.1.tar.gz) = 1896205 bytes
+SHA1 (meson-0.59.1.tar.gz) = a78ba29c785137eb9b85955f2911966e49b2592b
+RMD160 (meson-0.59.1.tar.gz) = 2f7977dd49fe7e4b24e465013e83a4182fba4d79
+SHA512 (meson-0.59.1.tar.gz) = c45e29869dc681675b2643c37c892e7fff365c051edce4f2ec278fc6cee25bac6818add819e4db69d2fe3c1ba9572fc55bb8f67fe791cdc9c187627c71b01963
+Size (meson-0.59.1.tar.gz) = 1944678 bytes
+SHA1 (patch-mesonbuild_compilers_detect.py) = 6379aaae55a7175291133335f15307b53aee4384
 SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = cc9fe3204c7cf003d288ef5635fa7853a44a2e34
-SHA1 (patch-mesonbuild_dependencies_dev.py) = ce9b93369d771f7e24208923b58af769e51bcd98
-SHA1 (patch-mesonbuild_environment.py) = d0340ea4149c7ed89fd64d0f1631721f7b9f04aa
-SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 7b524383bfa6511c43d2d27de91442d42623c3ad
+SHA1 (patch-mesonbuild_dependencies_dev.py) = 44a3bdb96a1afad1f1a9110b6187c9daad0d449f
+SHA1 (patch-mesonbuild_modules_pkgconfig.py) = fc14da26f81d8aa8dd7b2ec0d034124458e6ba88
 SHA1 (patch-mesonbuild_scripts_depfixer.py) = b8673de86f49f7a9876afcd05536766e0555d217

Index: pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py
diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py:1.4 pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py:1.5
--- pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py:1.4 Wed Apr  1 14:51:05 2020
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py     Mon Sep 27 18:50:06 2021
@@ -1,13 +1,13 @@
-$NetBSD: patch-mesonbuild_dependencies_dev.py,v 1.4 2020/04/01 14:51:05 wiz Exp $
+$NetBSD: patch-mesonbuild_dependencies_dev.py,v 1.5 2021/09/27 18:50:06 adam Exp $
 
 Allow handling different versions of LLVM in pkgsrc using LLVM_CONFIG_PATH.
 
---- mesonbuild/dependencies/dev.py.orig        2020-03-23 17:22:09.000000000 +0000
+--- mesonbuild/dependencies/dev.py.orig        2021-08-18 11:22:33.000000000 +0000
 +++ mesonbuild/dependencies/dev.py
-@@ -201,7 +201,10 @@ class LLVMDependencyConfigTool(ConfigToo
+@@ -204,7 +204,10 @@ class LLVMDependencyConfigTool(ConfigToo
      __cpp_blacklist = {'-DNDEBUG'}
  
-     def __init__(self, name: str, environment, kwargs):
+     def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any]):
 -        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.2 pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.3
--- pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.2        Sun Feb 21 12:45:23 2021
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py    Mon Sep 27 18:50:06 2021
@@ -1,11 +1,11 @@
-$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.2 2021/02/21 12:45:23 adam Exp $
+$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.3 2021/09/27 18:50:06 adam 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       2021-02-01 20:35:16.000000000 +0000
+--- mesonbuild/modules/pkgconfig.py.orig       2021-08-18 11:22:33.000000000 +0000
 +++ mesonbuild/modules/pkgconfig.py
-@@ -530,10 +530,7 @@ class PkgConfigModule(ExtensionModule):
+@@ -549,10 +549,7 @@ class PkgConfigModule(ExtensionModule):
          pcfile = filebase + '.pc'
          pkgroot = kwargs.get('install_dir', default_install_dir)
          if pkgroot is None:
@@ -16,4 +16,4 @@ a condition to match FreeBSD path norm f
 +            pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig')
          if not isinstance(pkgroot, str):
              raise mesonlib.MesonException('Install_dir must be a string.')
-         self.generate_pkgconfig_file(state, deps, subdirs, name, description, url,
+         self._generate_pkgconfig_file(state, deps, subdirs, name, description, url,

Added files:

Index: pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py
diff -u /dev/null pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py:1.1
--- /dev/null   Mon Sep 27 18:50:06 2021
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py     Mon Sep 27 18:50:06 2021
@@ -0,0 +1,34 @@
+$NetBSD: patch-mesonbuild_compilers_detect.py,v 1.1 2021/09/27 18:50:06 adam Exp $
+
+Specify c++ language when making CXX parse standard input.
+Fixes problem where graphics/MesaLib fails to build due to:
+
+> clang++ -std=c++14 -dM -E -
+> error: invalid argument '-std=c++14' not allowed with 'C'
+
+--- mesonbuild/compilers/detect.py.orig        2021-09-10 05:30:31.000000000 +0000
++++ mesonbuild/compilers/detect.py
+@@ -1162,7 +1162,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']
++    if compiler[0].endswith('++'):
++        args += ['-x', 'c++']
++    args += ['-']
+     p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)
+     if p.returncode != 0:
+         raise EnvironmentException('Unable to detect GNU compiler type:\n' + output + error)
+@@ -1186,7 +1189,10 @@ def _get_clang_compiler_defines(compiler
+     """
+     Get the list of Clang pre-processor defines
+     """
+-    args = compiler + ['-E', '-dM', '-']
++    args = compiler + ['-E', '-dM']
++    if compiler[0].endswith('++'):
++        args += ['-x', 'c++']
++    args += ['-']
+     p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)
+     if p.returncode != 0:
+         raise EnvironmentException('Unable to get clang pre-processor defines:\n' + output + error)