contrib/src/main.mak

@@ -19,12 +19,13 @@ VPATH := $(TARBALLS)
 
 # Common download locations
 GNU ?= http://ftp.gnu.org/gnu
-SF := https://netcologne.dl.sourceforge.net
+SF := https://downloads.sourceforge.net/project
 VIDEOLAN := http://downloads.videolan.org/pub/videolan
 CONTRIB_VIDEOLAN := http://downloads.videolan.org/pub/contrib
 GITHUB := https://github.com
 GOOGLE_CODE := https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com
 QT := https://download.qt.io/official_releases/qt
+XIPH := https://downloads.xiph.org/releases
 
 #
 # Machine-dependent variables

contrib/src/ogg/rules.mak

@@ -2,7 +2,7 @@
 
 OGG_VERSION := 1.3.4
 
-OGG_URL := http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.xz
+OGG_URL := $(XIPH)/ogg/libogg-$(OGG_VERSION).tar.xz
 #OGG_CVSROOT := :pserver:anoncvs@xiph.org:/usr/local/cvsroot
 
 PKGS += ogg

contrib/src/shout/rules.mak

 # shout
 
 SHOUT_VERSION := 2.4.6
-SHOUT_URL := http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz
+SHOUT_URL := $(XIPH)/libshout/libshout-$(SHOUT_VERSION).tar.gz
 
 ifdef BUILD_ENCODERS
 ifdef BUILD_NETWORK

contrib/src/speex/rules.mak

 # speex
 
 SPEEX_VERSION := 1.2.1
-SPEEX_URL := http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz
+SPEEX_URL := $(XIPH)/speex/speex-$(SPEEX_VERSION).tar.gz
 
 PKGS += speex
 ifeq ($(call need_pkg,"speex >= 1.0.5"),)

contrib/src/speexdsp/rules.mak

 # speexdsp
 
 SPEEXDSP_VERSION := 1.2.1
-SPEEXDSP_URL := http://downloads.us.xiph.org/releases/speex/speexdsp-$(SPEEXDSP_VERSION).tar.gz
+SPEEXDSP_URL := $(XIPH)/speex/speexdsp-$(SPEEXDSP_VERSION).tar.gz
 
 PKGS += speexdsp
 ifeq ($(call need_pkg,"speexdsp"),)

contrib/src/theora/rules.mak

 # Theora
 
 THEORA_VERSION := 1.1.1
-THEORA_URL := http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSION).tar.xz
+THEORA_URL := $(XIPH)/theora/libtheora-$(THEORA_VERSION).tar.xz
 
 PKGS += theora
 ifeq ($(call need_pkg,"theora >= 1.0"),)

contrib/src/vorbis/rules.mak

 # libvorbis
 
 VORBIS_VERSION := 1.3.6
-VORBIS_URL := http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.xz
+VORBIS_URL := $(XIPH)/vorbis/libvorbis-$(VORBIS_VERSION).tar.xz
 
 ifdef HAVE_FPU
 PKGS += vorbis