From nobody Tue Dec 31 14:00:44 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 4YMvkk4MRgz5jTbN; Tue, 31 Dec 2024 14:00:46 +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 4YMvkh55LLz4nPk; Tue, 31 Dec 2024 14:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735653644; 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=FpvzczeedmEwoptSTQoA2biZysVn8H3eoyLfqEXyYKs=; b=k0u42I0JQWj1rEStmMCXds0/BRWub5MlSQgNUN2OOG5q3TZAxPqZQmPaQXnF45e4sg41G0 pPsjDrUHcnKe2wWVUa+U+/wrax9b33sJgZfxNB1pweKpwIAMsq7sChtnmf9sbl6OPDntIb pgkvJCBj3ncJN0THKMu4sat6jGYyeBp6e09UJYcbnrAnvt8XKEw/dkRr4LrXp3GdSN2gF7 lG07K+04cirTnWui/s7/RnkdgKzxlty9RN/eZtrRldng2nz4hW+SS5qKYOp6B5hIlW2APU 01d47u1qt0UmJOGSo6WQoHnBjbByaP6qt3muyT8dQipn6CGwJUhrl9dTgMFIaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735653644; 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=FpvzczeedmEwoptSTQoA2biZysVn8H3eoyLfqEXyYKs=; b=TFaDrmDhSM63AVG+1Oueta2XJKylgZjb8w1AMyoITy2B6nVzxMmTbpWmn5/fz7BouXlthR dUhofEJTkKrp490f+OmYUt6G+KW/R+ut2h+Ter3DccWqBCR1EjBMgJ7s5Ge3xYTt7UJkYv jpbInUIgTpUnBe+/1AAikH96EMqhkxYISOfxbBCAqSl1g590cfEg6oStJhxZ+NN3l2XRXs fmwHlpz7i2h/Y8SxKxhh3KIpPidpfSB1kox12hT0nhPDEnFcedwoxVgHmVDA4lKabJiQTk lPPxcg73ejrMQbOSxZQNhDHWQI9qnDWnNY4/Ih2EmgDWTmLL/mQNX9QGMH7rIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735653644; a=rsa-sha256; cv=none; b=cagIoEj6FbRB/ZzlsCAhypAAvYfsQmjbch2jfsDT12d1Vot5y6XnvNSs3kb0E0eFiCcriG r62IygPO2wECTV90chJeZkUi1JIPxviK6sFx4T7OBIre+dju16/dVexptFT5W2NCpSMD0I 38MFktcIOrHilZCuCHwTvuCsFOF0OBK5zGHr812GYOmYpoB9mIxLN2ab3SquEKXsPIVE+A DEkiYH/4HQS8BUiQ2gQVfWpY3Ck0WVxfvmBgoHAAc5Zn9eCVeVP18+TrQHtmA+S/JMCudo VvCbygVM4L6fbU1wAdN40osUGK7IT+0t1P19XIRrdjsqcJXt/FzS8cNMeCBewQ== 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 4YMvkh3p7XzjL3; Tue, 31 Dec 2024 14:00:44 +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 4BVE0itc053366; Tue, 31 Dec 2024 14:00:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVE0i8j053363; Tue, 31 Dec 2024 14:00:44 GMT (envelope-from git) Date: Tue, 31 Dec 2024 14:00:44 GMT Message-Id: <202412311400.4BVE0i8j053363@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 3cc18ad22908 - main - audio/polyphone: fix build on big-endian 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cc18ad22908124ea1fe7dad1cef08e718c16b55 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=3cc18ad22908124ea1fe7dad1cef08e718c16b55 commit 3cc18ad22908124ea1fe7dad1cef08e718c16b55 Author: Piotr Kubaj AuthorDate: 2024-12-27 20:05:33 +0000 Commit: Piotr Kubaj CommitDate: 2024-12-31 13:59:51 +0000 audio/polyphone: fix build on big-endian ../polyphone-2.4.1/sources/core/input/sfark/sfarkextractor2.cpp:293:5: error: use of undeclared identifier 'bioP' 293 | INBITS(w, n); | ^ ../polyphone-2.4.1/sources/core/input/sfark/sfarkextractor2.cpp:62:5: note: expanded from macro 'INBITS' 62 | CHECK_INBUFFER \ | ^ ../polyphone-2.4.1/sources/core/input/sfark/sfarkextractor2.cpp:76:9: note: expanded from macro 'CHECK_INBUFFER' 76 | if (bioP == BIOBUFSIZE) \ | ^ ../polyphone-2.4.1/sources/core/input/sfark/sfarkextractor2.cpp:293:5: error: use of undeclared identifier 'bioWholeBlocks'; did you mean '_bioWholeBlocks'? ../polyphone-2.4.1/sources/core/input/sfark/sfarkextractor2.cpp:62:5: note: expanded from macro 'INBITS' 62 | CHECK_INBUFFER \ | ^ ../polyphone-2.4.1/sources/core/input/sfark/sfarkextractor2.cpp:78:5: note: expanded from macro 'CHECK_INBUFFER' 78 | bioWholeBlocks++; \ | ^ ../polyphone-2.4.1/sources/core/input/sfark/sfarkextractor2.h:411:12: note: '_bioWholeBlocks' declared here 411 | int _bioWholeBlocks; // Count blocks read from disk | ^ --- .../patch-core_input_sfark_sfarkextractor2.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/audio/polyphone/files/patch-core_input_sfark_sfarkextractor2.cpp b/audio/polyphone/files/patch-core_input_sfark_sfarkextractor2.cpp new file mode 100644 index 000000000000..5f072d7092d9 --- /dev/null +++ b/audio/polyphone/files/patch-core_input_sfark_sfarkextractor2.cpp @@ -0,0 +1,21 @@ +--- core/input/sfark/sfarkextractor2.cpp.orig 2024-12-27 19:56:25 UTC ++++ core/input/sfark/sfarkextractor2.cpp +@@ -73,13 +73,13 @@ const char SfArkExtractor2::UpgradeMsg[] = "Please see + #define WFIX(I) s = bp[I+0]; bp[I+0] = bp[I+1]; bp[I+1] = s; + // Read from disk if needed, and fix endians + #define CHECK_INBUFFER \ +- if (bioP == BIOBUFSIZE) \ ++ if (_bioP == BIOBUFSIZE) \ + { \ +- bioWholeBlocks++; \ +- bioP = 0; \ +- int ReadLen = ReadInputFile((quint8 *) bioBuf, BIOBUFSIZE * sizeof(quint16)); \ ++ _bioWholeBlocks++; \ ++ _bioP = 0; \ ++ int ReadLen = ReadInputFile((quint8 *) _bioBuf, BIOBUFSIZE * sizeof(quint16)); \ + if (ReadLen <= 0) return 0; \ +- quint8 *bp = (quint8 *) bioBuf, *ep = (quint8 *) (bioBuf+BIOBUFSIZE); \ ++ quint8 *bp = (quint8 *) _bioBuf, *ep = (quint8 *) (_bioBuf+BIOBUFSIZE); \ + do { \ + quint8 s; \ + WFIX(0); WFIX(2); WFIX(4); WFIX(6); \