From owner-dev-commits-ports-all@freebsd.org Mon Oct 4 09:20:23 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 23CE867AF97; Mon, 4 Oct 2021 09:20:23 +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 4HNFYg0F4Mz3wNn; Mon, 4 Oct 2021 09:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D2CCC167D1; Mon, 4 Oct 2021 09:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1949KMZo056245; Mon, 4 Oct 2021 09:20:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1949KM3g056244; Mon, 4 Oct 2021 09:20:22 GMT (envelope-from git) Date: Mon, 4 Oct 2021 09:20:22 GMT Message-Id: <202110040920.1949KM3g056244@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 05a45a5e5077 - main - games/scummvm: Unbreak build with FLUIDSYNTH=on MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05a45a5e50775e34b7c949ee3c6607dbb004b3a1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Oct 2021 09:20:23 -0000 The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=05a45a5e50775e34b7c949ee3c6607dbb004b3a1 commit 05a45a5e50775e34b7c949ee3c6607dbb004b3a1 Author: Kai Knoblich AuthorDate: 2021-10-04 09:14:03 +0000 Commit: Kai Knoblich CommitDate: 2021-10-04 09:14:03 +0000 games/scummvm: Unbreak build with FLUIDSYNTH=on After commit 4c2db26adf7d the build, if the non-default option FLUIDSYNTH is enabled, fails with: In file included from audio/softsynth/fluidsynth.cpp:32: In file included from /usr/local/include/fluidsynth.h:100: [..] audio/softsynth/fluidsynth.cpp:252:3: error: no matching function for call to 'fluid_sfloader_set_callbacks' fluid_sfloader_set_callbacks(soundFontMemoryLoader, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/local/include/fluidsynth/sfont.h:172:20: note: candidate function not viable: no known conversion from 'int (void *, int, void *)' to 'fluid_sfloader_callback_read_t' (aka 'int (*)(void *, long long, void *)') for 3rd argument FLUIDSYNTH_API int fluid_sfloader_set_callbacks(fluid_sfloader_t *loader, ^ Obtained from: NetBSD MFH: 2021Q4 --- .../files/patch-audio_softsynth_fluidsynth.cpp | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/games/scummvm/files/patch-audio_softsynth_fluidsynth.cpp b/games/scummvm/files/patch-audio_softsynth_fluidsynth.cpp new file mode 100644 index 000000000000..e538d47910b4 --- /dev/null +++ b/games/scummvm/files/patch-audio_softsynth_fluidsynth.cpp @@ -0,0 +1,31 @@ +Fix build with FluidSynth >= 2.2.0 + +Obtained from: + +https://github.com/NetBSD/pkgsrc/commit/25b35d66ba06339121f9ed19cc0a307a7b61dfc9 + +--- audio/softsynth/fluidsynth.cpp.orig 2020-09-13 21:05:37 UTC ++++ audio/softsynth/fluidsynth.cpp +@@ -144,11 +144,11 @@ static void *SoundFontMemLoader_open(const char *filen + return p; + } + +-static int SoundFontMemLoader_read(void *buf, int count, void *handle) { ++static int SoundFontMemLoader_read(void *buf, long long count, void *handle) { + return ((Common::SeekableReadStream *) handle)->read(buf, count) == (uint32)count ? FLUID_OK : FLUID_FAILED; + } + +-static int SoundFontMemLoader_seek(void *handle, long offset, int origin) { ++static int SoundFontMemLoader_seek(void *handle, long long offset, int origin) { + return ((Common::SeekableReadStream *) handle)->seek(offset, origin) ? FLUID_OK : FLUID_FAILED; + } + +@@ -157,7 +157,7 @@ static int SoundFontMemLoader_close(void *handle) { + return FLUID_OK; + } + +-static long SoundFontMemLoader_tell(void *handle) { ++static long long SoundFontMemLoader_tell(void *handle) { + return ((Common::SeekableReadStream *) handle)->pos(); + } + #endif