Skip to content

ci: Fix windows visual studio x86 job & Re-enable the MSYS2 job

Nirbheek Chauhan requested to merge nirbheek/gstreamer:vsx86-ci into main 
ci: Fix windows visual studio x86 job

meson setup --vsenv will actually always pick the host arch (64-bit),
not 32-bit, so we have to force it.

I accidentally broke this in my last MR.

ci: Re-enable MSYS2 job

meson: Always use forward slashes in defines with paths

Fixes the following build failure on MSYS2:

../subprojects/gstreamer/tests/check/elements/filesrc.c: In function 'test_seeking':
../subprojects/gstreamer/tests/check/elements/filesrc.c:107:53: error: incomplete universal character name \U
  107 |   g_object_set (G_OBJECT (src), "location", TESTFILE, NULL);
      |                                                     ^
../subprojects/gstreamer/tests/check/elements/filesrc.c:107:53: warning: unknown escape sequence: '\A'
../subprojects/gstreamer/tests/check/elements/filesrc.c:107:53: warning: unknown escape sequence: '\g'
../subprojects/gstreamer/tests/check/elements/filesrc.c:107:53: warning: unknown escape sequence: '\s'
../subprojects/gstreamer/tests/check/elements/filesrc.c:107:53: warning: unknown escape sequence: '\g'
../subprojects/gstreamer/tests/check/elements/filesrc.c:107:53: warning: unknown escape sequence: '\c'

Due to: `-DTESTFILE=\"C:\\Users\\Administrator\[...]`

https://gitlab.freedesktop.org/nirbheek/gstreamer/-/jobs/45317733

harfbuzz.wrap: Bump to latest to fix MSYS2 build failure

Need the following commit:

https://github.com/harfbuzz/harfbuzz/commit/7dfa672dac958bdbc7703ab0920e167eaa126754

fontconfig.wrap: Bump and fix MSYS2 build failure

Apply upstream patch:

fontconfig/fontconfig!283

pango.wrap: Bump to 1.50.14, remove merged patch

fribidi.wrap: Move to tarball, bump, provide dep

Wrap needs to provide the dep now after the pango bump.
cairo.wrap: Bump to latest to fix MSYS2 build failure


../subprojects/cairo/src/win32/cairo-dwrite-font.cpp: In member function 'cairo_fixed_t GeometryRecorder::GetFixedX(const D2D1_POINT_2F&)':
../subprojects/cairo/src/win32/cairo-dwrite-font.cpp:722:50: error: 'MCW_PC' was not declared in this scope
  722 |         _controlfp_s(&control_word, _CW_DEFAULT, MCW_PC);
      |                                                  ^~~~~~
libpsl.wrap: Fix MSYS2 build failure

Also switch from git repo to tarball.

https://github.com/rockdaboot/libpsl/pull/210

d3d11: Fix build on MSYS2 GCC

../subprojects/gst-plugins-bad/tests/examples/d3d11/d3d11overlay.cpp:145:37: error: invalid conversion from 'unsigned int' to 'D2D1_DRAW_TEXT_OPTIONS' [-fpermissive]
  145 |         D2D1_DRAW_TEXT_OPTIONS_CLIP | D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT);
      |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                                     |
      |                                     unsigned int
Edited by Nirbheek Chauhan

Merge request reports