[vlc-commits] [Git][videolan/vlc][master] 3 commits: extra: tools: use the ninja fork from Kitware
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Sun Dec 18 16:45:06 UTC 2022
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
270efe59 by Steve Lhomme at 2022-12-18T15:50:24+00:00
extra: tools: use the ninja fork from Kitware
This work, from the CMake makers, supports jobserver and is actively
maintained.
- - - - -
f31a7e8f by Steve Lhomme at 2022-12-18T15:50:24+00:00
extras: tools: update ninja to 1.11.1
- - - - -
72f38f5c by Steve Lhomme at 2022-12-18T15:50:24+00:00
contrib: build meson with jobserver support
If the installed ninja supports it, it will play nice with the other build
jobs.
- - - - -
13 changed files:
- contrib/src/basu/rules.mak
- contrib/src/dav1d/rules.mak
- contrib/src/fribidi/rules.mak
- contrib/src/glib/rules.mak
- contrib/src/harfbuzz/rules.mak
- contrib/src/libdsm/rules.mak
- contrib/src/libplacebo/rules.mak
- contrib/src/librist/rules.mak
- contrib/src/medialibrary/rules.mak
- contrib/src/microdns/rules.mak
- extras/tools/SHA512SUMS
- extras/tools/packages.mak
- extras/tools/tools.mak
Changes:
=====================================
contrib/src/basu/rules.mak
=====================================
@@ -37,5 +37,5 @@ basu: basu-$(BASU_VERSION).tar.gz .sum-basu
.basu: basu crossfile.meson
$(MESONCLEAN)
$(HOSTVARS_MESON) $(MESON)
- $(MESONBUILD)
+ +$(MESONBUILD)
touch $@
=====================================
contrib/src/dav1d/rules.mak
=====================================
@@ -28,5 +28,5 @@ dav1d: dav1d-$(DAV1D_VERSION).tar.xz .sum-dav1d
.dav1d: dav1d crossfile.meson
$(MESONCLEAN)
$(HOSTVARS_MESON) $(MESON) $(DAV1D_CONF)
- $(MESONBUILD)
+ +$(MESONBUILD)
touch $@
=====================================
contrib/src/fribidi/rules.mak
=====================================
@@ -20,5 +20,5 @@ fribidi: fribidi-$(FRIBIDI_VERSION).tar.xz .sum-fribidi
.fribidi: fribidi crossfile.meson
$(MESONCLEAN)
$(HOSTVARS_MESON) $(MESON) -Ddocs=false -Dbin=false -Dtests=false
- $(MESONBUILD)
+ +$(MESONBUILD)
touch $@
=====================================
contrib/src/glib/rules.mak
=====================================
@@ -21,5 +21,5 @@ glib: glib-$(GLIB_MINOR_VERSION).tar.xz .sum-glib
.glib: glib
$(MESONCLEAN)
$(HOSTVARS_MESON) $(MESON)
- $(MESONBUILD)
+ +$(MESONBUILD)
touch $@
=====================================
contrib/src/harfbuzz/rules.mak
=====================================
@@ -34,5 +34,5 @@ endif
.harfbuzz: harfbuzz crossfile.meson
$(MESONCLEAN)
$(HOSTVARS_MESON) $(MESON) $(HARFBUZZ_CONF)
- $(MESONBUILD)
+ +$(MESONBUILD)
touch $@
=====================================
contrib/src/libdsm/rules.mak
=====================================
@@ -24,5 +24,5 @@ endif
.libdsm: libdsm crossfile.meson
$(MESONCLEAN)
$(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled -Dbinaries=false
- $(MESONBUILD)
+ +$(MESONBUILD)
touch $@
=====================================
contrib/src/libplacebo/rules.mak
=====================================
@@ -44,7 +44,7 @@ libplacebo: $(PLACEBO_ARCHIVE) .sum-libplacebo
.libplacebo: libplacebo crossfile.meson .python-venv
$(MESONCLEAN)
$(HOSTVARS_MESON) $(MESON) $(PLACEBOCONF)
- $(MESONBUILD)
+ +$(MESONBUILD)
# Work-around for full paths to static libraries, which libtool does not like
# See https://github.com/mesonbuild/meson/issues/5479
(cd $(UNPACK_DIR) && $(SRC_BUILT)/pkg-rewrite-absolute.py -i "$(PREFIX)/lib/pkgconfig/libplacebo.pc")
=====================================
contrib/src/librist/rules.mak
=====================================
@@ -35,5 +35,5 @@ librist: librist-$(LIBRIST_VERSION).tar.gz .sum-librist
.librist: librist crossfile.meson
$(MESONCLEAN)
$(HOSTVARS_MESON) $(MESON) $(LIBRIST_CONF)
- $(MESONBUILD)
+ +$(MESONBUILD)
touch $@
=====================================
contrib/src/medialibrary/rules.mak
=====================================
@@ -20,6 +20,6 @@ medialibrary: medialibrary-$(MEDIALIBRARY_VERSION).tar.bz2 .sum-medialibrary
.medialibrary: medialibrary crossfile.meson
$(MESONCLEAN)
$(HOSTVARS_MESON) $(MESON) -Dlibvlc=disabled -Dlibtool_workaround=true
- $(MESONBUILD)
+ +$(MESONBUILD)
touch $@
=====================================
contrib/src/microdns/rules.mak
=====================================
@@ -24,5 +24,5 @@ microdns: microdns-$(LIBMICRODNS_VERSION).tar.xz .sum-microdns
.microdns: microdns crossfile.meson
$(MESONCLEAN)
$(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled
- $(MESONBUILD)
+ +$(MESONBUILD)
touch $@
=====================================
extras/tools/SHA512SUMS
=====================================
@@ -16,6 +16,6 @@ e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdb
073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1 gettext-0.19.8.1.tar.gz
d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942 help2man-1.47.6.tar.xz
8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd nasm-2.14.tar.gz
-1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2 ninja-1.8.2.tar.gz
+37b3a421419b16930e53181c431fe3b4afd55ac54733a5df08376641fd2fb88eeb73ee7abe3788f3e491e7c1b215c7f35aefa66f44b09008ad22b76ab2998830 ninja-1.11.1.tar.gz
8d427261bb42d2bd1da7d4f7b5f53908044aa2cea6d020fb320b0ab9d9848e17cf28deb12ae6dc139807f9e377db0c8a546561e94301216b634bd77703f17cea meson-0.63.0.tar.gz
27acef46d9eb67203d708b57d80b853f76fa4b9c2720ff36ec161e6cdf702249e7982214ddf60bae75511aa79bc7d92aa27e3eab7ef9c0f5c040e8e42e76a385 libtool-2.4.7.tar.gz
=====================================
extras/tools/packages.mak
=====================================
@@ -54,5 +54,6 @@ HELP2MAN_URL=$(GNU)/help2man/help2man-$(HELP2MAN_VERSION).tar.xz
MESON_VERSION=0.63.0
MESON_URL=https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)/meson-$(MESON_VERSION).tar.gz
-NINJA_VERSION=1.8.2
-NINJA_URL=https://github.com/ninja-build/ninja/archive/v$(NINJA_VERSION).tar.gz
+NINJA_VERSION=1.11.1
+NINJA_BUILD_NAME=$(NINJA_VERSION).g95dee.kitware.jobserver-1
+NINJA_URL=https://github.com/Kitware/ninja/archive/refs/tags/v$(NINJA_BUILD_NAME).tar.gz
=====================================
extras/tools/tools.mak
=====================================
@@ -379,6 +379,7 @@ CLEAN_FILE += .buildmeson
ninja-$(NINJA_VERSION).tar.gz:
$(call download_pkg,$(NINJA_URL),ninja)
+ninja: UNPACK_DIR=ninja-$(NINJA_BUILD_NAME)
ninja: ninja-$(NINJA_VERSION).tar.gz
$(UNPACK)
$(MOVE)
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/871ad624acd003446d53d1723996f24181cd521e...72f38f5cbb1b9b25323b0045010411a9dc3aa601
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/871ad624acd003446d53d1723996f24181cd521e...72f38f5cbb1b9b25323b0045010411a9dc3aa601
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