diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2024-10-06 12:46:46 +0200 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2024-10-07 12:59:44 +0200 |
| commit | b08638f69423264c169e1dcef888eeafbdaae395 (patch) | |
| tree | 03b10fd0c3d563d7b903498c5716c23a998f093c | |
| parent | 36224d9f9c28148172835ed3a7aceadef0c1f5ca (diff) | |
multimedia/obs-studio: fix build with clang 19
Clang 19 has become more strict about mixing different enum types, which
results in an error building multimedia/obs-studio:
/wrkdirs/usr/ports/multimedia/obs-studio/work/obs-studio-30.2.3/plugins/obs-outputs/flv-mux.c:659:37: error: bitwise operation between different enumeration types ('enum multitrack_type_t' and 'enum packet_type_t') [-Werror,-Wenum-enum-conversion]
659 | s_w8(&s, MULTITRACKTYPE_ONE_TRACK | PACKETTYPE_METADATA);
| ~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~
This can be fixed by explicitly casting each enum type to uint8_t.
PR: 281890
Approved by: yuri (maintainer)
MFH: 2024Q3
(cherry picked from commit f0e9df3448bd5a567b9447dc711d0a5f0341a327)
| -rw-r--r-- | multimedia/obs-studio/files/patch-plugins_obs-outputs_flv-mux.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/multimedia/obs-studio/files/patch-plugins_obs-outputs_flv-mux.c b/multimedia/obs-studio/files/patch-plugins_obs-outputs_flv-mux.c new file mode 100644 index 000000000000..14375e85281e --- /dev/null +++ b/multimedia/obs-studio/files/patch-plugins_obs-outputs_flv-mux.c @@ -0,0 +1,11 @@ +--- plugins/obs-outputs/flv-mux.c.orig 2024-08-15 21:53:35 UTC ++++ plugins/obs-outputs/flv-mux.c +@@ -656,7 +656,7 @@ void flv_packet_metadata(enum video_id_t codec_id, uin + * The default trackId is 0. + */ + if (is_multitrack) { +- s_w8(&s, MULTITRACKTYPE_ONE_TRACK | PACKETTYPE_METADATA); ++ s_w8(&s, (uint8_t)MULTITRACKTYPE_ONE_TRACK | (uint8_t)PACKETTYPE_METADATA); + s_w4cc(&s, codec_id); + // trackId + s_w8(&s, (uint8_t)idx); |