Contribs: use VideoLAN ftp first and then fallback on upstream

contrib/src/ebml/rules.mak

@@ -2,10 +2,9 @@
 
 EBML_VERSION := 1.3.3
 EBML_URL := http://dl.matroska.org/downloads/libebml/libebml-$(EBML_VERSION).tar.bz2
-#EBML_URL := $(CONTRIB_VIDEOLAN)/libebml-$(EBML_VERSION).tar.bz2
 
 $(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2:
-	$(call download,$(EBML_URL))
+	$(call download_pkg,$(EBML_URL),ebml)
 
 .sum-ebml: libebml-$(EBML_VERSION).tar.bz2
 

contrib/src/gnutls/rules.mak

@@ -1,8 +1,7 @@
 # GnuTLS
 
 GNUTLS_VERSION := 3.3.22
-#GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-$(GNUTLS_VERSION).tar.xz
-GNUTLS_URL := $(CONTRIB_VIDEOLAN)/gnutls-$(GNUTLS_VERSION).tar.xz
+GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-$(GNUTLS_VERSION).tar.xz
 
 ifdef BUILD_NETWORK
 ifndef HAVE_DARWIN_OS
@@ -14,7 +13,7 @@ PKGS_FOUND += gnutls
 endif
 
 $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.xz:
-	$(call download,$(GNUTLS_URL))
+	$(call download_pkg,$(GNUTLS_URL),gnutls)
 
 .sum-gnutls: gnutls-$(GNUTLS_VERSION).tar.xz
 

contrib/src/gsm/rules.mak

@@ -1,9 +1,9 @@
 # GSM
 GSM_VERSION := 1.0.13
-GSM_URL := $(CONTRIB_VIDEOLAN)/libgsm_$(GSM_VERSION).tar.gz
+GSM_URL := http://libgsm.sourcearchive.com/downloads/$(GSM_VERSION)/libgsm_$(GSM_VERSION).orig.tar.gz
 
 $(TARBALLS)/libgsm_$(GSM_VERSION).tar.gz:
-	$(call download,$(GSM_URL))
+	$(call download_pkg,$(GSM_URL),gsm)
 
 .sum-gsm: libgsm_$(GSM_VERSION).tar.gz
 

contrib/src/jpeg/rules.mak

@@ -1,11 +1,10 @@
 # jpeg
 
 JPEG_VERSION := 9a
-#JPEG_URL := http://www.ijg.org/files/jpegsrc.v$(JPEG_VERSION).tar.gz
-JPEG_URL := $(CONTRIB_VIDEOLAN)/jpegsrc.v$(JPEG_VERSION).tar.gz
+JPEG_URL := http://www.ijg.org/files/jpegsrc.v$(JPEG_VERSION).tar.gz
 
 $(TARBALLS)/jpegsrc.v$(JPEG_VERSION).tar.gz:
-	$(call download,$(JPEG_URL))
+	$(call download_pkg,$(JPEG_URL),jpeg)
 
 .sum-jpeg: jpegsrc.v$(JPEG_VERSION).tar.gz
 

contrib/src/live555/rules.mak

@@ -1,15 +1,14 @@
 # live555
 
 LIVE555_FILE := live.2016.02.22.tar.gz
-#LIVEDOTCOM_URL := http://live555.com/liveMedia/public/$(LIVE555_FILE)
-LIVEDOTCOM_URL := $(CONTRIB_VIDEOLAN)/live555/$(LIVE555_FILE)
+LIVEDOTCOM_URL := http://live555.com/liveMedia/public/$(LIVE555_FILE)
 
 ifdef BUILD_NETWORK
 PKGS += live555
 endif
 
 $(TARBALLS)/$(LIVE555_FILE):
-	$(call download,$(LIVEDOTCOM_URL))
+	$(call download_pkg,$(LIVEDOTCOM_URL),live555)
 
 .sum-live555: $(LIVE555_FILE)
 

contrib/src/matroska/rules.mak

@@ -2,13 +2,12 @@
 
 MATROSKA_VERSION := 1.4.4
 MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.bz2
-#MATROSKA_URL := $(CONTRIB_VIDEOLAN)/libmatroska-$(MATROSKA_VERSION).tar.bz2
 
 PKGS += matroska
 DEPS_matroska = ebml $(DEPS_ebml)
 
 $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2:
-	$(call download,$(MATROSKA_URL))
+	$(call download_pkg,$(MATROSKA_URL),matroska)
 
 .sum-matroska: libmatroska-$(MATROSKA_VERSION).tar.bz2
 

contrib/src/ogg/rules.mak

@@ -3,7 +3,6 @@
 OGG_VERSION := 1.3.2
 
 OGG_URL := http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.xz
-#OGG_URL := $(CONTRIB_VIDEOLAN)/libogg-$(OGG_VERSION).tar.xz
 #OGG_CVSROOT := :pserver:anoncvs@xiph.org:/usr/local/cvsroot
 
 PKGS += ogg
@@ -12,7 +11,7 @@ PKGS_FOUND += ogg
 endif
 
 $(TARBALLS)/libogg-$(OGG_VERSION).tar.xz:
-	$(call download,$(OGG_URL))
+	$(call download_pkg,$(OGG_URL),ogg)
 
 .sum-ogg: libogg-$(OGG_VERSION).tar.xz
 

contrib/src/png/rules.mak

@@ -8,7 +8,7 @@ PKGS_FOUND += png
 endif
 
 $(TARBALLS)/libpng-$(PNG_VERSION).tar.xz:
-	$(call download,$(PNG_URL))
+	$(call download_pkg,$(PNG_URL),png)
 
 .sum-png: libpng-$(PNG_VERSION).tar.xz
 

contrib/src/schroedinger/rules.mak

@@ -1,8 +1,7 @@
 # schroedinger
 
 SCHROEDINGER_VERSION := 1.0.11
-#SCHROEDINGER_URL := http://diracvideo.org/download/schroedinger/schroedinger-$(SCHROEDINGER_VERSION).tar.gz
-SCHROEDINGER_URL := $(CONTRIB_VIDEOLAN)/schroedinger-$(SCHROEDINGER_VERSION).tar.gz
+SCHROEDINGER_URL := http://diracvideo.org/download/schroedinger/schroedinger-$(SCHROEDINGER_VERSION).tar.gz
 
 PKGS += schroedinger
 ifeq ($(call need_pkg,"schroedinger-1.0"),)
@@ -10,7 +9,7 @@ PKGS_FOUND += schroedinger
 endif
 
 $(TARBALLS)/schroedinger-$(SCHROEDINGER_VERSION).tar.gz:
-	$(call download,$(SCHROEDINGER_URL))
+	$(call download_pkg,$(SCHROEDINGER_URL),schroedinger)
 
 .sum-schroedinger: schroedinger-$(SCHROEDINGER_VERSION).tar.gz
 

contrib/src/theora/rules.mak

@@ -2,7 +2,6 @@
 
 THEORA_VERSION := 1.1.1
 THEORA_URL := http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSION).tar.xz
-#THEORA_URL := $(CONTRIB_VIDEOLAN)/libtheora-$(THEORA_VERSION).tar.xz
 
 PKGS += theora
 ifeq ($(call need_pkg,"theora >= 1.0"),)
@@ -10,7 +9,7 @@ PKGS_FOUND += theora
 endif
 
 $(TARBALLS)/libtheora-$(THEORA_VERSION).tar.xz:
-	$(call download,$(THEORA_URL))
+	$(call download_pkg,$(THEORA_URL),theora)
 
 .sum-theora: libtheora-$(THEORA_VERSION).tar.xz
 

contrib/src/vorbis/rules.mak

@@ -2,7 +2,6 @@
 
 VORBIS_VERSION := 1.3.5
 VORBIS_URL := http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.xz
-#VORBIS_URL := $(CONTRIB_VIDEOLAN)/libvorbis-$(VORBIS_VERSION).tar.gz
 
 ifdef HAVE_FPU
 PKGS += vorbis
@@ -19,7 +18,7 @@ PKGS_FOUND += vorbisenc
 endif
 
 $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
-	$(call download,$(VORBIS_URL))
+	$(call download_pkg,$(VORBIS_URL),vorbis)
 
 .sum-vorbis: libvorbis-$(VORBIS_VERSION).tar.xz