[vlc-commits] Contribs: don't hardcode URLs

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Dec 19 16:40:28 2014 +0100| [6321b9fa4c61f8c37b107563d18924524af0c0de] | committer: Jean-Baptiste Kempf

Contribs: don't hardcode URLs

(cherry picked from commit ed5563d9b1aa46cc87aee2b33cfe1fdf1e4b3cf1)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=6321b9fa4c61f8c37b107563d18924524af0c0de
---

 contrib/src/jpeg/rules.mak    |    2 +-
 contrib/src/live555/rules.mak |    2 +-
 contrib/src/mpcdec/rules.mak  |    2 +-
 contrib/src/orc/rules.mak     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/src/jpeg/rules.mak b/contrib/src/jpeg/rules.mak
index 9f94e41..4bb571f 100644
--- a/contrib/src/jpeg/rules.mak
+++ b/contrib/src/jpeg/rules.mak
@@ -2,7 +2,7 @@
 
 JPEG_VERSION := 9a
 #JPEG_URL := http://www.ijg.org/files/jpegsrc.v$(JPEG_VERSION).tar.gz
-JPEG_URL := http://download.videolan.org/pub/contrib/jpegsrc.v$(JPEG_VERSION).tar.gz
+JPEG_URL := $(CONTRIB_VIDEOLAN)/jpegsrc.v$(JPEG_VERSION).tar.gz
 
 $(TARBALLS)/jpegsrc.v$(JPEG_VERSION).tar.gz:
 	$(call download,$(JPEG_URL))
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 6425816..7d08bb8 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -2,7 +2,7 @@
 
 #LIVEDOTCOM_URL := http://live555.com/liveMedia/public/live555-latest.tar.gz
 LIVE555_FILE := live.2014.07.25.tar.gz
-LIVEDOTCOM_URL := http://download.videolan.org/pub/contrib/live555/$(LIVE555_FILE)
+LIVEDOTCOM_URL := $(CONTRIB_VIDEOLAN)/live555/$(LIVE555_FILE)
 
 ifdef BUILD_NETWORK
 PKGS += live555
diff --git a/contrib/src/mpcdec/rules.mak b/contrib/src/mpcdec/rules.mak
index e0c004a..ab5a6b4 100644
--- a/contrib/src/mpcdec/rules.mak
+++ b/contrib/src/mpcdec/rules.mak
@@ -7,7 +7,7 @@ PKGS += mpcdec
 #MUSE_URL := http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
 
 MUSE_REV := 481
-MUSE_URL := http://download.videolan.org/pub/contrib/musepack_src_r$(MUSE_REV).tar.gz
+MUSE_URL := $(CONTRIB_VIDEOLAN)/musepack_src_r$(MUSE_REV).tar.gz
 
 $(TARBALLS)/musepack_src_r$(MUSE_REV).tar.gz:
 	$(call download,$(MUSE_URL))
diff --git a/contrib/src/orc/rules.mak b/contrib/src/orc/rules.mak
index 81c6438..80c0d1f 100644
--- a/contrib/src/orc/rules.mak
+++ b/contrib/src/orc/rules.mak
@@ -2,7 +2,7 @@
 
 ORC_VERSION := 0.4.18
 
-ORC_URL := http://download.videolan.org/pub/contrib/orc-$(ORC_VERSION).tar.gz
+ORC_URL := $(CONTRIB_VIDEOLAN)/orc-$(ORC_VERSION).tar.gz
 
 ifeq ($(call need_pkg,"orc-0.4"),)
 PKGS_FOUND += orc