[vlc-commits] [Git][videolan/vlc][3.0.x] 5 commits: contrib: allow verbose compilation with V=1 in meson

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
963407c9 by Steve Lhomme at 2025-11-07T14:01:43+00:00
contrib: allow verbose compilation with V=1 in meson

As supported by make and CMake targets.

(cherry picked from commit dd6be4fa388238e1b98eadf792c576e56ad98ea7) (rebased)
rebased:
- the code around is slightly different

- - - - -
6ca6e8aa by Steve Lhomme at 2025-11-07T14:01:43+00:00
contrib: don't show unzip'ed files in non verbose mode

This avoids being bombarded with logs when building.

Similar to 0a555fa1ac6db47923c9db03faa8d49393f571ec for unzip.

(cherry picked from commit d11f22f763a3601c018eb096556db13712b5641b)

- - - - -
0ab9522e by Rémi Denis-Courmont at 2025-11-07T14:01:43+00:00
contrib: gmp: detect with pkg-config

It doesn't even compile on Debian unstable at the moment, not even
natively if taken from contribs. Not that there would be any reasons
not to use the build from the distro.

(cherry picked from commit 525ebe9fc34cc92060adb5fba79ea263f4709e22) (rebased)
rebased:
- the code around is slightly different

- - - - -
2a06a378 by Steve Lhomme at 2025-11-07T14:01:43+00:00
configure: pass the macOS toolchain flags to CCAS

Otherwise we end up with warnings like this:

> ld: warning: object file (vlc/build/modules/isa/aarch64/simd/.libs/merge.o) was built for newer 'macOS' version (15.0) than being linked (11.0)

(cherry picked from commit 1e7dc2770d5b234973605dd2aa507bf95e8fe0fb)

- - - - -
83feb4a3 by Steve Lhomme at 2025-11-07T14:01:43+00:00
contrib: x264: pass EXTRA_CFLAGS to the CC assembler

Otherwise we end up with warnings like this:

> ld: warning: object file (/Volumes/APFS/Programs/Videolabs/vlc/build/contrib/aarch64-apple-darwin15/lib/libx264.a[63](bitstream-a-8.o)) was built for newer 'macOS' version (15.0) than being linked (11.0)

(cherry picked from commit 47ecb166f300e0b8b4b6d96838a7abeb112ba7d0)

- - - - -


4 changed files:

- configure.ac
- contrib/src/gmp/rules.mak
- contrib/src/main.mak
- contrib/src/x264/rules.mak


Changes:

=====================================
configure.ac
=====================================
@@ -203,6 +203,7 @@ case "${host_os}" in
         CC="${CC} -isysroot ${with_macosx_sdk}"
         CXX="${CXX} -isysroot ${with_macosx_sdk}"
         OBJC="${OBJC} -isysroot ${with_macosx_sdk}"
+        CCAS="${CCAS} -isysroot ${with_macosx_sdk}"
         LD="${LD} -syslibroot ${with_macosx_sdk}"
     fi
     AC_ARG_WITH(macosx-version-min,
@@ -213,6 +214,7 @@ case "${host_os}" in
         CC="${CC} -mmacosx-version-min=${with_macosx_version_min}"
         CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}"
         OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}"
+        CCAS="${CCAS} -mmacosx-version-min=${with_macosx_version_min}"
         LD="${LD} -mmacosx_version_min=${with_macosx_version_min}"
     fi
     ;;


=====================================
contrib/src/gmp/rules.mak
=====================================
@@ -20,6 +20,10 @@ GMP_CONF += --disable-assembly
 endif
 endif
 
+ifeq ($(call need_pkg,"gmp"),)
+PKGS_FOUND += gmp
+endif
+
 $(TARBALLS)/gmp-$(GMP_VERSION).tar.xz:
 	$(call download_pkg,$(GMP_URL),gmp)
 


=====================================
contrib/src/main.mak
=====================================
@@ -377,6 +377,8 @@ check_githash = \
 
 ifeq ($(V),1)
 TAR_VERBOSE := v
+else
+ZIP_QUIET := -q
 endif
 
 checksum = \
@@ -390,7 +392,7 @@ UNPACK = $(RM) -R $@ \
 	$(foreach f,$(filter %.tar.gz %.tgz,$^), && tar $(TAR_VERBOSE)xzfo $(f)) \
 	$(foreach f,$(filter %.tar.bz2,$^), && tar $(TAR_VERBOSE)xjfo $(f)) \
 	$(foreach f,$(filter %.tar.xz,$^), && tar $(TAR_VERBOSE)xJfo $(f)) \
-	$(foreach f,$(filter %.zip,$^), && unzip $(f) $(UNZIP_PARAMS))
+	$(foreach f,$(filter %.zip,$^), && unzip $(ZIP_QUIET) $(f) $(UNZIP_PARAMS))
 UNPACK_DIR = $(patsubst %.tar,%,$(basename $(notdir $<)))
 APPLY = (cd $(UNPACK_DIR) && patch -fp1) <
 pkg_static = (cd $(UNPACK_DIR) && $(SRC_BUILT)/pkg-static.sh $(1))
@@ -467,6 +469,11 @@ ifdef HAVE_DARWIN_OS
 MESONFLAGS += -Dobjc_args="$(CFLAGS)" -Dobjc_link_args="$(LDFLAGS)" -Dobjcpp_args="$(CXXFLAGS)" -Dobjcpp_link_args="$(LDFLAGS)"
 endif
 
+MESONCOMPILEFLAGS =
+ifeq ($(V),1)
+MESONCOMPILEFLAGS += -v
+endif
+
 ifdef HAVE_CROSS_COMPILE
 # When cross-compiling meson uses the env vars like
 # CC, CXX, etc. and CFLAGS, CXXFLAGS, etc. for the
@@ -488,7 +495,7 @@ else
 MESON = $(HOSTTOOLS) meson setup $(MESONFLAGS)
 endif
 MESONCLEAN = rm -rf $</build
-MESONBUILD = meson compile -C $</build $(MESON_BUILD) && meson install -C $</build
+MESONBUILD = meson compile -C $</build $(MESON_BUILD) $(MESONCOMPILEFLAGS) && meson install -C $</build
 
 ifeq ($(V),1)
 CMAKE += -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON


=====================================
contrib/src/x264/rules.mak
=====================================
@@ -51,6 +51,16 @@ endif
 endif
 endif
 
+ifneq ($(filter arm aarch64, $(ARCH)),)
+ifndef HAVE_WIN32
+X264_ASM_USES_CC:=1
+endif
+endif
+
+ifdef X264_ASM_USES_CC
+X264CONF += --extra-asflags="$(EXTRA_CFLAGS)"
+endif
+
 $(TARBALLS)/x264-$(X264_VERSION).tar.xz:
 	$(call download_git,$(X264_GITURL),,$(X264_HASH))
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7bec9f68922e5ba1c31c00ff32be3e4645807f7d...83feb4a3c31c9c0860530bf53426bdf0994c6513

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7bec9f68922e5ba1c31c00ff32be3e4645807f7d...83feb4a3c31c9c0860530bf53426bdf0994c6513
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance