[vlc-commits] [Git][videolan/vlc][3.0.x] 13 commits: extras/tools: boostrap: add a minimum version to Ninja
Steve Lhomme (@robUx4)
gitlab at videolan.org
Sat Jul 11 11:57:04 UTC 2026
Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
2c2ae243 by Steve Lhomme at 2026-07-11T10:42:10+00:00
extras/tools: boostrap: add a minimum version to Ninja
Otherwise check_ninja() was using a parameter than doesn't exit.
Ninja 1.13.0 is the first official version that supports jobserver [^1].
For now we still require a kitware version with jobserver support.
[^1]: https://github.com/ninja-build/ninja/releases/tag/v1.13.0
(cherry picked from commit 2904248d9dfb8ca90237fee748086f3485e17844)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
868da2f8 by Steve Lhomme at 2026-07-11T10:42:10+00:00
extras/tools: boostrap: put the regular check first
So that others may call it.
No functional changes.
(cherry picked from commit 8e94b1a9b8ca5533ac57cc017659d051cf896913)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
6330f2bc by Steve Lhomme at 2026-07-11T10:42:10+00:00
extras/tools: boostrap: check ninja has the minimum version when combined with GNU make 4.4+
Starting with version 1.13.0 ninja can support jobserver with GNU make 4.4+.
If we have a matching version we don't need to use the kitware version of ninja.
(cherry picked from commit 13111792f931a4a2f0d59e18588884616b9348d6)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
ad31991d by Steve Lhomme at 2026-07-11T10:42:10+00:00
extras/tools: boostrap: fix indentation
(cherry picked from commit 3affb189f004d8744d5cf1ff7d27b7d5b6a4980a)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
34ba847f by Steve Lhomme at 2026-07-11T10:42:10+00:00
tools: update Meson to 1.0.0
(cherry picked from commit 5dede0646e7b3a0a672c17475b35935bb8066c86)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
6210092c by Alexandre Janniaux at 2026-07-11T10:42:10+00:00
extras: tools: bump meson to 1.2.0
Meson 1.0.0 allows writing 0x0 characters into the junit test output,
which is not allowed in XML files and it prevents gitlab CI from parsing
the output of the tests. This can be checked locally with:
meson setup build
meson test -C build css_parser
xmllint build/meson-logs/testlog.junit.xml
(cherry picked from commit 931a2fa493fd22ba706b7cc6d516cc2479fd9a00)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
f2519231 by Khalid Masum at 2026-07-11T10:42:10+00:00
extras: tools: bump meson to 1.4.2
Meson 1.4.2 has python 3.12 support without removing
support for python 3.7+.
(cherry picked from commit 3f852923b4d6b1c01f88d0e01b33528a42d3d5ea)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
5593b675 by Steve Lhomme at 2026-07-11T10:42:10+00:00
extra/tools: update meson to 1.6.0
(cherry picked from commit a3d47a325d884ce5af2e56c7d69be6a742c6664d)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
4959f448 by Steve Lhomme at 2026-07-11T10:42:10+00:00
extra/tools: update meson to 1.7.0
(cherry picked from commit 8cbc0a1ae0c57433034ae47cb67ed2cf06fcb26f)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
f20f58e0 by Alexandre Janniaux at 2026-07-11T10:42:10+00:00
extras: tools: bump meson to 1.7.1
(cherry picked from commit 73e98da98614c0284e440c097ba8c7e7c85d23e6)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
b48fff28 by Steve Lhomme at 2026-07-11T10:42:10+00:00
tools: update meson to 1.9.0
(cherry picked from commit 16b2765d6787c988eee20e08361594a9783c9a55)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
1202ba5a by Marvin Scholz at 2026-07-11T10:42:10+00:00
extras/tools: update meson to 1.9.1
(cherry picked from commit 617cb8a64d47ccc1f6be2394e8a280988ab4b7bc)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
5959d974 by KO Myung-Hun at 2026-07-11T10:42:10+00:00
extra/tools: bump meson to 1.10.0
(cherry picked from commit 308e07dc59fec427d0b574601903bd13ff518392)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
3 changed files:
- extras/tools/SHA512SUMS
- extras/tools/bootstrap
- extras/tools/packages.mak
Changes:
=====================================
extras/tools/SHA512SUMS
=====================================
@@ -13,7 +13,7 @@ d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e6774
e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e flex-2.6.4.tar.gz
ef6c3b9edc7d69c3847324134630a4fb4316e394fa3e38effb8ef3d0c03e48574d43cadf06a774355d7e43a4d7a70e4760c5242807cf4e67331af70d205b9cb0 nasm-2.16.03.tar.gz
d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942 help2man-1.47.6.tar.xz
-8d427261bb42d2bd1da7d4f7b5f53908044aa2cea6d020fb320b0ab9d9848e17cf28deb12ae6dc139807f9e377db0c8a546561e94301216b634bd77703f17cea meson-0.63.0.tar.gz
37b3a421419b16930e53181c431fe3b4afd55ac54733a5df08376641fd2fb88eeb73ee7abe3788f3e491e7c1b215c7f35aefa66f44b09008ad22b76ab2998830 ninja-1.11.1.tar.gz
+4e6ad56e18c7d5b244b94b99c7e42489b8d4e79634abb97607c3f277f74b0c3c1cb043ba48816f444d2960fe96dc38459c404207e415a1401f5fad7c6f5d60e5 meson-1.10.0.tar.gz
27acef46d9eb67203d708b57d80b853f76fa4b9c2720ff36ec161e6cdf702249e7982214ddf60bae75511aa79bc7d92aa27e3eab7ef9c0f5c040e8e42e76a385 libtool-2.4.7.tar.gz
e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104644de23e5f5c374868caa0e091f9c45edbbe87b98ee51c04 gettext-0.22.tar.gz
=====================================
extras/tools/bootstrap
=====================================
@@ -24,6 +24,7 @@ MIN_M4=1.4.16
MIN_MESON=0.60.0
MIN_NASM=2.15
MIN_PROTOC=3.4.0
+MIN_NINJA=1.13.0
export LC_ALL=
FOUND=
@@ -67,6 +68,22 @@ check_version_majmin() {
}
+check() {
+if ! $1 --version >/dev/null 2>&1 && ! $1 -version >/dev/null 2>&1
+then
+ echo "$1 not found"
+ NEEDED="$NEEDED $1"
+else
+ # found, need to check version ?
+ if [ -z "$2" ];then
+ FOUND="$FOUND $1"
+ else
+ gotver=`$1 --version | head -1 | grep -o '[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' | head -1`
+ check_version $1 $gotver $2
+ fi
+fi
+}
+
check_tar() {
if ! tar PcJ /dev/null >/dev/null 2>&1 && ! tar PcJf /dev/null /dev/null 2>&1
then
@@ -107,43 +124,39 @@ fi
}
check_ninja() {
-if ! ninja --version >/dev/null 2>&1
+# with GNU make 4.4 we should use ninja 1.13.x and above
+# otherwise we must use the patched version from kitware
+
+isgnu=$(make -v | head -1 | cut -d ' ' -f 1)
+if [ "$isgnu" = "GNU" ];
+then
+ gotver=$(make -v | head -1 | cut -d ' ' -f 3)
+ gotmajor=$(echo $gotver|cut -d. -f1)
+ gotminor=$(echo $gotver|cut -d. -f2)
+fi
+if [ 4 -lt $gotmajor ] ||
+ [ 4 -eq $gotmajor ] && [ 4 -le $gotminor ];
then
- echo "ninja not found"
- NEEDED="$NEEDED ninja"
+ # GNU Make 4.4+
+ check ninja $1
else
- jobserver=`ninja --version | head -1 | grep .jobserver`
- if [ -z "$jobserver" ]; then
- echo "ninja missing jobserver support"
+ if ! ninja --version >/dev/null 2>&1
+ then
+ echo "ninja not found"
NEEDED="$NEEDED ninja"
else
- # found, need to check version ?
- if [ -z "$1" ];then
- FOUND="$FOUND ninja"
+ jobserver=$(ninja --version | head -1 | grep .jobserver)
+ if [ -z "$jobserver" ]; then
+ echo "ninja missing jobserver support"
+ NEEDED="$NEEDED ninja"
else
- gotver=`ninja --version | head -1 | sed s/'.* '//`
- check_version ninja $gotver $1
+ # check the known working jobserver kitware version
+ check ninja 1.11.1
fi
fi
fi
}
-check() {
-if ! $1 --version >/dev/null 2>&1 && ! $1 -version >/dev/null 2>&1
-then
- echo "$1 not found"
- NEEDED="$NEEDED $1"
-else
- # found, need to check version ?
- if [ -z "$2" ];then
- FOUND="$FOUND $1"
- else
- gotver=`$1 --version | head -1 | grep -o '[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' | head -1`
- check_version $1 $gotver $2
- fi
-fi
-}
-
check_majmin() {
if ! $1 --version >/dev/null 2>&1 && ! $1 -version >/dev/null 2>&1 && ! $1 --version 2>/dev/null
then
@@ -176,7 +189,7 @@ check flex
check_nasm $MIN_NASM
check help2man
check meson $MIN_MESON
-check_ninja
+check_ninja $MIN_NINJA
check gettext
DEPS_ONLY="help2man"
=====================================
extras/tools/packages.mak
=====================================
@@ -55,7 +55,7 @@ GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
HELP2MAN_VERSION=1.47.6
HELP2MAN_URL=$(GNU)/help2man/help2man-$(HELP2MAN_VERSION).tar.xz
-MESON_VERSION=0.63.0
+MESON_VERSION=1.10.0
MESON_URL=https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)/meson-$(MESON_VERSION).tar.gz
NINJA_VERSION=1.11.1
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fe211851b04d1bc536c3375469910b15178437c1...5959d9746ad26b4c67d4d5cf44df94d9d2541857
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fe211851b04d1bc536c3375469910b15178437c1...5959d9746ad26b4c67d4d5cf44df94d9d2541857
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help
More information about the vlc-commits
mailing list