From nobody Sat Apr 20 14:25:10 2024 X-Original-To: dev-commits-ports-branches@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 4VMDLb0KCPz5Hs6V; Sat, 20 Apr 2024 14:25:11 +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 4VMDLZ6yFJz4Shb; Sat, 20 Apr 2024 14:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713623111; 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=WpJH6Pu6QW2d/ej88N+YxWJY0L2fL+OHtVpepsOQjso=; b=PfX0ke/E4gHPcTKnyDweA123AoWFdYDvGeCxtJrZ38weABkCGQXEDqIibgidecY0m3XMv/ luqX0sKn/Tr6vVZpPmHy+TT0Mw4OzRwOm1ByfYMPuzyuFV7J729kAMtwY9hkNU2q9tPDWQ 3po17Z44hQWqWL6cDNugPXF6+/6ttCFG+hxdbaMPZl5hAhDr2sMsl0ohZJetHYv3VKB1S6 EwUu/ctVmJktQ2jqvKORX4zPGNbMyQneQjbIgCwwqFVgfOxxZHicnjH66dOCnPl02WWrHG 6HVrbwwrhccUHs6nG+GXj9Yw+qSoGuklRtYHIKYuRgdsC5RINah4fdTdOIjsug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713623111; a=rsa-sha256; cv=none; b=lk6SxfcMiXXRmc3eX50mNtbLKlMJv9/xakqoGyg1kfN8WHsigYM1AX78ejXHSjH4JQsG7/ FpfKN7rJXkgQR3AfhwsTOLjyO8e2ubQCGOlCKhNYFkG4ReSX8B82UAe0IPXfuo/HJwGdaf RRc3MzgCybzhaTjtjRLCIvxgxFFxU7ta9iLp3PYggrFzvrAjk74F4CyzCM2hRLuYCDaZeV KURAIJVb5d6QFrPdfMbHVwegh9PXM85oPr0vpaEKQdF2hA2NTl8LIxETpThsT/Z+MNNyjn 6A6woAP5VSqoLARTTniWak2EQDiwXJtpLzmiWDo36bTNoJEASJ/ijXytvAHA0w== 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=1713623111; 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=WpJH6Pu6QW2d/ej88N+YxWJY0L2fL+OHtVpepsOQjso=; b=Kx0XWwAEh+FSG6culWivz9mO0crwkLGdu8Y8NXS10SuJL1O7rvAx6wNvEnR7QDkP9al8P/ cA5qq30l1diHnQxdBvSEh7qRvzBJXbScbe90DLR8SKRLkdywIWMPNz7BVBpTO6JQvGYBUP 2baHno/9J24c+Ob7v747zPBHQ9VidihfgA0VYkkGRE1L5w33CRTd7wH9ZXFWDrLjd1gBRs zmV5RmSRpfziYg3f1IyCZUKxdLATriJxamYOSqJjSvq/zDb09QLxbJ5IZ6XkVTLf91MQvz uVOhBmxoSi7e3f/bq9D7QndPN3ywulhcdqVnVI6gBhxUgCSg62Ppt1V7AoLylA== 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 4VMDLZ6BfszgP3; Sat, 20 Apr 2024 14:25:10 +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 43KEPAMS005389; Sat, 20 Apr 2024 14:25:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KEPAEW005386; Sat, 20 Apr 2024 14:25:10 GMT (envelope-from git) Date: Sat, 20 Apr 2024 14:25:10 GMT Message-Id: <202404201425.43KEPAEW005386@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: 52512eb129b1 - 2024Q2 - audio/csound: fix build with clang 18 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q2 X-Git-Reftype: branch X-Git-Commit: 52512eb129b16872c9c75b7609e868b2b56f1cf5 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=52512eb129b16872c9c75b7609e868b2b56f1cf5 commit 52512eb129b16872c9c75b7609e868b2b56f1cf5 Author: Dimitry Andric AuthorDate: 2024-03-27 19:53:05 +0000 Commit: Dimitry Andric CommitDate: 2024-04-20 14:24:57 +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 (cherry picked from commit 8556c08e0816597ed4e51e64ad5152c105feebd2) --- 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;