From edef6b1149ffd851202c9632259612d84e1042c4 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sun, 18 Sep 2022 15:27:19 -0400 Subject: [PATCH] Update all wraps from WrapDB Update all wraps available in WrapDB. This is simply running the command "meson wrap update --force" with that Meson PR: https://github.com/mesonbuild/meson/pull/10357. Part-of: --- .gitlab-image-tags.yml | 4 ++-- subprojects/expat.wrap | 8 ++++---- subprojects/freetype2.wrap | 15 ++++++++++----- subprojects/glib.wrap | 16 +++++++++++----- subprojects/json-glib.wrap | 13 +++++++++---- subprojects/libdrm.wrap | 23 +++++++++++++++++++---- subprojects/libjpeg-turbo.wrap | 16 ++++++++-------- subprojects/libopenjp2.wrap | 8 ++++---- subprojects/libxml2.wrap | 16 ++++++++-------- subprojects/ogg.wrap | 8 ++++---- subprojects/openh264.wrap | 13 ++++++++----- subprojects/sqlite3.wrap | 16 ++++++++-------- 12 files changed, 95 insertions(+), 61 deletions(-) diff --git a/.gitlab-image-tags.yml b/.gitlab-image-tags.yml index c64c5a467f..3c32fad0db 100644 --- a/.gitlab-image-tags.yml +++ b/.gitlab-image-tags.yml @@ -5,6 +5,6 @@ variables: # If you are hacking on them or need a them to rebuild, its enough # to change any part of the string of the image you want. ### - FEDORA_TAG: '2022-09-22.0' + FEDORA_TAG: '2022-09-23.0' INDENT_TAG: '2022-03-07.1' - WINDOWS_TAG: "2022-09-17.0" + WINDOWS_TAG: "2022-09-23.0" diff --git a/subprojects/expat.wrap b/subprojects/expat.wrap index 8cb17ba72e..a659cdf569 100644 --- a/subprojects/expat.wrap +++ b/subprojects/expat.wrap @@ -3,10 +3,10 @@ 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-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/expat_2.4.8-1/get_patch -patch_hash = 9aec253a2c6d1c0feb852c5c6920298d14701eeec7acc6832bb402438b52112a +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 [provide] expat = expat_dep - diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap index 7534e2e121..1ff89ecd1d 100644 --- a/subprojects/freetype2.wrap +++ b/subprojects/freetype2.wrap @@ -1,5 +1,10 @@ -[wrap-git] -directory=freetype2 -url=https://gitlab.freedesktop.org/freetype/freetype.git -depth=1 -revision=VER-2-12-1 +[wrap-file] +directory = freetype-2.12.1 +source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.12.1.tar.xz +source_filename = freetype-2.12.1.tar.xz +source_hash = 4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f +wrapdb_version = 2.12.1-2 + +[provide] +freetype2 = freetype_dep +freetype = freetype_dep diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap index f512e8ae65..6fbad4d5a4 100644 --- a/subprojects/glib.wrap +++ b/subprojects/glib.wrap @@ -1,5 +1,11 @@ -[wrap-git] -directory=glib -url=https://gitlab.gnome.org/GNOME/glib.git -push-url=git@gitlab.gnome.org:GNOME/glib.git -revision=glib-2-72 +[wrap-file] +directory = glib-2.72.2 +source_url = https://download.gnome.org/sources/glib/2.72/glib-2.72.2.tar.xz +source_filename = glib-2.72.2.tar.xz +source_hash = 78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de +wrapdb_version = 2.72.2-1 + +[provide] +dependency_names = gthread-2.0, gobject-2.0, gmodule-no-export-2.0, gmodule-export-2.0, gmodule-2.0, glib-2.0, gio-2.0, gio-windows-2.0, gio-unix-2.0 +program_names = glib-genmarshal, glib-mkenums, glib-compile-schemas, glib-compile-resources, gio-querymodules, gdbus-codegen + diff --git a/subprojects/json-glib.wrap b/subprojects/json-glib.wrap index 65945397d0..a7301ed14f 100644 --- a/subprojects/json-glib.wrap +++ b/subprojects/json-glib.wrap @@ -1,4 +1,9 @@ -[wrap-git] -directory=json-glib -url=https://gitlab.gnome.org/GNOME/json-glib.git -revision=1.6.6 +[wrap-file] +directory = json-glib-1.6.6 +source_url = https://download.gnome.org/sources/json-glib/1.6/json-glib-1.6.6.tar.xz +source_filename = json-glib-1.6.6.tar.xz +source_hash = 96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e + +[provide] +json-glib-1.0 = json_glib_dep + diff --git a/subprojects/libdrm.wrap b/subprojects/libdrm.wrap index 6fb50d7258..60fb379f34 100644 --- a/subprojects/libdrm.wrap +++ b/subprojects/libdrm.wrap @@ -1,5 +1,20 @@ [wrap-file] -directory=libdrm-2.4.109 -source_url=https://dri.freedesktop.org/libdrm/libdrm-2.4.109.tar.xz -source_filename=libdrm-2.4.109.tar.xz -source_hash=629352e08c1fe84862ca046598d8a08ce14d26ab25ee1f4704f993d074cb7f26 +directory = libdrm-2.4.111 +source_url = https://dri.freedesktop.org/libdrm/libdrm-2.4.111.tar.xz +source_filename = libdrm-2.4.111.tar.xz +source_hash = 1ad7164f77424de6f4ecba7c262bde196a214c6e19a6fbf497f0815f4d7ab2a9 +wrapdb_version = 2.4.111-1 + +[provide] +libdrm = ext_libdrm +libdrm_amdgpu = ext_libdrm_amdgpu +libdrm_etnaviv = ext_libdrm_etnaviv +libdrm_exynos = ext_libdrm_exynos +libdrm_freedreno = ext_libdrm_freedreno +libdrm_intel = ext_libdrm_intel +libdrm_libkms = ext_libdrm_libkms +libdrm_nouveau = ext_libdrm_nouveau +libdrm_omap = ext_libdrm_omap +libdrm_radeon = ext_libdrm_radeon +libdrm_tegra = ext_libdrm_tegra + diff --git a/subprojects/libjpeg-turbo.wrap b/subprojects/libjpeg-turbo.wrap index 500f3ec90b..fb264750c2 100644 --- a/subprojects/libjpeg-turbo.wrap +++ b/subprojects/libjpeg-turbo.wrap @@ -1,12 +1,12 @@ [wrap-file] -directory = libjpeg-turbo-2.1.2 -source_url = https://sourceforge.net/projects/libjpeg-turbo/files/2.1.2/libjpeg-turbo-2.1.2.tar.gz -source_filename = libjpeg-turbo-2.1.2.tar.gz -source_hash = 09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5 -patch_filename = libjpeg-turbo_2.1.2-2_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/libjpeg-turbo_2.1.2-2/get_patch -patch_hash = d213c13c0a386460b0cef7fd259f559c98dd2b9c3f9a43e8a99f85244c6dd9b5 +directory = libjpeg-turbo-2.1.3 +source_url = https://sourceforge.net/projects/libjpeg-turbo/files/2.1.3/libjpeg-turbo-2.1.3.tar.gz +source_filename = libjpeg-turbo-2.1.3.tar.gz +source_hash = 467b310903832b033fe56cd37720d1b73a6a3bd0171dbf6ff0b620385f4f76d0 +patch_filename = libjpeg-turbo_2.1.3-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/libjpeg-turbo_2.1.3-1/get_patch +patch_hash = 07ddf733e26dee0117850acebce31ea074c8795572138bbe55912694cf932545 +wrapdb_version = 2.1.3-1 [provide] dependency_names = libjpeg - diff --git a/subprojects/libopenjp2.wrap b/subprojects/libopenjp2.wrap index a274153b75..eb124675eb 100644 --- a/subprojects/libopenjp2.wrap +++ b/subprojects/libopenjp2.wrap @@ -3,10 +3,10 @@ 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-8_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/libopenjp2_2.3.1-8/get_patch -patch_hash = ff44e0042d79f5c97e1c4717cd3d6f7eb7475b0238521d39ab704388507d58ae +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 [provide] libopenjp2 = libopenjp2_dep - diff --git a/subprojects/libxml2.wrap b/subprojects/libxml2.wrap index 17f6148909..d227218fb6 100644 --- a/subprojects/libxml2.wrap +++ b/subprojects/libxml2.wrap @@ -1,12 +1,12 @@ [wrap-file] -directory = libxml2-2.9.7 -source_url = https://download.gnome.org/sources/libxml2/2.9/libxml2-2.9.7.tar.xz -source_filename = libxml2-2.9.7.tar.xz -source_hash = 6437855f3332fcc0fc25323c5f06901e02277e1232a662b621dc88fde37259ac -patch_filename = libxml2_2.9.7-12_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/libxml2_2.9.7-12/get_patch -patch_hash = a0fc97727fefe0cfdd9947213954692a71c8caee77de17bd1320df050aca8775 +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 [provide] libxml-2.0 = libxml2_dep - diff --git a/subprojects/ogg.wrap b/subprojects/ogg.wrap index 292c84c1c8..184921b1a4 100644 --- a/subprojects/ogg.wrap +++ b/subprojects/ogg.wrap @@ -4,10 +4,10 @@ source_url = https://downloads.xiph.org/releases/ogg/libogg-1.3.5.tar.xz source_fallback_url = https://gstreamer.freedesktop.org/data/src/mirror/libogg-1.3.5.tar.xz source_filename = libogg-1.3.5.tar.xz source_hash = c4d91be36fc8e54deae7575241e03f4211eb102afb3fc0775fbbc1b740016705 -patch_filename = ogg_1.3.5-4_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/ogg_1.3.5-4/get_patch -patch_hash = dfcf6e97eae0521da9293fb10729a7c75a866605e222dfb9fa8226f46abd15bc -wrapdb_version = 1.3.5-4 +patch_filename = ogg_1.3.5-5_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/ogg_1.3.5-5/get_patch +patch_hash = 16b9d2a2b1b0a6edcaedf6521de786ba3e08f7416fe818967f6d75a621ae8156 +wrapdb_version = 1.3.5-5 [provide] ogg = libogg_dep diff --git a/subprojects/openh264.wrap b/subprojects/openh264.wrap index 4dd70f6e7a..b0fb3aad69 100644 --- a/subprojects/openh264.wrap +++ b/subprojects/openh264.wrap @@ -1,6 +1,9 @@ [wrap-file] -directory = openh264-2.3.0 -source_url = https://github.com/cisco/openh264/archive/refs/tags/v2.3.0.tar.gz -source_fallback_url = https://gstreamer.freedesktop.org/data/src/mirror/openh264-2.3.0.tar.gz -source_filename = openh264-2.3.0.tar.gz -source_hash = 99b0695272bee73a3b3a5fcb1afef462c11a142d1dc35a2c61fef5a4b7d60bc0 +directory = openh264-2.3.1 +source_url = https://github.com/cisco/openh264/archive/refs/tags/v2.3.1.tar.gz +source_filename = openh264-2.3.1.tar.gz +source_hash = 453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 +wrapdb_version = 2.3.1-1 + +[provide] +openh264 = openh264_dep diff --git a/subprojects/sqlite3.wrap b/subprojects/sqlite3.wrap index 39434f566d..d6af580066 100644 --- a/subprojects/sqlite3.wrap +++ b/subprojects/sqlite3.wrap @@ -1,12 +1,12 @@ [wrap-file] -directory = sqlite-amalgamation-3380000 -source_url = https://sqlite.org/2022/sqlite-amalgamation-3380000.zip -source_filename = sqlite-amalgamation-3380000.zip -source_hash = e055f6054e97747a135c89e36520c0a423249e8a91c5fc445163f4a6adb20df6 -patch_filename = sqlite3_3.38.0-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/sqlite3_3.38.0-1/get_patch -patch_hash = 49e30bf010ff63ab772d5417885e6905379025ceac80382e292c6dbd3a9da744 +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 [provide] sqlite3 = sqlite3_dep -