meson updates

.github/workflows/on_PR_meson.yaml

@@ -12,45 +12,41 @@ jobs:
     name: Linux-GCC${{matrix.cxx}}-deps=${{matrix.deps}}
     strategy:
       matrix:
-        cxx: ['7', '10']
-        deps: ['enabled', 'disabled']
+        cxx: ['7', '11']
+        deps: ['forcefallback', 'default']
     steps:
       - uses: actions/checkout@v4
-      - uses: awalsh128/cache-apt-pkgs-action@v1
+      - uses: egor-tensin/setup-gcc@v1
         with:
-          packages: g++-${{matrix.cxx}} libcurl4-gnutls-dev libbrotli-dev libinih-dev libgmock-dev libgtest-dev gettext ninja-build
-          version: 1.0
+          version: ${{matrix.cxx}}
       - name: Install meson
-        run: python3 -m pip install meson==0.54.1
+        run: python3 -m pip install meson ninja
       - name: Compile and Test
-        env:
-          CXX: g++-${{matrix.cxx}}
         run: |
-          meson setup "${{github.workspace}}/build" -Dauto_features=${{matrix.deps}} -Dwarning_level=3
+          meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Dwarning_level=3
           meson compile -C "${{github.workspace}}/build"
           meson test -C "${{github.workspace}}/build"
   Ubuntu-clang:
     runs-on: ubuntu-20.04
     name: Linux-Clang${{matrix.cxx}}-deps=${{matrix.deps}}
     strategy:
       matrix:
-        cxx: ['7', '12']
-        deps: ['enabled', 'disabled']
+        cxx: ['7', '17']
+        deps: ['forcefallback', 'default']
     steps:
       - uses: actions/checkout@v4
-      - uses: awalsh128/cache-apt-pkgs-action@v1
+      - uses: egor-tensin/setup-clang@v1
         with:
-          packages: clang-${{matrix.cxx}} libc++abi-${{matrix.cxx}}-dev libc++-${{matrix.cxx}}-dev lld-${{matrix.cxx}} libcurl4-gnutls-dev libbrotli-dev gettext ninja-build
-          version: 1.0
+          version: ${{matrix.cxx}}
       - name: Install meson
-        run: python3 -m pip install meson
+        run: |
+          python3 -m pip install meson ninja
+          sudo apt install -y libc++abi-${{matrix.cxx}}-dev libc++-${{matrix.cxx}}-dev
       - name: Compile and Test
         env:
-          CXX: clang++-${{matrix.cxx}}
           CXXFLAGS: -stdlib=libc++
-          CXX_LD: lld-${{matrix.cxx}}
         run: |
-          meson setup "${{github.workspace}}/build" -Dauto_features=${{matrix.deps}} -Dwarning_level=3 -Dcpp_std=c++20
+          meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Dwarning_level=3 -Dcpp_std=c++20
           meson compile -C "${{github.workspace}}/build" --verbose
           meson test -C "${{github.workspace}}/build" --verbose
   VisualStudio:
@@ -175,5 +171,5 @@ jobs:
         uses: mymindstorm/setup-emsdk@v12
       - name: Compile
         run: |
-          meson setup "${{github.workspace}}/build" --cross-file="${{github.workspace}}/em.txt" --wrap-mode=forcefallback -Ddefault_library=static -Dwarning_level=3 -Dcpp_std=c++20 -DunitTests=disabled
+          meson setup "${{github.workspace}}/build" --cross-file="${{github.workspace}}/em.txt" --wrap-mode=forcefallback -Ddefault_library=static -Dwarning_level=3 -Dcpp_std=c++20 -DunitTests=disabled -Dcurl=disabled
           meson compile -C "${{github.workspace}}/build" --verbose

subprojects/curl.wrap

@@ -0,0 +1,13 @@
+[wrap-file]
+directory = curl-8.4.0
+source_url = https://github.com/curl/curl/releases/download/curl-8_4_0/curl-8.4.0.tar.xz
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/curl_8.4.0-1/curl-8.4.0.tar.xz
+source_filename = curl-8.4.0.tar.xz
+source_hash = 16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d
+patch_filename = curl_8.4.0-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/curl_8.4.0-1/get_patch
+patch_hash = 2c645784d61a20c542dc7c0a1da259200cfbde74ecdad26624d5bea27c140837
+wrapdb_version = 8.4.0-1
+
+[provide]
+dependency_names = libcurl

subprojects/zlib.wrap

@@ -1,13 +1,13 @@
 [wrap-file]
 directory = zlib-1.3
 source_url = http://zlib.net/fossils/zlib-1.3.tar.gz
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.3-2/zlib-1.3.tar.gz
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.3-4/zlib-1.3.tar.gz
 source_filename = zlib-1.3.tar.gz
 source_hash = ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
-patch_filename = zlib_1.3-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.3-2/get_patch
-patch_hash = 2cccc711ee29ea86cf75f84a7b6509f1efb5a7d855446de5caa0e010115e15c3
-wrapdb_version = 1.3-2
+patch_filename = zlib_1.3-4_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.3-4/get_patch
+patch_hash = 580e61fa3ca9b9ad0d39684b6b889ae92eb5c362c641d8f0d34cf19d49b766ce
+wrapdb_version = 1.3-4
 
 [provide]
 zlib = zlib_dep