[vlc-commits] [Git][videolan/vlc][3.0.x] 4 commits: contrib: use curl --retry to download tarballs

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
81771e1c by Steve Lhomme at 2025-09-24T07:00:11+00:00
contrib: use curl --retry to download tarballs

If some URLs are flaky we have a better chance of not failing a build.
(like GNU mirrors and git)

We don't need a temporary file, we let curl manage the output file and
overwrite it when necessary. If anything the hash will not match.

(cherry picked from commit b57f13f97e0c395791aeff997a85380e4769d0df)

- - - - -
8c7274c2 by Steve Lhomme at 2025-09-24T07:00:11+00:00
tools: use curl --retry to download tarballs

If some URLs are flaky we have a better chance of not failing a build.
(like GNU mirrors and git)

We don't need a temporary file, we let curl manage the output file and
overwrite it when necessary. If anything the hash will not match.

(cherry picked from commit ded9e6c5d9162dfb0bbac50740e0c13b24f67e2e)

- - - - -
a22bdad4 by William Woodruff at 2025-09-24T07:00:11+00:00
extras/tools: use HTTPS for all tool bootstrapping

This patch updates all of the URL prefixes and
templates in packages.mak to use HTTPS instead of
HTTP.

Each of the domains was tested to ensure that
HTTPS was available. One domain, used for
Apache, was updated from an OVH mirror
to the official Apache downloads site, as the
OVH mirror did not support HTTPS.

Signed-off-by: William Woodruff <william at trailofbits.com>
(cherry picked from commit e02872fb5cd25eff369cae445f7bf58529dd2f19) (edited)
edited:
- 3.0 has less tools

- - - - -
4a645203 by Steve Lhomme at 2025-09-24T07:00:11+00:00
tools: use ftpmirror for GNU packages

It's less overloaded and the recommended URL [^1].

Similar to 03d3b0a941b1bce0715af0dda612fa080a975d1c for tools.

[^1]: https://www.gnu.org/prep/ftp.en.html

(cherry picked from commit 36356178a0461bd6b65a2d36946a9c7ede82e23f)

- - - - -


3 changed files:

- contrib/src/main.mak
- extras/tools/packages.mak
- extras/tools/tools.mak


Changes:

=====================================
contrib/src/main.mak
=====================================
@@ -242,7 +242,7 @@ endif
 SVN ?= $(error subversion client (svn) not found!)
 
 ifeq ($(shell curl --version >/dev/null 2>&1 || echo FAIL),)
-download = curl -f -L -- "$(1)" > "$@"
+download = curl -f -L --retry 3 --output "$@" -- "$(1)"
 else ifeq ($(shell wget --version >/dev/null 2>&1 || echo FAIL),)
 download = (rm -f $@.tmp && \
 	wget --passive -c -p -O $@.tmp "$(1)" && \


=====================================
extras/tools/packages.mak
=====================================
@@ -1,16 +1,16 @@
-GNU=http://ftp.gnu.org/gnu
-APACHE=http://mir2.ovh.net/ftp.apache.org/dist
-SF= http://downloads.sourceforge.net/project
-VIDEOLAN=http://downloads.videolan.org/pub/contrib
+GNU=https://ftpmirror.gnu.org/gnu
+APACHE=https://downloads.apache.org/
+SF=https://downloads.sourceforge.net/project
+VIDEOLAN=https://downloads.videolan.org/pub/contrib
 
 YASM_VERSION=1.3.0
 YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz
 
 NASM_VERSION=2.14
-NASM_URL=http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)/nasm-$(NASM_VERSION).tar.gz
+NASM_URL=https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)/nasm-$(NASM_VERSION).tar.gz
 
 CMAKE_VERSION=3.17.0
-CMAKE_URL=http://www.cmake.org/files/v3.17/cmake-$(CMAKE_VERSION).tar.gz
+CMAKE_URL=https://www.cmake.org/files/v3.17/cmake-$(CMAKE_VERSION).tar.gz
 
 LIBTOOL_VERSION=2.4.7
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
@@ -31,7 +31,7 @@ TAR_VERSION=1.26
 TAR_URL=$(GNU)/tar/tar-$(TAR_VERSION).tar.bz2
 
 XZ_VERSION=5.2.2
-XZ_URL=http://tukaani.org/xz/xz-$(XZ_VERSION).tar.bz2
+XZ_URL=https://tukaani.org/xz/xz-$(XZ_VERSION).tar.bz2
 
 GAS_VERSION=72887b9
 GAS_URL=http://git.libav.org/?p=gas-preprocessor.git;a=snapshot;h=$(GAS_VERSION);sf=tgz


=====================================
extras/tools/tools.mak
=====================================
@@ -10,7 +10,7 @@ TARBALLS := $(TOOLS)
 #
 
 ifeq ($(shell command -v curl >/dev/null 2>&1 || echo FAIL),)
-download = curl -f -L -- "$(1)" > "$@.tmp" && touch $@.tmp && mv $@.tmp $@
+download = curl -f -L --retry 3 --output "$@" -- "$(1)"
 else ifeq ($(shell command -v wget >/dev/null 2>&1 || echo FAIL),)
 download = rm -f $@.tmp && \
 	wget --passive -c -p -O $@.tmp "$(1)" && \



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/553e1def6a7d8371292208279c1c695206696b00...4a645203d3b88f56e5d83925650373a1e450182a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/553e1def6a7d8371292208279c1c695206696b00...4a645203d3b88f56e5d83925650373a1e450182a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance