Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
7bfec127 by Steve Lhomme at 2026-01-31T08:40:10+00:00
Revert "contrib: fontconfig: build with meson"
The generated pkg-config file is not correct. It's missing the libxml2
requirement as in the autotools version.
This reverts commit 747e25100a8e436cb70578ebb744299bd3ffe1ac.
- - - - -
649673d8 by Steve Lhomme at 2026-01-31T08:40:10+00:00
CI: never use prebuilt contribs in debian-contrib target
It's manually triggered to build the contribs or built when the contribs change.
We don't care about the prebuilt.
- - - - -
8c4bc413 by Steve Lhomme at 2026-01-31T08:40:10+00:00
CI: don't generate a contrib tarball for debian-contrib
It won't be used by another job.
- - - - -
0f49ca3a by Steve Lhomme at 2026-01-31T08:40:10+00:00
CI: don't download all contribs before building anything
With "--output-sync=recurse" each job is properly separated.
We don't need to download something if the build will fail before getting there.
- - - - -
f2131e33 by Steve Lhomme at 2026-01-31T08:40:10+00:00
CI: do build VLC after the contribs in debian-contrib
If pkg-config files are not correct we can't tell just by building the contribs.
- - - - -
75a57ed1 by Steve Lhomme at 2026-01-31T08:40:10+00:00
CI: discard system contribs when building debian-contrib
So we rebuild all the contribs that can be used on Linux, not just the few
missing.
- - - - -
2 changed files:
- contrib/src/fontconfig/rules.mak
- extras/ci/gitlab-ci.yml
Changes:
=====================================
contrib/src/fontconfig/rules.mak
=====================================
@@ -17,25 +17,43 @@ $(TARBALLS)/fontconfig-$(FONTCONFIG_VERSION).tar.gz:
fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz .sum-fontconfig
$(UNPACK)
+ $(call update_autoconfig,.)
$(RM) $(UNPACK_DIR)/src/fcobjshash.gperf
# include the generated fcobjshash.h, not the one from src/
sed -i.orig -e 's,"fcobjshash.h",<fcobjshash.h>,'
$(UNPACK_DIR)/src/fcobjs.c
$(APPLY) $(SRC)/fontconfig/0001-detect-mkostemp-with-stdlib.h.patch
+ $(call pkg_static, "fontconfig.pc.in")
$(MOVE)
-FONTCONFIG_CONF := -Ddoc=disabled -Dtests=disabled -Dtools=disabled
-Dnls=disabled
+FONTCONFIG_CONF := --enable-libxml2 --disable-docs
+FONTCONFIG_INSTALL :=
+ifdef HAVE_MACOSX
+# fc-cache crashes on macOS
+FONTCONFIG_INSTALL += RUN_FC_CACHE_TEST=false
+endif
+
+# FreeType flags
+ifneq ($(findstring freetype2,$(PKGS)),)
+FONTCONFIG_CONF += --with-freetype-config="$(PREFIX)/bin/freetype-config"
+endif
+
+ifdef HAVE_CROSS_COMPILE
+FONTCONFIG_CONF += --with-arch=$(ARCH)
+endif
ifdef HAVE_MACOSX
FONTCONFIG_CONF += \
- -Dcache-dir=~/Library/Caches/fontconfig \
- -Ddefault-fonts-dirs=/System/Library/Fonts \
- -Dadditional-fonts-dirs=/Library/Fonts,~/Library/Fonts
+ --with-cache-dir=~/Library/Caches/fontconfig \
+ --with-default-fonts=/System/Library/Fonts \
+ --with-add-fonts=/Library/Fonts,~/Library/Fonts
endif
DEPS_fontconfig = freetype2 $(DEPS_freetype2) libxml2 $(DEPS_libxml2)
-.fontconfig: fontconfig crossfile.meson
- $(MESONCLEAN)
- $(MESON) $(FONTCONFIG_CONF)
- +$(MESONBUILD)
+.fontconfig: fontconfig
+ $(RECONF)
+ $(MAKEBUILDDIR)
+ $(MAKECONFIGURE) $(FONTCONFIG_CONF)
+ +$(MAKEBUILD)
+ +$(MAKEBUILD) $(FONTCONFIG_INSTALL) install
touch $@
=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -287,25 +287,25 @@ debian-contrib:
( cd extras/tools && ./bootstrap && make -j$NCPU --output-sync=recurse
)
export PATH="$(pwd)/extras/tools/build/bin:$PATH"
+ # don't use system packages
+ export PKG_CONFIG_LIBDIR=""
+ export PKG_CONFIG_PATH=""
+
# Build contribs
mkdir -p contrib/contrib-$TRIPLET && cd contrib/contrib-$TRIPLET
- ../bootstrap --enable-x262
- if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
- echo "Building using prebuilt contribs at
$VLC_PREBUILT_CONTRIBS_URL"
- make prebuilt PREBUILT_URL="${VLC_PREBUILT_CONTRIBS_URL}" ||
PREBUILT_FAILED=yes
- else
- PREBUILT_FAILED=yes
- fi
- if [ -n "$PREBUILT_FAILED" ]; then
- make list
- make -j$NCPU --output-sync=recurse fetch
- make -j$NCPU --output-sync=recurse
- if [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" -a
"${CI_PROJECT_PATH}" = "videolan/vlc" ]; then
- make package
- fi
- else
- make -j$NCPU --output-sync=recurse tools
- fi
+ # x262 is not built by default
+ # libplacebo needs vulkan-loader which needs the x11 system package
+ ../bootstrap --enable-x262 --disable-libplacebo
+ make list
+ make -j$NCPU --output-sync=recurse
+ cd ../..
+
+ # Build VLC
+ # Qt is not build in contribs so don't build the code either
+ ./bootstrap
+ ./configure --disable-nls --disable-qt --disable-skins2
--enable-extra-checks
+ make -j$NCPU
+
allow_failure: true
variables:
<<: *variables-debian
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/f002cf4ac967e13a7804fe041c166be5419362f3...75a57ed144b4db91f8f995cf2b1530f22fadbf50
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/f002cf4ac967e13a7804fe041c166be5419362f3...75a57ed144b4db91f8f995cf2b1530f22fadbf50
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
