From fc22bb8794e8b19e4fa54135f0ac69c861cafad6 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 5 Dec 2022 17:58:23 +0530 Subject: [PATCH] meson: Update some more wraps At least the libxml2 update fixes a failure on macOS, the rest are happening for free. Part-of: --- subprojects/expat.wrap | 16 ++++++++-------- subprojects/lame.wrap | 8 ++++---- subprojects/libopenjp2.wrap | 16 ++++++++-------- subprojects/libxml2.wrap | 17 +++++++++-------- subprojects/pango.wrap | 15 +++++++++++---- subprojects/pixman.wrap | 11 +++++------ subprojects/sqlite3.wrap | 16 ++++++++-------- subprojects/zlib.wrap | 16 ++++++++-------- 8 files changed, 61 insertions(+), 54 deletions(-) diff --git a/subprojects/expat.wrap b/subprojects/expat.wrap index a659cdf569..60eedb33c5 100644 --- a/subprojects/expat.wrap +++ b/subprojects/expat.wrap @@ -1,12 +1,12 @@ [wrap-file] -directory = expat-2.4.8 -source_url = https://github.com/libexpat/libexpat/releases/download/R_2_4_8/expat-2.4.8.tar.xz -source_filename = expat-2.4.8.tar.bz2 -source_hash = f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25 -patch_filename = expat_2.4.8-2_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/expat_2.4.8-2/get_patch -patch_hash = e8855d668a0dee74dee909521c91d6723f564167fcad65507fec63b0f2b41f7e -wrapdb_version = 2.4.8-2 +directory = expat-2.5.0 +source_url = https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.xz +source_filename = expat-2.5.0.tar.bz2 +source_hash = ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe +patch_filename = expat_2.5.0-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/expat_2.5.0-1/get_patch +patch_hash = 0d0d6e07ed21cf4892126a8270f5fd182012ab34b3ebe24932a2bef5ca608a61 +wrapdb_version = 2.5.0-1 [provide] expat = expat_dep diff --git a/subprojects/lame.wrap b/subprojects/lame.wrap index 3d1491f1ab..727bc2fafc 100644 --- a/subprojects/lame.wrap +++ b/subprojects/lame.wrap @@ -3,10 +3,10 @@ directory = lame-3.100 source_url = http://downloads.sourceforge.net/project/lame/lame/3.100/lame-3.100.tar.gz source_filename = lame-3.100.tar.gz source_hash = ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e -patch_filename = lame_3.100-5_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/lame_3.100-5/get_patch -patch_hash = ed9d897e8ce69e521551812b232de0a651da710d6b0f91606cad4e3afdfd137f -wrapdb_version = 3.100-5 +patch_filename = lame_3.100-6_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/lame_3.100-6/get_patch +patch_hash = 002b76cfc681160ac2b6b1a684981b5104ce65980847bdc72e5e5f3e52c9c1b2 +wrapdb_version = 3.100-6 [provide] mp3lame = lame_dep diff --git a/subprojects/libopenjp2.wrap b/subprojects/libopenjp2.wrap index eb124675eb..46a56dbc2d 100644 --- a/subprojects/libopenjp2.wrap +++ b/subprojects/libopenjp2.wrap @@ -1,12 +1,12 @@ [wrap-file] -directory = openjpeg-2.3.1 -source_url = https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz -source_filename = openjpeg-2.3.1.tar.gz -source_hash = 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9 -patch_filename = libopenjp2_2.3.1-9_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/libopenjp2_2.3.1-9/get_patch -patch_hash = d94bc9ba7bd4c2a13e942c3699509f82bc3c161eeb3b9d8db5ff2d643c968bce -wrapdb_version = 2.3.1-9 +directory = openjpeg-2.5.0 +source_url = https://github.com/uclouvain/openjpeg/archive/v2.5.0.tar.gz +source_filename = openjpeg-2.5.0.tar.gz +source_hash = 0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a +patch_filename = libopenjp2_2.5.0-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/libopenjp2_2.5.0-1/get_patch +patch_hash = 191a6e0276d153545607e68f64363035077448dbce068799ecd3cf0bd9882896 +wrapdb_version = 2.5.0-1 [provide] libopenjp2 = libopenjp2_dep diff --git a/subprojects/libxml2.wrap b/subprojects/libxml2.wrap index d227218fb6..387a720775 100644 --- a/subprojects/libxml2.wrap +++ b/subprojects/libxml2.wrap @@ -1,12 +1,13 @@ [wrap-file] -directory = libxml2-2.10.2 -source_url = https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.2.tar.xz -source_filename = libxml2-2.10.2.tar.xz -source_hash = d240abe6da9c65cb1900dd9bf3a3501ccf88b3c2a1cb98317d03f272dda5b265 -patch_filename = libxml2_2.10.2-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/libxml2_2.10.2-1/get_patch -patch_hash = 1b2bb789aabbaba04493f2e59e396ea04e64458493daa0056cc56da79bc9b2aa -wrapdb_version = 2.10.2-1 +directory = libxml2-2.10.3 +source_url = https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.3.tar.xz +source_fallback_url = https://ftp.acc.umu.se/pub/gnome/sources/libxml2/2.10/libxml2-2.10.3.tar.xz +source_filename = libxml2-2.10.3.tar.xz +source_hash = 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c +patch_filename = libxml2_2.10.3-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/libxml2_2.10.3-1/get_patch +patch_hash = 6ababcad7bc2e030d4238453060cf261fc3f8462d763196c1bb88dc8a852bcd2 +wrapdb_version = 2.10.3-1 [provide] libxml-2.0 = libxml2_dep diff --git a/subprojects/pango.wrap b/subprojects/pango.wrap index 5518d2f253..9d89583a05 100644 --- a/subprojects/pango.wrap +++ b/subprojects/pango.wrap @@ -1,5 +1,12 @@ [wrap-file] -directory = pango-1.50.10 -source_url = https://download.gnome.org/sources/pango/1.50/pango-1.50.10.tar.xz -source_filename = pango-1.50.10.tar.xz -source_hash = 7e5d2f1e40854d24a9a2c4d093bafe75dcdbeccdf1de43e4437332eabed64966 +directory = pango-1.50.12 +source_url = https://download.gnome.org/sources/pango/1.50/pango-1.50.12.tar.xz +source_filename = pango-1.50.12.tar.xz +source_hash = caef96d27bbe792a6be92727c73468d832b13da57c8071ef79b9df69ee058fe3 + +[provide] +pango = libpango_dep +pangoft2 = libpangoft2_dep +pangoxft = libpangoxft_dep +pangowin32 = libpangowin32_dep +pangocairo = libpangocairo_dep diff --git a/subprojects/pixman.wrap b/subprojects/pixman.wrap index f8b3e3e776..3022e213ed 100644 --- a/subprojects/pixman.wrap +++ b/subprojects/pixman.wrap @@ -1,6 +1,5 @@ -[wrap-git] -directory=pixman -url=https://gitlab.freedesktop.org/pixman/pixman -push-url=git@gitlab.freedesktop.org:pixman/pixman.git -depth=1 -revision=adc07d46188920806e32366917d00599fb183a5a +[wrap-file] +directory = pixman-0.42.2 +source_url = https://www.cairographics.org/releases/pixman-0.42.2.tar.gz +source_filename = pixman-0.42.2.tar.gz +source_hash = ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e diff --git a/subprojects/sqlite3.wrap b/subprojects/sqlite3.wrap index d6af580066..316cb4d8a6 100644 --- a/subprojects/sqlite3.wrap +++ b/subprojects/sqlite3.wrap @@ -1,12 +1,12 @@ [wrap-file] -directory = sqlite-amalgamation-3390300 -source_url = https://sqlite.org/2022/sqlite-amalgamation-3390300.zip -source_filename = sqlite-amalgamation-3390300.zip -source_hash = a89db3030d229d860ae56a8bac50ac9761434047ae886e47e7c8f9f428fa98ad -patch_filename = sqlite3_3.39.3-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/sqlite3_3.39.3-1/get_patch -patch_hash = f5c41ff7b3da1108ed221b9a820b41188550cafb8a6c3d247bb40bd598775050 -wrapdb_version = 3.39.3-1 +directory = sqlite-amalgamation-3400000 +source_url = https://sqlite.org/2022/sqlite-amalgamation-3400000.zip +source_filename = sqlite-amalgamation-3400000.zip +source_hash = 7c23eb51409315738c930a222cf7cd41518ae5823c41e60a81b93a07070ef22a +patch_filename = sqlite3_3.40.0-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/sqlite3_3.40.0-1/get_patch +patch_hash = 7780fd0908a57ffbf718d88b5930c7b551993352a9156d5a33573f6ea01768c2 +wrapdb_version = 3.40.0-1 [provide] sqlite3 = sqlite3_dep diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap index 3c7b5757de..23af071a2e 100644 --- a/subprojects/zlib.wrap +++ b/subprojects/zlib.wrap @@ -1,12 +1,12 @@ [wrap-file] -directory = zlib-1.2.12 -source_url = http://zlib.net/fossils/zlib-1.2.12.tar.gz -source_filename = zlib-1.2.12.tar.gz -source_hash = 91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9 -patch_filename = zlib_1.2.12-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.2.12-1/get_patch -patch_hash = 8ec8344f3fe7b06ad4be768fd416694bc56cb4545ce78b0f1c18b3e72b3ec936 +directory = zlib-1.2.13 +source_url = http://zlib.net/fossils/zlib-1.2.13.tar.gz +source_filename = zlib-1.2.13.tar.gz +source_hash = b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 +patch_filename = zlib_1.2.13-2_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.2.13-2/get_patch +patch_hash = a7abea3ad65dc2c291ad5fbbf5355d0585a7f7b8c935d4a74335b8fe18684506 +wrapdb_version = 1.2.13-2 [provide] zlib = zlib_dep -