[vlc-commits] [Git][videolan/vlc][master] contrib: regenerate contrib.ini when using prebuilts

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
6eec05fd by Mohak Malviya at 2026-09-21T13:53:50+00:00
contrib: regenerate contrib.ini when using prebuilts

Prebuilt archives can carry luac and protoc paths from their build
machine. Regenerate contrib.ini after extraction using local tool
detection and installation paths.

Call the generator directly so make prebuilt does not rebuild target
libraries. Tools missing from the system can still be built with
make tools.

Fixes #30151

- - - - -


2 changed files:

- contrib/src/main.mak
- doc/standalone/buildsystem.md


Changes:

=====================================
contrib/src/main.mak
=====================================
@@ -758,6 +758,13 @@ prebuilt: vlc-contrib-$(HOST)-latest.tar.zst
 	$(UNPACK)
 	mv $(HOST) $(PREFIX)
 	cd $(PREFIX) && $(abspath $(SRC))/change_prefix.sh
+	# Regenerate the machine file with local tool paths, without rebuilding dependencies.
+	install -d "$(PREFIX)/share/meson/$(CROSS_OR_NATIVE)"
+	PREFIX="$(PREFIX)" \
+	$(SRC)/gen-meson-machinefile.py \
+		--type external-$(CROSS_OR_NATIVE) \
+		$(foreach tool,$(filter-out $(PKGS_FOUND),$(PKGS.tools)),--binary $(PKGS.tools.$(tool).config-tool):$(PKGS.tools.$(tool).path)) \
+		"$(PREFIX)/share/meson/$(CROSS_OR_NATIVE)/contrib.ini"
 
 package: install
 	rm -Rf tmp/


=====================================
doc/standalone/buildsystem.md
=====================================
@@ -305,6 +305,10 @@ found at the following location:
 
     vlc/contrib/x86_64-pc-linux-gnu/share/meson/native/contrib.ini
 
+When using prebuilt contribs, `make prebuilt` regenerates this file for the
+local tool paths. Run `make tools` before configuring VLC if the required
+build tools are not available on the system.
+
 Then you can setup meson with this file using the following command:
 
     meson setup build-meson \



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/6eec05fd8e7e742dcaa75638031e7c93102a33d3

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/6eec05fd8e7e742dcaa75638031e7c93102a33d3
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