Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TEST] build: test #15594

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[TEST] build: test #15594

wants to merge 1 commit into from

Conversation

Akemi
Copy link
Member

@Akemi Akemi commented Dec 29, 2024

test for issue #15591

@Akemi Akemi force-pushed the swift_build_test branch 2 times, most recently from 6fc091c to 4610384 Compare December 29, 2024 13:31
@Akemi
Copy link
Member Author

Akemi commented Dec 29, 2024

also on a side note, this might need fixing https://github.com/mpv-player/mpv/actions/runs/12535713736/job/34957901688?pr=15594#step:7:425

[137/287] Compiling C object libmpv.2.dylib.p/player_command.c.o
FAILED: libmpv.2.dylib.p/player_command.c.o 
clang -Ilibmpv.2.dylib.p -I. -I.. -Icommon -Ietc -Iplayer/javascript -Iplayer/lua -Isub -ITOOLS/osxbundle -Iosdep/mac -I/usr/local/Cellar/libass/0.17.3/include -I/usr/local/Cellar/libunibreak/6.1/include -I/usr/local/Cellar/harfbuzz/10.1.0/include/harfbuzz -I/usr/local/Cellar/glib/2.82.4/include/glib-2.0 -I/usr/local/Cellar/glib/2.82.4/lib/glib-2.0/include -I/usr/local/opt/gettext/include -I/usr/local/Cellar/pcre2/10.44/include -I/usr/local/Cellar/graphite2/1.3.14/include -I/usr/local/Cellar/fribidi/1.0.16/include/fribidi -I/usr/local/opt/freetype/include/freetype2 -I/usr/local/opt/libpng/include/libpng16 -I/usr/local/Cellar/ffmpeg/7.1_4/include -I/usr/local/Cellar/libplacebo/7.349.0/include -I/usr/local/Cellar/shaderc/2024.4/include -I/usr/local/Cellar/vulkan-loader/1.4.304/../../../opt/vulkan-headers/include -I/usr/local/opt/little-cms2/include -I/usr/local/Cellar/mujs/1.3.5/include -I/usr/local/Cellar/libbluray/1.3.4/include -I/usr/local/Cellar/fontconfig/2.15.0/include -I/usr/local/Cellar/luajit/2.1.1734355927/include/luajit-2.1 -I/usr/local/Cellar/rubberband/4.0.0/include -I/usr/local/Cellar/libsamplerate/0.2.2/include -I/usr/local/Cellar/uchardet/0.0.8/include/uchardet -I/usr/local/Cellar/zimg/3.0.5/include -I/usr/local/opt/jpeg-turbo/include -fvisibility=hidden -fdiagnostics-color=always -Wall -Winvalid-pch -Wextra -Werror -std=c11 -O2 -g -D_FILE_OFFSET_BITS=64 -Wdisabled-optimization -Wempty-body -Wformat -Wimplicit-fallthrough -Wparentheses -Wpointer-arith -Wshadow -Wundef -Wvla -Wno-cast-function-type -Wno-format-zero-length -Wno-missing-field-initializers -Wno-sign-compare -Wno-switch -Wno-unused-parameter -fno-math-errno -fno-signed-zeros -fno-trapping-math -Werror=format-security -D_GNU_SOURCE -Wmissing-prototypes -Wstrict-prototypes -Werror=implicit-function-declaration -Wno-pointer-sign -Wno-error=deprecated -Wno-error=deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -MD -MQ libmpv.2.dylib.p/player_command.c.o -MF libmpv.2.dylib.p/player_command.c.o.d -o libmpv.2.dylib.p/player_command.c.o -c ../player/command.c
../player/command.c:327:16: error: format specifies type 'unsigned char' but the argument has type 'int' [-Werror,-Wformat]
               255 - mpctx->video_out->osd->opts->osd_selected_color.a,
               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../player/command.c:331:16: error: format specifies type 'unsigned char' but the argument has type 'int' [-Werror,-Wformat]
               255 - mpctx->video_out->osd->opts->osd_selected_outline_color.a,
               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

fixed by casting to unsigned char 4610384#diff-830516050a5bf883d9c265fa0cf3c5b59d23d8bc9e6dec63db3d3d9b9868bb6b?

from

static char *append_selected_style(struct MPContext *mpctx, char *str)
{
    if (!mpctx->video_out || !mpctx->opts->video_osd)
        return talloc_strdup_append(str, TERM_ESC_REVERSE_COLORS);

    return talloc_asprintf_append(str,
               "%s{\\b1\\1c&H%02hhx%02hhx%02hhx&\\1a&H%02hhx&\\3c&H%02hhx%02hhx%02hhx&\\3a&H%02hhx&}%s",
               OSD_ASS_0,
               mpctx->video_out->osd->opts->osd_selected_color.b,
               mpctx->video_out->osd->opts->osd_selected_color.g,
               mpctx->video_out->osd->opts->osd_selected_color.r,
               255 - mpctx->video_out->osd->opts->osd_selected_color.a,
               mpctx->video_out->osd->opts->osd_selected_outline_color.b,
               mpctx->video_out->osd->opts->osd_selected_outline_color.g,
               mpctx->video_out->osd->opts->osd_selected_outline_color.r,
               255 - mpctx->video_out->osd->opts->osd_selected_outline_color.a,
               OSD_ASS_1);
}

to

static char *append_selected_style(struct MPContext *mpctx, char *str)
{
    if (!mpctx->video_out || !mpctx->opts->video_osd)
        return talloc_strdup_append(str, TERM_ESC_REVERSE_COLORS);

    return talloc_asprintf_append(str,
               "%s{\\b1\\1c&H%02hhx%02hhx%02hhx&\\1a&H%02hhx&\\3c&H%02hhx%02hhx%02hhx&\\3a&H%02hhx&}%s",
               OSD_ASS_0,
               mpctx->video_out->osd->opts->osd_selected_color.b,
               mpctx->video_out->osd->opts->osd_selected_color.g,
               mpctx->video_out->osd->opts->osd_selected_color.r,
               (unsigned char)(255 - mpctx->video_out->osd->opts->osd_selected_color.a),
               mpctx->video_out->osd->opts->osd_selected_outline_color.b,
               mpctx->video_out->osd->opts->osd_selected_outline_color.g,
               mpctx->video_out->osd->opts->osd_selected_outline_color.r,
               (unsigned char)(255 - mpctx->video_out->osd->opts->osd_selected_outline_color.a),
               OSD_ASS_1);
}

@Akemi Akemi force-pushed the swift_build_test branch 7 times, most recently from 34a7579 to ce62d6a Compare December 29, 2024 16:12
Copy link

Download the artifacts for this pull request:

Windows
macOS

@Akemi Akemi force-pushed the swift_build_test branch 3 times, most recently from e7b91bd to dc161b7 Compare December 29, 2024 17:53
@kasper93 kasper93 marked this pull request as draft January 5, 2025 00:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant