Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
b51744dd by Steve Lhomme at 2026-01-19T06:38:54+00:00
contrib: freetype: build with meson
It fails to build with CMake 4:
> Compatibility with CMake < 3.5 has been removed from CMake.
(cherry picked from commit 0065daaade70531ffc1d48e13d0d60ec29abedc0) (edited)
edited:
- VLC 3 was still using HOSTVARS_CMAKE and not CMAKEINSTALL
- - - - -
a8c9df2a by Tristan Matthews at 2026-01-19T06:38:54+00:00
contrib: opus: update to 1.3.1
(cherry picked from commit fce0fbf29e4e511227c6c56bd0dc78f54e1564f5)
- - - - -
770a9066 by Steve Lhomme at 2026-01-19T06:38:54+00:00
contrib: opus: build with CMake
The generated pkgconfig file is bogus with CMake and an include file from
CMakeLists.txt was not put in the tarball...
I would send the patches upstream but I can't fork the repo so I can't submit
a MR.
(cherry picked from commit 60f65663b958b8961a8eff8e41dc93eaea9facde) (edited)
edited:
- VLC 3.0 was not using the autotools macros
- - - - -
a0ad5705 by Tristan Matthews at 2026-01-19T06:38:54+00:00
contrib: opus: update to 1.4
An equivalent fix for our PROJECT_VERSION patch (but using PACKAGE_VERSION) was
merged,
so that patch was dropped.
(cherry picked from commit 2715d41ebede22cfa9cb7427d4486fc228feeef9) (rebased)
rebased:
- the code around is slightly different
- - - - -
ec4c8c48 by Tristan Matthews at 2026-01-19T06:38:54+00:00
contrib: opus: switch to meson build
(cherry picked from commit fb9cd5dea159613943904cc28389c1c1ed3a8b26) (edited)
edited:
- VLC 3 was still using HOSTVARS_PIC and not CMAKEINSTALL
- - - - -
4 changed files:
- contrib/src/freetype2/rules.mak
- + contrib/src/opus/0001-meson-arm64.patch
- contrib/src/opus/SHA512SUMS
- contrib/src/opus/rules.mak
Changes:
=====================================
contrib/src/freetype2/rules.mak
=====================================
@@ -15,20 +15,18 @@ $(TARBALLS)/freetype-$(FREETYPE2_VERSION).tar.xz:
freetype: freetype-$(FREETYPE2_VERSION).tar.xz .sum-freetype2
$(UNPACK)
- $(call pkg_static, "builds/unix/freetype2.in")
$(MOVE)
DEPS_freetype2 = zlib $(DEPS_zlib)
-FREETYPE_CONF = -DFT_DISABLE_ZLIB=OFF -DFT_DISABLE_PNG=ON
-DFT_DISABLE_BZIP2=ON \
- -DDISABLE_FORCE_DEBUG_POSTFIX:BOOL=ON -DFT_DISABLE_HARFBUZZ=ON
\
- -DFT_DISABLE_BROTLI=ON
+FREETYPE_CONF := -Dpng=disabled -Dbzip2=disabled -Dharfbuzz=disabled \
+ -Dbrotli=disabled
-.freetype2: freetype toolchain.cmake
+.freetype2: freetype crossfile.meson
ifndef AD_CLAUSES
$(REQUIRE_GPL)
endif
- $(CMAKECLEAN)
- $(HOSTVARS) $(CMAKE) $(FREETYPE_CONF)
- +$(CMAKEBUILD) --target install
+ $(MESONCLEAN)
+ $(MESON) $(FREETYPE_CONF)
+ +$(MESONBUILD)
touch $@
=====================================
contrib/src/opus/0001-meson-arm64.patch
=====================================
@@ -0,0 +1,36 @@
+From 07d1fa08b618585c7c019b7a24a221c8161cbbb5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]>
+Date: Thu, 20 Apr 2023 19:06:13 +0100
+Subject: [PATCH] meson: fix build on arm64
+
+Would fail like:
+
+Checking if "compiler supports ARMv7/AArch64 NEON intrinsics" : links: NO
+Checking if "compiler supports ARMv7/AArch64 NEON intrinsics with -mfpu=neon"
: links: YES
+Checking if "compiler supports AArch64 NEON intrinsics" : links: NO
+Checking if "compiler supports AArch64 NEON intrinsics with -mfpu=neon" :
links: NO
+Message: Compiler does not support AArch64 NEON intrinsics
+../silk/meson.build:28:45: ERROR: Unknown variable
"have_arm_intrinsics_or_asm".
+
+since commit 08088411259056f63774befb2d00951fdd5c46ba.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index ed66d380..9f28de33 100644
+--- a/meson.build
++++ b/meson.build
+@@ -574,8 +574,8 @@ foreach l : lines
+ endforeach
+
+ subdir('include')
+-subdir('silk')
+ subdir('celt')
++subdir('silk')
+ subdir('src')
+
+ configure_file(output: 'config.h', configuration: opus_conf)
+--
+GitLab
+
=====================================
contrib/src/opus/SHA512SUMS
=====================================
@@ -1 +1 @@
-438635667e72c326d6d06a30e0b3a5564ba6cf5d484066456e1118e1c2fe3a61b959d0afa77a1084b177b72f9230618b6b55c78bc4e24e9127a09fd345b42518
opus-1.3.tar.gz
+1ecd39e0add24de12823bf7c936bb67441228721e2cdae0edbfcf3cee0894bcc6edf2a1d0ca5cdfdad1565803bf39cc4c985ad32710c2a9582f850adeb5ca631
opus-1.4.tar.gz
=====================================
contrib/src/opus/rules.mak
=====================================
@@ -1,8 +1,8 @@
# opus
-OPUS_VERSION := 1.3
+OPUS_VERSION := 1.4
-OPUS_URL := https://archive.mozilla.org/pub/opus/opus-$(OPUS_VERSION).tar.gz
+OPUS_URL := $(XIPH)/opus/opus-$(OPUS_VERSION).tar.gz
PKGS += opus
ifeq ($(call need_pkg,"opus >= 0.9.14"),)
@@ -16,15 +16,16 @@ $(TARBALLS)/opus-$(OPUS_VERSION).tar.gz:
opus: opus-$(OPUS_VERSION).tar.gz .sum-opus
$(UNPACK)
- $(UPDATE_AUTOCONFIG)
+ $(APPLY) $(SRC)/opus/0001-meson-arm64.patch
$(MOVE)
-OPUS_CONF= --disable-extra-programs --disable-doc
+OPUS_CONF= -D extra-programs=disabled -D tests=disabled -D docs=disabled
ifndef HAVE_FPU
-OPUS_CONF += --enable-fixed-point
+OPUS_CONF += -D fixed-point=true
endif
-.opus: opus
- cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(OPUS_CONF)
- $(MAKE) -C $< install
+.opus: opus crossfile.meson
+ $(MESONCLEAN)
+ $(HOSTVARS_MESON) $(MESON) $(OPUS_CONF)
+ +$(MESONBUILD)
touch $@
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/3447caa7377df39d2b15dfcc9dbc9dc4e2b836cf...ec4c8c48f6bdf741c23c2e86614c75ca0416b656
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/3447caa7377df39d2b15dfcc9dbc9dc4e2b836cf...ec4c8c48f6bdf741c23c2e86614c75ca0416b656
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
