CVS commit: pkgsrc/devel/meson

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Feb 24 08:19:00 UTC 2023

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

Log Message:
meson: updated to 1.0.1

1.0.1
Bug fixes


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/meson/build.mk
cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/meson/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    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.48 pkgsrc/devel/meson/Makefile:1.49
--- pkgsrc/devel/meson/Makefile:1.48    Sun Jan  1 21:20:01 2023
+++ pkgsrc/devel/meson/Makefile Fri Feb 24 08:19:00 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2023/01/01 21:20:01 adam Exp $
+# $NetBSD: Makefile,v 1.49 2023/02/24 08:19:00 adam Exp $
 
-DISTNAME=      meson-1.0.0
+DISTNAME=      meson-1.0.1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}
 

Index: pkgsrc/devel/meson/build.mk
diff -u pkgsrc/devel/meson/build.mk:1.16 pkgsrc/devel/meson/build.mk:1.17
--- pkgsrc/devel/meson/build.mk:1.16    Thu Nov 24 08:56:36 2022
+++ pkgsrc/devel/meson/build.mk Fri Feb 24 08:19:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.16 2022/11/24 08:56:36 adam Exp $
+# $NetBSD: build.mk,v 1.17 2023/02/24 08:19:00 adam Exp $
 
 MESON_REQD?=   0
 .for version in ${MESON_REQD}
@@ -23,8 +23,7 @@ MAKE_ENV+=    CMAKE=${TOOLS_PATH.false}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-
+.if ${USE_CROSS_COMPILE:U:tl} == yes
 MESON_CPU_FAMILY.amd64=                x86_64
 MESON_CPU_FAMILY.arm26?=       arm
 MESON_CPU_FAMILY.arm32?=       arm

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.44 pkgsrc/devel/meson/distinfo:1.45
--- pkgsrc/devel/meson/distinfo:1.44    Sun Jan  1 21:20:01 2023
+++ pkgsrc/devel/meson/distinfo Fri Feb 24 08:19:00 2023
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.44 2023/01/01 21:20:01 adam Exp $
+$NetBSD: distinfo,v 1.45 2023/02/24 08:19:00 adam Exp $
 
-BLAKE2s (meson-1.0.0.tar.gz) = ee8bd9d338aba4102914b3e39ef017d49eb975ab6b2fe7c34df7141e269625da
-SHA512 (meson-1.0.0.tar.gz) = 9b1195cfe856c1aa51bc79f6eb4d0f94925bb02d0a9fbd68a6a6ced6e5c252b09b22d9aac812640687e49b8d64a313ce48d0a69a3bf83ea8ffb8c9dab559fc23
-Size (meson-1.0.0.tar.gz) = 2099642 bytes
+BLAKE2s (meson-1.0.1.tar.gz) = cd8a0a6feddb166a58c5fae0080a1447eb41f3a216d4cb651cef79a0fb58471d
+SHA512 (meson-1.0.1.tar.gz) = 3d2e2630f9eacf2fd999d5068d82b2a719400a55cfdea5d38253410a3ee74def638ac09622bceb72edf7bc867ae3de6a5f48c1846601e7e4b5afdf3ac9339ebc
+Size (meson-1.0.1.tar.gz) = 2104183 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) = 0f90519240445cc5e51c5980e8f1cd9ef04d9a3b
+SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 9ff9b4d5106b9db26850ad7592fe0bddb89dd043
 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.6 pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.7
--- pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.6        Sun Nov 13 09:57:24 2022
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py    Fri Feb 24 08:19:00 2023
@@ -1,9 +1,9 @@
-$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.6 2022/11/13 09:57:24 adam Exp $
+$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.7 2023/02/24 08:19:00 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-10-24 19:25:24.000000000 +0000
+--- mesonbuild/modules/pkgconfig.py.orig       2023-02-23 22:07:07.000000000 +0000
 +++ mesonbuild/modules/pkgconfig.py
 @@ -696,7 +696,7 @@ class PkgConfigModule(NewExtensionModule
          pcfile = filebase + '.pc'
@@ -13,4 +13,4 @@ a condition to match FreeBSD path norm f
 +            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:
+             elif mesonlib.is_haiku():