[vlc-commits] [Git][videolan/vlc][master] 6 commits: extras: tools: rename pkgconfig variables
Steve Lhomme (@robUx4)
gitlab at videolan.org
Mon Jun 8 11:44:48 UTC 2026
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
18bd3b01 by Steve Lhomme at 2026-06-08T11:01:00+00:00
extras: tools: rename pkgconfig variables
So they match the name of the target.
- - - - -
68a79321 by Steve Lhomme at 2026-06-08T11:01:00+00:00
extras: tools: add a dummy config.guess URL
So we can use the name with a URL with no effect.
- - - - -
8d14ff43 by Steve Lhomme at 2026-06-08T11:01:00+00:00
extras: tools: add intermediate targets to download+check each package
- - - - -
f373a9d8 by Steve Lhomme at 2026-06-08T11:01:00+00:00
extras: tools: add a fetch target to download only the packages to build
- - - - -
b17fadb7 by Steve Lhomme at 2026-06-08T11:01:00+00:00
extras: tools: use a single variable for the targets to build
- - - - -
4b1d6d74 by Steve Lhomme at 2026-06-08T11:01:00+00:00
extras: tools: separate package dependencies from tarball dependencies
- - - - -
3 changed files:
- extras/tools/bootstrap
- extras/tools/packages.mak
- extras/tools/tools.mak
Changes:
=====================================
extras/tools/bootstrap
=====================================
@@ -258,13 +258,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
@@ -285,4 +284,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/packages.mak
=====================================
@@ -22,8 +22,8 @@ AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
M4_VERSION=1.4.21
M4_URL=$(GNU)/m4/m4-$(M4_VERSION).tar.gz
-PKGCFG_VERSION=0.28-1
-PKGCFG_URL=$(SF)/pkgconfiglite/$(PKGCFG_VERSION)/pkg-config-lite-$(PKGCFG_VERSION).tar.gz
+PKGCONFIG_VERSION=0.28-1
+PKGCONFIG_URL=$(SF)/pkgconfiglite/$(PKGCONFIG_VERSION)/pkg-config-lite-$(PKGCONFIG_VERSION).tar.gz
TAR_VERSION=1.34
TAR_URL=$(GNU)/tar/tar-$(TAR_VERSION).tar.bz2
@@ -61,3 +61,4 @@ GPERF_URL=$(GNU)/gperf/gperf-$(GPERF_VERSION).tar.gz
CONFIGGUESS_VERSION=a2287c3041a3f2a204eb942e09c015eab00dc7dd
CONFIGSUB_VERSION=a2287c3041a3f2a204eb942e09c015eab00dc7dd
+CONFIGGUESS_URL=
=====================================
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,7 +101,9 @@ DISTCLEAN_PKG += cmake-$(CMAKE_VERSION).tar.gz
help2man-$(HELP2MAN_VERSION).tar.xz:
$(call download_pkg,$(HELP2MAN_URL),help2man)
-help2man: help2man-$(HELP2MAN_VERSION).tar.xz .tar
+help2man: .tar
+.gethelp2man: help2man-$(HELP2MAN_VERSION).tar.xz
+help2man: help2man-$(HELP2MAN_VERSION).tar.xz
$(UNPACK)
$(MOVE)
@@ -118,6 +122,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)
@@ -147,6 +152,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)
@@ -166,6 +172,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)
@@ -191,6 +198,7 @@ config.sub: $(TOOLS)/config.sub-$(CONFIGSUB_VERSION)
# CONFIGSUB_URL=https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=$(CONFIGSUB_VERSION)
cp -f $< $@
+.getconfigguess:
.buildconfigguess: config.guess config.sub
# install in a dummy autoconf so that VLC contribs pick it
install -d "$(PREFIX)/share/autoconf-vlc/build-aux"
@@ -203,7 +211,9 @@ config.sub: $(TOOLS)/config.sub-$(CONFIGSUB_VERSION)
autoconf-$(AUTOCONF_VERSION).tar.gz:
$(call download_pkg,$(AUTOCONF_URL),autoconf)
-autoconf: autoconf-$(AUTOCONF_VERSION).tar.gz .configguess
+autoconf: .configguess
+.getautoconf: autoconf-$(AUTOCONF_VERSION).tar.gz
+autoconf: autoconf-$(AUTOCONF_VERSION).tar.gz
$(UNPACK)
@-cp config.guess $(UNPACK_DIR)/build-aux
@-cp config.sub $(UNPACK_DIR)/build-aux
@@ -224,7 +234,9 @@ DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.gz
automake-$(AUTOMAKE_VERSION).tar.gz:
$(call download_pkg,$(AUTOMAKE_URL),automake)
-automake: automake-$(AUTOMAKE_VERSION).tar.gz .configguess
+automake: .configguess
+.getautomake: automake-$(AUTOMAKE_VERSION).tar.gz
+automake: automake-$(AUTOMAKE_VERSION).tar.gz
$(UNPACK)
$(APPLY) $(TOOLS)/automake-disable-documentation.patch
$(APPLY) $(TOOLS)/automake-clang.patch
@@ -248,6 +260,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)
@@ -264,12 +277,13 @@ DISTCLEAN_PKG += m4-$(M4_VERSION).tar.gz
# pkg-config
-pkg-config-$(PKGCFG_VERSION).tar.gz:
- $(call download_pkg,$(PKGCFG_URL),pkgconfiglite)
+pkg-config-$(PKGCONFIG_VERSION).tar.gz:
+ $(call download_pkg,$(PKGCONFIG_URL),pkgconfiglite)
-pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz
+.getpkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz
+pkgconfig: pkg-config-$(PKGCONFIG_VERSION).tar.gz
$(UNPACK)
- mv pkg-config-lite-$(PKGCFG_VERSION) pkg-config-$(PKGCFG_VERSION)
+ mv pkg-config-lite-$(PKGCONFIG_VERSION) pkg-config-$(PKGCONFIG_VERSION)
$(APPLY) $(TOOLS)/pkg-config-stdc23-port.patch
$(MOVE)
@@ -281,13 +295,14 @@ pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz
CLEAN_FILE += .buildpkg-config
CLEAN_PKG += pkgconfig
-DISTCLEAN_PKG += pkg-config-$(PKGCFG_VERSION).tar.gz
+DISTCLEAN_PKG += pkg-config-$(PKGCONFIG_VERSION).tar.gz
# GNU sed
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)
@@ -307,6 +322,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)
@@ -328,7 +344,9 @@ CLEAN_FILE += .buildant
bison-$(BISON_VERSION).tar.xz:
$(call download_pkg,$(BISON_URL),bison)
-bison: bison-$(BISON_VERSION).tar.xz .tar
+bison: .tar
+.getbison: bison-$(BISON_VERSION).tar.xz
+bison: bison-$(BISON_VERSION).tar.xz
$(UNPACK)
$(MOVE)
@@ -349,6 +367,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)
@@ -386,6 +405,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)
$(APPLY) $(TOOLS)/gettext-no-iconv.patch
@@ -408,6 +428,7 @@ CLEAN_FILE += .buildgettext
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)
@@ -430,6 +451,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
@@ -450,6 +472,7 @@ CLEAN_FILE += .buildninja
gperf-$(GPERF_VERSION).tar.gz:
$(call download_pkg,$(GPERF_URL),gperf)
+.getgperf: gperf-$(GPERF_VERSION).tar.gz
gperf: gperf-$(GPERF_VERSION).tar.gz
$(UNPACK)
$(MOVE)
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/706bcb2d8f10cd9b8de2893621ea03483991077d...4b1d6d74be3a63d745f49f0b1cb3704166d8745e
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/706bcb2d8f10cd9b8de2893621ea03483991077d...4b1d6d74be3a63d745f49f0b1cb3704166d8745e
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