Skip to content

Commit

Permalink
ci
Browse files Browse the repository at this point in the history
  • Loading branch information
kasper93 committed Sep 18, 2023
1 parent ed5c744 commit 57eb99d
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 19 deletions.
1 change: 1 addition & 0 deletions ci/build-freebsd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export CXXFLAGS="$CXXFLAGS -isystem/usr/local/include"
export LDFLAGS="$LDFLAGS -L/usr/local/lib"

meson setup build \
--werror \
-Dlibmpv=true \
-Dlua=enabled \
-Degl-drm=enabled \
Expand Down
1 change: 1 addition & 0 deletions ci/build-mingw64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ build=mingw_build
rm -rf $build

meson setup $build --cross-file "$prefix_dir/crossfile" \
--werror \
--buildtype debugoptimized \
-Dlibmpv=true -Dlua=luajit \
-D{shaderc,spirv-cross,d3d11,libplacebo}=enabled
Expand Down
1 change: 1 addition & 0 deletions ci/build-msys2.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/sh -e

meson setup build \
--werror \
-D cdda=enabled \
-D d3d-hwaccel=enabled \
-D d3d11=enabled \
Expand Down
1 change: 1 addition & 0 deletions ci/build-tumbleweed.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
set -e

meson setup build \
--werror \
-Dcdda=enabled \
-Ddvbin=enabled \
-Ddvdnav=enabled \
Expand Down
2 changes: 0 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,6 @@ flags = ['-D_ISOC99_SOURCE', '-D_GNU_SOURCE',
link_flags = []

test_flags = ['-Werror=implicit-function-declaration',
'-Wno-error=deprecated-declarations',
'-Wno-error=unused-function',
'-Wempty-body',
'-Wdisabled-optimization',
'-Wstrict-prototypes',
Expand Down
2 changes: 1 addition & 1 deletion video/out/d3d11/ra_d3d11.c
Original file line number Diff line number Diff line change
Expand Up @@ -1598,7 +1598,7 @@ static void save_cached_program(struct ra *ra, struct ra_renderpass *pass,
.comp_bytecode_len = comp_bc.len,
};
memcpy(header.magic, cache_magic, sizeof(header.magic));
strncpy(header.compiler, spirv->name, sizeof(header.compiler) - 1);
memcpy(header.compiler, spirv->name, sizeof(header.compiler));

struct bstr *prog = &pass->params.cached_program;
bstr_xappend(pass, prog, (bstr){ (char *) &header, sizeof(header) });
Expand Down
14 changes: 8 additions & 6 deletions video/out/placebo/ra_pl.c
Original file line number Diff line number Diff line change
Expand Up @@ -450,9 +450,11 @@ static struct ra_renderpass *renderpass_create_pl(struct ra *ra,
.glsl_shader = params->type == RA_RENDERPASS_TYPE_COMPUTE
? params->compute_shader
: params->frag_shader,
.cached_program = params->cached_program.start,
.cached_program_len = params->cached_program.len,
};
AV_NOWARN_DEPRECATED(
pl_params.cached_program = params->cached_program.start;
pl_params.cached_program_len = params->cached_program.len;
)

struct pl_blend_params blend_params;

Expand Down Expand Up @@ -505,10 +507,10 @@ static struct ra_renderpass *renderpass_create_pl(struct ra *ra,
.priv = talloc_steal(pass, priv),
};

pass->params.cached_program = (struct bstr) {
.start = (void *) priv->pass->params.cached_program,
.len = priv->pass->params.cached_program_len,
};
AV_NOWARN_DEPRECATED(
pass->params.cached_program.start = (void *) priv->pass->params.cached_program;
pass->params.cached_program.len = priv->pass->params.cached_program_len;
)

// fall through
error:
Expand Down
24 changes: 14 additions & 10 deletions video/out/vo_gpu_next.c
Original file line number Diff line number Diff line change
Expand Up @@ -1234,7 +1234,7 @@ static bool update_icc(struct priv *p, struct bstr icc)
return ok;
#else
talloc_free((void *) p->icc_profile.data);
profile.data = talloc_steal(p, profile.data);
profile.data = talloc_steal(p, (void *) profile.data);
p->icc_profile = profile;
return true;
#endif
Expand Down Expand Up @@ -1625,9 +1625,9 @@ static void uninit(struct vo *vo)
if (cache_file && p->rr) {
FILE *cache = fopen(cache_file, "wb");
if (cache) {
size_t size = pl_renderer_save(p->rr, NULL);
AV_NOWARN_DEPRECATED(size_t size = pl_renderer_save(p->rr, NULL);)
uint8_t *buf = talloc_size(NULL, size);
pl_renderer_save(p->rr, buf);
AV_NOWARN_DEPRECATED(pl_renderer_save(p->rr, buf);)
fwrite(buf, size, 1, cache);
talloc_free(buf);
fclose(cache);
Expand Down Expand Up @@ -1703,7 +1703,7 @@ static int preinit(struct vo *vo)
if (cache_file) {
if (stat(cache_file, &(struct stat){0}) == 0) {
bstr c = stream_read_file(cache_file, p, vo->global, 1000000000);
pl_renderer_load(p->rr, c.start);
AV_NOWARN_DEPRECATED(pl_renderer_load(p->rr, c.start);)
talloc_free(c.start);
}
talloc_free(cache_file);
Expand Down Expand Up @@ -1926,9 +1926,11 @@ static void update_icc_opts(struct priv *p, const struct mp_icc_opts *opts)
p->icc_params.size_r = s_r;
p->icc_params.size_g = s_g;
p->icc_params.size_b = s_b;
p->icc_params.cache_priv = p;
p->icc_params.cache_save = icc_save;
p->icc_params.cache_load = icc_load;
AV_NOWARN_DEPRECATED(
p->icc_params.cache_priv = p;
p->icc_params.cache_save = icc_save;
p->icc_params.cache_load = icc_load;
)
#if PL_API_VER < 327
p->pars->params.icc_params = &p->icc_params;
#endif
Expand Down Expand Up @@ -2124,9 +2126,11 @@ static void update_render_options(struct vo *vo)
};

pars->color_map_params.tone_mapping_function = tone_map_funs[opts->tone_map.curve];
pars->color_map_params.tone_mapping_param = opts->tone_map.curve_param;
if (isnan(pars->color_map_params.tone_mapping_param)) // vo_gpu compatibility
pars->color_map_params.tone_mapping_param = 0.0;
AV_NOWARN_DEPRECATED(
pars->color_map_params.tone_mapping_param = opts->tone_map.curve_param;
if (isnan(pars->color_map_params.tone_mapping_param)) // vo_gpu compatibility
pars->color_map_params.tone_mapping_param = 0.0;
)
pars->color_map_params.inverse_tone_mapping = opts->tone_map.inverse;
pars->color_map_params.contrast_recovery = opts->tone_map.contrast_recovery;
pars->color_map_params.visualize_lut = opts->tone_map.visualize;
Expand Down

0 comments on commit 57eb99d

Please sign in to comment.