From 30c8267d24a490b7d95f061c661600d62d4bf487 Mon Sep 17 00:00:00 2001 From: talisein Date: Wed, 1 Nov 2023 11:46:00 -0700 Subject: [PATCH] Update wrapped dependencies (#26) * Update deps * Use newer meson --- .github/workflows/main.yml | 3 ++- subprojects/libjpeg-turbo.wrap | 20 ++++++++++---------- subprojects/liblzma.wrap | 18 +++++++++--------- subprojects/libpng.wrap | 18 +++++++++--------- subprojects/libxml2.wrap | 18 +++++++++--------- subprojects/zlib.wrap | 18 +++++++++--------- 6 files changed, 48 insertions(+), 47 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c1eff09..1f24645 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -109,7 +109,8 @@ jobs: sudo add-apt-repository -n ppa:talisein/outcome sudo add-apt-repository -n ppa:talisein/magic-enum sudo apt-get update - sudo apt-get install meson ninja-build libhowardhinnant-date-dev liboutcome-dev libboost-ext-ut-dev libctre-dev libmagicenum-dev jq findutils + sudo apt-get install ninja-build libhowardhinnant-date-dev liboutcome-dev libboost-ext-ut-dev libctre-dev libmagicenum-dev jq findutils + sudo pip3 install meson - if: ${{ matrix.flavor == 'mac' }} name: Install deps mac diff --git a/subprojects/libjpeg-turbo.wrap b/subprojects/libjpeg-turbo.wrap index 1abdf5b..2296223 100644 --- a/subprojects/libjpeg-turbo.wrap +++ b/subprojects/libjpeg-turbo.wrap @@ -1,13 +1,13 @@ [wrap-file] -directory = libjpeg-turbo-2.1.5.1 -source_url = https://sourceforge.net/projects/libjpeg-turbo/files/2.1.5.1/libjpeg-turbo-2.1.5.1.tar.gz -source_filename = libjpeg-turbo-2.1.5.1.tar.gz -source_hash = 2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf -patch_filename = libjpeg-turbo_2.1.5.1-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/libjpeg-turbo_2.1.5.1-1/get_patch -patch_hash = 7daf69a0795f0fe3aecf2d1bcde78266d7a60a36df8573fe3b442e0adcbb4ca0 -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libjpeg-turbo_2.1.5.1-1/libjpeg-turbo-2.1.5.1.tar.gz -wrapdb_version = 2.1.5.1-1 +directory = libjpeg-turbo-3.0.1 +source_url = https://sourceforge.net/projects/libjpeg-turbo/files/3.0.1/libjpeg-turbo-3.0.1.tar.gz +source_filename = libjpeg-turbo-3.0.1.tar.gz +source_hash = 22429507714ae147b3acacd299e82099fce5d9f456882fc28e252e4579ba2a75 +patch_filename = libjpeg-turbo_3.0.1-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/libjpeg-turbo_3.0.1-1/get_patch +patch_hash = fe56c562a4be3d699f3948fb0ae9452445b94795540a7f6bd58e6fd2fd5b53cd +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libjpeg-turbo_3.0.1-1/libjpeg-turbo-3.0.1.tar.gz +wrapdb_version = 3.0.1-1 [provide] -dependency_names = libjpeg +dependency_names = libjpeg, libturbojpeg diff --git a/subprojects/liblzma.wrap b/subprojects/liblzma.wrap index 18afe0a..c41b1cd 100644 --- a/subprojects/liblzma.wrap +++ b/subprojects/liblzma.wrap @@ -1,13 +1,13 @@ [wrap-file] -directory = xz-5.2.11 -source_url = http://tukaani.org/xz/xz-5.2.11.tar.xz -source_filename = xz-5.2.11.tar.xz -source_hash = 503b4a9fb405e70e1d3912e418fdffe5de27e713e58925fb67e12d20d03a77bc -patch_filename = liblzma_5.2.11-2_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/liblzma_5.2.11-2/get_patch -patch_hash = 1a1a008b2f3a81e7332d8d5d28df16df70488038901496fe73c734afab74c645 -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/liblzma_5.2.11-2/xz-5.2.11.tar.xz -wrapdb_version = 5.2.11-2 +directory = xz-5.2.12 +source_url = http://tukaani.org/xz/xz-5.2.12.tar.xz +source_filename = xz-5.2.12.tar.xz +source_hash = f79a92b84101d19d76be833aecc93e68e56065b61ec737610964cd4f6c54ff2e +patch_filename = liblzma_5.2.12-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/liblzma_5.2.12-1/get_patch +patch_hash = e2fa25218cdc6713a876e58cddd0f64169976c5a101efe045dfc6ec32632e688 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/liblzma_5.2.12-1/xz-5.2.12.tar.xz +wrapdb_version = 5.2.12-1 [provide] liblzma = lzma_dep diff --git a/subprojects/libpng.wrap b/subprojects/libpng.wrap index 68abec8..eb0785d 100644 --- a/subprojects/libpng.wrap +++ b/subprojects/libpng.wrap @@ -1,13 +1,13 @@ [wrap-file] -directory = libpng-1.6.39 -source_url = https://github.com/glennrp/libpng/archive/v1.6.39.tar.gz -source_filename = libpng-1.6.39.tar.gz -source_hash = a00e9d2f2f664186e4202db9299397f851aea71b36a35e74910b8820e380d441 -patch_filename = libpng_1.6.39-3_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.39-3/get_patch -patch_hash = 6af2a8d464e3f1d2e2832580896323ac7b0b786806c75f0eff0c8ec82dd603ec -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.39-3/libpng-1.6.39.tar.gz -wrapdb_version = 1.6.39-3 +directory = libpng-1.6.40 +source_url = https://github.com/glennrp/libpng/archive/v1.6.40.tar.gz +source_filename = libpng-1.6.40.tar.gz +source_hash = 62d25af25e636454b005c93cae51ddcd5383c40fa14aa3dae8f6576feb5692c2 +patch_filename = libpng_1.6.40-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.40-1/get_patch +patch_hash = bad558070e0a82faa5c0ae553bcd12d49021fc4b628f232a8e58c3fbd281aae1 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.40-1/libpng-1.6.40.tar.gz +wrapdb_version = 1.6.40-1 [provide] libpng = libpng_dep diff --git a/subprojects/libxml2.wrap b/subprojects/libxml2.wrap index 67f7234..3bbf21b 100644 --- a/subprojects/libxml2.wrap +++ b/subprojects/libxml2.wrap @@ -1,13 +1,13 @@ [wrap-file] -directory = libxml2-2.11.4 -source_url = https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.4.tar.xz -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libxml2_2.11.4-1/libxml2-2.11.4.tar.xz -source_filename = libxml2-2.11.4.tar.xz -source_hash = 737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7 -patch_filename = libxml2_2.11.4-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/libxml2_2.11.4-1/get_patch -patch_hash = 31867206881a6ec8f2338972775c9c9155aaf8c8a7d680331ae62ea231c9622e -wrapdb_version = 2.11.4-1 +directory = libxml2-2.11.5 +source_url = https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.5.tar.xz +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libxml2_2.11.5-2/libxml2-2.11.5.tar.xz +source_filename = libxml2-2.11.5.tar.xz +source_hash = 3727b078c360ec69fa869de14bd6f75d7ee8d36987b071e6928d4720a28df3a6 +patch_filename = libxml2_2.11.5-2_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/libxml2_2.11.5-2/get_patch +patch_hash = b6770ad53298507a1c63bbf4584025472d1832b46d53bd15d76f30d80a2858cf +wrapdb_version = 2.11.5-2 [provide] libxml-2.0 = libxml2_dep diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap index c104529..2f1a1e2 100644 --- a/subprojects/zlib.wrap +++ b/subprojects/zlib.wrap @@ -1,13 +1,13 @@ [wrap-file] -directory = zlib-1.2.13 -source_url = http://zlib.net/fossils/zlib-1.2.13.tar.gz -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.2.13-3/zlib-1.2.13.tar.gz -source_filename = zlib-1.2.13.tar.gz -source_hash = b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 -patch_filename = zlib_1.2.13-3_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.2.13-3/get_patch -patch_hash = 49d1afd719a8e4e52cf1dd1f6ca94bcd085b96eac55d1ccf6f336a8280c02bd3 -wrapdb_version = 1.2.13-3 +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-4/zlib-1.3.tar.gz +source_filename = zlib-1.3.tar.gz +source_hash = ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e +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