From nobody Mon Oct 07 10:59:16 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMbkX4Xb3z5XjhF; Mon, 07 Oct 2024 10:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMbkX3N9Fz4F5l; Mon, 7 Oct 2024 10:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728298756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OprEKOoIypnjE+2otTgTTCh1QkHmUQARVbx7C/P9QkY=; b=eZznsrwD0rVhMWT4SCaDSfQ99AAh5Fj111fY+KWVrdGR+mgtH+/tEGYg6+JjyB2cpW+afA KQa+YiCXM0+AAzc+z4qGS0yUMbaOuNiACy3i//wxm0LmdxMeHbL1NX0f9ci/n2mm4tV2jj GnvBLYRpaH80GpT4jc5gDRsrnQ+LfA1tIEQl1qxoRRKYnC9D08iaFVxjujw2r8YkSKlPwQ vIdsSlcLBHxV26pT5tJdkNzSk2dfzygJEJD2xJTu/IVGazIwaOGxc+S/Y6WcbO46EYkgRO NgN6ANmjyiXiqNEe0GxkTCeOUQ/T3FYmuD2yqq19zDnxAo4VPfQQ3sRyN6w9Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728298756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OprEKOoIypnjE+2otTgTTCh1QkHmUQARVbx7C/P9QkY=; b=Sv3NCTRrboFDLbw9OXvNajSSXnXcLGc+PmTJLuLDM14AlUT1Z97qR9OGtkAmdiRiSw1o+y Z6/R11BMMF9k3de90UwPjePPjEElr+LrJgkw5bvKuKlXqkPEIwxUasq3aT9gwLZPbxl6aA mOTS/pbNcVmkkZzqvrDJ8CHo/BiMG2XfZY2ou/LF1SqU8p/gvKi2jdbhWcWDx2N6f2Z57T ms2Pu49pEnx9shUWHA5QzYM/095YaHjLYvUaW3kbP7PhjQfcJ/gYvj2ppeFJuwYHTIjNn3 LpbuUver4r8HUCcfZsAURAaXnXj6XzAYxUIiozytFBh5exNYx7sJlaZbuXVLCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728298756; a=rsa-sha256; cv=none; b=WkWTWt1HO9zm8t3y4DTlDbnOWglLmKIBVJQHKQp5tuGcdNhXylOriOJu5sUsX+fZGw1z3U RN6MX4lUQ7zM0y+MOR0ta7YljFvNgP368VlKOJ41Q1waehenPnQf3gzA7ef4zhg8BDoAAg kps8xms4LQW2VixdqqaGT36rQf33r5GpbwjiCTADoZ23mRjGb1WClvET80Nclb/ukde5vv Yl/ekzzPC1ARpLzLMHeicMyZQqqU9Gj1wgSLbjciW24htZHyqFozWPAVNKdk2fxvodbABv Me4ZcGYnMseTGjncPKTXkEQmLodfKjuUg5VOvVQW+BBjx/l7ljE84IGMf/HvZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XMbkX2YvRzkKF; Mon, 7 Oct 2024 10:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497AxGbU068568; Mon, 7 Oct 2024 10:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497AxGRh068565; Mon, 7 Oct 2024 10:59:16 GMT (envelope-from git) Date: Mon, 7 Oct 2024 10:59:16 GMT Message-Id: <202410071059.497AxGRh068565@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: f0e9df3448bd - main - multimedia/obs-studio: fix build with clang 19 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0e9df3448bd5a567b9447dc711d0a5f0341a327 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=f0e9df3448bd5a567b9447dc711d0a5f0341a327 commit f0e9df3448bd5a567b9447dc711d0a5f0341a327 Author: Dimitry Andric AuthorDate: 2024-10-06 10:46:46 +0000 Commit: Dimitry Andric CommitDate: 2024-10-07 10:58:28 +0000 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 --- .../obs-studio/files/patch-plugins_obs-outputs_flv-mux.c | 11 +++++++++++ 1 file changed, 11 insertions(+) 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);