Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
e055227d by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: libxml2: build with CMake
(cherry picked from commit 5356a445abc64d846c6c618b32a980c4fc1612a0) (edited)
edited:
- VLC 3.0 was not using the autotools macros
- - - - -
98cf8e4f by Tristan Matthews at 2026-01-23T09:27:19+00:00
contrib: flac: update to 1.4.0
(cherry picked from commit 329cfb1544c64c7eb24fdc0e2bfba0270c11be0f)
- - - - -
622d1839 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: flac: remove uneeded Android patch
USE_OBSOLETE_SIGCONTEXT_FLAVOR is not used since 1.3.1
https://github.com/xiph/flac/commit/6a28facd7cd70f7ad0c6bc37e3a661dbfd850b45
(cherry picked from commit a5809c292975c985d6698a53679c071d2baeaf0e)
- - - - -
9ceea71f by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: flac: build with CMake
It doesn't require forcing a CFLAG manually or using AUTORECONF.
(cherry picked from commit 71bc0ae5f7866dfacdd6b16b6c08a1321811a571) (edited)
edited:
- VLC 3.0 was not using the autotools macros
- - - - -
3415a295 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: flac: update to 1.4.2
(cherry picked from commit 90722ca1229d7fad6cdb1b5427c0bc0705b0fb1a) (rebased)
rebased:
- the code around is slightly different
- - - - -
0a37537c by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: nfs: update to 5.0.2
(cherry picked from commit e9526e8fc511158a40b85943817b0aad2b13cdf3)
- - - - -
daec0623 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: nfs: build with CMake
(cherry picked from commit 48366047ff790fd25d97788b9a9e1d326eafb7a0) (edited)
edited:
- VLC 3.0 was not using the autotools macros
- - - - -
e76045b2 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: nfs: use the UNPACK_DIR
Rather than moving files.
(cherry picked from commit f360f3e74510f6f3bffaeffb626a189a149686b3)
- - - - -
40a27e59 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: nfs: update to 6.0.2
With the necessary patches to build for Windows.
(cherry picked from commit 8672e89056a5c9f79cb0feb3c95032f17eaa61ff)
- - - - -
7830ba4c by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: nfs: export the necessary library in the pkg-config file
(cherry picked from commit a97a0c9422d1a5989b35f182031d3de40775c520)
- - - - -
e0b2dff0 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: nfs: disable if network is disabled in contribs
(cherry picked from commit 7ee26e6fa72ce6b4dab5ad5d7ad4c31a3e036133) (rebased)
rebased:
- the code around is slightly different
- - - - -
aadaa44d by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: vorbis: do not use a fake target for vorbisenc
We don't add useless rules.
vorbisenc is built with libvorbis, so we just build that when needed.
(cherry picked from commit b56cc33613babcb6f4b0d651c21d84a5f56a47cc) (rebased)
rebased:
- the code around is slightly different
- - - - -
bc795ac8 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: vorbis: update to 1.3.7
And build with CMake which doesn't force compiler flags that don't work.
And it avoids a RECONF call.
CMake patch submitted here https://github.com/xiph/vorbis/pull/105
(cherry picked from commit 51d3312c958b08a2d2578b9dd00167244201189c) (edited)
edited:
- VLC 3.0 was not using the autotools macros
- - - - -
5e423786 by Alaric Senat at 2026-01-23T09:27:19+00:00
contrib: upnp: build with cmake
pupnp maintainers are actively switching to CMake as their main
build-system.
Co-authored-by: Steve Lhomme <[email protected]>
(cherry picked from commit e77c23818f0c238bfa2d2bdd0dd685177e30ba8c) (edited)
edited:
- VLC 3.0 was not using the autotools macros
- VLC 3 was disabling more build flags
- the iOS reuseaddr patch was already applied
- - - - -
acfba38a by Alaric Senat at 2026-01-23T09:27:19+00:00
contrib: upnp: update to 1.14.15
This pupnp release address some win32 issues reported after we bumped to
1.14.
Removed patches:
- 0001-ThreadPool-[...].patch -> Fixed upstream by d4cfec4674c6877bad350
- win32-remove-wro[...].patch -> Fixed upstream by d86f4159e13d00a9eb59a
This release also fixes an XML descriptor parsing error:
<https://github.com/pupnp/pupnp/issues/412>
(cherry picked from commit 3d7b30a7a1b57a64d50055b7e60e33d6088ea1be)
- - - - -
e8b8394e by Alaric Senat at 2026-01-23T09:27:19+00:00
contrib: upnp: update to 1.14.16
Minor version of libupnp containing memory leak fixes and better
resources cleaning on initialization failures.
(cherry picked from commit a29868eb4bf91bddb5f2ea631b54c8cb60dbb5b9)
- - - - -
e1afc518 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: pupnp: enable IPv6 on UWP
It was disabled in e29343db7852f91e377915a0c8205a5efa03680d but there's
no reason given, and it should work anyway.
(cherry picked from commit 266bc7920b4a7b3f43b9fe5d29979627b1366c94)
- - - - -
7a1baae2 by Thomas Guillem at 2026-01-23T09:27:19+00:00
contrib: upnp: update to 1.14.18
To include the following commit that was causing high CPU usage on
vlc-ios:
miniserver: fix busy loop on socket error
In case of a socket error, the socket was not removed from the select
pool, causing future select() calls to return immediately, and
readFromSSDPSocket() to be called just after on the failing socket. This
was causing a high CPU load.
(cherry picked from commit 702278564b99d355885bfd63df8e361a1e18a8cb)
- - - - -
2a93451e by Johannes Kauffmann at 2026-01-23T09:27:19+00:00
contrib: upnp: remove windows-version-inet patch
This was fixes upstream by 44cdeeb70db9112be132a4fb5b21d0cb8d57acaf.
(cherry picked from commit 4ef0554350516b641de38c2ad77d9d5e685221b2)
- - - - -
8e906c16 by Johannes Kauffmann at 2026-01-23T09:27:19+00:00
contrib: upnp: remove strerror_s patch
The function has a declaration in MinGW headers since v3.0.0, thus this
patch should not be needed anymore.
(cherry picked from commit 8c56a836f30a55469ffa81afad5c67aafb8f1b8a)
- - - - -
b9c14a7e by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: upnp: don't use fseeko on older 32-bit Android
It's not supported [1]. NDK 26 will emit an error if you try to use it.
Upstream patch: https://github.com/pupnp/pupnp/pull/441
[1] https://android.googlesource.com/platform/bionic/+/main/docs/32-bit-abi.md
(cherry picked from commit db5b75f021a002d61d4ff30ac5cab160d7af1d80)
- - - - -
a6dd3293 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: upnp: update to 1.4.20
And remove the merged android patch.
(cherry picked from commit 77611ed7018e582b5bf1a014d5c0bfdbf6644169)
- - - - -
eb187781 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: use the CMake flag to select the PIC flag
It may differ between compilers and is internally handled by CMake, including
not doing it on Windows targets.
(cherry picked from commit e1b6661e1ec42362800b6b928267899d271a144a) (edited)
edited:
- 61eff32a9b4bda4c8917f9570ad8850d1305b68d was already backported,
we just need to remove HOSTVARS_PIC from CMake targets
- - - - -
4369590f by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: build all code before installing for cmake contribs
If the contrib install sub-directories it may install some and fail later. We
should only install when we know everything built correctly.
Do each build step in a separate make line.
zlib had issues building all at once on emscripten
https://code.videolan.org/robUx4/vlc/-/jobs/1149115
(cherry picked from commit 420e9f62fe57a3891f68e551ec7df1f21a4fe3bd) (edited)
edited:
- this commit was already backported in cbabeb443e1a69210ee8012a7a22fb5af1ba1d2a
- - - - -
c2d5822f by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: replace CMAKEBUILD --target install with CMAKEINSTALL
We don't need to know the prefix when compiling. We also don't need multiple
threads to install files. They will be better used for compiling files.
(cherry picked from commit 6c86ff70e67146e0c1163d2a9fde6ca891d093f1) (edited)
edited:
- this was already backported in 2313453b5d6e92acd69652dee5f385b1a212be46
- VLC 3 doesn't have HOSTVARS_PIC anymore
- - - - -
b93b271b by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: use a specific HOSTVARS for CMake
Just like meson, some flags may be left to CMake to pick the right values for
the compiler/linker.
(cherry picked from commit 4e0f95287228f9954184196541f03c9884ac6f0e) (edited)
edited:
- jpeg-turbo is not used in VLC 3
- many targets don't exist in VLC 3 (glslang, libaribcaption, libebur128, qt*,
vulkan-headers, vulkan-loader)
- musepack doesn't have MUSE_CONF anymore
- freetype is built with meson in VLC 3
- - - - -
70fb1749 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: srt: don't build standalone apps
(cherry picked from commit 12e6d7ab2b625e9b595997873f10c2b19456171b) (rebased)
rebased:
- the code around is slightly different
- - - - -
0c6b2457 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: openjpeg: update to 2.5.4
(cherry picked from commit ad16647a917930c15e66053ecf9c4a7fa749ca1c)
- - - - -
db9aa17c by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: x265: remove CMAKE_SYSTEM_PROCESSOR already set in toolchain.cmake
(cherry picked from commit 58bd81312a73cd3f7662a237762607cac72d87ea) (rebased)
rebased:
- pkg_static is placed differently in VLC 3
- - - - -
1635ba2f by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: x265: patch the pkg-config file before it's installed
(cherry picked from commit ee7f1173d1cadd2e00ec5c7f3c3dbf2d73c7a56c) (rebased)
rebased:
- VLC 3 already uses HOSTVARS_CMAKE
- - - - -
e31049bd by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: x265: remove win32 pkg-config patch
It builds without it and if we needed pthread, we would need to depend on
winpthread. #16389 mentions dlsym but the code uses the Windows API.
It also uses CreateThread() so it likely doesn't depend on winpthreads
anymore.
Reverts f9ecbd07dd0100e2251a1523a961f8677da0d400.
(cherry picked from commit 93ae46a2a184aa50113c481bc22319602b540933) (edited)
edited:
- the pkg_static call was done in a different place in VLC 3
- - - - -
2efee5db by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: x265: update to 4.1
(cherry picked from commit 611f6f8df3af121f2d0b2554ff999bd5a29b63bc) (rebased)
rebased:
- VLC 3 doesn't have the UWP patches
- - - - -
e24338a3 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: x265: pass mmacosx-version-min/isysroot to the CC assembler
Otherwise we end up with warnings like this:
> ld: warning: object file
> (/vlc/build/contrib/aarch64-apple-darwin15/lib/libx265.a[83](blockcopy8-sve.S.o))
> was built for newer 'macOS' version (15.0) than being linked (11.0)
The CXXCOMPILER is not used with x86/x86_64.
(cherry picked from commit be11c02cda1a6c7af8c28a7101f39b6fc5587c38) (edited)
edited:
- in VLC 3 VLC_DEPLOYMENT_TARGET is not passed to contribs so we hardcode 10.7
as in other places
- - - - -
df37f68a by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: x265: fix build with recent CMake on macOS
(cherry picked from commit 68581f7444139ec828cbe601b217682f9d84fd98) (rebased)
rebased:
- VLC 3 doesn't have the UWP patches
- - - - -
ae57d220 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: x265: verify the SVE/NEON flags can be used
It may be runtime detection but the toolchain also needs to support the calls.
(cherry picked from commit 2dab04dbbf5b12ce22c868f0f631c50fdeb05145) (rebased)
rebased:
- VLC 3 doesn't have the UWP patches
- - - - -
c301d919 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: x265: don't force _WIN32_WINNT values
Let the toolchain/environment decide.
(cherry picked from commit 93943387be6181032636f606ae570646a9a0ad96) (rebased)
rebased:
- VLC 3 doesn't have the UWP patches
- - - - -
35ad462d by Rémi Denis-Courmont at 2026-01-23T09:27:19+00:00
fluidsynth: look for fonts in installation prefix
... in addition to /usr (unless the prefix happens to be /usr).
(cherry picked from commit 176580cb7d2291b5fe40c506c2035359468f91b8)
- - - - -
a3f4b37c by Steve Lhomme at 2026-01-23T09:27:19+00:00
fluidsynth: use fluidlite LIBS/CFLAGS it fluidsynth is not found
(cherry picked from commit 01963765fc0772199b99f25de45890c9642eb49a)
- - - - -
4334b2af by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: fluidlite: update to a newer build that support CMake 4
(cherry picked from commit 95dfd15831e730104c5c6060b3f6ccbfc96cf7cd)
- - - - -
340f6f80 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: fluidlite: enable SF3 files (ogg/vorbis compressed samples)
(cherry picked from commit 4f4c7b43842577fc76eaba3ce79fea57c086980c)
- - - - -
733f1154 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: gme: update to 0.6.4
(cherry picked from commit 114d9a910372c12da694de65a61f64aaa62e1095)
- - - - -
f1f7ed8d by Fatih Uzunoglu at 2026-01-23T09:27:19+00:00
contrib: set cmake PATH_MODE_PACKAGE="only" when cross-compiling
This seems to be mistakenly not included. Usually; library,
include, and package path mode should all be set to "only"
when cross-compiling.
(cherry picked from commit 72108fc8b3b8fd8022da8f9ffa820ff0fd051b83) (edited)
edited:
- VLC 3 doesn't use a python script
- - - - -
120212d9 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: keep our PKG_CONFIG in the CMake toolchain file
It's part of HOSTOOLS we keep passing to the CMake configuration.
(cherry picked from commit 912b4702b9063f0fed8483578baab4e35b0fe457) (edited)
edited:
- VLC 3 doesn't use a python script
- - - - -
c2d3e2f7 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: keep our linker in the CMake toolchain file
It's part of HOSTOOLS we keep passing to the CMake configuration.
(cherry picked from commit ddb544ca654b6502fed41b6e5b39ed98ca7b335f) (edited)
edited:
- VLC 3 doesn't use a python script
- - - - -
c464898a by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: don't pass HOSTTOOLS during CMake configuration
The tools should already be in the toolchain.cmake file.
(cherry picked from commit 280d53f3f95fc04f288eb69b8947c89d460ace3a)
- - - - -
7e1c8c79 by Tristan Matthews at 2026-01-23T09:27:19+00:00
contrib: chromaprint: update to 1.5.1
(cherry picked from commit d9bf59b990fa886038523e0d000fed1ecb3e2936)
- - - - -
f05aaeaa by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: chromaprint: update to 1.6.0
(cherry picked from commit e48d137e2170956001fee10ea7717126a6897046)
- - - - -
88e5c092 by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: chromaprint: fix build with FFmpeg 4.2 to 5.0
tx.h exists but not AV_TX_FLOAT_RDFT
(cherry picked from commit 91af5355f4e771a3e83252d978b40acc6c1cca47)
- - - - -
63763d3e by Steve Lhomme at 2026-01-23T09:27:19+00:00
contrib: upnp: add missing file in Windows compilation
It's compiled with the autotools build but not CMake.
This is only useful when compiling for older targets than Windows Vista.
Ref. https://github.com/pupnp/pupnp/pull/518
- - - - -
83 changed files:
- contrib/src/aom/rules.mak
- + contrib/src/chromaprint/0001-Fix-support-for-FFMpeg-4.2-to-5.0.patch
-
contrib/src/chromaprint/0002-add-the-C-runtime-to-the-packages-to-link-to.patch
→
contrib/src/chromaprint/0001-add-the-C-runtime-to-the-packages-to-link-to.patch
- −
contrib/src/chromaprint/0001-contribs-chromaprint-more-fixes-for-.pc-file.patch
- +
contrib/src/chromaprint/0002-add-required-FFmpeg-libraries-to-the-generated-pkg-c.patch
- +
contrib/src/chromaprint/0003-chromaprint-add-ability-to-link-with-VDSP-Accelerate.patch
- contrib/src/chromaprint/SHA512SUMS
- contrib/src/chromaprint/rules.mak
- contrib/src/ebml/rules.mak
- contrib/src/flac/SHA512SUMS
- − contrib/src/flac/console_write.patch
- − contrib/src/flac/dont-force-msvcrt-version.patch
- − contrib/src/flac/no-createfilea.patch
- − contrib/src/flac/remove_blocking_code_useless_flaclib.patch
- contrib/src/flac/rules.mak
- contrib/src/fluid/rules.mak
- +
contrib/src/fluidlite/0001-pkg-config-add-FLUIDLITE_STATIC-define-when-using-th.patch
- contrib/src/fluidlite/rules.mak
- contrib/src/glew/rules.mak
- contrib/src/gme/0001-Export-the-proper-C-runtime-library.patch
- − contrib/src/gme/0001-don-t-skip-negative-fixes-14088.patch
- −
contrib/src/gme/0002-link-with-libm-and-set-it-in-pkg-config-when-buildin.patch
- −
contrib/src/gme/0003-fix-android-toolchain-broken-CMAKE_CXX_IMPLICIT_LINK.patch
- − contrib/src/gme/0004-Blip_Buffer-replace-assert-with-a-check.patch
- contrib/src/gme/SHA512SUMS
- contrib/src/gme/rules.mak
- contrib/src/libarchive/rules.mak
- − contrib/src/libxml2/bins.patch
- − contrib/src/libxml2/pthread.patch
- contrib/src/libxml2/rules.mak
- − contrib/src/libxml2/win32.patch
- contrib/src/main.mak
- contrib/src/matroska/rules.mak
- contrib/src/mpcdec/rules.mak
- contrib/src/mysofa/rules.mak
- +
contrib/src/nfs/0001-cant-have-win32.h-referenced-from-a-header-we-instal.patch
- +
contrib/src/nfs/0001-cmake-export-the-necessary-library-in-the-pkg-config.patch
- +
contrib/src/nfs/0002-pthread-and-win32-need-to-be-exclusive-in-multithrea.patch
- + contrib/src/nfs/0003-win32-define-struct-timezone-for-non-mingw-w32.patch
- + contrib/src/nfs/0004-win32-fix-build-with-MSVC.patch
- + contrib/src/nfs/0005-win32-don-t-use-pthread-on-Windows.patch
- contrib/src/nfs/SHA512SUMS
- contrib/src/nfs/rules.mak
- contrib/src/ogg/rules.mak
- + contrib/src/openjpeg/5e258319332800f7a9937dc0b8b16b19a07dea8f.patch
- + contrib/src/openjpeg/7b508bb00f7fc5e7b61a6035fc4e2622d4ddff0d.patch
- contrib/src/openjpeg/SHA512SUMS
- − contrib/src/openjpeg/openjp2_pthread.patch
- contrib/src/openjpeg/rules.mak
- contrib/src/png/rules.mak
- contrib/src/projectM/rules.mak
- contrib/src/protobuf/rules.mak
- contrib/src/soxr/rules.mak
- contrib/src/spatialaudio/rules.mak
- contrib/src/srt/rules.mak
- contrib/src/taglib/rules.mak
- − contrib/src/upnp/0001-ThreadPool-Fix-non-UCRT-builds.patch
- + contrib/src/upnp/0001-cmake-add-missing-file-in-Windows-compilation.patch
- contrib/src/upnp/SHA512SUMS
- + contrib/src/upnp/libtool-nostdlib-workaround.patch
- − contrib/src/upnp/libupnp-pthread-force.patch
- − contrib/src/upnp/libupnp-win32-exports.patch
- − contrib/src/upnp/libupnp-win32.patch
- contrib/src/upnp/rules.mak
- − contrib/src/upnp/win32-remove-wrong-safe-wrappers.patch
- − contrib/src/upnp/windows-version-inet.patch
- +
contrib/src/vorbis/0001-CMake-add-missing-libm-in-.pc-file-when-it-s-used.patch
- contrib/src/vorbis/SHA512SUMS
- − contrib/src/vorbis/clang.patch
- contrib/src/vorbis/rules.mak
- − contrib/src/vorbis/vorbis-bitcode.patch
- +
contrib/src/x265/0001-CMake-verify-the-Neon-SVE-compiler-flags-can-be-used.patch
- + contrib/src/x265/0001-use-OpenFileMappingW-instead-of-OpenFileMappingA.patch
- + contrib/src/x265/0002-CMake-don-t-force-_WIN32_WINNT-values.patch
- − contrib/src/x265/0002-do-not-copy-.pdb-files-that-don-t-exist.patch
- contrib/src/x265/0003-add-patch-to-enable-detect512.patch
- + contrib/src/x265/0004-Fix-for-CMake-Build-Errors-in-MacOS.patch
- contrib/src/x265/SHA512SUMS
- contrib/src/x265/rules.mak
- − contrib/src/x265/x265-pkg-libs.patch
- contrib/src/zlib/rules.mak
- modules/codec/Makefile.am
- modules/codec/fluidsynth.c
The diff was not included because it is too large.
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/d4c431d4fcf73900335b3f5c0f31ec6fb3126379...63763d3e64f79cfecc456a3957332815c93780fc
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/d4c431d4fcf73900335b3f5c0f31ec6fb3126379...63763d3e64f79cfecc456a3957332815c93780fc
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
