pixman: Branch 'master'

[GitLab Mirror]

 .editorconfig      |    2 +-
 meson.build        |   12 +++---------
 pixman/meson.build |    7 ++-----
 3 files changed, 6 insertions(+), 15 deletions(-)

New commits:
commit 8d7a2f8bf624f3a83554a5797368fd78444251c3
Author: Benjamin Gilbert <bgilbert at backtick.net>
Date:   Wed Nov 6 20:06:06 2024 -0800

    meson: require Meson >= 1.3.0
    
    Remove obsolete workarounds.  Rename meson_options.txt to meson.options.
    Use c_std=gnu99,c99 to avoid configure-time warning on MSVC:
    
        DEPRECATION: None of the values ['gnu99'] are supported by the c compiler.
        However, the deprecated gnu99 std currently falls back to c99.
        This will be an error in meson 2.0.
        If the project supports both GNU and MSVC compilers, a value such as
        "c_std=gnu11,c11" specifies that GNU is preferred but it can safely fallback to plain c11.

diff --git a/.editorconfig b/.editorconfig
index 5153bb0..550f74c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,6 +6,6 @@ root = true
 [*]
 tab_width = 8
 
-[meson.build,meson_options.txt]
+[meson.build,meson.options]
 indent_style = space
 indent_size = 2
diff --git a/meson.build b/meson.build
index c04cf73..bda81a0 100644
--- a/meson.build
+++ b/meson.build
@@ -23,8 +23,8 @@ project(
   ['c'],
   version : '0.44.1',
   license : 'MIT',
-  meson_version : '>= 0.52.0',
-  default_options : ['c_std=gnu99', 'buildtype=debugoptimized'],
+  meson_version : '>= 1.3.0',
+  default_options : ['c_std=gnu99,c99', 'buildtype=debugoptimized'],
 )
 
 config = configuration_data()
@@ -418,12 +418,6 @@ if cc.get_id() != 'msvc'
   dep_openmp = dependency('openmp', required : get_option('openmp'))
   if dep_openmp.found()
     config.set10('USE_OPENMP', true)
-  elif meson.version().version_compare('<0.51.0')
-  # In versions of meson before 0.51 the openmp dependency can still
-  # inject arguments in the the auto case when it is not found, the
-  # detection does work correctly in that case however, so we just
-  # replace dep_openmp with null_dep to work around this.
-    dep_openmp = null_dep
   endif
 else
   # the MSVC implementation of openmp is not compliant enough for our
@@ -592,7 +586,7 @@ add_project_arguments('-DHAVE_CONFIG_H', language : ['c'])
 subdir('pixman')
 
 if not get_option('tests').disabled() or not get_option('demos').disabled()
-  subdir(join_paths('test', 'utils'))
+  subdir('test/utils')
 endif
 
 if not get_option('demos').disabled()
diff --git a/meson_options.txt b/meson.options
similarity index 100%
rename from meson_options.txt
rename to meson.options
diff --git a/pixman/meson.build b/pixman/meson.build
index ffbce17..fd41288 100644
--- a/pixman/meson.build
+++ b/pixman/meson.build
@@ -27,7 +27,7 @@ version_h = configure_file(
   configuration : version_conf,
   input : 'pixman-version.h.in',
   output : 'pixman-version.h',
-  install_dir : join_paths(get_option('prefix'), get_option('includedir'), 'pixman-1')
+  install_dir : get_option('prefix') / get_option('includedir') / 'pixman-1'
 )
 
 libpixman_extra_cargs = []
@@ -135,9 +135,6 @@ idep_pixman = declare_dependency(
   link_with: libpixman,
   include_directories : inc_pixman,
 )
-
-if meson.version().version_compare('>= 0.54.0')
-  meson.override_dependency('pixman-1', idep_pixman)
-endif
+meson.override_dependency('pixman-1', idep_pixman)
 
 install_headers('pixman.h', subdir : 'pixman-1')