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: Sun, 21 Feb 2021 12:45:23 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Feb 21 12:45:23 UTC 2021

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

Log Message:
meson: updated to 0.57.1

Release 0.57.0
* Project version can be specified with a file
* Support for reading files at configuration time with the fs module
* meson install --dry-run
* Experimental support for C++ modules in Visual Studio
* Qt6 module
* Unstable Rust module
* Meson test() now accepts protocol : 'rust'
* MSVC/Clang-Cl Argument Changes/Cleanup
* Buildtype remains even if dependent options are changed
* Passing internal dependencies to the compiler object
* unstable_external_project improvements
* gnome.post_install()
* "Edit and continue" (/ZI) is no longer used by default for Visual Studio
* Minimum required Python version updated to 3.6
* Packaging a subproject
* custom_target() and run_target() now accepts an env keyword argument
* summary() accepts external programs or dependencies
* CMake find_package version support
* meson test only rebuilds test dependencies
* The add_*_script methods now accept a File as the first argument
* Unity build with Vala disabled
* New logging format for meson test
* Specify DESTDIR on command line
* Skip install scripts if DESTDIR is set
* Add support for prelinked static libraries
* Rust now has an std option
* Ctrl-C behavior in meson test
* Support added for LLVM's thinLTO
* test() timeout and timeout_multiplier value <= 0
* Knob to control LTO thread
* summary() now uses left alignment for both keys and values
* // is now allowed as a function id for meson rewrite.
* Get keys of configuration data object


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/meson/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/meson/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py \
    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.22 pkgsrc/devel/meson/Makefile:1.23
--- pkgsrc/devel/meson/Makefile:1.22    Mon Jan 11 07:26:32 2021
+++ pkgsrc/devel/meson/Makefile Sun Feb 21 12:45:22 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2021/01/11 07:26:32 adam Exp $
+# $NetBSD: Makefile,v 1.23 2021/02/21 12:45:22 adam Exp $
 
-DISTNAME=      meson-0.56.2
+DISTNAME=      meson-0.57.1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}
 

Index: pkgsrc/devel/meson/PLIST
diff -u pkgsrc/devel/meson/PLIST:1.8 pkgsrc/devel/meson/PLIST:1.9
--- pkgsrc/devel/meson/PLIST:1.8        Sat Nov 21 11:27:23 2020
+++ pkgsrc/devel/meson/PLIST    Sun Feb 21 12:45:22 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2020/11/21 11:27:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2021/02/21 12:45:22 adam Exp $
 bin/meson
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -9,9 +9,6 @@ ${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/arglist.py
 ${PYSITELIB}/mesonbuild/arglist.pyc
 ${PYSITELIB}/mesonbuild/arglist.pyo
@@ -246,9 +243,21 @@ ${PYSITELIB}/mesonbuild/mdist.pyo
 ${PYSITELIB}/mesonbuild/mesondata.py
 ${PYSITELIB}/mesonbuild/mesondata.pyc
 ${PYSITELIB}/mesonbuild/mesondata.pyo
-${PYSITELIB}/mesonbuild/mesonlib.py
-${PYSITELIB}/mesonbuild/mesonlib.pyc
-${PYSITELIB}/mesonbuild/mesonlib.pyo
+${PYSITELIB}/mesonbuild/mesonlib/__init__.py
+${PYSITELIB}/mesonbuild/mesonlib/__init__.pyc
+${PYSITELIB}/mesonbuild/mesonlib/__init__.pyo
+${PYSITELIB}/mesonbuild/mesonlib/platform.py
+${PYSITELIB}/mesonbuild/mesonlib/platform.pyc
+${PYSITELIB}/mesonbuild/mesonlib/platform.pyo
+${PYSITELIB}/mesonbuild/mesonlib/posix.py
+${PYSITELIB}/mesonbuild/mesonlib/posix.pyc
+${PYSITELIB}/mesonbuild/mesonlib/posix.pyo
+${PYSITELIB}/mesonbuild/mesonlib/universal.py
+${PYSITELIB}/mesonbuild/mesonlib/universal.pyc
+${PYSITELIB}/mesonbuild/mesonlib/universal.pyo
+${PYSITELIB}/mesonbuild/mesonlib/win32.py
+${PYSITELIB}/mesonbuild/mesonlib/win32.pyc
+${PYSITELIB}/mesonbuild/mesonlib/win32.pyo
 ${PYSITELIB}/mesonbuild/mesonmain.py
 ${PYSITELIB}/mesonbuild/mesonmain.pyc
 ${PYSITELIB}/mesonbuild/mesonmain.pyo
@@ -309,6 +318,9 @@ ${PYSITELIB}/mesonbuild/modules/qt4.pyo
 ${PYSITELIB}/mesonbuild/modules/qt5.py
 ${PYSITELIB}/mesonbuild/modules/qt5.pyc
 ${PYSITELIB}/mesonbuild/modules/qt5.pyo
+${PYSITELIB}/mesonbuild/modules/qt6.py
+${PYSITELIB}/mesonbuild/modules/qt6.pyc
+${PYSITELIB}/mesonbuild/modules/qt6.pyo
 ${PYSITELIB}/mesonbuild/modules/rpm.py
 ${PYSITELIB}/mesonbuild/modules/rpm.pyc
 ${PYSITELIB}/mesonbuild/modules/rpm.pyo
@@ -324,6 +336,9 @@ ${PYSITELIB}/mesonbuild/modules/unstable
 ${PYSITELIB}/mesonbuild/modules/unstable_icestorm.py
 ${PYSITELIB}/mesonbuild/modules/unstable_icestorm.pyc
 ${PYSITELIB}/mesonbuild/modules/unstable_icestorm.pyo
+${PYSITELIB}/mesonbuild/modules/unstable_rust.py
+${PYSITELIB}/mesonbuild/modules/unstable_rust.pyc
+${PYSITELIB}/mesonbuild/modules/unstable_rust.pyo
 ${PYSITELIB}/mesonbuild/modules/unstable_simd.py
 ${PYSITELIB}/mesonbuild/modules/unstable_simd.pyc
 ${PYSITELIB}/mesonbuild/modules/unstable_simd.pyo
@@ -366,9 +381,6 @@ ${PYSITELIB}/mesonbuild/scripts/cleantre
 ${PYSITELIB}/mesonbuild/scripts/cmake_run_ctgt.py
 ${PYSITELIB}/mesonbuild/scripts/cmake_run_ctgt.pyc
 ${PYSITELIB}/mesonbuild/scripts/cmake_run_ctgt.pyo
-${PYSITELIB}/mesonbuild/scripts/commandrunner.py
-${PYSITELIB}/mesonbuild/scripts/commandrunner.pyc
-${PYSITELIB}/mesonbuild/scripts/commandrunner.pyo
 ${PYSITELIB}/mesonbuild/scripts/coverage.py
 ${PYSITELIB}/mesonbuild/scripts/coverage.pyc
 ${PYSITELIB}/mesonbuild/scripts/coverage.pyo
@@ -378,6 +390,9 @@ ${PYSITELIB}/mesonbuild/scripts/delwiths
 ${PYSITELIB}/mesonbuild/scripts/depfixer.py
 ${PYSITELIB}/mesonbuild/scripts/depfixer.pyc
 ${PYSITELIB}/mesonbuild/scripts/depfixer.pyo
+${PYSITELIB}/mesonbuild/scripts/depscan.py
+${PYSITELIB}/mesonbuild/scripts/depscan.pyc
+${PYSITELIB}/mesonbuild/scripts/depscan.pyo
 ${PYSITELIB}/mesonbuild/scripts/dirchanger.py
 ${PYSITELIB}/mesonbuild/scripts/dirchanger.pyc
 ${PYSITELIB}/mesonbuild/scripts/dirchanger.pyo

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.19 pkgsrc/devel/meson/distinfo:1.20
--- pkgsrc/devel/meson/distinfo:1.19    Mon Jan 11 07:26:32 2021
+++ pkgsrc/devel/meson/distinfo Sun Feb 21 12:45:22 2021
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.19 2021/01/11 07:26:32 adam Exp $
+$NetBSD: distinfo,v 1.20 2021/02/21 12:45:22 adam Exp $
 
-SHA1 (meson-0.56.2.tar.gz) = a62199aca12eb69d4df7e828a8d11cc241ecff73
-RMD160 (meson-0.56.2.tar.gz) = 50db2f70e1984c8ace05fb1655f282c5de37d08a
-SHA512 (meson-0.56.2.tar.gz) = 3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514
-Size (meson-0.56.2.tar.gz) = 1794847 bytes
-SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = 17f09e1b147f6baa434091f8a31b48f1941004f6
+SHA1 (meson-0.57.1.tar.gz) = eb87a41d4265aec1223c446c344455b674d4538c
+RMD160 (meson-0.57.1.tar.gz) = 741aff38cfab30963efc044f47216fe688514760
+SHA512 (meson-0.57.1.tar.gz) = 815dc2a41d389c3eb798b00bbfb458fde91ce360803a1b9e589d95fb4716d6b88f0e7c04545fa4f60fed82e9866fbf4f2638bf8f5ab15cb73d2ad252284826e9
+Size (meson-0.57.1.tar.gz) = 1849222 bytes
+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) = 7b5dff2fbc29199a2b1b18a0073e73461c517744
+SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 7b524383bfa6511c43d2d27de91442d42623c3ad
 SHA1 (patch-mesonbuild_scripts_depfixer.py) = b8673de86f49f7a9876afcd05536766e0555d217

Index: pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py
diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py:1.1 pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py:1.2
--- pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py:1.1     Fri Aug  7 13:04:08 2020
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py Sun Feb 21 12:45:23 2021
@@ -1,15 +1,15 @@
-$NetBSD: patch-mesonbuild_compilers_mixins_gnu.py,v 1.1 2020/08/07 13:04:08 jperkin Exp $
+$NetBSD: patch-mesonbuild_compilers_mixins_gnu.py,v 1.2 2021/02/21 12:45:23 adam Exp $
 
 Do not default to -z ignore on SunOS, it breaks for example -fstack-protector.
 
---- mesonbuild/compilers/mixins/gnu.py.orig    2020-06-29 17:00:07.000000000 +0000
+--- mesonbuild/compilers/mixins/gnu.py.orig    2021-02-08 21:39:00.000000000 +0000
 +++ mesonbuild/compilers/mixins/gnu.py
-@@ -144,7 +144,7 @@ class GnuLikeCompiler(metaclass=abc.ABCM
-                              'b_ndebug', 'b_staticpic', 'b_pie']
+@@ -153,7 +153,7 @@ class GnuLikeCompiler(Compiler, metaclas
+                                    'b_ndebug', 'b_staticpic', 'b_pie']}
          if not (self.info.is_windows() or self.info.is_cygwin() or self.info.is_openbsd()):
-             self.base_options.append('b_lundef')
+             self.base_options.add(OptionKey('b_lundef'))
 -        if not self.info.is_windows() or self.info.is_cygwin():
 +        if not (self.info.is_windows() or self.info.is_sunos()) or self.info.is_cygwin():
-             self.base_options.append('b_asneeded')
+             self.base_options.add(OptionKey('b_asneeded'))
          if not self.info.is_hurd():
-             self.base_options.append('b_sanitize')
+             self.base_options.add(OptionKey('b_sanitize'))
Index: pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py
diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.1 pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.2
--- pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.1        Thu Apr 23 07:00:09 2020
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py    Sun Feb 21 12:45:23 2021
@@ -1,19 +1,19 @@
-$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.1 2020/04/23 07:00:09 triaxx Exp $
+$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.2 2021/02/21 12:45:23 adam Exp $
 
-* Revert https://github.com/mesonbuild/meson/commit/aba8792 that introduced
-  a condition to match FreeBSD path norm for pkg-config files.
+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       2020-03-23 17:22:09.000000000 +0000
+--- mesonbuild/modules/pkgconfig.py.orig       2021-02-01 20:35:16.000000000 +0000
 +++ mesonbuild/modules/pkgconfig.py
-@@ -496,10 +496,7 @@ class PkgConfigModule(ExtensionModule):
+@@ -530,10 +530,7 @@ class PkgConfigModule(ExtensionModule):
          pcfile = filebase + '.pc'
          pkgroot = kwargs.get('install_dir', default_install_dir)
          if pkgroot is None:
 -            if mesonlib.is_freebsd():
--                pkgroot = os.path.join(state.environment.coredata.get_builtin_option('prefix'), 'libdata', 'pkgconfig')
+-                pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('prefix')), 'libdata', 'pkgconfig')
 -            else:
--                pkgroot = os.path.join(state.environment.coredata.get_builtin_option('libdir'), 'pkgconfig')
-+            pkgroot = os.path.join(state.environment.coredata.get_builtin_option('libdir'), 'pkgconfig')
+-                pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig')
++            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,

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