Mesa (staging/19.3): meson: use github URL for wraps instead of completely unreliable wrapdb

[GitLab Mirror]

Module: Mesa
Branch: staging/19.3
Commit: dc2933cf18ef6be050c7c2bd17f8d565a83af71a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc2933cf18ef6be050c7c2bd17f8d565a83af71a

Author: Eric Engestrom <eric at engestrom.ch>
Date:   Tue Jan 14 15:53:21 2020 +0000

meson: use github URL for wraps instead of completely unreliable wrapdb

Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Eric Engestrom <eric at engestrom.ch>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3391>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3391>
(cherry picked from commit 65641e0c7a29944e19cc068457ee0d59cace8096)

---

 .pick_status.json      | 2 +-
 subprojects/expat.wrap | 2 +-
 subprojects/zlib.wrap  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index ef7940c8f27..827c656d616 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1138,7 +1138,7 @@
         "description": "meson: use github URL for wraps instead of completely unreliable wrapdb",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/subprojects/expat.wrap b/subprojects/expat.wrap
index 0b7c53e54db..e36bd5f6827 100644
--- a/subprojects/expat.wrap
+++ b/subprojects/expat.wrap
@@ -5,6 +5,6 @@ source_url = https://github.com/libexpat/libexpat/releases/download/R_2_2_5/expa
 source_filename = expat-2.2.5.tar.bz2
 source_hash = d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6
 
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/expat/2.2.5/4/get_zip
+patch_url = https://github.com/mesonbuild/expat/releases/download/2.2.5-4/expat.zip
 patch_filename = expat-2.2.5-4-wrap.zip
 patch_hash = 25748839be2bbdd2ff586d1a05aa6fc37aeada75c78416df6e8347a6321abaac
diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap
index f459463bb59..60e9d05771e 100644
--- a/subprojects/zlib.wrap
+++ b/subprojects/zlib.wrap
@@ -5,6 +5,6 @@ source_url = http://zlib.net/fossils/zlib-1.2.11.tar.gz
 source_filename = zlib-1.2.11.tar.gz
 source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
 
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.11/2/get_zip
+patch_url = https://github.com/mesonbuild/zlib/releases/download/1.2.11-2/zlib.zip
 patch_filename = zlib-1.2.11-2-wrap.zip
 patch_hash = aed811a48707be2a374a230c01e2efa17b385fe7e88f4ac0ee122093766aab2b