From be20e63cdcaebbe4320968571f080240962020f9 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 14 Feb 2025 12:51:00 -0800 Subject: [PATCH 1/2] meson: Disable unused fs import fs requires Meson >= 0.53. --- testbed/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbed/meson.build b/testbed/meson.build index e7e89c99..538be6b0 100644 --- a/testbed/meson.build +++ b/testbed/meson.build @@ -10,7 +10,7 @@ iccs = [ 'bad_mpe.icc', 'ibm-t61.icc', 'test1.icc', 'test3.icc', 'test5.icc', 'toosmall.icc' ] -fs=import('fs') +# fs=import('fs') - requires Meson >=0.53.0 foreach icc : iccs # fs.copyfile(icc) # DOES NOT WORK ON FEDORA 40 configure_file(input : icc, output : icc, copy : true) From 9cc10b909268ae5393f2ff8b5f2a3f028cfc0b66 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 14 Feb 2025 12:52:07 -0800 Subject: [PATCH 2/2] meson: Bump minimum Meson version to 0.52 for visibility:hidden Have CI use the minimum supported version. --- .github/workflows/build.yml | 14 ++++++++------ meson.build | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d547dc30..ca91be72 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,13 +61,14 @@ jobs: - name: Install packages run: | sudo apt-get -y install build-essential python3-pip ninja-build - pip install meson==0.64.0 + pip install meson==0.52.0 - name: Build Ubuntu run: | meson setup build -Dfastfloat=true -Dthreaded=true - meson compile -C build - meson test -C build + cd build + ninja + meson test VisualStudio-meson: runs-on: windows-latest @@ -77,12 +78,13 @@ jobs: - name: Install packages run: | - pip install meson==0.64.0 + pip install meson==0.52.0 - uses: ilammy/msvc-dev-cmd@v1 - name: Build Windows run: | meson setup build - meson compile -C build - meson test -C build + cd build + ninja + meson test diff --git a/meson.build b/meson.build index ff917151..8e89ba0a 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project( 'Little-CMS', 'c', version: '2.17', - meson_version: '>=0.49.0', + meson_version: '>=0.52.0', # default_options: ['c_std=c99'] )