Skip to content

GitLab

Switch branch/tag
  1. 26 Jun, 2020 21 commits
  3. 25 Jun, 2020 2 commits
  5. 24 Jun, 2020 1 commit
  7. 22 Jun, 2020 3 commits
  9. 20 Jun, 2020 13 commits
    • Martin Storsjö's avatar
      contrib: qt: Backport more patches to fix building with even newer versions of Clang · 3124e5ae
      Martin Storsjö authored 
      The master branch has moved on to newer Qt versions that don't
need these.
      3124e5ae
    • Martin Storsjö's avatar
      win32: Don't pass the built dll to dlltool when creating the import library · f3a9d05f
      Martin Storsjö authored 
      The def file generated by the linker is enough input to dlltool;
this doesn't change the output import library at all.

This fixes building with llvm-dlltool, which doesn't support
providing object files/dlls, it only supports reading from a def file
(which these commands already did anyway).

(cherry picked from commit 86d68171643e9c36ef16d4d0e22dcd947a96ad9d)
      f3a9d05f
    • Martin Storsjö's avatar
      direct3d9: Disable OpenGL interop if OpenGL is unavailable · 7fe9c1fc
      Martin Storsjö authored 
      On Windows on ARM/ARM64, OpenGL isn't available. (For emulation
of i386 binaries, there is an opengl32.dll, but it's only the
fallback software renderer, nothing else. For ARM and ARM64, there
is no opengl32.dll.)

(cherry picked from commit 0d0aef05)
      7fe9c1fc
    • Martin Storsjö's avatar
      simple_channel_mixer: Don't include the common AM_LDFLAGS for the arm_neon static library · 19d8d73b
      Martin Storsjö authored 
      This avoids including module.rc.o in the helper static library when
building for windows, avoiding a duplicate module.rc.o for the
real simple_channel_mixer plugin.

Recent lld versions error out if two resource object files are passed
to the same link. (If GNU ld is presented with two resource object
files, it tries to merge the resources. In this case, as both object
files contain the same resource, they would conflict, and GNU ld would
print an error message, but still complete the link successfully.)

(cherry picked from commit 593d0ec84fde7c2b98d051e44f66b01de8a761fa)
      19d8d73b
    • Martin Storsjö's avatar
      bin: win32: Link vlc.exe and vlc-cache-gen.exe with -static · 6fb84c96
      Martin Storsjö authored 
      This prevents these executables from linking to a shared
libssp-0.dll if both a static and shared version is available
of this library.

Since these refer to the dynamically linked libvlc via libvlc.la,
it will still pick up the correct shared version of those, instead
of refusing to link to a dynamic library (as it does for any
library specified via -l<name>).

The same use of -Wc,-static is present in a few other Makefile.am
already.

(cherry picked from commit 9edf62844f9af6b9fd645fcf16e3725fd13d814a)
      6fb84c96
    • Martin Storsjö's avatar
      configure: Treat host_cpu = armv* as plain arm · 220e1182
      Martin Storsjö authored 
      This matches a change in contrib in 99acb87c.

(cherry picked from commit 4214cf05)
      220e1182
    • Martin Storsjö's avatar
      contrib: x264: Fix building for aarch64/windows after the recent x264 update · 31ade615
      Martin Storsjö authored 
      The current version of x264 defaults to using gas-preprocessor and
arasm64 for this target. Override it to use plain $(CC) instead.

(cherry picked from commit 31c65810c27b492316e7a32925e599f5bea9db31)
      31ade615
    • Martin Storsjö's avatar
      contrib: x264: Fix building for windows on arm · be70cc11
      Martin Storsjö authored 
      (cherry picked from commit 1374a33c83ead6eced5a6dc67bb860b74361dcda)

edited:
- The patch enclosed in the original commit is no longer necessary.
      be70cc11
    • Martin Storsjö's avatar
      contribs: qt: Clean up libQt5Bootstrap.a in the build tree as well · ab0a756a
      Martin Storsjö authored 
      

When building the Qt tools for the target architecture in cross
compilation, the bootstrap object library is rebuilt. (In cross
builds of Qt, the tools are only built for the build host.
The VLC contribs build them manually for the targeted environment
afterwards.) The tools bootstrap library wasn't removed inbetween
though.

This meant that the object files for the second round (for the
cross target environment) were added to the bootstrap library for
the host environment. Most object files were just replaced, but some
few object files weren't built at all in cross builds for windows.
This meant that after cross-building the bootstrap library for windows,
it still contained a few object files for the native host build
environment as well.

lld-link errors out when it encounters object files in a static library
that it can't parse (in this case, ELF files when doing a windows cross
build).
Signed-off-by: Hugo Beauzée-Luyssen's avatarHugo Beauzée-Luyssen <hugo@beauzee.fr>
(cherry picked from commit a943285ad52cdfd49003aa4ee93c37ebded6bdc5)
      ab0a756a
    • Martin Storsjö's avatar
      contrib: qt: Add patches for building with llvm-mingw · 43a4455f
      Martin Storsjö authored 
      All of them are backports (in Qt 5.11, everything needed for building
with llvm-mingw is upstreamed), with annotations about where they
come from.

To actually build with llvm-mingw, one has to use the mkspec
win32-clang-g++ instead of win32-g++.

(cherry picked from commit 0a09b3b63e4afc160c441e01306a30ba977e8b45)
      43a4455f
    • Martin Storsjö's avatar
      contrib: projectM/glew: Don't build projectM (and implicitly glew) when... · b58a89ff
      Martin Storsjö authored 
      contrib: projectM/glew: Don't build projectM (and implicitly glew) when targeting windows on arm/aarch64

OpenGL is unavailable on windows on these architectures.

(cherry picked from commit 85c8fa3f7fc41e7d76eb28422dbdec58a0df00c5)
      b58a89ff
    • Martin Storsjö's avatar
      contrib: projectM: Don't force building in C++98 mode · 3310acd4
      Martin Storsjö authored 
      Instead patch the project to fix the error that was clang gave when
building in C+11 mode (which clang 6 does by default):

Renderer/VideoEcho.cpp:77:30: error: non-constant-expression cannot be narrowed from type 'double' to 'float' in initializer list [-Wc++11-narrowing]
  float pointsFlip[4][2] = {{-0.5*flipx, -0.5*flipy},

(cherry picked from commit e2ea86d8a21d5ddf63f9263aec401f0f8556e671)
      3310acd4
    • Martin Storsjö's avatar
      contrib: harfbuzz: Avoid harfbuzz using 'icu-config' for finding ICU · 75d14354
      Martin Storsjö authored 
      When cross compiling, we shouldn't let packages' build systems
accidentally pick up libraries from the surrounding native environment.
Normally this is accomplished by setting PKG_CONFIG_LIBDIR.
Harfbuzz's configure script tries looking for ICU using the tool
icu-config, if it isn't found with pkg-config.

Set ICU_CONFIG to false, to avoid configure using and picking it up.

(cherry picked from commit c2b60e813180c89e66e96d3300d0c8b2eae6db15)
      75d14354

VideoLAN code repository instance