contrib: Add upstream urls where possible.

32 files changed, 176 insertions, 35 deletions

diff --git a/contrib/autoconf/module.defs b/contrib/autoconf/module.defs
index b23480332..b50631ce1 100644
--- a/contrib/autoconf/module.defs
+++ b/contrib/autoconf/module.defs
@@ -3,3 +3,7 @@ $(eval $(call import.CONTRIB.defs,AUTOCONF))
 
 AUTOCONF.FETCH.url = http://download.handbrake.fr/handbrake/contrib/autoconf-2.69.tar.bz2
 AUTOCONF.FETCH.md5 = 58e0cca25061e1b3e2bc30a5be13815b
+
+# TODO: Upstream no longer provides bzip2 archives
+#AUTOCONF.FETCH.url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
+#AUTOCONF.FETCH.md5 = 82d05e03b93e45f5a39b828dc9c6c29b
diff --git a/contrib/automake/module.defs b/contrib/automake/module.defs
index d42542aad..902b1a1c6 100644
--- a/contrib/automake/module.defs
+++ b/contrib/automake/module.defs
@@ -3,3 +3,10 @@ $(eval $(call import.CONTRIB.defs,AUTOMAKE))
 
 AUTOMAKE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/automake-1.13.1.tar.bz2
 AUTOMAKE.FETCH.md5 = c66595aafe79e4e5455b4b3491fe6b05
+
+# TODO: Upstream no longer provides bzip2 archives, automake 1.15 is latest
+#AUTOMAKE.FETCH.url = http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz
+#AUTOMAKE.FETCH.md5 = 78a0ef8216b0556b44508e7b5b0c0847
+#
+#AUTOMAKE.FETCH.url = http://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz
+#AUTOMAKE.FETCH.md5 = 716946a105ca228ab545fc37a70df3a3
diff --git a/contrib/bzip2/module.defs b/contrib/bzip2/module.defs
index b477d8b51..7c14485d9 100644
--- a/contrib/bzip2/module.defs
+++ b/contrib/bzip2/module.defs
@@ -1,9 +1,11 @@
 $(eval $(call import.MODULE.defs,BZIP2,bzip2))
 $(eval $(call import.CONTRIB.defs,BZIP2))
 
-BZIP2.FETCH.url = http://download.handbrake.fr/handbrake/contrib/bzip2-1.0.6.tar.gz
-BZIP2.FETCH.md5 = 6ec09fe81e3380184ed11e21ea06c215
+BZIP2.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/bzip2-1.0.6.tar.gz
+BZIP2.FETCH.url += http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
+BZIP2.FETCH.md5 =  00b516f4704d4a7cb50a1d97e6e8e15b
 BZIP2.EXTRACT.tarbase = bzip2
+
 BZIP2.CONFIGURE = $(TOUCH.exe) $@
 
 BZIP2.BUILD.extra = \
diff --git a/contrib/cmake/module.defs b/contrib/cmake/module.defs
index 56f6fea59..cd3b866e0 100644
--- a/contrib/cmake/module.defs
+++ b/contrib/cmake/module.defs
@@ -1,8 +1,9 @@
 $(eval $(call import.MODULE.defs,CMAKE,cmake))
 $(eval $(call import.CONTRIB.defs,CMAKE))
 
-CMAKE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/cmake-3.3.2.tar.gz
-CMAKE.FETCH.md5 = 5febbd11bcaac854a27eebaf4a124be2
+CMAKE.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/cmake-3.3.2.tar.gz
+CMAKE.FETCH.url += https://cmake.org/files/v3.3/cmake-3.3.2.tar.gz
+CMAKE.FETCH.md5 =  5febbd11bcaac854a27eebaf4a124be2
 
 CMAKE.CONFIGURE.deps =
 CMAKE.CONFIGURE.shared =
diff --git a/contrib/fdk-aac/module.defs b/contrib/fdk-aac/module.defs
index dc8bafd74..1dbc5b65f 100644
--- a/contrib/fdk-aac/module.defs
+++ b/contrib/fdk-aac/module.defs
@@ -1,8 +1,9 @@
 $(eval $(call import.MODULE.defs,FDKAAC,fdkaac))
 $(eval $(call import.CONTRIB.defs,FDKAAC))
 
-FDKAAC.FETCH.url = http://download.handbrake.fr/handbrake/contrib/fdk-aac-0.1.4.tar.gz
-FDKAAC.FETCH.md5 = e274a7d7f6cd92c71ec5c78e4dc9f8b7
+FDKAAC.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/fdk-aac-0.1.4.tar.gz
+FDKAAC.FETCH.url += http://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk-aac-0.1.4.tar.gz
+FDKAAC.FETCH.md5 =  e274a7d7f6cd92c71ec5c78e4dc9f8b7
 
 # fdk-aac configure script fails to add compiler optimizations if the
 # CFLAGS env variable is set during configure.  Since we set it, we
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 03ddb3d0b..a4e796090 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -9,6 +9,13 @@ $(eval $(call import.CONTRIB.defs,FFMPEG))
 FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v11.3-0-g00abc00.tar.gz
 FFMPEG.FETCH.md5 = 23648740623345f122cfd0e015063c7e
 
+# TODO: Upstream archive differs, libav 11.4 is latest
+#FFMPEG.FETCH.url = https://libav.org/releases/libav-11.3.tar.gz
+#FFMPEG.FETCH.md5 = 1a2eb461b98e0f1d1d6c4d892d51ac9b
+#
+#FFMPEG.FETCH.url = https://libav.org/releases/libav-11.4.tar.gz
+#FFMPEG.FETCH.md5 = 133fab51636f47d01c25b80f33f6ae3f
+
 FFMPEG.CONFIGURE.deps  =
 FFMPEG.CONFIGURE.env   =
 FFMPEG.CONFIGURE.host  =
diff --git a/contrib/fontconfig/module.defs b/contrib/fontconfig/module.defs
index ccb61f021..de6edf376 100644
--- a/contrib/fontconfig/module.defs
+++ b/contrib/fontconfig/module.defs
@@ -2,8 +2,9 @@ __deps__ := FREETYPE LIBXML2 LIBICONV
 $(eval $(call import.MODULE.defs,FONTCONFIG,fontconfig,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FONTCONFIG))
 
-FONTCONFIG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/fontconfig-2.11.94.tar.bz2
-FONTCONFIG.FETCH.md5 = c988ea12f4117330246e041109152b4a
+FONTCONFIG.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/fontconfig-2.11.94.tar.bz2
+FONTCONFIG.FETCH.url += http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.11.94.tar.bz2
+FONTCONFIG.FETCH.md5 =  c988ea12f4117330246e041109152b4a
 FONTCONFIG.EXTRACT.tarbase = fontconfig-2.11.94
 
 #
diff --git a/contrib/freetype/module.defs b/contrib/freetype/module.defs
index be83c7855..45a535702 100644
--- a/contrib/freetype/module.defs
+++ b/contrib/freetype/module.defs
@@ -2,7 +2,12 @@ __deps__ := BZIP ZLIB
 $(eval $(call import.MODULE.defs,FREETYPE,freetype,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FREETYPE))
 
-FREETYPE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/freetype-2.6.tar.bz2
-FREETYPE.FETCH.md5 = 5682890cb0267f6671dd3de6eabd3e69
+FREETYPE.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/freetype-2.6.tar.bz2
+FREETYPE.FETCH.url += http://download.savannah.gnu.org/releases/freetype/freetype-2.6.tar.bz2
+FREETYPE.FETCH.md5 =  5682890cb0267f6671dd3de6eabd3e69
+
+# TODO: freetype 2.6.1 is latest
+#FREETYPE.FETCH.url = http://download.savannah.gnu.org/releases/freetype/freetype-2.6.1.tar.bz2
+#FREETYPE.FETCH.md5 = 35cb8f4d9e5906847901bb39324c2f80
 
 FREETYPE.CONFIGURE.extra = --with-harfbuzz=no --with-png=no
diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs
index 36d50f639..43cdb4d02 100644
--- a/contrib/fribidi/module.defs
+++ b/contrib/fribidi/module.defs
@@ -5,8 +5,9 @@ endif
 $(eval $(call import.MODULE.defs,FRIBIDI,fribidi))
 $(eval $(call import.CONTRIB.defs,FRIBIDI))
 
-FRIBIDI.FETCH.url = http://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.bz2
-FRIBIDI.FETCH.md5 = 6c7e7cfdd39c908f7ac619351c1c5c23
+FRIBIDI.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.bz2
+FRIBIDI.FETCH.url += http://fribidi.org/download/fribidi-0.19.7.tar.bz2
+FRIBIDI.FETCH.md5 =  6c7e7cfdd39c908f7ac619351c1c5c23
 
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     FRIBIDI.CONFIGURE.extra = --with-glib=no
diff --git a/contrib/jansson/module.defs b/contrib/jansson/module.defs
index 7a9bd0ae3..0bc0a74e7 100644
--- a/contrib/jansson/module.defs
+++ b/contrib/jansson/module.defs
@@ -1,7 +1,12 @@
 $(eval $(call import.MODULE.defs,JANSSON,jansson))
 $(eval $(call import.CONTRIB.defs,JANSSON))
 
-JANSSON.FETCH.url = http://download.handbrake.fr/handbrake/contrib/jansson-2.6.tar.bz2
-JANSSON.FETCH.md5 = c70a52488db623a26f7213c7c6b7c878
+JANSSON.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/jansson-2.6.tar.bz2
+JANSSON.FETCH.url += http://www.digip.org/jansson/releases/jansson-2.6.tar.bz2
+JANSSON.FETCH.md5 =  c70a52488db623a26f7213c7c6b7c878
+
+# TODO: jansson 2.7 is latest
+#JANSSON.FETCH.url + http://www.digip.org/jansson/releases/jansson-2.7.tar.bz2
+#JANSSON.FETCH.md5 = ffac352f9c5f80a6ae8145d451af2c0e
 
 JANSSON.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; mkdir m4; autoreconf -fiv;
diff --git a/contrib/lame/module.defs b/contrib/lame/module.defs
index 33da72785..d311bf4a0 100644
--- a/contrib/lame/module.defs
+++ b/contrib/lame/module.defs
@@ -4,3 +4,13 @@ $(eval $(call import.CONTRIB.defs,LAME))
 LAME.FETCH.url = http://download.handbrake.fr/handbrake/contrib/lame-3.98.tar.gz
 LAME.FETCH.md5 = 7036b52e792538fd665595d56b9e49a0
 LAME.EXTRACT.tarbase = lame
+
+# TODO: Upstream archive differs, lame 3.99.5 is latest, tarbase is unnecessary for latest
+#LAME.FETCH.url = http://sourceforge.net/projects/lame/files/lame/3.98/lame-398.tar.gz
+#LAME.FETCH.md5 = f44b9f8e1b5d8835d0a77f9cc9cedd1c
+#LAME.FETCH.distfile  = lame-3.98.tar.gz
+#LAME.EXTRACT.tarbase = lame
+#
+#LAME.FETCH.md5 = 84835b313d4a8b68f5349816d33e07ce
+#LAME.FETCH.url = http://sourceforge.net/projects/lame/files/lame/3.99/lame-3.99.5.tar.gz
+#LAME.EXTRACT.tarbase = lame
diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs
index 03e37bd27..3cae9b900 100644
--- a/contrib/libass/module.defs
+++ b/contrib/libass/module.defs
@@ -2,8 +2,13 @@ __deps__ := FONTCONFIG FREETYPE FRIBIDI
 $(eval $(call import.MODULE.defs,LIBASS,libass,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,LIBASS))
 
-LIBASS.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libass-0.12.3.tar.gz
-LIBASS.FETCH.md5 = 648ee785f966c69d4b5d50948e509d93
+LIBASS.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libass-0.12.3.tar.gz
+LIBASS.FETCH.url += https://github.com/libass/libass/releases/download/0.12.3/libass-0.12.3.tar.gz
+LIBASS.FETCH.md5 =  648ee785f966c69d4b5d50948e509d93
+
+# TODO: libass 0.13.0 is latest
+#LIBASS.FETCH.url = https://github.com/libass/libass/releases/download/0.13.0/libass-0.13.0.tar.gz
+#LIBASS.FETCH.md5 = 44290519105b3779b8b25813a25a9914
 
 # Disable as many external dependencies as I can get away with
 # and tell configure where to find our version of freetype
diff --git a/contrib/libbluray/module.defs b/contrib/libbluray/module.defs
index 7154bc706..85098bb1a 100644
--- a/contrib/libbluray/module.defs
+++ b/contrib/libbluray/module.defs
@@ -1,8 +1,13 @@
 $(eval $(call import.MODULE.defs,LIBBLURAY,libbluray,PKGCONFIG LIBXML2 FREETYPE))
 $(eval $(call import.CONTRIB.defs,LIBBLURAY))
 
-LIBBLURAY.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libbluray-0.8.1.tar.bz2
-LIBBLURAY.FETCH.md5 = c7a89966ad091fa6075a58d31a698e70
+LIBBLURAY.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libbluray-0.8.1.tar.bz2
+LIBBLURAY.FETCH.url += http://download.videolan.org/pub/videolan/libbluray/0.8.1/libbluray-0.8.1.tar.bz2
+LIBBLURAY.FETCH.md5 =  c7a89966ad091fa6075a58d31a698e70
+
+# TODO: libbluray 0.9.0 is latest
+#LIBBLURAY.FETCH.url = http://download.videolan.org/pub/videolan/libbluray/0.9.0/libbluray-0.9.0.tar.bz2
+#LIBBLURAY.FETCH.md5 = a4e8077b9fd82349c767cef2ba9bd750
 
 ifneq (max,$(LIBBLURAY.GCC.g))
 	LIBBLURAY.CONFIGURE.extra += --disable-debug
diff --git a/contrib/libdvdnav/module.defs b/contrib/libdvdnav/module.defs
index 2626d1697..3905c8af2 100644
--- a/contrib/libdvdnav/module.defs
+++ b/contrib/libdvdnav/module.defs
@@ -3,6 +3,13 @@ $(eval $(call import.CONTRIB.defs,LIBDVDNAV))
 
 LIBDVDNAV.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libdvdnav-5.0.1-0-gaa3659d.tar.gz
 LIBDVDNAV.FETCH.md5 = 1fb10188c7a33f480011d3ddf32553c7
+
+# TODO: Upstream archive differs, libdvdnav 5.0.3 is latest
+#LIBDVDNAV.FETCH.url = http://download.videolan.org/pub/videolan/libdvdnav/5.0.1/libdvdnav-5.0.1.tar.bz2
+#LIBDVDNAV.FETCH.md5 = 81e30fb57eaf9f61aa6513a7bd85bd74
+#LIBDVDNAV.FETCH.url = http://download.videolan.org/pub/videolan/libdvdnav/5.0.3/libdvdnav-5.0.3.tar.bz2
+#LIBDVDNAV.FETCH.md5 = e9ea4de3bd8f204e61301d407d09f033
+
 LIBDVDNAV.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -I m4 -fiv;
 
 ifneq (max,$(LIBDVDNAV.GCC.g))
diff --git a/contrib/libdvdread/module.defs b/contrib/libdvdread/module.defs
index 25e2eb0be..9350b85db 100644
--- a/contrib/libdvdread/module.defs
+++ b/contrib/libdvdread/module.defs
@@ -3,6 +3,11 @@ $(eval $(call import.CONTRIB.defs,LIBDVDREAD))
 
 LIBDVDREAD.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libdvdread-5.0.0-6-gcb1ae87.tar.gz
 LIBDVDREAD.FETCH.md5 = 607a5dd41b0dd2f35433d6deac79b99e
+
+# TODO: libdvdread 5.0.3 is latest
+#LIBDVDREAD.FETCH.url = https://download.videolan.org/pub/videolan/libdvdread/5.0.3/libdvdread-5.0.3.tar.bz2
+#LIBDVDREAD.FETCH.md5 = b7b7d2a782087ed2a913263087083715
+
 LIBDVDREAD.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -I m4 -fiv;
 
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
diff --git a/contrib/libgnurx/module.defs b/contrib/libgnurx/module.defs
index a4c0f2504..c04bee4a4 100644
--- a/contrib/libgnurx/module.defs
+++ b/contrib/libgnurx/module.defs
@@ -1,8 +1,9 @@
 $(eval $(call import.MODULE.defs,LIBGNURX,libgnurx))
 $(eval $(call import.CONTRIB.defs,LIBGNURX))
 
-LIBGNURX.FETCH.url = http://download.handbrake.fr/handbrake/contrib/mingw-libgnurx-2.5.1-src.tar.gz
-LIBGNURX.FETCH.md5 = 35c8fed3101ca1f253e9b6b1966661f6
+LIBGNURX.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/mingw-libgnurx-2.5.1-src.tar.gz
+LIBGNURX.FETCH.url += http://sourceforge.net/projects/mingw/files/Other/UserContributed/regex/mingw-regex-2.5.1/mingw-libgnurx-2.5.1-src.tar.gz
+LIBGNURX.FETCH.md5 =  35c8fed3101ca1f253e9b6b1966661f6
 LIBGNURX.EXTRACT.tarbase = mingw-libgnurx-2.5.1
 
 LIBGNURX.CONFIGURE.env += AR="$(AR.exe)"
diff --git a/contrib/libiconv/module.defs b/contrib/libiconv/module.defs
index 19e4a1240..67f9ef250 100644
--- a/contrib/libiconv/module.defs
+++ b/contrib/libiconv/module.defs
@@ -4,6 +4,12 @@ $(eval $(call import.CONTRIB.defs,LIBICONV))
 LIBICONV.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libiconv-1.13.tar.bz2
 LIBICONV.FETCH.md5 = 9c8b41b77f508edf72e26b406e873a2f
 
+# TODO: Upstream no longer provides bzip2 archives, libiconv 1.14 is latest
+#LIBICONV.FETCH.url = http://ftp.gnu.org/gnu/libiconv/libiconv-1.13.tar.gz
+#LIBICONV.FETCH.md5 = 048032a3032ebd182150bdee30a5d533
+#LIBICONV.FETCH.url = http://ftp.gnu.org/gnu/libiconv/libiconv-1.14.tar.gz
+#LIBICONV.FETCH.md5 = e34509b1623cec449dfeb73d7ce9c6c6
+
 # this contrib will not build under MinGW with -std=gnu99
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     LIBICONV.GCC.args.c_std =
diff --git a/contrib/libmfx/module.defs b/contrib/libmfx/module.defs
index 719b4d840..b985a0a0f 100644
--- a/contrib/libmfx/module.defs
+++ b/contrib/libmfx/module.defs
@@ -4,6 +4,10 @@ $(eval $(call import.CONTRIB.defs,LIBMFX))
 LIBMFX.FETCH.url = http://download.handbrake.fr/contrib/mfx_dispatch-9f4a84d7.tar.gz
 LIBMFX.FETCH.md5 = 694058b83b43b39b7e5b5fc38dbe2b88
 
+# TODO: Upstream no longer provides bzip2 archives
+#LIBMFX.FETCH.url = https://github.com/Rodeo314/libmfx/archive/v6.0.0.349.tar.gz
+#LIBMFX.FETCH.md5 = 0fb95829f1886bdb9bb7c812f7315297
+
 LIBMFX.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; autoreconf -fiv;
 
 ## optional static libs need to be marked
diff --git a/contrib/libogg/module.defs b/contrib/libogg/module.defs
index e1b6e5fdc..25406872d 100644
--- a/contrib/libogg/module.defs
+++ b/contrib/libogg/module.defs
@@ -1,10 +1,15 @@
 $(eval $(call import.MODULE.defs,LIBOGG,libogg))
 $(eval $(call import.CONTRIB.defs,LIBOGG))
 
-LIBOGG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libogg-1.3.0.tar.gz
-LIBOGG.FETCH.md5 = 0a7eb40b86ac050db3a789ab65fe21c2
+LIBOGG.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libogg-1.3.0.tar.gz
+LIBOGG.FETCH.url += http://downloads.xiph.org/releases/ogg/libogg-1.3.0.tar.gz
+LIBOGG.FETCH.md5 =  0a7eb40b86ac050db3a789ab65fe21c2
 LIBOGG.EXTRACT.tarbase = libogg-1.3.0
 
+# TODO: libogg 1.3.2 is latest, tarbase is not necessary with new upstream
+#LIBOGG.FETCH.url = http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.gz
+#LIBOGG.FETCH.md5 = b72e1a1dbadff3248e4ed62a4177e937
+
 LIBOGG.CONFIGURE.extra = --disable-sdl
 
 LIBOGG.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -fiv;
diff --git a/contrib/libsamplerate/module.defs b/contrib/libsamplerate/module.defs
index 410e6a134..bf517741a 100644
--- a/contrib/libsamplerate/module.defs
+++ b/contrib/libsamplerate/module.defs
@@ -5,5 +5,14 @@ LIBSAMPLERATE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libsamp
 LIBSAMPLERATE.FETCH.md5 = 69ec6c05f487458f688dda8f3e722e5d
 LIBSAMPLERATE.EXTRACT.tarbase = libsamplerate
 
+# TODO: Upstream hash differs, tarbase not necessary with new upstream, libsamplerate 0.1.8 is latest
+#LIBSAMPLERATE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libsamplerate-0.1.4.tar.gz
+#LIBSAMPLERATE.FETCH.md5 = f6fafd5d4971a2442352c72bc3598cbd
+#LIBSAMPLERATE.EXTRACT.tarbase = libsamplerate
+#
+#LIBSAMPLERATE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libsamplerate-0.1.8.tar.gz
+#LIBSAMPLERATE.FETCH.md5 = 1c7fb25191b4e6e3628d198a66a84f47
+#LIBSAMPLERATE.EXTRACT.tarbase = libsamplerate
+
 # Disable to avoid Carbon.h dependency on OSX
 LIBSAMPLERATE.CONFIGURE.extra = --disable-sndfile
diff --git a/contrib/libtheora/module.defs b/contrib/libtheora/module.defs
index 54435da6f..c03a5e78b 100644
--- a/contrib/libtheora/module.defs
+++ b/contrib/libtheora/module.defs
@@ -1,8 +1,13 @@
 $(eval $(call import.MODULE.defs,LIBTHEORA,libtheora,LIBOGG LIBVORBIS))
 $(eval $(call import.CONTRIB.defs,LIBTHEORA))
 
-LIBTHEORA.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libtheora-1.1.0.tar.bz2
-LIBTHEORA.FETCH.md5 = d0f83cf7f13e2b3bd068a858ca1398ad
+LIBTHEORA.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libtheora-1.1.0.tar.bz2
+LIBTHEORA.FETCH.url += http://downloads.xiph.org/releases/theora/libtheora-1.1.0.tar.bz2
+LIBTHEORA.FETCH.md5 =  d0f83cf7f13e2b3bd068a858ca1398ad
+
+# TODO: libtheora 1.1.1 is latest
+#LIBTHEORA.FETCH.url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
+#LIBTHEORA.FETCH.md5 = 292ab65cedd5021d6b7ddd117e07cd8e
 
 LIBTHEORA.CONFIGURE.extra = \
     --disable-examples \
diff --git a/contrib/libtool/module.defs b/contrib/libtool/module.defs
index 26739730c..fb3bfc4a2 100644
--- a/contrib/libtool/module.defs
+++ b/contrib/libtool/module.defs
@@ -3,3 +3,9 @@ $(eval $(call import.CONTRIB.defs,LIBTOOL))
 
 LIBTOOL.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libtool-2.4.2.tar.bz2
 LIBTOOL.FETCH.md5 = f1a2109b9cd9c03a8df1f47e672c3aeb
+
+# TODO: Upstream no longer provides bzip2 archives, libtool 2.4.6 is latest
+#LIBTOOL.FETCH.url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz
+#LIBTOOL.FETCH.md5 = d2f3b7d4627e69e13514a40e72a24d50
+#LIBTOOL.FETCH.url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz
+#LIBTOOL.FETCH.md5 = addf44b646ddb4e3919805aa88fa7c5e
diff --git a/contrib/libvorbis/module.defs b/contrib/libvorbis/module.defs
index d63c92b75..989f19202 100644
--- a/contrib/libvorbis/module.defs
+++ b/contrib/libvorbis/module.defs
@@ -5,6 +5,10 @@ LIBVORBIS.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libvorbis-a
 LIBVORBIS.FETCH.md5 = 586d2ac0fa13f32cba78be5db4a16330
 LIBVORBIS.EXTRACT.tarbase = aotuv-b6.03_20110424
 
+# TODO: Upstream variant aotuv no longer exists, libvorbis 1.3.5 is latest, tarbase not necessary with new upstream
+#LIBVORBIS.FETCH.url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.gz
+#LIBVORBIS.FETCH.md5 = 7220e089f3be3412a2317d6fde9e3944
+
 LIBVORBIS.CONFIGURE.extra = --with-ogg=$(call fn.ABSOLUTE,$(CONTRIB.build/)) HAVE_PKG_CONFIG="no"
 
 LIBVORBIS.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -I m4 -fiv;
diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs
index 77ab27cb1..380a48961 100644
--- a/contrib/libvpx/module.defs
+++ b/contrib/libvpx/module.defs
@@ -4,6 +4,17 @@ $(eval $(call import.CONTRIB.defs,LIBVPX))
 LIBVPX.FETCH.url = http://download.handbrake.fr/contrib/libvpx-v1.3.0.tar.bz2
 LIBVPX.FETCH.md5 = 14783a148872f2d08629ff7c694eb31f
 
+# TODO: Upstream migrated from Google Code to self-hosted with GitHub mirror and no longer provides bzip2 archives, libvpx 1.4.0 is latest
+#LIBVPX.FETCH.url = https://github.com/webmproject/libvpx/archive/v1.3.0.tar.gz
+#LIBVPX.FETCH.md5 = 733a1bedec212a9f1ce723d17679bf2f
+#LIBVPX.FETCH.distfile  = libvpx-v1.3.0.tar.gz
+#LIBVPX.EXTRACT.tarbase = libvpx-v1.3.0
+#
+#LIBVPX.FETCH.url = https://github.com/webmproject/libvpx/archive/v1.4.0.tar.gz
+#LIBVPX.FETCH.md5 = 9e82cdcb2d2146f812b71c8a7a2686a3
+#LIBVPX.FETCH.distfile  = libvpx-v1.4.0.tar.gz
+#LIBVPX.EXTRACT.tarbase = libvpx-v1.4.0
+
 LIBVPX.CONFIGURE.args.host =
 LIBVPX.CONFIGURE.deps  =
 LIBVPX.CONFIGURE.extra =  \
diff --git a/contrib/libxml2/module.defs b/contrib/libxml2/module.defs
index aa37d0521..f7081dcd3 100644
--- a/contrib/libxml2/module.defs
+++ b/contrib/libxml2/module.defs
@@ -2,10 +2,15 @@ __deps__ := LIBICONV
 $(eval $(call import.MODULE.defs,LIBXML2,libxml2,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,LIBXML2))
 
-LIBXML2.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libxml2-2.7.7.tar.gz
-LIBXML2.FETCH.md5 = 9abc9959823ca9ff904f1fbcf21df066
+LIBXML2.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libxml2-2.7.7.tar.gz
+LIBXML2.FETCH.url += ftp://xmlsoft.org/libxml2/libxml2-2.7.7.tar.gz
+LIBXML2.FETCH.md5 =  9abc9959823ca9ff904f1fbcf21df066
 LIBXML2.EXTRACT.tarbase = libxml2-2.7.7
 
+# TODO: libxml2 2.9.2 is latest, tarbase not necessary with new upstream
+#LIBXML2.FETCH.url = ftp://xmlsoft.org/libxml2/libxml2-2.9.2.tar.gz
+#LIBXML2.FETCH.md5 = 9e6a9aca9d155737868b3dc5fd82f788
+
 # The Python components do not build on MinGW due to the lack of a select() call
 # in the MinGW environment.
 LIBXML2.CONFIGURE.extra = \
diff --git a/contrib/m4/module.defs b/contrib/m4/module.defs
index b73674bed..72c1af629 100644
--- a/contrib/m4/module.defs
+++ b/contrib/m4/module.defs
@@ -1,5 +1,6 @@
 $(eval $(call import.MODULE.defs,M4,m4))
 $(eval $(call import.CONTRIB.defs,M4))
 
-M4.FETCH.url = http://download.handbrake.fr/handbrake/contrib/m4-1.4.16.tar.bz2
-M4.FETCH.md5 = 8a7cef47fecab6272eb86a6be6363b2f
+M4.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/m4-1.4.16.tar.bz2
+M4.FETCH.url += http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.bz2
+M4.FETCH.md5 =  8a7cef47fecab6272eb86a6be6363b2f
diff --git a/contrib/pkgconfig/module.defs b/contrib/pkgconfig/module.defs
index 24a006852..1ad7cee40 100644
--- a/contrib/pkgconfig/module.defs
+++ b/contrib/pkgconfig/module.defs
@@ -4,4 +4,11 @@ $(eval $(call import.CONTRIB.defs,PKGCONFIG))
 PKGCONFIG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/pkg-config-0.28.tar.bz2
 PKGCONFIG.FETCH.md5 = 60c2d5353d501c5619d535c6d4d80f1c
 
+# TODO: Upstream no longer provides bzip2 archives, pkg-config 0.29 is latest
+#PKGCONFIG.FETCH.url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
+#PKGCONFIG.FETCH.md5 = aa3c86e67551adc3ac865160e34a2a0d
+#
+#PKGCONFIG.FETCH.url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.29.tar.gz
+#PKGCONFIG.FETCH.md5 = 77f27dce7ef88d0634d0d6f90e03a77f
+
 PKGCONFIG.CONFIGURE.extra = --with-internal-glib --disable-host-tool
diff --git a/contrib/pthreadw32/module.defs b/contrib/pthreadw32/module.defs
index c2bfc0a5e..f78fc36ef 100644
--- a/contrib/pthreadw32/module.defs
+++ b/contrib/pthreadw32/module.defs
@@ -1,6 +1,7 @@
 $(eval $(call import.MODULE.defs,PTHREADW32,pthreadw32))
 $(eval $(call import.CONTRIB.defs,PTHREADW32))
 
+# TODO: Unknown upstream url, package seems very out of date
 PTHREADW32.FETCH.url = http://download.handbrake.fr/handbrake/contrib/pthreads-w32-cvs20100909.tar.bz2
 PTHREADW32.FETCH.md5 = d1dea735b53176567e9841ca77388633
 
diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index 7497b9d6d..9804e35d7 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -1,6 +1,7 @@
 $(eval $(call import.MODULE.defs,X264,x264,YASM PTHREADW32))
 $(eval $(call import.CONTRIB.defs,X264))
 
+# TODO: Unknown upstream url (self-packaged?)
 X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r2665-a01e339.tar.gz
 X264.FETCH.md5 = 4ffeac9157c5a7119b5b6ff36a5d96b7
 X264.EXTRACT.tarbase = x264
diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs
index e760a0836..5255c44f6 100644
--- a/contrib/x265/module.defs
+++ b/contrib/x265/module.defs
@@ -3,6 +3,7 @@ $(eval $(call import.MODULE.defs,X265,x265,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,X265))
 
 X265.FETCH.url = http://download.handbrake.fr/contrib/x265_1.9.tar.gz
+X265.FETCH.url += https://download.videolan.org/pub/videolan/x265/x265_1.9.tar.gz
 X265.FETCH.md5 = f34a1c4c660ff07511365cb0983cf164
 
 X265.CONFIGURE.exe         = cmake
@@ -36,5 +37,3 @@ X265.CONFIGURE.extra += "$(call fn.ABSOLUTE,$(X265.EXTRACT.dir/)source/)"
 ## optional static libs need to be marked
 X265.OSL.libs  = x265
 X265.OSL.files = $(foreach i,$(X265.OSL.libs),$(call fn.ABSOLUTE,$(CONTRIB.build/)lib/lib$(i).a))
-
-
diff --git a/contrib/yasm/module.defs b/contrib/yasm/module.defs
index ae1e31e7f..d08bd5627 100644
--- a/contrib/yasm/module.defs
+++ b/contrib/yasm/module.defs
@@ -1,6 +1,6 @@
 $(eval $(call import.MODULE.defs,YASM,yasm))
 $(eval $(call import.CONTRIB.defs,YASM))
 
-YASM.FETCH.url = http://download.handbrake.fr/handbrake/contrib/yasm-1.2.0.tar.gz
-YASM.FETCH.md5 = 4cfc0686cf5350dd1305c4d905eb55a6
-
+YASM.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/yasm-1.2.0.tar.gz
+YASM.FETCH.url += https://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz
+YASM.FETCH.md5 =  4cfc0686cf5350dd1305c4d905eb55a6
diff --git a/contrib/zlib/module.defs b/contrib/zlib/module.defs
index 541ced6dc..3d0e15941 100644
--- a/contrib/zlib/module.defs
+++ b/contrib/zlib/module.defs
@@ -1,9 +1,19 @@
 $(eval $(call import.MODULE.defs,ZLIB,zlib))
 $(eval $(call import.CONTRIB.defs,ZLIB))
 
-ZLIB.FETCH.url = http://download.handbrake.fr/handbrake/contrib/zlib-1.2.3.tar.gz
-ZLIB.FETCH.md5 = af3358a811ad3469a2e54db49f77d52a
+ZLIB.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/zlib-1.2.3.tar.gz
+ZLIB.FETCH.md5 =  af3358a811ad3469a2e54db49f77d52a
 ZLIB.EXTRACT.tarbase = zlib
+
+# TODO: Upstream hash does not match mirror, zlib 1.2.8 is latest
+#ZLIB.FETCH.url += http://sourceforge.net/projects/libpng/files/zlib/1.2.3/zlib-1.2.3.tar.gz
+#ZLIB.FETCH.md5 =  debc62758716a169df9f62e6ab2bc634
+#ZLIB.EXTRACT.tarbase = zlib
+#
+#ZLIB.FETCH.url += http://sourceforge.net/projects/libpng/files/zlib/1.2.8/zlib-1.2.8.tar.gz
+#ZLIB.FETCH.md5 =  44d667c142d7cda120332623eab69f40
+#ZLIB.EXTRACT.tarbase = zlib
+
 ZLIB.CONFIGURE.args = !sete @dir !env !exe @prefix !extra
 
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))