From nobody Sat Apr 20 14:24:33 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 4VMDKs6Bhkz5HsHF; Sat, 20 Apr 2024 14:24:33 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VMDKs5KK1z4SQM; Sat, 20 Apr 2024 14:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713623073; 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=G34ctgWs9uRm9FvPhQbZKPoJkLl/CkybvooJsOTxxGY=; b=TLUbu5AVKg6HOfE4V34PBlEjXDTvobIZJyhGcXpbLZht7loa+GB1wICFktU0411flMgU4a uF038NlzKfZh/fpWDjFDfT6Bevh3OJIiip3UfjHVIvMVVjoywtWUHmTImpTmNmudkXdoEF 4kXRWRRzAP4F2bPxfGj+FmmIyGipb7aD6/Pgs2U7jCZbsz0N9bYBvPTuUtzxue0vhzifGl SSatlQO0wAY4zZjikt7vqKgKU64/iwKY9pHfdz7xx78dK65tDZhlGEbC9yrd5xqeArtRUf w5RSK/pTcHVf7Qac2W3FCTqYZQO0X22F902A1NDtrg/nc2N6vPhWBZvotoidOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713623073; a=rsa-sha256; cv=none; b=USx72LuxFjWAiE5f3FwtNsAJbZr8vRK53mVdChT76m5dIo16aOC3r4NiWJp1vnBRHQ3jOF SW5FF6V6esgve1l1H32CjIFeHeOhkWYNyVHOOPtjXr+JoHMKncqRRd/sjWCZZdDPO5jv8D pR030yOe5ZDiFWs4wyz05OC4msxekRgzWJ8LtrgcJr0xh346v93+yihlNiAurM+MJV+zG4 aGVKQJqclVPlpV/uAhaxPPcEz+FVyR1QKuEJGxgRe+8c0TkPNRhq3Pk7CVrm0pd2eBf9HN ZHjnturKUygOctpmxplGCnvmmMU9+H15GkZkk28nrtUEdTQk4t7HX5y4RkGc6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713623073; 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=G34ctgWs9uRm9FvPhQbZKPoJkLl/CkybvooJsOTxxGY=; b=XrgFavU8LceL1Tws+jjr5Fh97b5mFOs8vVrxkyzVwX7c6cp2ta500+S2enet7yZHGU0K9X 4sE8Z7KLT4x0dfrfgaMutR8xrtUBYFDqybwJcsAVaUL8zzuVD/paTrGTpCqid3Css389YN skGWw2cjutLihd1PwHkopm8zN1gE209zqx4n3sONFROy/ntlC0MyP6bVlVaVJ0+36OXgdX aCl2fx2A8+5BliViOq679JpL+UlsVzDmjH8IJWMK2lq7WcGyge9FLyd1kzm46TuCtcqOjd LuZD5Svg3MXDRBPTXBw0a4Ir4NHPYgFM36ybKUF/XOf9njJKS0xk1Yd4gwDwww== 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 4VMDKs4pcNzgbk; Sat, 20 Apr 2024 14:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43KEOX95005066; Sat, 20 Apr 2024 14:24:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KEOXeT005063; Sat, 20 Apr 2024 14:24:33 GMT (envelope-from git) Date: Sat, 20 Apr 2024 14:24:33 GMT Message-Id: <202404201424.43KEOXeT005063@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: 8556c08e0816 - main - audio/csound: fix build with clang 18 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/main X-Git-Reftype: branch X-Git-Commit: 8556c08e0816597ed4e51e64ad5152c105feebd2 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=8556c08e0816597ed4e51e64ad5152c105feebd2 commit 8556c08e0816597ed4e51e64ad5152c105feebd2 Author: Dimitry Andric AuthorDate: 2024-03-27 19:53:05 +0000 Commit: Dimitry Andric CommitDate: 2024-04-20 14:22:24 +0000 audio/csound: fix build with clang 18 With clang 18, audio/csound fails to build: /wrkdirs/usr/ports/audio/csound/work/csound-6.15.0/Opcodes/OSC.c:784:47: error: incompatible function pointer types passing 'int32_t (const char *, const char *, lo_arg **, int32_t, void *, void *)' (aka 'int (const char *, const char *, lo_arg **, int, void *, void *)') to parameter of type 'lo_method_handler' (aka 'int (*)(const char *, const char *, lo_arg **, int, struct lo_message_ *, void *)') [-Wincompatible-function-pointer-types] 784 | OSC_handler, p->port); | ^~~~~~~~~~~ /usr/local/include/lo/lo_serverthread.h:151:72: note: passing argument to parameter 'h' here 151 | const char *typespec, lo_method_handler h, | ^ This is because the callback functions OSC_handler() and OSC_ahandler() have the wrong signature: liblo's headers use 'int' for the 'argc' argument, and 'lo_message' for the 'data' argument. Fix the parameter types of the functions to match the liblo declarations. PR: 277999 Approved by: maintainer timeout (2 weeks) MFH: 2024Q2 --- audio/csound/files/patch-Opcodes_OSC.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/audio/csound/files/patch-Opcodes_OSC.c b/audio/csound/files/patch-Opcodes_OSC.c new file mode 100644 index 000000000000..744ce92d1fb2 --- /dev/null +++ b/audio/csound/files/patch-Opcodes_OSC.c @@ -0,0 +1,20 @@ +--- Opcodes/OSC.c.orig 2020-08-13 23:03:03 UTC ++++ Opcodes/OSC.c +@@ -477,7 +477,7 @@ static int32_t OSC_handler(const char *path, const cha + } + + static int32_t OSC_handler(const char *path, const char *types, +- lo_arg **argv, int32_t argc, void *data, void *p) ++ lo_arg **argv, int argc, lo_message data, void *p) + { + IGN(argc); IGN(data); + OSC_PORT *pp = (OSC_PORT*) p; +@@ -958,7 +958,7 @@ static int32_t OSC_ahandler(const char *path, const ch + /* ******** ARRAY VERSION **** EXPERIMENTAL *** */ + + static int32_t OSC_ahandler(const char *path, const char *types, +- lo_arg **argv, int32_t argc, void *data, void *p) ++ lo_arg **argv, int argc, lo_message data, void *p) + { + IGN(argc); IGN(data); + OSC_PORT *pp = (OSC_PORT*) p;