From nobody Mon Oct 07 10:59:57 2024 X-Original-To: dev-commits-ports-all@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 4XMblK30Rsz5XjWK; Mon, 07 Oct 2024 10:59:57 +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 4XMblK2VLrz4GXk; Mon, 7 Oct 2024 10:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728298797; 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=OQIb2s2EXEW5nGsDWIIAtT5Cn754XDUTMbsXNfZ/NN4=; b=S0KJz6b7WpER1i7UqY4zMxrRHR0yVzOJVX+L8izl5XWBYOeDnMAyN+Bm1bv16iDC36jyhk eBiYsqfLnWUujK7twCeWXmpJm4xzR+diSn35W/taW0zW15qAkFW23qzpeqgY5VXiQ6bFxB 0PW9tk+IxltUzuIOfr1ESIiQj4+C01PGlt3WHMyRnLtLS+rgCL2WszWYMTpMu8WiBQJbJ0 /Ppzx3wBZdKLanLO2stdpwzXTEi+zZFfH/l1DGPlFMyr4FRiLsicBBvMZvY3Qycr8Xqq/4 sjqulV+dqFi6vrw3TaBHiefKxNMLwUMD/BL68RwcAwKjJWmsGp7tqb7qkqmKUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728298797; 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=OQIb2s2EXEW5nGsDWIIAtT5Cn754XDUTMbsXNfZ/NN4=; b=J4xplkmFYcKLcRoD1S94pBkJo1PnDnjyG92q/3UFX/TpWc3p/FmlrE/VuzG82TjIHMFPs+ UJuVAuE/uaGtFfQFmwdSlQhID78Yhp/nhm40gHZB6iTXBzBdDeZSzn2SEhfuKgSglDN9q8 FFmpphsUtQK+f8vNB85CaOOINL3XA9hdt6acszCE8ag4cKCD5w0S4hfObtBUILasEzA7wf oej4+AIlGIV/njfYqZi42xD2psCvXPfQ0l2VTcyuCBowlUCXN5nHKRErU39lQoqZsOgdg2 YMnFy+lpPWqDr2XS8SO6z45yR4baW3hNx+z/2fDg1RcpZcIqb8vXFGieTjmPpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728298797; a=rsa-sha256; cv=none; b=akChfgYFS1AU+B2JqcJBiZdYXiJQKlgrC2705Gj8GNsG7s/g/OqlfzKPF37tIucRo5Pvav fgT0lHGwzOEux0etmWct4i3cJjq9KzU2PQDbjN13OhtVAP99/KvfdOlXVIDG2UgsZW9eTW i2qF9kiM/rojgmNlp2zgBsfIK0WVjMQ8TnCc0FpZsIb9BbvvTcGQ6l9c3QbCnNW8vsmYk4 9dQEkoje+Xq/OPFHtct0dOZHRLIjHct6/N4BLApumaF1wwU1IZPYnzsC07/pYZ15y8GUMv UczHlA8/tBPYV1bFluU57mZ4LAhWA9/CCgAiLam5fHFQ7Z4uOpv0I2EPFVzYTA== 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 4XMblK26XtzjMk; Mon, 7 Oct 2024 10:59:57 +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 497Axv49068816; Mon, 7 Oct 2024 10:59:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497Axvbg068813; Mon, 7 Oct 2024 10:59:57 GMT (envelope-from git) Date: Mon, 7 Oct 2024 10:59:57 GMT Message-Id: <202410071059.497Axvbg068813@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: b08638f69423 - 2024Q3 - multimedia/obs-studio: fix build with clang 19 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/2024Q3 X-Git-Reftype: branch X-Git-Commit: b08638f69423264c169e1dcef888eeafbdaae395 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=b08638f69423264c169e1dcef888eeafbdaae395 commit b08638f69423264c169e1dcef888eeafbdaae395 Author: Dimitry Andric AuthorDate: 2024-10-06 10:46:46 +0000 Commit: Dimitry Andric CommitDate: 2024-10-07 10:59:44 +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 (cherry picked from commit f0e9df3448bd5a567b9447dc711d0a5f0341a327) --- .../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);