[vlc-commits] [Git][videolan/vlc][master] 7 commits: contrib: ffmpeg: update to 7.1.2
Steve Lhomme (@robUx4)
gitlab at videolan.org
Sat Sep 20 09:40:15 UTC 2025
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
5737ca11 by Steve Lhomme at 2025-09-20T08:45:32+00:00
contrib: ffmpeg: update to 7.1.2
- - - - -
52813b87 by Steve Lhomme at 2025-09-20T08:45:32+00:00
contrib: ffmpeg: rewrite architecture for arm64_32
aarch64_32 is not recognized and disables arm assembly code.
arm64_32 is somehow recognized but fails to build because
all inline code fails.
- - - - -
ded9e6c5 by Steve Lhomme at 2025-09-20T08:45:32+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.
- - - - -
b57f13f9 by Steve Lhomme at 2025-09-20T08:45:32+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.
- - - - -
1f7583d2 by Steve Lhomme at 2025-09-20T08:45:32+00:00
tools: update the config.guess/config.sub
They have official support for arm64_32, Apple simulators.
- - - - -
3d72b36f by Steve Lhomme at 2025-09-20T08:45:32+00:00
apple: build.sh: don't translate arm64_32 to aarch64_32
That arch/triplet doesn't officially exist.
- - - - -
986c0625 by Steve Lhomme at 2025-09-20T08:45:32+00:00
tools: use a Github mirror to get GNU config.* files
The git.savannah.gnu.org connection is too unreliable.
- - - - -
9 changed files:
- contrib/src/ffmpeg/SHA512SUMS
- contrib/src/ffmpeg/rules.mak
- contrib/src/main.mak
- extras/package/apple/build.sh
- extras/tools/SHA512SUMS
- − extras/tools/config.guess-config-add-support-for-arm64_32.patch
- − extras/tools/config.sub-config-add-support-for-arm64_32.patch
- extras/tools/packages.mak
- extras/tools/tools.mak
Changes:
=====================================
contrib/src/ffmpeg/SHA512SUMS
=====================================
@@ -1 +1 @@
-42486e485c8fc6f3ec61598a1a7cb40360535762b3fcf28c10d7c6840bc55afe3334434912746e69eef862d3cedf45a02953bde73d38547d2d9a7a38a65e123a ffmpeg-7.1.1.tar.xz
+181e6415da359e3addbc448ff09b5cebe57d9c37106e5125c41f484adebc250502fc9efe150cb117d7378e20830715035be94c2ba4ad7c369b18af85f1a4ca20 ffmpeg-7.1.2.tar.xz
=====================================
contrib/src/ffmpeg/rules.mak
=====================================
@@ -1,7 +1,7 @@
# FFmpeg
FFMPEG_HASH=ec47a3b95f88fc3f820b900038ac439e4eb3fede
-FFMPEG_MAJVERSION := 7.1.1
+FFMPEG_MAJVERSION := 7.1.2
FFMPEG_REVISION := 0
# FFMPEG_VERSION := $(FFMPEG_MAJVERSION).$(FFMPEG_REVISION)
FFMPEG_VERSION := $(FFMPEG_MAJVERSION)
@@ -137,7 +137,13 @@ endif
# Darwin
ifdef HAVE_DARWIN_OS
-FFMPEGCONF += --arch=$(ARCH) --target-os=darwin --extra-cflags="$(CFLAGS)"
+ifeq ($(ARCH),arm64_32)
+# TODO remove when FFMpeg supports arm64_32
+FFMPEGCONF += --arch=aarch64_32
+else
+FFMPEGCONF += --arch=$(ARCH)
+endif
+FFMPEGCONF += --target-os=darwin --extra-cflags="$(CFLAGS)"
FFMPEGCONF += --disable-lzma
ifeq ($(ARCH),x86_64)
FFMPEGCONF += --cpu=core2
=====================================
contrib/src/main.mak
=====================================
@@ -293,7 +293,7 @@ endif
GIT ?= $(error git 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/package/apple/build.sh
=====================================
@@ -241,7 +241,7 @@ set_host_triplet()
# Therefore we construct a triplet here without a version number, which
# will not match the autoconf "guessed" host machine triplet.
VLC_HOST_TRIPLET="${triplet_arch}-apple-darwin"
- VLC_HOST_TRIPLET="${VLC_HOST_TRIPLET/arm64/aarch64}"
+ VLC_HOST_TRIPLET="${VLC_HOST_TRIPLET/arm64-/aarch64-}"
}
# Set the VLC_BUILD_TRIPLET based on the architecture
=====================================
extras/tools/SHA512SUMS
=====================================
@@ -18,5 +18,5 @@ bad913c59f540b701a0d234a868bd88615ccfcdc09931f8dea7b4da48bcc3a3c3c7e9cdeeff5abfc
27acef46d9eb67203d708b57d80b853f76fa4b9c2720ff36ec161e6cdf702249e7982214ddf60bae75511aa79bc7d92aa27e3eab7ef9c0f5c040e8e42e76a385 libtool-2.4.7.tar.gz
60599f5c3168a287fe3a35062fd2e32e0b73433fce820bfd18d28b0e3bd7a8fefde6d6f0505fbbc2d664119ab7c539269184993843289932c895847ea1ab9f04 libtool-2.5.4.tar.gz
855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4 gperf-3.1.tar.gz
-1bf28876ee38557042bf790af3d06ae0dcddc2d310480a821fbae1f269d433259b1ef0243fa6eff829ce67a22e8461655d41bbb7382355b7530d5648e296c9d6 config.guess-948ae97ca5703224bd3eada06b7a69f40dd15a02
-14e316b18542d0a971d925a0dfca38f67680f1e2933d170767b59137d527a15d2b785910c9ba0845ebba7e089e3a05fe60aabd6a7c06a7481822942a698f8a6a config.sub-948ae97ca5703224bd3eada06b7a69f40dd15a02
+e67a96ae99b8d06576209e0c316dda62e480b010e8459266fd4cf7029019b4a77499acbbf07d8f43541f28dae9063030a5d0f1c71eb81f723fd1b9924f967302 config.guess-a2287c3041a3f2a204eb942e09c015eab00dc7dd
+dad55c53a201de050522ed47073a6318599e15312d79eef44e1de5f82288a9bd1550c909e08752d43dd2fe442782187987e12aa565bbad70fc1b82180b49ac67 config.sub-a2287c3041a3f2a204eb942e09c015eab00dc7dd
=====================================
extras/tools/config.guess-config-add-support-for-arm64_32.patch deleted
=====================================
@@ -1,26 +0,0 @@
-From 1d28edfb0574c77591403f133d42e0edf7d037e1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix at feepk.net>
-Date: Wed, 19 Jun 2024 13:59:41 +0200
-Subject: [PATCH] config: add support for arm64_32
-
----
- config.guess | 3 +++
- 1 files changed, 3 insertions(+), 0 deletion(-)
-
-diff --git a/config.guess b/config.guess
-index f6d217a4..84bd5401 100755
---- a/config.guess
-+++ b/config.guess
-@@ -1455,6 +1455,9 @@ EOF
- arm64:Darwin:*:*)
- GUESS=aarch64-apple-darwin$UNAME_RELEASE
- ;;
-+ arm64_32:Darwin:*:*)
-+ GUESS=aarch64_32-apple-darwin$UNAME_RELEASE
-+ ;;
- *:Darwin:*:*)
- UNAME_PROCESSOR=`uname -p`
- case $UNAME_PROCESSOR in
---
-2.32.1 (Apple Git-133)
-
=====================================
extras/tools/config.sub-config-add-support-for-arm64_32.patch deleted
=====================================
@@ -1,25 +0,0 @@
-From 1d28edfb0574c77591403f133d42e0edf7d037e1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix at feepk.net>
-Date: Wed, 19 Jun 2024 13:59:41 +0200
-Subject: [PATCH] config: add support for arm64_32
-
----
- config.sub | 2 +-
- 1 files changed, 1 insertions(+), 1 deletion(-)
-
-diff --git a/config.sub b/config.sub
-index 2c6a07ab..b7f358cb 100755
---- a/config.sub
-+++ b/config.sub
-@@ -1181,7 +1181,7 @@ case $cpu-$vendor in
- case $cpu in
- 1750a | 580 \
- | a29k \
-- | aarch64 | aarch64_be | aarch64c | arm64ec \
-+ | aarch64 | aarch64_be | aarch64c | arm64ec | aarch64_32 | arm64_32 \
- | abacus \
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
---
-2.32.1 (Apple Git-133)
-
=====================================
extras/tools/packages.mak
=====================================
@@ -59,8 +59,12 @@ NINJA_URL=https://github.com/Kitware/ninja/archive/refs/tags/v$(NINJA_BUILD_NAME
GPERF_VERSION=3.1
GPERF_URL=$(GNU)/gperf/gperf-$(GPERF_VERSION).tar.gz
-CONFIGGUESS_VERSION=948ae97ca5703224bd3eada06b7a69f40dd15a02
-CONFIGGUESS_URL=https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=$(CONFIGGUESS_VERSION)
-
-CONFIGSUB_VERSION=948ae97ca5703224bd3eada06b7a69f40dd15a02
-CONFIGSUB_URL=https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=$(CONFIGGUESS_VERSION)
+CONFIGGUESS_VERSION=a2287c3041a3f2a204eb942e09c015eab00dc7dd
+# git.savannah.gnu.org connection is too unreliable
+# CONFIGGUESS_URL=https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=$(CONFIGGUESS_VERSION)
+CONFIGGUESS_URL=https://raw.githubusercontent.com/tianon/mirror-gnu-config/$(CONFIGGUESS_VERSION)/config.guess
+
+CONFIGSUB_VERSION=a2287c3041a3f2a204eb942e09c015eab00dc7dd
+# git.savannah.gnu.org connection is too unreliable
+# CONFIGSUB_URL=https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=$(CONFIGGUESS_VERSION)
+CONFIGSUB_URL=https://raw.githubusercontent.com/tianon/mirror-gnu-config/$(CONFIGSUB_VERSION)/config.sub
=====================================
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)" && \
@@ -191,12 +191,10 @@ config.sub-$(CONFIGSUB_VERSION):
config.guess: UNPACK_DIR=.
config.guess: config.guess-$(CONFIGGUESS_VERSION)
cp -f $< $@
- $(APPLY) $(TOOLS)/config.guess-config-add-support-for-arm64_32.patch
config.sub:UNPACK_DIR=.
config.sub: config.sub-$(CONFIGSUB_VERSION)
cp -f $< $@
- $(APPLY) $(TOOLS)/config.sub-config-add-support-for-arm64_32.patch
.buildconfigguess: config.guess config.sub
# install in a dummy autoconf so that VLC contribs pick it
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b5870e4f1b6805c5bca829271e816a630f582e42...986c062566655c6999b7ce057da39ef6155cdc04
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b5870e4f1b6805c5bca829271e816a630f582e42...986c062566655c6999b7ce057da39ef6155cdc04
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list