Merge pull request matplotlib#27752 from QuLogic/meson-update

Update some Meson internals

Author: tacaswell

meson.build

@@ -7,6 +7,19 @@ project(
   # Carlogo, STIX and Computer Modern is OFL
   # DejaVu is Bitstream Vera and Public Domain
   license: 'PSF-2.0 AND MIT AND CC0-1.0 AND OFL-1.1 AND Bitstream-Vera AND Public-Domain',
+  license_files: [
+    'LICENSE/LICENSE',
+    'LICENSE/LICENSE_AMSFONTS',
+    'LICENSE/LICENSE_BAKOMA',
+    'LICENSE/LICENSE_CARLOGO',
+    'LICENSE/LICENSE_COLORBREWER',
+    'LICENSE/LICENSE_COURIERTEN',
+    'LICENSE/LICENSE_JSXTOOLS_RESIZE_OBSERVER',
+    'LICENSE/LICENSE_QT4_EDITOR',
+    'LICENSE/LICENSE_SOLARIZED',
+    'LICENSE/LICENSE_STIX',
+    'LICENSE/LICENSE_YORICK',
+  ],
   meson_version: '>=1.1.0',
   default_options: [
     'b_lto=true',

meson_options.txt renamed to meson.options

@@ -52,7 +52,7 @@ if devnull == 'not-given'
 endif
 
 # Will only exist on Linux with older glibc.
-dl = cc.find_library('dl', required: false)
+dl = dependency('dl', required: false)
 
 # With Meson >= 1.2.0, use cpp_winlibs instead of manually searching.
 if ['cygwin', 'windows'].contains(host_machine.system())

src/meson.build

@@ -1,6 +1,12 @@
 project('freetype2', 'c',
-  license : ['FTL', 'GPL2'],
-  version: '2.6.1')
+  version: '2.6.1',
+  license: '(FTL OR GPL-2.0-or-later) AND BSD-3-Clause AND MIT AND MIT-Modern-Variant AND Zlib',
+  license_files: [
+    'docs/LICENSE.TXT',
+    'docs/FTL.TXT',
+    'docs/GPLv2.TXT',
+  ],
+  meson_version: '>=1.1.0')
 
 # NOTE about FreeType versions
 # There are 3 versions numbers associated with each releases:

subprojects/packagefiles/freetype-2.6.1-meson/meson.build

@@ -1,6 +1,10 @@
 project('qhull', 'c',
   version: '8.0.2',
-  license: 'Qhull')
+  license: 'Qhull',
+  license_files: [
+    'COPYING.txt',
+  ],
+  meson_version: '>=1.1.0')
 
 qhull_inc = include_directories('src')
 qhull_lib = static_library('qhull_r',