[vlc-commits] Contribs: change contribs URLs on our FTP

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jun 20 12:15:02 2016 +0200| [82da842e737e9a64f3db8a3b7a0a61c9e4b48ab7] | committer: Jean-Baptiste Kempf

Contribs: change contribs URLs on our FTP

(cherry picked from commit ba6c6589d65412c2c2df6f165431544bc6243d70)

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

 contrib/src/a52/rules.mak    |    2 +-
 contrib/src/goom/rules.mak   |    2 +-
 contrib/src/mad/rules.mak    |    2 +-
 contrib/src/mpcdec/rules.mak |    2 +-
 contrib/src/orc/rules.mak    |    3 +--
 contrib/src/regex/rules.mak  |    2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/contrib/src/a52/rules.mak b/contrib/src/a52/rules.mak
index dd4d7a3..00a9d76 100644
--- a/contrib/src/a52/rules.mak
+++ b/contrib/src/a52/rules.mak
@@ -1,7 +1,7 @@
 # liba52
 
 A52DEC_VERSION := 0.7.4
-A52DEC_URL := $(CONTRIB_VIDEOLAN)/a52dec-$(A52DEC_VERSION).tar.gz
+A52DEC_URL := $(CONTRIB_VIDEOLAN)/a52/a52dec-$(A52DEC_VERSION).tar.gz
 
 ifdef GPL
 PKGS += a52
diff --git a/contrib/src/goom/rules.mak b/contrib/src/goom/rules.mak
index 9b97484..e48fe58 100644
--- a/contrib/src/goom/rules.mak
+++ b/contrib/src/goom/rules.mak
@@ -1,7 +1,7 @@
 # goom
 
 GOOM_VERSION := 2k4-0
-GOOM_URL := $(CONTRIB_VIDEOLAN)/goom-$(GOOM_VERSION)-src.tar.gz
+GOOM_URL := $(CONTRIB_VIDEOLAN)/goom/goom-$(GOOM_VERSION)-src.tar.gz
 
 PKGS += goom
 
diff --git a/contrib/src/mad/rules.mak b/contrib/src/mad/rules.mak
index 30490f9..e49a733 100644
--- a/contrib/src/mad/rules.mak
+++ b/contrib/src/mad/rules.mak
@@ -1,7 +1,7 @@
 # mad
 
 MAD_VERSION := 0.15.1b
-MAD_URL := $(CONTRIB_VIDEOLAN)/libmad-$(MAD_VERSION).tar.gz
+MAD_URL := $(CONTRIB_VIDEOLAN)/mad/libmad-$(MAD_VERSION).tar.gz
 
 ifdef GPL
 PKGS += mad
diff --git a/contrib/src/mpcdec/rules.mak b/contrib/src/mpcdec/rules.mak
index ab5a6b4..c2197a0 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 := $(CONTRIB_VIDEOLAN)/musepack_src_r$(MUSE_REV).tar.gz
+MUSE_URL := $(CONTRIB_VIDEOLAN)/mpcdec/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 80c0d1f..54a1959 100644
--- a/contrib/src/orc/rules.mak
+++ b/contrib/src/orc/rules.mak
@@ -1,8 +1,7 @@
 # orc
 
 ORC_VERSION := 0.4.18
-
-ORC_URL := $(CONTRIB_VIDEOLAN)/orc-$(ORC_VERSION).tar.gz
+ORC_URL := $(CONTRIB_VIDEOLAN)/orc/orc-$(ORC_VERSION).tar.gz
 
 ifeq ($(call need_pkg,"orc-0.4"),)
 PKGS_FOUND += orc
diff --git a/contrib/src/regex/rules.mak b/contrib/src/regex/rules.mak
index 955eaf5..3d33b9b 100644
--- a/contrib/src/regex/rules.mak
+++ b/contrib/src/regex/rules.mak
@@ -1,6 +1,6 @@
 # REGEX
 REGEX_VERSION := 0.13
-REGEX_URL := $(CONTRIB_VIDEOLAN)/regex-$(REGEX_VERSION).tar.gz
+REGEX_URL := $(CONTRIB_VIDEOLAN)/regex/regex-$(REGEX_VERSION).tar.gz
 
 ifndef HAVE_WIN32
 # Part of POSIX.2001