Felix Paul Kühne pushed to branch 3.0.x at VideoLAN / VLC
Commits: f1fa4a7b by Steve Lhomme at 2026-06-08T16:05:32+02:00 extras: tools: add intermediate targets to download+check each package (cherry picked from commit 8d14ff43a5eb56254219c2b37e2954606dbff21b) Signed-off-by: Mathieu Velten <[email protected]> - - - - - 649b45f0 by Steve Lhomme at 2026-06-08T16:06:52+02:00 extras: tools: add a fetch target to download only the packages to build (cherry picked from commit f373a9d8ac3f9a797815aeb2fa609525518bc5b5) Signed-off-by: Mathieu Velten <[email protected]> - - - - - 618ba84a by Steve Lhomme at 2026-06-08T16:07:16+02:00 extras: tools: use a single variable for the targets to build (cherry picked from commit b17fadb76a6479d05b7f9e2d6bad6ecfad38a9b5) Signed-off-by: Mathieu Velten <[email protected]> - - - - - 2 changed files: - extras/tools/bootstrap - extras/tools/tools.mak Changes: ===================================== extras/tools/bootstrap ===================================== @@ -212,13 +212,12 @@ for t in $NEEDED; do *$DEPS_ONLY*) ;; # Dependency only, not build by default *) - PACKAGES="$PACKAGES $t" TARGETS="$TARGETS .build$t" ;; esac done -[ -n "$PACKAGES" ] && mkdir -p build/bin && echo "To-be-built packages: $PACKAGES" +[ -n "$TARGETS" ] && mkdir -p build/bin && echo "To-be-built packages: $(echo $TARGETS | sed 's/.build//g')" cat > Makefile << EOF TOOLS = $BOOTSTRAP_PATH @@ -239,4 +238,6 @@ all: $TARGETS @echo "You are ready to build VLC and its contribs" include \$(TOOLS)/tools.mak + +fetch: $(echo $TARGETS | sed 's/.build/.get/g') EOF ===================================== extras/tools/tools.mak ===================================== @@ -62,6 +62,7 @@ MOVE = mv $(UNPACK_DIR) $@ && touch $@ nasm-$(NASM_VERSION).tar.gz: $(call download_pkg,$(NASM_URL),nasm) +.getnasm: nasm-$(NASM_VERSION).tar.gz nasm: nasm-$(NASM_VERSION).tar.gz $(UNPACK) $(MOVE) @@ -81,6 +82,7 @@ DISTCLEAN_PKG += nasm-$(NASM_VERSION).tar.gz cmake-$(CMAKE_VERSION).tar.gz: $(call download_pkg,$(CMAKE_URL),cmake) +.getcmake: cmake-$(CMAKE_VERSION).tar.gz cmake: cmake-$(CMAKE_VERSION).tar.gz $(UNPACK) $(MOVE) @@ -99,6 +101,7 @@ DISTCLEAN_PKG += cmake-$(CMAKE_VERSION).tar.gz help2man-$(HELP2MAN_VERSION).tar.xz: $(call download_pkg,$(HELP2MAN_URL),help2man) +.gethelp2man: help2man-$(HELP2MAN_VERSION).tar.xz help2man: help2man-$(HELP2MAN_VERSION).tar.xz .tar $(UNPACK) $(MOVE) @@ -118,6 +121,7 @@ DISTCLEAN_PKG += help2man-$(HELP2MAN_VERSION).tar.xz libtool-$(LIBTOOL_VERSION).tar.gz: $(call download_pkg,$(LIBTOOL_URL),libtool) +.getlibtool: libtool-$(LIBTOOL_VERSION).tar.gz libtool: libtool-$(LIBTOOL_VERSION).tar.gz $(UNPACK) (cd $(UNPACK_DIR) && chmod u+w build-aux/ltmain.sh) @@ -146,6 +150,7 @@ CLEAN_FILE += .buildlibtool tar-$(TAR_VERSION).tar.bz2: $(call download_pkg,$(TAR_URL),tar) +.gettar: tar-$(TAR_VERSION).tar.bz2 tar: tar-$(TAR_VERSION).tar.bz2 $(UNPACK) $(MOVE) @@ -165,6 +170,7 @@ CLEAN_FILE += .buildtar xz-$(XZ_VERSION).tar.bz2: $(call download_pkg,$(XZ_URL),xz) +.getxz: xz-$(XZ_VERSION).tar.bz2 xz: xz-$(XZ_VERSION).tar.bz2 $(UNPACK) $(MOVE) @@ -185,6 +191,7 @@ CLEAN_FILE += .buildxz autoconf-$(AUTOCONF_VERSION).tar.gz: $(call download_pkg,$(AUTOCONF_URL),autoconf) +.getautoconf: autoconf-$(AUTOCONF_VERSION).tar.gz autoconf: autoconf-$(AUTOCONF_VERSION).tar.gz $(UNPACK) $(MOVE) @@ -204,6 +211,7 @@ DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.gz automake-$(AUTOMAKE_VERSION).tar.gz: $(call download_pkg,$(AUTOMAKE_URL),automake) +.getautomake: automake-$(AUTOMAKE_VERSION).tar.gz automake: automake-$(AUTOMAKE_VERSION).tar.gz $(UNPACK) $(APPLY) $(TOOLS)/automake-disable-documentation.patch @@ -226,6 +234,7 @@ DISTCLEAN_PKG += automake-$(AUTOMAKE_VERSION).tar.gz m4-$(M4_VERSION).tar.gz: $(call download_pkg,$(M4_URL),m4) +.getm4: m4-$(M4_VERSION).tar.gz m4: m4-$(M4_VERSION).tar.gz $(UNPACK) $(MOVE) @@ -245,6 +254,7 @@ DISTCLEAN_PKG += m4-$(M4_VERSION).tar.gz pkg-config-$(PKGCFG_VERSION).tar.gz: $(call download_pkg,$(PKGCFG_URL),pkgconfiglite) +.getpkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz $(UNPACK) mv pkg-config-lite-$(PKGCFG_VERSION) pkg-config-$(PKGCFG_VERSION) @@ -264,6 +274,7 @@ DISTCLEAN_PKG += pkg-config-$(PKGCFG_VERSION).tar.gz gas-preprocessor-$(GAS_VERSION).tar.gz: $(call download_pkg,$(GAS_URL),gas-preprocessor) +.getgas: gas-preprocessor-$(GAS_VERSION).tar.gz gas: gas-preprocessor-$(GAS_VERSION).tar.gz $(UNPACK) $(MOVE) @@ -282,6 +293,7 @@ DISTCLEAN_PKG += gas-preprocessor-$(GAS_VERSION).tar.gz sed-$(SED_VERSION).tar.bz2: $(call download_pkg,$(SED_URL),sed) +.getsed: sed-$(SED_VERSION).tar.bz2 sed: sed-$(SED_VERSION).tar.bz2 $(UNPACK) $(MOVE) @@ -301,6 +313,7 @@ CLEAN_FILE += .buildsed apache-ant-$(ANT_VERSION).tar.bz2: $(call download_pkg,$(ANT_URL),ant) +.getant: apache-ant-$(ANT_VERSION).tar.bz2 ant: apache-ant-$(ANT_VERSION).tar.bz2 $(UNPACK) $(MOVE) @@ -320,11 +333,13 @@ CLEAN_FILE += .buildant protobuf-$(PROTOBUF_VERSION).tar.gz: $(call download_pkg,$(PROTOBUF_URL),protobuf) +.getprotobuf: protobuf-$(PROTOBUF_VERSION).tar.gz protobuf: protobuf-$(PROTOBUF_VERSION).tar.gz $(UNPACK) $(APPLY) $(TOOLS)/protobuf-3.4.1-missing-includes.patch $(MOVE) +.getprotoc: .getprotobuf .buildprotoc: protobuf cd $< && ./configure --prefix="$(PREFIX)" --disable-shared --enable-static --disable-dependency-tracking +$(MAKE) -C $< @@ -343,6 +358,7 @@ CLEAN_FILE += .buildprotoc bison-$(BISON_VERSION).tar.xz: $(call download_pkg,$(BISON_URL),bison) +.getbison: bison-$(BISON_VERSION).tar.xz bison: bison-$(BISON_VERSION).tar.xz .tar $(UNPACK) $(MOVE) @@ -364,6 +380,7 @@ CLEAN_FILE += .buildbison flex-$(FLEX_VERSION).tar.gz: $(call download_pkg,$(FLEX_URL),flex) +.getflex: flex-$(FLEX_VERSION).tar.gz flex: flex-$(FLEX_VERSION).tar.gz $(UNPACK) $(MOVE) @@ -385,6 +402,7 @@ CLEAN_FILE += .buildflex meson-$(MESON_VERSION).tar.gz: $(call download_pkg,$(MESON_URL),meson) +.getmeson: meson-$(MESON_VERSION).tar.gz meson: meson-$(MESON_VERSION).tar.gz $(UNPACK) $(MOVE) @@ -407,6 +425,7 @@ ninja-$(NINJA_VERSION).tar.gz: $(call download_pkg,$(NINJA_URL),ninja) ninja: UNPACK_DIR=ninja-$(NINJA_BUILD_NAME) +.getninja: ninja-$(NINJA_VERSION).tar.gz ninja: ninja-$(NINJA_VERSION).tar.gz $(UNPACK) $(APPLY) $(TOOLS)/ninja-1.11.1-replace-pipes-quote-with-shlex-quote.patch @@ -444,6 +463,7 @@ GETTEXT_CONF = \ gettext-$(GETTEXT_VERSION).tar.gz: $(call download_pkg,$(GETTEXT_URL),gettext) +.getgettext: gettext-$(GETTEXT_VERSION).tar.gz gettext: gettext-$(GETTEXT_VERSION).tar.gz $(UNPACK) $(MOVE) View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f971556a3ef052908aad990818f4243f5b6ecafc...618ba84a6bcaaed85fbfe90e1dd0eb5892664917 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f971556a3ef052908aad990818f4243f5b6ecafc...618ba84a6bcaaed85fbfe90e1dd0eb5892664917 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
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
