Many contribs use forbidden APIs that are mapped to valid APIs in the
winstorecompat. We make sure they map to these calls with the define and
linking with the matching library.

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

.zip files usually don't have a top directory with a version number.

(cherry picked from commit c93ee73d)

This avoids being bombarded with logs when building.

(cherry picked from commit 0a555fa1)

(cherry picked from commit ea7354d2) (edited)
edited:
- 3.0 only had GITHUB
- 3.0 uses gcrypt 1.7.10

When cross-compiling they are included in the crossfile.

(cherry picked from commit cb0ebea6) (edited)
edited:
- 3.0 doesn't use BUILD_DIR with meson
- 3.0 doesn't build libplacebo with meson
- 3.0 doesn't build glib with meson
- 3.0 doesn't build opus with meson
- 3.0 doesn't have basu
- 3.0 doesn't have librist
- 3.0 doesn't have medialibrary

They are always the same. No need for an extra variable with a confusing name.

(cherry picked from commit dedaffaf) (edited)
edited:
- the code around the edited code is slightly different
- 3.0 doesn't build libplacebo with meson
- 3.0 doesn't build glib with meson
- 3.0 doesn't build opus with meson
- 3.0 doesn't have basu
- 3.0 doesn't have librist
- 3.0 doesn't have medialibrary

Alaric Senat authored 2 years ago and Steve Lhomme committed 5 months ago

"meson builddir" has been deprecated since 0.64.0.

Please see 3c7ab542c0c4770241eae149b0d4cd8de329aee0 [1] upstream for the
complete explanation.

[1] https://github.com/mesonbuild/meson/commit/3c7ab542c0c4770241eae149b0d4cd8de329aee0

(cherry picked from commit f1622937) (rebased)
- 3.0 doesn't use BUILD_DIR with meson

Rather than the cross file which generates warnings. It also allows to override
each flag per target.

(cherry picked from commit 6e912b40)

Mehdi Sabwat authored 3 years ago and Steve Lhomme committed 5 months ago

pkg_config_libdir is not a builtin option, to use
it we need to define it either in the meson.build of the
project or in the crossfile.

This used to fail silently, but since PR#8974 (meson 0.60.0.rc1)
it is a fatal error.

(cherry picked from commit 791c4833)

Hugo Beauzée-Luyssen authored 4 years ago and Steve Lhomme committed 5 months ago

In addition to environment variables. Those are ignored when cross
compiling starting with meson 0.54
Use of environment variables should be removed in the future

(cherry picked from commit 583a941d)

Felix Paul Kühne authored 3 years ago and Steve Lhomme committed 5 months ago

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

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

(cherry picked from commit d0055d6c) (edited)
edited:
- 3.0 doesn't build libplacebo with meson
- 3.0 doesn't have basu
- 3.0 doesn't have librist
- 3.0 doesn't have medialibrary

This simplifies the meson calls without worrying where the files will be put.

(cherry picked from commit 159d8609) (edited)
edited:
- 3.0 doesn't build libplacebo with meson
- 3.0 doesn't have basu
- 3.0 doesn't have librist
- 3.0 doesn't have medialibrary

like MESON_BUILD="-v -j4"

We need to split the compile and install phases as install doesn't have as many
options as compile.

(cherry picked from commit 0773a89e) (rebased)
rebased:
- DCMAKE_VERBOSE_MAKEFILE is placed differently on 3.0

We don't use the '+' in front because it doesn't use the jobserver from our
make call, because of ninja:
https://github.com/ninja-build/ninja/issues/1139

(cherry picked from commit 0b2008e9) (edited)
edited:
- DCMAKE_VERBOSE_MAKEFILE is placed differently on 3.0
- 3.0 doesn't build libplacebo with meson
- 3.0 doesn't have basu
- 3.0 doesn't have librist
- 3.0 doesn't have medialibrary

(cherry picked from commit 66fdd2d8) (edited)
edited:
- only apply to autotools as it was already used for CMake

(cherry picked from commit b7c5ba6e) (rebased)
rebased:
- 3.0 already has BUILD_DIR

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

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

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 7e172702) (rebased)
rebased:
- 3.0 doesn't have the following MSYS_BUILD check

We don't need a specific CMAKE_PIC anymore

(cherry picked from commit 61eff32a) (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)

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 1266db2b) (rebased)
rebased:
- the code around is slightly different

It may differ between compilers and is internally handled by CMake, including
not doing it on Windows targets.

(cherry picked from commit e1b6661e) (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)

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 d2b9059d)

(cherry picked from commit 0f2caa56)

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

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

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

It can be overriden when calling $(CMAKE).

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

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

We always use the same name and always use it.

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

We always use the same name and always use it.

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

Hugo Beauzée-Luyssen authored 3 years ago and Steve Lhomme committed 6 months ago

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

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

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

This unbreaks packages using autoreconf.

(cherry picked from commit 7beb0605) (edited)

edited:
* on 3.0 it was already done since 8179b10e
 but not for Darwin targets

Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>

Rémi Denis-Courmont authored 3 years ago and Steve Lhomme committed 2 years ago

This unbreaks packages using autoreconf.

(cherry picked from commit 7beb0605)

Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>

(cherry picked from commit e0c0e009)

Alexandre Janniaux authored 2 years ago and Rémi Denis-Courmont committed 2 years ago

CMAKE_INSTALL_LIBDIR can be lib, lib64 or even lib/<multiarch-tuple> on
Debian, but we already split the contribs by multiarch-tuple /
installation directory at the prefix level for contribs to avoid mixups.

Preventing installation in lib64/ ensure every pc files from contribs/
are in the PKG_CONFIG_PATH when configuring.

Refs #26888

Cherry-picked from commit 346b2fb9.

Signed-off-by: Alexandre Janniaux <ajanni@videolabs.io>

Steve Lhomme authored 3 years ago and François Cartegnie committed 3 years ago

If anyone has a pthread with a different Windows SDK it should work.

It will also avoid bogus pthread.h missing reports when mingw-w64 is not
detected properly. HAVE_WINPTHREAD is not checked and assumed to be
available.

(cherry picked from commit 4acd34bc)

Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>

Steve Lhomme authored 3 years ago and François Cartegnie committed 3 years ago

It doesn't involve grep nor sed.

Co-authored-by: Stephen Kitt <steve@sk2.org>
(cherry picked from commit 4f73bdde)

Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>

Steve Lhomme authored 3 years ago and François Cartegnie committed 3 years ago

(cherry picked from commit 8a191b4c)

Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>

Steve Lhomme authored 3 years ago and François Cartegnie committed 3 years ago

We don't have any local patch for this library.

A normal mingw-w64 install has both libpthread.a and libpthread.dll.a, contribs
will use the former.

(cherry picked from commit de493a1d) (rebased)
rebased:
- 3.0 uses mingw_at_least instead of HAVE_MINGW64_V8

Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>

Steve Lhomme authored 3 years ago and François Cartegnie committed 3 years ago

(cherry picked from commit 6d2a3115) (edited)
edited:
- 3.0 already had MINGW_W64_VERSION

Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>