meson: Update some wraps, remove unused wraps

These wraps have point releases on the wrapdb, so update them.

Remove pcre.wrap since it is pulled in automatically by glib and not
used by gstreamer.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2761>

diff --git a/subprojects/expat.wrap b/subprojects/expat.wrap
index 0daf87c..8cb17ba 100644 (file)
--- a/subprojects/expat.wrap
+++ b/subprojects/expat.wrap
@@ -1,11 +1,11 @@
 [wrap-file]
-directory = expat-2.2.9
-source_url = https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz
-source_filename = expat-2.2.9.tar.bz2
-source_hash = 1ea6965b15c2106b6bbe883397271c80dfa0331cdf821b2c319591b55eadc0a4
-patch_filename = expat_2.2.9-4_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/expat_2.2.9-4/get_patch
-patch_hash = 8337fcf3928bbf9048a1a6a93b41a55588a5c9838a860bcc7c57f0e2a9517e95
+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
 
 [provide]
 expat = expat_dep

diff --git a/subprojects/lame.wrap b/subprojects/lame.wrap
index ab985c6..3d1491f 100644 (file)
--- a/subprojects/lame.wrap
+++ b/subprojects/lame.wrap
@@ -3,11 +3,11 @@ 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-4_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/lame_3.100-4/get_patch
-patch_hash = d2df5d27be783b29bd8a8a57f60f769b71164c3a2df22a3ec87ef0b27f37de14
+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
 
 [provide]
 mp3lame = lame_dep
 mpglib = mpglib_dep
-

diff --git a/subprojects/libjpeg-turbo.wrap b/subprojects/libjpeg-turbo.wrap
index e126163..500f3ec 100644 (file)
--- a/subprojects/libjpeg-turbo.wrap
+++ b/subprojects/libjpeg-turbo.wrap
@@ -3,9 +3,9 @@ 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-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/libjpeg-turbo_2.1.2-1/get_patch
-patch_hash = f1498a0d71880bd0193f73961cf870d38d21c3965bf643870cf0f8f6da9acb2e
+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
 
 [provide]
 dependency_names = libjpeg

diff --git a/subprojects/ogg.wrap b/subprojects/ogg.wrap
index 5968b8e..31c9130 100644 (file)
--- a/subprojects/ogg.wrap
+++ b/subprojects/ogg.wrap
@@ -4,9 +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-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/ogg_1.3.5-2/get_patch
-patch_hash = 46f6b42c426907f3b2bbc070adc6016261f342cff32d47fe517fcdfd5b58f16d
+patch_filename = ogg_1.3.5-3_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/ogg_1.3.5-3/get_patch
+patch_hash = 632f9b820e91f4c6495f32738b95fbd7ce2af917b06a0fe3e501b94d624aae1c
+wrapdb_version = 1.3.5-3
 
 [provide]
 ogg = libogg_dep

diff --git a/subprojects/pcre.wrap b/subprojects/pcre.wrap
deleted file mode 100644 (file)
index 6630326..0000000
--- a/subprojects/pcre.wrap
+++ /dev/null
@@ -1,12 +0,0 @@
-[wrap-file]
-directory = pcre-8.37
-source_url = https://sourceforge.net/projects/pcre/files/pcre/8.37/pcre-8.37.tar.bz2
-source_filename = pcre-8.37.tar.bz2
-source_hash = 51679ea8006ce31379fb0860e46dd86665d864b5020fc9cd19e71260eef4789d
-patch_filename = pcre_8.37-4_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/pcre_8.37-4/get_patch
-patch_hash = c957f42da6f6378300eb8a18f4a5cccdb8e2aada51a703cac842982f9f785399
-
-[provide]
-libpcre = pcre_dep
-

diff --git a/subprojects/vorbis.wrap b/subprojects/vorbis.wrap
index 8db73d0..481b2c8 100644 (file)
--- a/subprojects/vorbis.wrap
+++ b/subprojects/vorbis.wrap
@@ -4,12 +4,12 @@ source_url = https://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.xz
 source_fallback_url = https://gstreamer.freedesktop.org/data/src/mirror/libvorbis-1.3.7.tar.xz
 source_filename = libvorbis-1.3.7.tar.xz
 source_hash = b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b
-patch_filename = vorbis_1.3.7-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/vorbis_1.3.7-2/get_patch
-patch_hash = fe302576cbf8408754b332b539ea1b83f0f96fa9aae50a5d1fea911713d5f21c
+patch_filename = vorbis_1.3.7-4_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/vorbis_1.3.7-4/get_patch
+patch_hash = 979e22b24b16c927040700dfd8319cd6ba29bf52a14dbc66b1cb4ea60504f14a
+wrapdb_version = 1.3.7-4
 
 [provide]
 vorbis = vorbis_dep
 vorbisfile = vorbisfile_dep
 vorbisenc = vorbisenc_dep
-

diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap
index 3773781..3c7b575 100644 (file)
--- a/subprojects/zlib.wrap
+++ b/subprojects/zlib.wrap
@@ -1,11 +1,11 @@
 [wrap-file]
-directory = zlib-1.2.11
-source_url = http://zlib.net/fossils/zlib-1.2.11.tar.gz
-source_filename = zlib-1.2.11.tar.gz
-source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
-patch_filename = zlib_1.2.11-6_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.2.11-6/get_patch
-patch_hash = f7c24c5698ce787294910ad431f94088102d35ddaf88542d04add1e54afa9212
+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
 
 [provide]
 zlib = zlib_dep