From nobody Sun Feb 19 18:42:31 2023 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 4PKZD76jYdz3rZDh; Sun, 19 Feb 2023 18:42:31 +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 4PKZD75qlZz3w3P; Sun, 19 Feb 2023 18:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676832151; 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=mxNpfTohzA+e7Hsxqo9Lb7BSxSn1XPYCvoBwd6gbVPM=; b=ayb6hWhBJUuYC9vrOyXAKUxHCBKcfjEGuVyrKAx5C6Drc3aoxvEZ4RirnsLvxr490+LC38 LP2ZViTyJtF/6ooTJEJcm71wi+Kpnvw6CZ7q7L2UzgJ0QArCQv6ePSTgBbP6QKzhgx/6Bh TCZZ5kquLFCaPNXk6Bix4QbcXDT+TPS6o9m7lQtW3evXCyzDFM1XVIlD7scZHdCeIS3aCW my3gOk5Y6L8DUsddndKmHSvPcv8ZS6lvhEbKEeJLwOExWcT9nX7OGqgiyrIfKrvjDUNvvT tFP8Lvw831dd5E7x5YYFKf2/MukVzCC3yVHG6v8R2BsnOq7oYUCR/mwChb6OCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676832151; 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=mxNpfTohzA+e7Hsxqo9Lb7BSxSn1XPYCvoBwd6gbVPM=; b=a+Ch1i4tASi1Jv7X0xh7YQD2Ed6eGyDKMfr6GeAtH6qC6Pw3KAU7Rw9s94diAg0hZHXLVA 9HHrX4oLnUOYxaPwWkdnKt0vg+81xjojkOft1Z/zJtYPq54CVMje5nY+QOpkwTcB5kH/ln cUE7JJiNXg4QGccMcexOGuy4UZAqcrf+3HvsuJGxfwnRIx4LKApVLr9ZezZKbzD4H8rOhC 9xywI1eeyHblrfUVnFBaaPrC8U6QVRMnyojC7YiU28uuNIB3v5kZX9MwAMVK2Bumv7OiD4 DcAtgWZ2S8Bw6UmJCPP+ffKLXox0w8/hJn3561DT4Xj0OWfmFgDks4Dpbjz9wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676832151; a=rsa-sha256; cv=none; b=dQPNeWqbS8o6fV+jCfEqZOtbvoxsHLNdRiQz2ZoLkDYkFC14JCxZYXxFH1b6CBy8YFsGjE SKnQbVrc0/l8cpNC5fg2mjxTaKGxsGd8OtIK28nP4UUVVdIovPPz+2QNO8PjKRqPyCgIny yI9jtTTu1b2PBGlQeF044ZLBjsGHpkpejpS59lsrW7GoXZvgTcSPkCfRh/d/JoHzPAi0xO qGjGyp0LXp1sktL0ZiUaScCth3BqwkwkH8jfSMEjdftcnZUfI0ziNz9ZE1IncN241rinTC G0MwjcxzdkostCvx1+1tO3GkRmc1W9auM4JSU2yZHlixZGhrsQefdSiYEbjwEA== 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 4PKZD74twyz1BNM; Sun, 19 Feb 2023 18:42:31 +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 31JIgVUv008382; Sun, 19 Feb 2023 18:42:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31JIgV5v008381; Sun, 19 Feb 2023 18:42:31 GMT (envelope-from git) Date: Sun, 19 Feb 2023 18:42:31 GMT Message-Id: <202302191842.31JIgV5v008381@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: e65d3eeb6a49 - main - audio/yoshimi: Fix bug when yoshimi asserted because it defaulted to ALSA 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e65d3eeb6a497f9af9aff37eda0ee050e70dd5c6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=e65d3eeb6a497f9af9aff37eda0ee050e70dd5c6 commit e65d3eeb6a497f9af9aff37eda0ee050e70dd5c6 Author: Yuri Victorovich AuthorDate: 2023-02-19 18:33:35 +0000 Commit: Yuri Victorovich CommitDate: 2023-02-19 18:42:28 +0000 audio/yoshimi: Fix bug when yoshimi asserted because it defaulted to ALSA ... which it isn't linked with. PR: 269673 Reported by: Luc --- audio/yoshimi/Makefile | 3 +++ audio/yoshimi/files/patch-src_globals.h | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/audio/yoshimi/Makefile b/audio/yoshimi/Makefile index e7042f0d9b58..50de08285173 100644 --- a/audio/yoshimi/Makefile +++ b/audio/yoshimi/Makefile @@ -1,5 +1,6 @@ PORTNAME= yoshimi DISTVERSION= 2.2.2.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${DISTVERSION:R:R} @@ -30,4 +31,6 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS +# ALSA can also be enabled, but its build fails, see https://github.com/Yoshimi/yoshimi/issues/175 + .include diff --git a/audio/yoshimi/files/patch-src_globals.h b/audio/yoshimi/files/patch-src_globals.h new file mode 100644 index 000000000000..272ba8a39937 --- /dev/null +++ b/audio/yoshimi/files/patch-src_globals.h @@ -0,0 +1,15 @@ +- workaround for https://github.com/Yoshimi/yoshimi/issues/174 + +--- src/globals.h.orig 2023-02-19 18:22:47 UTC ++++ src/globals.h +@@ -126,8 +126,8 @@ typedef unsigned int uint; + #define DEFAULT_NAME "Simple Sound" + #define UNTITLED "No Title" + +-#define DEFAULT_AUDIO alsa_audio +-#define DEFAULT_MIDI alsa_midi ++#define DEFAULT_AUDIO jack_audio ++#define DEFAULT_MIDI jack_midi + + #define FORCED_EXIT 16 +