[vlc-commits] [Git][videolan/vlc][3.0.x] 77 commits: contrib: aom: remove redundant mkdir

Tue Oct 8 05:44:30 UTC 2024

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

Commits:
1743b53b by Steve Lhomme at 2024-10-07T07:26:38+02:00
contrib: aom: remove redundant mkdir

- - - - -
f7ba35f7 by Steve Lhomme at 2024-10-07T07:26:38+02:00
extras: snap: build all tools in one call, including cmake

- - - - -
e38fa342 by Steve Lhomme at 2024-10-07T07:26:39+02:00
contrib: libarchive: use a local variable to store the configuration

(cherry picked from commit 0b609afa656c561050077ec05233815e42ce3dbb)

- - - - -
feb960f2 by Steve Lhomme at 2024-10-07T07:26:39+02:00
contrib: vncclient: build without pthread on windows

That's how the buildbot does it

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

- - - - -
74deed0a by Steve Lhomme at 2024-10-07T07:26:39+02:00
contrib: gpg-error: group the configure flags in a variable

(cherry picked from commit 498619b876398ce2ff4c4dc3abfef4ab515e7e52)

- - - - -
56e2cea3 by Steve Lhomme at 2024-10-07T07:26:39+02:00
contrib: turn the verbose mode of CMake when called with make V=1

So that we get a similar level of verbosity as the make based targets

(cherry picked from commit 5389c05bb639fb8e3457c663b26f5ba0981bd59a) (rebased)
rebased:
- 4.0 has MESON defined above

- - - - -
b2f26c8d by Steve Lhomme at 2024-10-07T07:26:39+02:00
contrib: glew: update to 2.1.0

And build using cmake rather their manually edited makefiles

(cherry picked from commit d44e8c06423fc7fb255337bc39de268dc98f470c) (edited)
edited:
- 3.0 had GLEW_DEST=$(PREFIX) on the MAKE like

- - - - -
f404827b by Hugo Beauzée-Luyssen at 2024-10-07T07:26:39+02:00
contribs: src: Fix glew tarball name

sourceforge accepted .tar.gz but was redirecting to .tgz
Our mirrors have .tgz

(cherry picked from commit 3bf912cc7366ddfd1b8bba4e0998f8a28c3dd537)

- - - - -
d6edc329 by Alexandre Janniaux at 2024-10-07T07:26:39+02:00
contrib: chromaprint: remove dependency on .ffmpeg

This dependency is already setup by the dependency propagation at
the end of the main.mak makefile.

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
(cherry picked from commit bda34233393d36d085963a7147f887612c337f7d) (rebased)
rebased:
- DBUILD_SHARED_LIBS:BOOL=OFF is not used on 3.0

- - - - -
d33b3b80 by Pavlov Konstantin at 2024-10-07T07:26:39+02:00
contrib: glew: drop debug postfix from the library name

With 4d57652c407d4a75e0b36f4e1fbc438def3b5c2e the Cmake BUILD_TYPE is
set to Debug when optimizations are disabled, which is then used by glew
to determine the resulting library name.

This in turn confuses our build of projectM, which uses glew32 as a name
to use when linking.

(cherry picked from commit 31d47ca70e4b8c412eab440b2212bdc6aefdea03)

- - - - -
7a1352ac by Steve Lhomme at 2024-10-07T07:27:25+02:00
contrib: protobuf: only build for C++ support

(cherry picked from commit 75dc8ba56b8732a2622002631c353835bd154147) (edited)
edited:
- 3.0 build protoc separately

- - - - -
8d215010 by Steve Lhomme at 2024-10-07T07:27:25+02:00
contrib: mad: pass the extra flags via a single variable

(cherry picked from commit 405c8b41858af8f7425b61f2e9967a8db297f43f)

- - - - -
220091ac by Steve Lhomme at 2024-10-07T07:27:25+02:00
contrib: mad: remove forced -O3

This shouldn't be enforced. We already use -O2 on release builds.

-O4 was removed in 8d09802392b674ea6ae7993c20e6f725b0d7a86c
-O3 was added with the contrib in 9c0b836a35bced0ede45054b85640694f54faeaa

(cherry picked from commit 6240c4cea4bdbeab9422378f90eaddf7116b8952)

- - - - -
99834990 by Zhao Zhili at 2024-10-07T07:27:25+02:00
contrib: support CMAKE_GENERATOR other than makefile

First, fix the conflict setting/using of CMAKE_GENERATOR. Second,
call build via cmake instead of run make directly.

Signed-off-by: Alexandre Janniaux <ajanni at videolabs.io>
(cherry picked from commit c74a77e7eba252d0e126e71b59910fc9507ba9ed) (edited)
edited:
- only use the patch for glew that is now built with CMake

- - - - -
5fd08343 by Hugo Beauzée-Luyssen at 2024-10-07T07:27:25+02:00
contrib: x265: Allow make to communicate with jobserver

(cherry picked from commit 2277fd97a409d494f7186d4070b82b0ebcc55625)

- - - - -
6fe74ca8 by Hugo Beauzée-Luyssen at 2024-10-07T07:27:25+02:00
contrib: src: Allow make to communicate with jobserver

(cherry picked from commit ed5fd4176879f80d035cb578ad134d1cef31ee9e) (rebased)
rebased:
- 3.0 doesn't have CFLAGS/CXXFLAGS for srt

- - - - -
31daf263 by Hugo Beauzée-Luyssen at 2024-10-07T07:27:25+02:00
contrib: spatialaudio: Allow make to communicate with jobserver

(cherry picked from commit 89954b5a9a41b634e39c87af1fec1fbb3c5ff090)

- - - - -
c33775c4 by Hugo Beauzée-Luyssen at 2024-10-07T07:27:25+02:00
contrib: soxr: Allow make to communicate with jobserver

(cherry picked from commit a29d55b19e89e4e7c0a8960e75c51abd926fe691)

- - - - -
b2048bef by Hugo Beauzée-Luyssen at 2024-10-07T07:27:25+02:00
contrib: projectM: Allow make to communicate with jobserver

(cherry picked from commit 7c5abbf37037e289894db4ba522ffe03a7d93a3b)

- - - - -
4f00b920 by Hugo Beauzée-Luyssen at 2024-10-07T07:27:25+02:00
contrib: openjpeg: Allow make to communicate with jobserver

(cherry picked from commit 69f5556704ab2562c102a6faeba06c3bf628cec5)

- - - - -
a9dc792b by Hugo Beauzée-Luyssen at 2024-10-07T07:27:25+02:00
contrib: mysofa: Allow make to communicate with jobserver

(cherry picked from commit 83893fd0f3123b2ff006b82a3715c2d9f589bbb4)

- - - - -
9e2e4634 by Hugo Beauzée-Luyssen at 2024-10-07T07:27:25+02:00
contrib: mpcdec: Allow make to communicate with jobserver

(cherry picked from commit 6cf7db55b0499b1bb10384eff226b17d71cfc05e)

- - - - -
8e2e32b0 by Hugo Beauzée-Luyssen at 2024-10-07T07:27:25+02:00
contrib: glew: Allow make to communicate with jobserver

(cherry picked from commit a1405bc989547a4a676ab53fbdd378ee59cd7086)

- - - - -
d937c2d3 by Hugo Beauzée-Luyssen at 2024-10-07T07:27:25+02:00
contrib: ebml: Allow make to communicate with jobserver

(cherry picked from commit 0d97ee8a13965684b960e17c19050e50b6f14f60)

- - - - -
979ba6fa by Hugo Beauzée-Luyssen at 2024-10-07T07:27:25+02:00
contrib: chromaprint: Allow make to communicate with jobserver

(cherry picked from commit 140cd0a387f870bf461310be2da17a192c5cfb4a)

- - - - -
6f3e064e by Hugo Beauzée-Luyssen at 2024-10-07T07:27:25+02:00
contrib: fluid: Allow make to communicate with jobserver

(cherry picked from commit 96b9ffec876b2cfb81b87726afbfcf854cade095)

- - - - -
e929828f by Hugo Beauzée-Luyssen at 2024-10-07T07:27:25+02:00
contrib: fluidlite: Allow make to communicate with jobserver

(cherry picked from commit 2f71ade47af315498d7e93c2f0425f338bfa62a8) (rebased)
rebased:
- 3.0 already has FLUIDLITE_CONF

- - - - -
5ee4c35a by Hugo Beauzée-Luyssen at 2024-10-07T07:27:26+02:00
contrib: matroska: Allow make to communicate with jobserver

(cherry picked from commit c8c5541cc1090b69027d37b15a05e544d74c5886)

- - - - -
78b8d730 by Hugo Beauzée-Luyssen at 2024-10-07T07:27:26+02:00
contrib: taglib: Allow make to communicate with jobserver

(cherry picked from commit f941c3ca6d051cfe0b8f95b2caba1cad2a3c17e7)

- - - - -
4b8cce48 by Hugo Beauzée-Luyssen at 2024-10-07T07:27:26+02:00
contrib: aom: Allow make to communicate with jobserver

(cherry picked from commit 8c3d39bfbb93f76403ac78080b9741b1420cd934)

- - - - -
bd488ed0 by Hugo Beauzée-Luyssen at 2024-10-07T07:27:26+02:00
contrib: main.mak: Work around GNU Make bug

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

- - - - -
82d0523e by Steve Lhomme at 2024-10-07T07:27:26+02:00
contrib: srt: use the recommended USE_ENCLIB to select gnutls

(cherry picked from commit 60b079bb97903b50efa2cc422768dd625237fc3e)

- - - - -
929bdda5 by Steve Lhomme at 2024-10-07T07:27:26+02:00
contrib: srt: replace MSG_TRUNC with upstream fix

It can be removed once we update to the next release.

The previous patch potentially hides an error handling.

(cherry picked from commit 183ecb2eb3e1c516d8b64b54f8a11b34f6f60478)

- - - - -
f1bf9e2a by Steve Lhomme at 2024-10-07T07:27:26+02:00
contrib: srt: don't set default GNU folders

We do force CMAKE_INSTALL_LIBDIR which makes srt not use any other of the GNU
directories...

Merged upstream: https://github.com/Haivision/srt/pull/2450

(cherry picked from commit 055841ec129641f5e121f883c5746ff03ccc6d1e)

- - - - -
972ee391 by Steve Lhomme at 2024-10-07T07:27:26+02:00
contrib: soxr: remove default cmake option values

(cherry picked from commit 375d5a48e501a0d95118cb3a90bc28fa3b432d06)

- - - - -
ada3105d by Steve Lhomme at 2024-10-07T07:27:26+02:00
contrib: projectM: install extra depended on libraries via CMake

rather than manually.

(cherry picked from commit 7017b973de2e8d0e40ad362312fa74cdeffb524f) (rebased)
rebased:
- 3.0 does't have PROJECTM_CONF

- - - - -
ffb160a0 by Steve Lhomme at 2024-10-07T07:27:26+02:00
contrib: projectM: remove unused cmake include options

These options don't exist. The others are set to non default values.

(cherry picked from commit 9ac24e74962957018472b788ed4c0751e358b913) (rebased)
rebased:
- on 3.0 projectM uses -DCMAKE_CXX_STANDARD=98

- - - - -
fffb78c3 by Steve Lhomme at 2024-10-07T07:27:26+02:00
contrib: use internal CONF variables for the project configurations

This is how it's done for autotools target and some cmake targets. It makes
long lines a little better to read.

(cherry picked from commit 780b04d35d3c2618c0d63b26a500ae7d2066b845) (edited)
edited:
- 3.0 some contribs don't exist (glslang, libebur128)
- on 3.0 soxr uses -Wno-dev
- on 3.0 projectM uses -DCMAKE_CXX_STANDARD=98

- - - - -
bead67a3 by Steve Lhomme at 2024-10-07T07:27:26+02:00
contribs: don't force libraries to be build statically locally

The CMAKE variable already sets it for all targets.

(cherry picked from commit 49ff728d48005aac6d87ecfb8f8114fe07dedd51) (edited)
edited:
- 3.0 some contribs don't exist (glslang, libebur128)

- - - - -
9a485ace by Steve Lhomme at 2024-10-07T07:27:26+02:00
contrib: glew: don't force GLEW_USE_STATIC_LIBS

It's used to set the library prefix between glew (dynamic) and glew_s (static).
But only the static target (glew_s) is selected in our environment. It will
pick the proper prefix on its own. It's not even a public option to set.

(cherry picked from commit bf1793ee250f958488da820bb34c89832eefbcc0)

- - - - -
d80b45c8 by Steve Lhomme at 2024-10-07T07:27:26+02:00
contrib: ebml: no need to disable ENABLE_WIN32_IO

It's off by default.

(cherry picked from commit 9aee532882e2bda62a073006aca3ef1fa22d2f01)

- - - - -
a7899a98 by Steve Lhomme at 2024-10-07T07:27:26+02:00
contrib: chromaprint: use CMAKE_CXX_IMPLICIT_LINK_LIBRARIES to get the C++ runtime

Submitted upstream https://github.com/acoustid/chromaprint/pull/119

(cherry picked from commit 7a772424d70e512976ab806a95fbc887df7c0381)

- - - - -
17210091 by Steve Lhomme at 2024-10-07T07:27:26+02:00
contrib: fluidsynth: do not force FLUIDSYNTH_NOT_A_DLL

FLUIDSYNTH_NOT_A_DLL is not used anymore when built statically. Here's the file
used to generate the public header:

https://github.com/FluidSynth/fluidsynth/blob/v2.1.8/include/fluidsynth.cmake
(cherry picked from commit e1fb8bcba014cfb76294d1fa6b332dceff59fe02)

- - - - -
d3d4c94e by Steve Lhomme at 2024-10-07T07:27:26+02:00
contrib: remove the CMakeCache.txt at every run

Just like we do with autotools builds, we configure the target every time we
build a contrib.

In the case of cmake, touching `toolchain.cmake` does rebuild the cmake
contribs but if there's a cache it's not reconfigured and doesn't rebuild
anything.

(cherry picked from commit 575c4acdf5f4bc57f43e1213c43a8721741df6b9) (edited)
edited:
- 3.0 some contribs don't exist (glslang, libebur128, vulkan-headers)

- - - - -
15141855 by Steve Lhomme at 2024-10-07T07:27:26+02:00
contribs: build from the top directory like other contribs

We just need to tell CMake where to find the root CMakeLists.txt file.

CMake already puts all its build files in a CMakeFiles folder.

There's only libaom that generates an error if you build the library from the
root...

(cherry picked from commit cd41528ce933448badd35ba5bf96424e3f0fdbf8)

- - - - -
572cd363 by Steve Lhomme at 2024-10-07T07:27:26+02:00
contrib: remove CMakeCache.txt without changing the current directory

(cherry picked from commit dd0c79a7270b0f9f074bd3536b37a0fbec263ff4) (edited)
edited:
- 3.0 some contribs don't exist (libaribcaption)

- - - - -
5b2499ac by Steve Lhomme at 2024-10-07T07:27:27+02:00
contribs: don't force CMake to build in the current folder

It is the default behavior. We could change that in CMAKE for all targets
at once.

(cherry picked from commit 3513e834d34642831fcc60174582ffe02638ba09)

- - - - -
58026bf2 by Steve Lhomme at 2024-10-07T07:27:27+02:00
contrib: mpcdec: backport some patches from the original SVN repo

via https://github.com/ctarbide/musepack_libmpc

It transforms the SHARED option into proper BUILD_SHARED_LIBS.

Fix the old patches and apply them as commits. The MSVC patch can be applied
no matter what. The macOS patching is useless since CFLAGS are respected thanks
to the first patch. The sed is not needed since the second patch removes build
of all the programs.

The decoder and encoder code has not changed since revision 481. Only the tools
have been slightly updated.

We don't need to copy the .a manually anymore.

(cherry picked from commit 48caea17c602e026290b6eef0c3cf994263d4c1d) (edited)
edited:
- 3.0 used $@_src_r$(MUSE_REV) instead of UNPACK_DIR

- - - - -
bd2900f4 by Steve Lhomme at 2024-10-07T07:27:27+02:00
contrib: build CMake targets in a build folder

Meson targets already do it.

We don't need to create the build folder prior to using it, CMake will do it
for us. We don't need to cd in the folder either, we can tell CMake where to
find the CMakeLists.txt file in the same call.

(cherry picked from commit 8f47412922df15870614f2ac21cef703edd43d37) (edited)
edited:
- 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)

- - - - -
6f298bb9 by Steve Lhomme at 2024-10-07T07:27:27+02:00
contrib: aom: remove redundant flag

LDFLAGS is already set in HOSTVARS

(cherry picked from commit 0857e1c9799a9510df70bc13572f5a3a1f92a88e)

- - - - -
f86adb2f by Steve Lhomme at 2024-10-07T07:27:27+02:00
contrib: aom: use the same build folder as other CMake contribs

We don't need to destroy nor create the build folder each time.

(cherry picked from commit bb04ae4603a95020ffe9ca5c8b3f8f395b7275cb)

- - - - -
4edc0582 by Steve Lhomme at 2024-10-07T07:27:27+02:00
contrib: put the build folder directly in the CMAKE command

We always use the same name and always use it.

(cherry picked from commit 44ccea2f0783733bed7f9ce39b0e7ce8136d0fb7) (edited)
edited:
- 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)

- - - - -
e690bd15 by Steve Lhomme at 2024-10-07T07:27:27+02:00
contrib: put the build folder directly in the CMAKEBUILD command

We always use the same name and always use it.

(cherry picked from commit 8fa16a23d569ece87931b0fc2071e6cf8440e531) (edited)
edited:
- 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)

- - - - -
fae2865c by Steve Lhomme at 2024-10-07T07:27:27+02:00
contrib: assume CMakeLists.txt is in the contrib folder by default

It can be overriden when calling $(CMAKE).

Remove the stray '.' that was left after -S was used in all cases.

(cherry picked from commit b2e78e25bcbf57cf945652985c38883d6a588a1e) (edited)
edited:
- 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)

- - - - -
70d22dbe by Steve Lhomme at 2024-10-07T07:27:27+02:00
contrib: use a command to clean the cemake contrib before rebuilding

Now the cmake build folder is handled in a single place.

(cherry picked from commit b650363488c735a1bb2959e8380044cad9e3b5d2) (edited)
edited:
- 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)

- - - - -
c345ce71 by Hugo Beauzée-Luyssen at 2024-10-07T07:27:27+02:00
contrib: tiff: Ensure we only build & install the lib

(cherry picked from commit 52971aeb0e6217132969ba2bae2551d1c7d6cf29)

- - - - -
a5968cb2 by Steve Lhomme at 2024-10-07T07:27:27+02:00
contrib: do successive builds separately

(cherry picked from commit c637a0bd59ea311683a7a41e039edb0e8b7b4988)

- - - - -
a13f6c4e by Steve Lhomme at 2024-10-07T07:27:27+02:00
contrib: use a variable to set the configuration

(cherry picked from commit 52add02a4e13f7b210b89406a12cba50985207eb) (edited)
edited:
- 3.0 doesn't have rnnoise
- ssh2 has a flag for gcc 4.9

- - - - -
5c4f13f0 by Steve Lhomme at 2024-10-07T07:27:27+02:00
contrib: x264: use HOSTCONF for common autotools parameters

(cherry picked from commit 3f557ee5dde63bcbe15caee641f46429da9723f1) (edited)
edited:
- on 3.0 x262 is in the same build script as x264

- - - - -
3c2f5583 by Steve Lhomme at 2024-10-07T07:30:13+02:00
contrib: always put HOSTCONF before custom parameters

(cherry picked from commit 88b6c195472ce4cc75aebaf63f71f571d7e934b4) (edited)
edited:
- 3.0 doesn't have a VNCCLIENT_CONF
- 3.0 had SHOUT_CONF an empty because 85268b42d744538158fbef6ad1973147cf8e8f5c is not backported
- 3.0 doesn't use the sqlite anymore
- 3.0 has FONTCONFIG_ENV

- - - - -
747e969f by Steve Lhomme at 2024-10-07T07:30:27+02:00
contrib: put variables after the configure call

It should make no different where the variables are. They should be before the
target name if there is one.

(cherry picked from commit cfeea778135bf125ad2720a97199b7f1233b07af) (edited)
edited:
- PROTOBUFVARS is already in the right place
- 3.0 doesn't use sqlite anymore

- - - - -
83f98942 by Steve Lhomme at 2024-10-07T07:30:40+02:00
contrib: use a variable for the build dir and source dir from there

(cherry picked from commit 66fdd2d83faee83de38a351b28d69c9b32fdf279) (edited)
edited:
- 3.0 doesn't have MAKEBUILD
- don't modify MESON

- - - - -
90368e8f by Steve Lhomme at 2024-10-07T07:30:40+02:00
contrib: add a command to install the built CMake target

(cherry picked from commit 0f2caa566c8c9df248e0781d098edf5271e6115a)

- - - - -
e4e0727f by Steve Lhomme at 2024-10-07T07:30:40+02:00
contrib: use the specific build directory variables

(cherry picked from commit 8d0461dd448142545aa447d45edf1c226153ddf0) (edited)
edited:
- only keep the AOM change building with CMake

- - - - -
ea11a0d8 by Steve Lhomme at 2024-10-07T07:30:40+02:00
contrib: taglib: disable C bindings

We use it with the C++ interface.

(cherry picked from commit 2599291bb489512b20147a1df3175345b0411e26) (rebased)
rebased:
- 3.0 doesn't patch the same files

- - - - -
cbabeb44 by Steve Lhomme at 2024-10-07T07:30:40+02: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:
- 3.0 some contribs are not build with CMake (flac, freetype2)
- 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)

- - - - -
2313453b by Steve Lhomme at 2024-10-07T07:30:40+02: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:
- 3.0 some contribs are not build with CMake (flac, fluid, freetype2, jpeg, libxml2, nfs, ogg, opus, png, zlib)
- 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)

- - - - -
75ad2577 by Steve Lhomme at 2024-10-07T07:30:40+02:00
contrib: use cmake --install to install CMake targets

It is cleaner than using an internal "install" target which may not be on all
CMake generators.

We don't need multiple threads to install files. They will be better used for
compiling files.

(cherry picked from commit d2b9059d191a7752fdcc57c454360ed4dc4a6104)

- - - - -
774abe26 by Johannes Kauffmann at 2024-10-07T07:30:40+02:00
contrib: openjpeg: update to 2.5.0

(cherry picked from commit eb7ec4423f78204136f8d8bcdc1509ae1ec7e2f7) (edited)
edited:
- 3.0 didn't have the emscripten patch
- 3.0 already used $(GITHUB)

- - - - -
f96fd3c1 by Steve Lhomme at 2024-10-07T07:30:40+02:00
contrib: use HOSTVARS_PIC on CMake targets forcing POSITION_INDEPENDENT_CODE

...for static library builds.

So we have a clearer view of which target uses PIC and which doesn't.

aom does it with the CONFIG_PIC variable that we set with the same conditions
we set PIC.

(cherry picked from commit c3ceacfd26fbbf765bd48696cbe8dd9d8f2c7a1a) (edited)
edited:
- 3.0 some contribs are not build with CMake (libxml2)

- - - - -
ddbbf247 by Steve Lhomme at 2024-10-07T07:30:40+02: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:
- 3.0 doesn't use BUILD_DIR for autotools
- 3.0 some contribs are not build with CMake (flac, fluid, freetype2, jpeg, libxml2, nfs, ogg, opus, png, zlib)

- - - - -
7a12274a by Steve Lhomme at 2024-10-07T07:30:40+02:00
contrib: always use CMAKE_POSITION_INDEPENDENT_CODE for CMake projects

It's used for static libraries and only for some targets that need it. CMake
takes care of picking the right configuration.

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

- - - - -
c7c249b7 by Steve Lhomme at 2024-10-07T07:30:41+02:00
contrib: openjpeg: extract to the proper directory during UNPACK

(cherry picked from commit c3d55dc14495a338906bca7602581f2b62b8ed50) (rebased)
rebased:
- 3.0 uses pthreads instead of winpthreads

- - - - -
cac14437 by Steve Lhomme at 2024-10-07T07:30:41+02:00
contrib: simplify the cmake call

We don't need a specific CMAKE_PIC anymore

(cherry picked from commit 61eff32a9b4bda4c8917f9570ad8850d1305b68d) (edited)
edited:
- 3.0 some contribs are not build with CMake (flac, fluid, freetype2, jpeg, libxml2, nfs, ogg, opus, png, zlib)
- 3.0 some contribs don't exist (glslang, libaribcaption, libebur128, vulkan-headers, vulkan-loader)

- - - - -
9d47a81b by Steve Lhomme at 2024-10-07T07:30:41+02:00
contrib: mimic the Android CMake toolchain

We need to set ANDROID so that the code can tell it's building for Android.
This is until we use the proper CMake Android configuration.

(cherry picked from commit 7e172702b1e64da90ba9519bdc3693451b653936) (rebased)
rebased:
- 3.0 doesn't have the following MSYS_BUILD check

- - - - -
b8768a50 by Steve Lhomme at 2024-10-07T07:30:41+02:00
contrib: taglib: enable WinRT option in winstore mode

This triggers the use of CreateFile2 instead of CreateFileW.

(cherry picked from commit c133bc4b6cfa7bb02e51697e02a861e5733e7c6d)

- - - - -
b8e6e008 by Steve Lhomme at 2024-10-07T07:30:41+02:00
contrib: don't set the build mode in the toolchain file

It doesn't describe the toolchain we use. We can pass the value as a regular flag.

(cherry picked from commit 89fe89ee75a508d486e85b43961616cf17faa10b) (edited)
edited:
- 3.0 doesn't use gen-cmake-toolchain.py

- - - - -

30 changed files:

- contrib/src/aom/rules.mak
- contrib/src/aribb25/rules.mak
- contrib/src/asdcplib/rules.mak
- contrib/src/bluray/rules.mak
- contrib/src/breakpad/rules.mak
- contrib/src/cddb/rules.mak
- + contrib/src/chromaprint/0002-add-the-C-runtime-to-the-packages-to-link-to.patch
- contrib/src/chromaprint/rules.mak
- contrib/src/daala/rules.mak
- contrib/src/dvdcss/rules.mak
- contrib/src/dvdread/rules.mak
- contrib/src/ebml/rules.mak
- contrib/src/faad2/rules.mak
- contrib/src/flac/rules.mak
- contrib/src/fluid/rules.mak
- contrib/src/fluidlite/rules.mak
- contrib/src/fontconfig/rules.mak
- contrib/src/gcrypt/rules.mak
- contrib/src/glew/SHA512SUMS
- + contrib/src/glew/glew-drop-debug-postfix.patch
- contrib/src/glew/rules.mak
- − contrib/src/glew/win32.patch
- contrib/src/gme/rules.mak
- contrib/src/gnutls/rules.mak
- contrib/src/gpg-error/rules.mak
- contrib/src/kate/rules.mak
- contrib/src/lame/rules.mak
- contrib/src/libarchive/rules.mak
- contrib/src/libmpeg2/rules.mak
- contrib/src/libtasn1/rules.mak

The diff was not included because it is too large.

View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7b8f075537a4cdebefd39fae193eb8bc131dd8b5...b8e6e00809f36cb9e74bac0b9d6a4b58d532575d

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

VideoLAN code repository instance