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, 13 Nov 2022 09:57:24 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Nov 13 09:57:24 UTC 2022

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

Log Message:
meson: updated to 0.64.0

0.64.0
Add optimization plain option
New languages: nasm and masm
Pager and colors for meson configure output
various install_* functions no longer handle the sticky bit
fs.copyfile to replace configure_file(copy : true)
Added update_mime_database to gnome.post_install()
Added preserve_path arg to install_data
BSD support for the jni dependency
Credentials from ~/.netrc for https URLs
Basic support for oneAPI compilers on Linux and Windows
New method to preprocess source files
python.find_installation() now accepts pure argument
Generates rust-project.json when there are Rust targets
summary() accepts disablers
Option to allow meson test to fail fast after the first failing testcase
Incremental ThinLTO with b_thinlto_cache
Update all wraps from WrapDB with meson wrap update command
Added include_core_only arg to wayland.scan_xml.
Automatic fallback using WrapDB


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/meson/PLIST
cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/meson/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    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.45 pkgsrc/devel/meson/Makefile:1.46
--- pkgsrc/devel/meson/Makefile:1.45    Thu Oct  6 13:32:26 2022
+++ pkgsrc/devel/meson/Makefile Sun Nov 13 09:57:24 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2022/10/06 13:32:26 adam Exp $
+# $NetBSD: Makefile,v 1.46 2022/11/13 09:57:24 adam Exp $
 
-DISTNAME=      meson-0.63.3
+DISTNAME=      meson-0.64.0
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}
 

Index: pkgsrc/devel/meson/PLIST
diff -u pkgsrc/devel/meson/PLIST:1.14 pkgsrc/devel/meson/PLIST:1.15
--- pkgsrc/devel/meson/PLIST:1.14       Fri May 27 12:26:50 2022
+++ pkgsrc/devel/meson/PLIST    Sun Nov 13 09:57:24 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2022/05/27 12:26:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2022/11/13 09:57:24 adam Exp $
 bin/meson
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -106,6 +106,9 @@ ${PYSITELIB}/mesonbuild/cmake/tracetarge
 ${PYSITELIB}/mesonbuild/compilers/__init__.py
 ${PYSITELIB}/mesonbuild/compilers/__init__.pyc
 ${PYSITELIB}/mesonbuild/compilers/__init__.pyo
+${PYSITELIB}/mesonbuild/compilers/asm.py
+${PYSITELIB}/mesonbuild/compilers/asm.pyc
+${PYSITELIB}/mesonbuild/compilers/asm.pyo
 ${PYSITELIB}/mesonbuild/compilers/c.py
 ${PYSITELIB}/mesonbuild/compilers/c.pyc
 ${PYSITELIB}/mesonbuild/compilers/c.pyo
@@ -373,24 +376,9 @@ ${PYSITELIB}/mesonbuild/mdist.pyo
 ${PYSITELIB}/mesonbuild/mesondata.py
 ${PYSITELIB}/mesonbuild/mesondata.pyc
 ${PYSITELIB}/mesonbuild/mesondata.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/vsenv.py
-${PYSITELIB}/mesonbuild/mesonlib/vsenv.pyc
-${PYSITELIB}/mesonbuild/mesonlib/vsenv.pyo
-${PYSITELIB}/mesonbuild/mesonlib/win32.py
-${PYSITELIB}/mesonbuild/mesonlib/win32.pyc
-${PYSITELIB}/mesonbuild/mesonlib/win32.pyo
+${PYSITELIB}/mesonbuild/mesonlib.py
+${PYSITELIB}/mesonbuild/mesonlib.pyc
+${PYSITELIB}/mesonbuild/mesonlib.pyo
 ${PYSITELIB}/mesonbuild/mesonmain.py
 ${PYSITELIB}/mesonbuild/mesonmain.pyc
 ${PYSITELIB}/mesonbuild/mesonmain.pyo
@@ -412,9 +400,15 @@ ${PYSITELIB}/mesonbuild/modules/__init__
 ${PYSITELIB}/mesonbuild/modules/cmake.py
 ${PYSITELIB}/mesonbuild/modules/cmake.pyc
 ${PYSITELIB}/mesonbuild/modules/cmake.pyo
+${PYSITELIB}/mesonbuild/modules/cuda.py
+${PYSITELIB}/mesonbuild/modules/cuda.pyc
+${PYSITELIB}/mesonbuild/modules/cuda.pyo
 ${PYSITELIB}/mesonbuild/modules/dlang.py
 ${PYSITELIB}/mesonbuild/modules/dlang.pyc
 ${PYSITELIB}/mesonbuild/modules/dlang.pyo
+${PYSITELIB}/mesonbuild/modules/external_project.py
+${PYSITELIB}/mesonbuild/modules/external_project.pyc
+${PYSITELIB}/mesonbuild/modules/external_project.pyo
 ${PYSITELIB}/mesonbuild/modules/fs.py
 ${PYSITELIB}/mesonbuild/modules/fs.pyc
 ${PYSITELIB}/mesonbuild/modules/fs.pyo
@@ -427,6 +421,9 @@ ${PYSITELIB}/mesonbuild/modules/hotdoc.p
 ${PYSITELIB}/mesonbuild/modules/i18n.py
 ${PYSITELIB}/mesonbuild/modules/i18n.pyc
 ${PYSITELIB}/mesonbuild/modules/i18n.pyo
+${PYSITELIB}/mesonbuild/modules/icestorm.py
+${PYSITELIB}/mesonbuild/modules/icestorm.pyc
+${PYSITELIB}/mesonbuild/modules/icestorm.pyo
 ${PYSITELIB}/mesonbuild/modules/java.py
 ${PYSITELIB}/mesonbuild/modules/java.pyc
 ${PYSITELIB}/mesonbuild/modules/java.pyo
@@ -457,27 +454,18 @@ ${PYSITELIB}/mesonbuild/modules/qt5.pyo
 ${PYSITELIB}/mesonbuild/modules/qt6.py
 ${PYSITELIB}/mesonbuild/modules/qt6.pyc
 ${PYSITELIB}/mesonbuild/modules/qt6.pyo
+${PYSITELIB}/mesonbuild/modules/rust.py
+${PYSITELIB}/mesonbuild/modules/rust.pyc
+${PYSITELIB}/mesonbuild/modules/rust.pyo
+${PYSITELIB}/mesonbuild/modules/simd.py
+${PYSITELIB}/mesonbuild/modules/simd.pyc
+${PYSITELIB}/mesonbuild/modules/simd.pyo
 ${PYSITELIB}/mesonbuild/modules/sourceset.py
 ${PYSITELIB}/mesonbuild/modules/sourceset.pyc
 ${PYSITELIB}/mesonbuild/modules/sourceset.pyo
-${PYSITELIB}/mesonbuild/modules/unstable_cuda.py
-${PYSITELIB}/mesonbuild/modules/unstable_cuda.pyc
-${PYSITELIB}/mesonbuild/modules/unstable_cuda.pyo
-${PYSITELIB}/mesonbuild/modules/unstable_external_project.py
-${PYSITELIB}/mesonbuild/modules/unstable_external_project.pyc
-${PYSITELIB}/mesonbuild/modules/unstable_external_project.pyo
-${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
-${PYSITELIB}/mesonbuild/modules/unstable_wayland.py
-${PYSITELIB}/mesonbuild/modules/unstable_wayland.pyc
-${PYSITELIB}/mesonbuild/modules/unstable_wayland.pyo
+${PYSITELIB}/mesonbuild/modules/wayland.py
+${PYSITELIB}/mesonbuild/modules/wayland.pyc
+${PYSITELIB}/mesonbuild/modules/wayland.pyo
 ${PYSITELIB}/mesonbuild/modules/windows.py
 ${PYSITELIB}/mesonbuild/modules/windows.pyc
 ${PYSITELIB}/mesonbuild/modules/windows.pyo
@@ -578,12 +566,18 @@ ${PYSITELIB}/mesonbuild/scripts/symbolex
 ${PYSITELIB}/mesonbuild/scripts/tags.py
 ${PYSITELIB}/mesonbuild/scripts/tags.pyc
 ${PYSITELIB}/mesonbuild/scripts/tags.pyo
+${PYSITELIB}/mesonbuild/scripts/test_loaded_modules.py
+${PYSITELIB}/mesonbuild/scripts/test_loaded_modules.pyc
+${PYSITELIB}/mesonbuild/scripts/test_loaded_modules.pyo
 ${PYSITELIB}/mesonbuild/scripts/uninstall.py
 ${PYSITELIB}/mesonbuild/scripts/uninstall.pyc
 ${PYSITELIB}/mesonbuild/scripts/uninstall.pyo
 ${PYSITELIB}/mesonbuild/scripts/vcstagger.py
 ${PYSITELIB}/mesonbuild/scripts/vcstagger.pyc
 ${PYSITELIB}/mesonbuild/scripts/vcstagger.pyo
+${PYSITELIB}/mesonbuild/scripts/yasm.py
+${PYSITELIB}/mesonbuild/scripts/yasm.pyc
+${PYSITELIB}/mesonbuild/scripts/yasm.pyo
 ${PYSITELIB}/mesonbuild/templates/__init__.py
 ${PYSITELIB}/mesonbuild/templates/__init__.pyc
 ${PYSITELIB}/mesonbuild/templates/__init__.pyo
@@ -629,6 +623,27 @@ ${PYSITELIB}/mesonbuild/templates/sample
 ${PYSITELIB}/mesonbuild/templates/valatemplates.py
 ${PYSITELIB}/mesonbuild/templates/valatemplates.pyc
 ${PYSITELIB}/mesonbuild/templates/valatemplates.pyo
+${PYSITELIB}/mesonbuild/utils/__init__.py
+${PYSITELIB}/mesonbuild/utils/__init__.pyc
+${PYSITELIB}/mesonbuild/utils/__init__.pyo
+${PYSITELIB}/mesonbuild/utils/core.py
+${PYSITELIB}/mesonbuild/utils/core.pyc
+${PYSITELIB}/mesonbuild/utils/core.pyo
+${PYSITELIB}/mesonbuild/utils/platform.py
+${PYSITELIB}/mesonbuild/utils/platform.pyc
+${PYSITELIB}/mesonbuild/utils/platform.pyo
+${PYSITELIB}/mesonbuild/utils/posix.py
+${PYSITELIB}/mesonbuild/utils/posix.pyc
+${PYSITELIB}/mesonbuild/utils/posix.pyo
+${PYSITELIB}/mesonbuild/utils/universal.py
+${PYSITELIB}/mesonbuild/utils/universal.pyc
+${PYSITELIB}/mesonbuild/utils/universal.pyo
+${PYSITELIB}/mesonbuild/utils/vsenv.py
+${PYSITELIB}/mesonbuild/utils/vsenv.pyc
+${PYSITELIB}/mesonbuild/utils/vsenv.pyo
+${PYSITELIB}/mesonbuild/utils/win32.py
+${PYSITELIB}/mesonbuild/utils/win32.pyc
+${PYSITELIB}/mesonbuild/utils/win32.pyo
 ${PYSITELIB}/mesonbuild/wrap/__init__.py
 ${PYSITELIB}/mesonbuild/wrap/__init__.pyc
 ${PYSITELIB}/mesonbuild/wrap/__init__.pyo

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.41 pkgsrc/devel/meson/distinfo:1.42
--- pkgsrc/devel/meson/distinfo:1.41    Thu Oct  6 13:32:26 2022
+++ pkgsrc/devel/meson/distinfo Sun Nov 13 09:57:24 2022
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.41 2022/10/06 13:32:26 adam Exp $
+$NetBSD: distinfo,v 1.42 2022/11/13 09:57:24 adam Exp $
 
-BLAKE2s (meson-0.63.3.tar.gz) = a71affb891355a3a01563c33d17e9593538c37ba8e9f5f1444e272db9b62261f
-SHA512 (meson-0.63.3.tar.gz) = 6855b2bfe05d592419bfeaf4346c3d1079319f14de995109c09a7e5e9770cef829f66d659553337b3e54ca0dd6c497bccd4abef720f299173077b664d905864b
-Size (meson-0.63.3.tar.gz) = 2067612 bytes
+BLAKE2s (meson-0.64.0.tar.gz) = 9996091c658a7a393f75b5f717ed39e239448c6787c9ea5ff76df8e310776ee9
+SHA512 (meson-0.64.0.tar.gz) = 0656515e983d98350081dc7cd726bff4a83ed1e24d414c022ea804317f2ff86052b53bbbc36e00847541f2cbe19ebe4c87bb35a174bf6321864363512a4cf6b0
+Size (meson-0.64.0.tar.gz) = 2090162 bytes
 SHA1 (patch-mesonbuild_compilers_detect.py) = 44b3a70a127824808c8a05226a546988c6a1339f
 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) = 3f40c48a0c9ddc4eef143217f7f0eab44b263564
+SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 0f90519240445cc5e51c5980e8f1cd9ef04d9a3b
 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.5 pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.6
--- pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.5        Wed Jul 13 03:57:22 2022
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py    Sun Nov 13 09:57:24 2022
@@ -1,22 +1,16 @@
-$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.5 2022/07/13 03:57:22 triaxx Exp $
+$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.6 2022/11/13 09:57:24 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       2022-06-19 19:10:14.000000000 +0000
+--- mesonbuild/modules/pkgconfig.py.orig       2022-10-24 19:25:24.000000000 +0000
 +++ mesonbuild/modules/pkgconfig.py
-@@ -593,12 +593,8 @@ class PkgConfigModule(ExtensionModule):
+@@ -696,7 +696,7 @@ class PkgConfigModule(NewExtensionModule
          pcfile = filebase + '.pc'
-         pkgroot = pkgroot_name = kwargs.get('install_dir', default_install_dir)
+         pkgroot = pkgroot_name = kwargs['install_dir'] or default_install_dir
          if pkgroot is None:
 -            if mesonlib.is_freebsd():
--                pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('prefix')), 'libdata', 'pkgconfig')
--                pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig')
--            else:
--                pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig')
--                pkgroot_name = os.path.join('{libdir}', 'pkgconfig')
-+            pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig')
-+            pkgroot_name = os.path.join('{libdir}', 'pkgconfig')
-         if not isinstance(pkgroot, str):
-             raise mesonlib.MesonException('Install_dir must be a string.')
-         relocatable = state.get_option('relocatable', module='pkgconfig')
++            if False:
+                 pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'libdata', 'pkgconfig')
+                 pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig')
+             else:

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/graphics/gdk-pixbuf2
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/graphics/gdk-pixbuf2
Indexes:

Home | Main Index | Thread Index | Old Index