From 91bc6370e5e60255e0d0e488fda5077432753da4 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Tue, 11 Feb 2020 21:49:58 +0000
Subject: [PATCH] contrib: Switch to using GitHub to host our contrib binaries.
 Their CDN should be global and more reliable than our own server.

---
 contrib/amf/module.defs        | 2 +-
 contrib/bzip2/module.defs      | 2 +-
 contrib/fdk-aac/module.defs    | 2 +-
 contrib/ffmpeg/module.defs     | 2 +-
 contrib/freetype/module.defs   | 2 +-
 contrib/fribidi/module.defs    | 2 +-
 contrib/harfbuzz/module.defs   | 2 +-
 contrib/jansson/module.defs    | 2 +-
 contrib/lame/module.defs       | 2 +-
 contrib/libass/module.defs     | 2 +-
 contrib/libbluray/module.defs  | 2 +-
 contrib/libdav1d/module.defs   | 2 +-
 contrib/libdvdnav/module.defs  | 2 +-
 contrib/libdvdread/module.defs | 2 +-
 contrib/libgnurx/module.defs   | 2 +-
 contrib/libiconv/module.defs   | 2 +-
 contrib/libmfx/module.defs     | 2 +-
 contrib/libogg/module.defs     | 2 +-
 contrib/libopus/module.defs    | 2 +-
 contrib/libspeex/module.defs   | 2 +-
 contrib/libtheora/module.defs  | 2 +-
 contrib/libvorbis/module.defs  | 2 +-
 contrib/libvpx/module.defs     | 2 +-
 contrib/libxml2/module.defs    | 2 +-
 contrib/nvenc/module.defs      | 2 +-
 contrib/x264/module.defs       | 2 +-
 contrib/x265/module.defs       | 2 +-
 contrib/x265_10bit/module.defs | 2 +-
 contrib/x265_12bit/module.defs | 2 +-
 contrib/x265_8bit/module.defs  | 2 +-
 contrib/xz/module.defs         | 2 +-
 contrib/zlib/module.defs       | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/contrib/amf/module.defs b/contrib/amf/module.defs
index 68f0c3e66738..1b7d7f41b91c 100644
--- a/contrib/amf/module.defs
+++ b/contrib/amf/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,AMF,amf))
 $(eval $(call import.CONTRIB.defs,AMF))
 
-AMF.FETCH.url      = https://download.handbrake.fr/contrib/AMF-1.4.9.tar.gz
+AMF.FETCH.url      = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/AMF-1.4.9.tar.gz
 AMF.FETCH.url     += https://github.com/GPUOpen-LibrariesAndSDKs/AMF/archive/v1.4.9.tar.gz
 AMF.FETCH.sha256   = d10f75612da5bcbc26325adecc5d398dcddf216c0dae3406d9a29b9d0b44b112
 AMF.FETCH.basename = AMF-1.4.9.tar.gz
diff --git a/contrib/bzip2/module.defs b/contrib/bzip2/module.defs
index a9aa4020a062..7818d470ca5d 100644
--- a/contrib/bzip2/module.defs
+++ b/contrib/bzip2/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,BZIP2,bzip2))
 $(eval $(call import.CONTRIB.defs,BZIP2))
 
-BZIP2.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/bzip2-1.0.8.tar.gz
+BZIP2.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/bzip2-1.0.8.tar.gz
 BZIP2.FETCH.url    += https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
 BZIP2.FETCH.sha256  = ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
 
diff --git a/contrib/fdk-aac/module.defs b/contrib/fdk-aac/module.defs
index 1133a9eea375..f04db2f30f84 100644
--- a/contrib/fdk-aac/module.defs
+++ b/contrib/fdk-aac/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,FDKAAC,fdkaac))
 $(eval $(call import.CONTRIB.defs,FDKAAC))
 
-FDKAAC.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/fdk-aac-2.0.1.tar.gz
+FDKAAC.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/fdk-aac-2.0.1.tar.gz
 FDKAAC.FETCH.url    += https://github.com/mstorsjo/fdk-aac/archive/v2.0.1.tar.gz
 FDKAAC.FETCH.sha256  = a4142815d8d52d0e798212a5adea54ecf42bcd4eec8092b37a8cb615ace91dc6
 
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 97662b4913d9..6be179428d6f 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -12,7 +12,7 @@ endif
 $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FFMPEG))
 
-FFMPEG.FETCH.url    = https://download.handbrake.fr/handbrake/contrib/ffmpeg-4.2.2.tar.bz2
+FFMPEG.FETCH.url    = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/ffmpeg-4.2.2.tar.bz2
 FFMPEG.FETCH.url   += https://ffmpeg.org/releases/ffmpeg-4.2.2.tar.bz2
 FFMPEG.FETCH.sha256 = b620d187c26f76ca19e74210a0336c3b8380b97730df5cdf45f3e69e89000e5c
 
diff --git a/contrib/freetype/module.defs b/contrib/freetype/module.defs
index b493fc91baa6..a0d61dd49268 100644
--- a/contrib/freetype/module.defs
+++ b/contrib/freetype/module.defs
@@ -2,7 +2,7 @@ __deps__ := BZIP2 ZLIB
 $(eval $(call import.MODULE.defs,FREETYPE,freetype,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FREETYPE))
 
-FREETYPE.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/freetype-2.10.1.tar.gz
+FREETYPE.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/freetype-2.10.1.tar.gz
 FREETYPE.FETCH.url    += https://download.savannah.gnu.org/releases/freetype/freetype-2.10.1.tar.gz
 FREETYPE.FETCH.sha256  = 3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110
 
diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs
index 1fee29e077fa..49e8c4298d3b 100644
--- a/contrib/fribidi/module.defs
+++ b/contrib/fribidi/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,FRIBIDI,fribidi))
 $(eval $(call import.CONTRIB.defs,FRIBIDI))
 
-FRIBIDI.FETCH.url      = https://download.handbrake.fr/handbrake/contrib/fribidi-1.0.7.tar.gz
+FRIBIDI.FETCH.url      = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/fribidi-1.0.7.tar.gz
 FRIBIDI.FETCH.url     += https://github.com/fribidi/fribidi/archive/v1.0.7.tar.gz
 FRIBIDI.FETCH.sha256   = 4352e95aa26bc0c4a45a224d606df0aba5f17f8cadcbcde36dd976e585a320e8
 FRIBIDI.FETCH.basename = fribidi-1.0.7.tar.gz
diff --git a/contrib/harfbuzz/module.defs b/contrib/harfbuzz/module.defs
index 8bd4336b4b4f..425e4e3bb4cf 100644
--- a/contrib/harfbuzz/module.defs
+++ b/contrib/harfbuzz/module.defs
@@ -3,7 +3,7 @@ __deps__ := FREETYPE
 $(eval $(call import.MODULE.defs,HARFBUZZ,harfbuzz,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,HARFBUZZ))
 
-HARFBUZZ.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/harfbuzz-2.6.4.tar.xz
+HARFBUZZ.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/harfbuzz-2.6.4.tar.xz
 HARFBUZZ.FETCH.url    += https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.6.4.tar.xz
 HARFBUZZ.FETCH.sha256  = 9413b8d96132d699687ef914ebb8c50440efc87b3f775d25856d7ec347c03c12
 
diff --git a/contrib/jansson/module.defs b/contrib/jansson/module.defs
index 183b854f8b57..6661c6081ea5 100644
--- a/contrib/jansson/module.defs
+++ b/contrib/jansson/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,JANSSON,jansson))
 $(eval $(call import.CONTRIB.defs,JANSSON))
 
-JANSSON.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/jansson-2.12.tar.bz2
+JANSSON.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/jansson-2.12.tar.bz2
 JANSSON.FETCH.url    += http://www.digip.org/jansson/releases/jansson-2.12.tar.bz2
 JANSSON.FETCH.sha256  = 645d72cc5dbebd4df608d33988e55aa42a7661039e19a379fcbe5c79d1aee1d2
 
diff --git a/contrib/lame/module.defs b/contrib/lame/module.defs
index a874fb3a203d..e96acb9e7f6c 100644
--- a/contrib/lame/module.defs
+++ b/contrib/lame/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LAME,lame))
 $(eval $(call import.CONTRIB.defs,LAME))
 
-LAME.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/lame-3.100.tar.gz
+LAME.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/lame-3.100.tar.gz
 LAME.FETCH.url    += https://sourceforge.net/projects/lame/files/lame/3.100/lame-3.100.tar.gz
 LAME.FETCH.sha256  = ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e
 
diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs
index 139c6711e0d6..594f456f1e6c 100644
--- a/contrib/libass/module.defs
+++ b/contrib/libass/module.defs
@@ -7,7 +7,7 @@ endif
 $(eval $(call import.MODULE.defs,LIBASS,libass,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,LIBASS))
 
-LIBASS.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libass-0.14.0.tar.gz
+LIBASS.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libass-0.14.0.tar.gz
 LIBASS.FETCH.url    += https://github.com/libass/libass/releases/download/0.14.0/libass-0.14.0.tar.gz
 LIBASS.FETCH.sha256  = 8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf
 
diff --git a/contrib/libbluray/module.defs b/contrib/libbluray/module.defs
index 329b9a501666..a796ed9fc827 100644
--- a/contrib/libbluray/module.defs
+++ b/contrib/libbluray/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBBLURAY,libbluray,LIBXML2 FREETYPE))
 $(eval $(call import.CONTRIB.defs,LIBBLURAY))
 
-LIBBLURAY.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libbluray-1.1.2.tar.bz2
+LIBBLURAY.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libbluray-1.1.2.tar.bz2
 LIBBLURAY.FETCH.url    += https://download.videolan.org/pub/videolan/libbluray/1.1.2/libbluray-1.1.2.tar.bz2
 LIBBLURAY.FETCH.sha256  = a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42
 
diff --git a/contrib/libdav1d/module.defs b/contrib/libdav1d/module.defs
index 5985ccca91ec..9903fa2d64a9 100644
--- a/contrib/libdav1d/module.defs
+++ b/contrib/libdav1d/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBDAV1D,libdav1d,PTHREADW32))
 $(eval $(call import.CONTRIB.defs,LIBDAV1D))
 
-LIBDAV1D.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/dav1d-0.5.1.tar.bz2
+LIBDAV1D.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-0.5.1.tar.bz2
 LIBDAV1D.FETCH.url    += https://code.videolan.org/videolan/dav1d/-/archive/0.5.1/dav1d-0.5.1.tar.bz2
 LIBDAV1D.FETCH.sha256  = 0214d201a338e8418f805b68f9ad277e33d79c18594dee6eaf6dcd74db2674a9
 
diff --git a/contrib/libdvdnav/module.defs b/contrib/libdvdnav/module.defs
index b1ca4047ca07..e9cd330ddb26 100644
--- a/contrib/libdvdnav/module.defs
+++ b/contrib/libdvdnav/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBDVDNAV,libdvdnav,LIBDVDREAD))
 $(eval $(call import.CONTRIB.defs,LIBDVDNAV))
 
-LIBDVDNAV.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libdvdnav-6.0.1.tar.bz2
+LIBDVDNAV.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdnav-6.0.1.tar.bz2
 LIBDVDNAV.FETCH.url    += https://download.videolan.org/pub/videolan/libdvdnav/6.0.1/libdvdnav-6.0.1.tar.bz2
 LIBDVDNAV.FETCH.sha256  = e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733
 
diff --git a/contrib/libdvdread/module.defs b/contrib/libdvdread/module.defs
index 32aed5f9a276..9241f975e110 100644
--- a/contrib/libdvdread/module.defs
+++ b/contrib/libdvdread/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBDVDREAD,libdvdread))
 $(eval $(call import.CONTRIB.defs,LIBDVDREAD))
 
-LIBDVDREAD.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libdvdread-6.0.2.tar.bz2
+LIBDVDREAD.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdread-6.0.2.tar.bz2
 LIBDVDREAD.FETCH.url    += https://download.videolan.org/pub/videolan/libdvdread/6.0.2/libdvdread-6.0.2.tar.bz2
 LIBDVDREAD.FETCH.sha256  = f91401af213b219cdde24b46c50a57f29301feb7f965678f1d7ed4632cc6feb0
 
diff --git a/contrib/libgnurx/module.defs b/contrib/libgnurx/module.defs
index eab597961ec8..b5eb6856d0c2 100644
--- a/contrib/libgnurx/module.defs
+++ b/contrib/libgnurx/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBGNURX,libgnurx))
 $(eval $(call import.CONTRIB.defs,LIBGNURX))
 
-LIBGNURX.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/mingw-libgnurx-2.5.1-src.tar.gz
+LIBGNURX.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/mingw-libgnurx-2.5.1-src.tar.gz
 LIBGNURX.FETCH.url    += https://sourceforge.net/projects/mingw/files/Other/UserContributed/regex/mingw-regex-2.5.1/mingw-libgnurx-2.5.1-src.tar.gz
 LIBGNURX.FETCH.sha256  = 7147b7f806ec3d007843b38e19f42a5b7c65894a57ffc297a76b0dcd5f675d76
 LIBGNURX.EXTRACT.tarbase = mingw-libgnurx-2.5.1
diff --git a/contrib/libiconv/module.defs b/contrib/libiconv/module.defs
index f11059d7d7b3..454aa41a4ec4 100644
--- a/contrib/libiconv/module.defs
+++ b/contrib/libiconv/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBICONV,libiconv))
 $(eval $(call import.CONTRIB.defs,LIBICONV))
 
-LIBICONV.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libiconv-1.16.tar.gz
+LIBICONV.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libiconv-1.16.tar.gz
 LIBICONV.FETCH.url    += https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz
 LIBICONV.FETCH.sha256  = e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04
 
diff --git a/contrib/libmfx/module.defs b/contrib/libmfx/module.defs
index f1fa624755f5..9fd86c87395c 100644
--- a/contrib/libmfx/module.defs
+++ b/contrib/libmfx/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBMFX,libmfx))
 $(eval $(call import.CONTRIB.defs,LIBMFX))
 
-LIBMFX.FETCH.url       = https://download.handbrake.fr/contrib/mfx_dispatch-c200d83.tar.gz
+LIBMFX.FETCH.url       = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/mfx_dispatch-c200d83.tar.gz
 LIBMFX.FETCH.url      += https://github.com/lu-zero/mfx_dispatch/archive/c200d833e25a91e3e49d69890dac1ffa3486cbe9.tar.gz
 LIBMFX.FETCH.sha256    = ec1da009e7c77fcc3e45ff665b30c9390437cd920f2951ccabf3d79e8d5703a9
 LIBMFX.FETCH.basename  = mfx_dispatch-c200d83.tar.gz
diff --git a/contrib/libogg/module.defs b/contrib/libogg/module.defs
index cf3f70dfe1d0..f585465c5c45 100644
--- a/contrib/libogg/module.defs
+++ b/contrib/libogg/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBOGG,libogg))
 $(eval $(call import.CONTRIB.defs,LIBOGG))
 
-LIBOGG.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libogg-1.3.4.tar.gz
+LIBOGG.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libogg-1.3.4.tar.gz
 LIBOGG.FETCH.url    += https://downloads.xiph.org/releases/ogg/libogg-1.3.4.tar.gz
 LIBOGG.FETCH.sha256  = fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e
 
diff --git a/contrib/libopus/module.defs b/contrib/libopus/module.defs
index 02779a4f9bc0..3f767c32fc49 100644
--- a/contrib/libopus/module.defs
+++ b/contrib/libopus/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBOPUS,libopus))
 $(eval $(call import.CONTRIB.defs,LIBOPUS))
 
-LIBOPUS.FETCH.url     = https://download.handbrake.fr/contrib/opus-1.3.1.tar.gz
+LIBOPUS.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/opus-1.3.1.tar.gz
 LIBOPUS.FETCH.url    += https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz
 LIBOPUS.FETCH.sha256  = 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d
 
diff --git a/contrib/libspeex/module.defs b/contrib/libspeex/module.defs
index 54b719514eb1..d7fcd5a78667 100644
--- a/contrib/libspeex/module.defs
+++ b/contrib/libspeex/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBSPEEX,libspeex,LIBOGG))
 $(eval $(call import.CONTRIB.defs,LIBSPEEX))
 
-LIBSPEEX.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/speex-1.2.0.tar.gz
+LIBSPEEX.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/speex-1.2.0.tar.gz
 LIBSPEEX.FETCH.url    += https://downloads.us.xiph.org/releases/speex/speex-1.2.0.tar.gz
 LIBSPEEX.FETCH.sha256  = eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094
 LIBSPEEX.EXTRACT.tarbase = speex-1.2.0
diff --git a/contrib/libtheora/module.defs b/contrib/libtheora/module.defs
index 2cd1631392e9..88b5057c044e 100644
--- a/contrib/libtheora/module.defs
+++ b/contrib/libtheora/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBTHEORA,libtheora,LIBOGG LIBVORBIS))
 $(eval $(call import.CONTRIB.defs,LIBTHEORA))
 
-LIBTHEORA.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libtheora-1.1.1.tar.bz2
+LIBTHEORA.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libtheora-1.1.1.tar.bz2
 LIBTHEORA.FETCH.url    += https://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 LIBTHEORA.FETCH.sha256  = b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc
 
diff --git a/contrib/libvorbis/module.defs b/contrib/libvorbis/module.defs
index c03476014c66..30bf82d5579e 100644
--- a/contrib/libvorbis/module.defs
+++ b/contrib/libvorbis/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBVORBIS,libvorbis,LIBOGG))
 $(eval $(call import.CONTRIB.defs,LIBVORBIS))
 
-LIBVORBIS.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libvorbis-1.3.6.tar.gz
+LIBVORBIS.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libvorbis-1.3.6.tar.gz
 LIBVORBIS.FETCH.url    += https://downloads.xiph.org/releases/vorbis/libvorbis-1.3.6.tar.gz
 LIBVORBIS.FETCH.sha256  = 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb
 
diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs
index c776b4d6569f..07d2ec0cf08a 100644
--- a/contrib/libvpx/module.defs
+++ b/contrib/libvpx/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBVPX,libvpx))
 $(eval $(call import.CONTRIB.defs,LIBVPX))
 
-LIBVPX.FETCH.url     = https://download.handbrake.fr/contrib/libvpx-1.8.1.tar.gz
+LIBVPX.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libvpx-1.8.1.tar.gz
 LIBVPX.FETCH.url    += https://github.com/webmproject/libvpx/archive/v1.8.1.tar.gz
 LIBVPX.FETCH.sha256  = df19b8f24758e90640e1ab228ab4a4676ec3df19d23e4593375e6f3847dee03e
 
diff --git a/contrib/libxml2/module.defs b/contrib/libxml2/module.defs
index 4e28933840b2..c7852423f52a 100644
--- a/contrib/libxml2/module.defs
+++ b/contrib/libxml2/module.defs
@@ -2,7 +2,7 @@ __deps__ := LIBICONV
 $(eval $(call import.MODULE.defs,LIBXML2,libxml2,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,LIBXML2))
 
-LIBXML2.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libxml2-2.9.9.tar.gz
+LIBXML2.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libxml2-2.9.9.tar.gz
 LIBXML2.FETCH.url    += https://download.videolan.org/pub/contrib/libxml2/libxml2-2.9.9.tar.gz
 LIBXML2.FETCH.sha256  = 94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871
 
diff --git a/contrib/nvenc/module.defs b/contrib/nvenc/module.defs
index 7bc57d751a47..7592d759e0ac 100644
--- a/contrib/nvenc/module.defs
+++ b/contrib/nvenc/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,NVENC,nvenc))
 $(eval $(call import.CONTRIB.defs,NVENC))
 
-NVENC.FETCH.url      = https://download.handbrake.fr/contrib/nv-codec-headers-9.0.18.1.tar.gz
+NVENC.FETCH.url      = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/nv-codec-headers-9.0.18.1.tar.gz
 NVENC.FETCH.url     += https://github.com/FFmpeg/nv-codec-headers/releases/download/n9.0.18.1/nv-codec-headers-9.0.18.1.tar.gz
 NVENC.FETCH.sha256   = 6181a5dac66a6990aa3baf10a77ae677f372b9068be9ef73abfd37b73fb4c745
 NVENC.EXTRACT.tarbase = nv-codec-headers-n9.0.18.1
diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index f256c3313b7a..f9bd448ae436 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,X264,x264))
 $(eval $(call import.CONTRIB.defs,X264))
 
-X264.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/x264-snapshot-20180925-2245.tar.bz2
+X264.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x264-snapshot-20180925-2245.tar.bz2
 X264.FETCH.url    += https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180925-2245.tar.bz2
 X264.FETCH.sha256  = 207c668e5b149dae04648b74f1008ab457e57ea89ea96712eebe52a79884ca7c
 
diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs
index 6ebe9cca3d04..b49b88863711 100644
--- a/contrib/x265/module.defs
+++ b/contrib/x265/module.defs
@@ -2,7 +2,7 @@ __deps__ := X265_8 X265_10 X265_12
 $(eval $(call import.MODULE.defs,X265,x265,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,X265))
 
-X265.FETCH.url     = https://download.handbrake.fr/contrib/x265_3.2.1.tar.gz
+X265.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265_3.2.1.tar.gz
 X265.FETCH.url    += https://bitbucket.org/multicoreware/x265/downloads/x265_3.2.1.tar.gz
 X265.FETCH.url    += https://download.videolan.org/pub/videolan/x265/x265_3.2.1.tar.gz
 X265.FETCH.sha256  = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc
diff --git a/contrib/x265_10bit/module.defs b/contrib/x265_10bit/module.defs
index 6f1f0c103358..bfff6d24d2c4 100644
--- a/contrib/x265_10bit/module.defs
+++ b/contrib/x265_10bit/module.defs
@@ -2,7 +2,7 @@ __deps__ := X265_8
 $(eval $(call import.MODULE.defs,X265_10,x265_10,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_10))
 
-X265_10.FETCH.url     = https://download.handbrake.fr/contrib/x265_3.2.1.tar.gz
+X265_10.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265_3.2.1.tar.gz
 X265_10.FETCH.url    += https://bitbucket.org/multicoreware/x265/downloads/x265_3.2.1.tar.gz
 X265_10.FETCH.url    += https://download.videolan.org/pub/videolan/x265/x265_3.2.1.tar.gz
 X265_10.FETCH.sha256  = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc
diff --git a/contrib/x265_12bit/module.defs b/contrib/x265_12bit/module.defs
index cfc62e6797d9..5fd8499ecfd1 100644
--- a/contrib/x265_12bit/module.defs
+++ b/contrib/x265_12bit/module.defs
@@ -2,7 +2,7 @@ __deps__ := X265_8
 $(eval $(call import.MODULE.defs,X265_12,x265_12,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_12))
 
-X265_12.FETCH.url     = https://download.handbrake.fr/contrib/x265_3.2.1.tar.gz
+X265_12.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265_3.2.1.tar.gz
 X265_12.FETCH.url    += https://bitbucket.org/multicoreware/x265/downloads/x265_3.2.1.tar.gz
 X265_12.FETCH.url    += https://download.videolan.org/pub/videolan/x265/x265_3.2.1.tar.gz
 X265_12.FETCH.sha256  = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc
diff --git a/contrib/x265_8bit/module.defs b/contrib/x265_8bit/module.defs
index efe77cbe46ac..a1942c461b88 100644
--- a/contrib/x265_8bit/module.defs
+++ b/contrib/x265_8bit/module.defs
@@ -2,7 +2,7 @@ __deps__ :=
 $(eval $(call import.MODULE.defs,X265_8,x265_8,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_8))
 
-X265_8.FETCH.url     = https://download.handbrake.fr/contrib/x265_3.2.1.tar.gz
+X265_8.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265_3.2.1.tar.gz
 X265_8.FETCH.url    += https://bitbucket.org/multicoreware/x265/downloads/x265_3.2.1.tar.gz
 X265_8.FETCH.url    += https://download.videolan.org/pub/videolan/x265/x265_3.2.1.tar.gz
 X265_8.FETCH.sha256  = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc
diff --git a/contrib/xz/module.defs b/contrib/xz/module.defs
index eeeb286c4999..2035c52c9d49 100644
--- a/contrib/xz/module.defs
+++ b/contrib/xz/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,XZ,xz))
 $(eval $(call import.CONTRIB.defs,XZ))
 
-XZ.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/xz-5.2.4.tar.bz2
+XZ.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/xz-5.2.4.tar.bz2
 XZ.FETCH.url    += https://tukaani.org/xz/xz-5.2.4.tar.bz2
 XZ.FETCH.sha256  = 3313fd2a95f43d88e44264e6b015e7d03053e681860b0d5d3f9baca79c57b7bf
 
diff --git a/contrib/zlib/module.defs b/contrib/zlib/module.defs
index 6f19b8130de1..92e364de6e12 100644
--- a/contrib/zlib/module.defs
+++ b/contrib/zlib/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,ZLIB,zlib))
 $(eval $(call import.CONTRIB.defs,ZLIB))
 
-ZLIB.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/zlib-1.2.11.tar.gz
+ZLIB.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/zlib-1.2.11.tar.gz
 ZLIB.FETCH.url    += https://sourceforge.net/projects/libpng/files/zlib/1.2.11/zlib-1.2.11.tar.gz
 ZLIB.FETCH.sha256  = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1