From nobody Sun Feb 19 18:43:10 2023 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 4PKZDv1FD2z3rZhc; Sun, 19 Feb 2023 18:43: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 4PKZDv0j3jz3wSZ; Sun, 19 Feb 2023 18:43:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676832191; 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=5s6mLUCU7L1j4qaNZW7AD8+LVSZ9IhMg5dW38jy6w/U=; b=ktPaFALMwEIN7649Cez0AIrpEtQW4XWWg29kT/uh16UfF4JiNJnCBYVbMWwAzSg+ZpyEeq sROi2TZ+hhPj9Y+6cxHskIEikrGOqCeDHdSNDy0YGdIbmVJu1R0BAYojq30MuY8QX4fdlJ LLep1GOr9gngsfo7ClGvkagSkP4AhUJMS8aOQ+3MaZihiujXD3SMMpYKQp47gAbbX6gO84 Mi8w9oEI9rOxr4obfwA6dAUICtLKfabKXxrNqwuGraU7TNWjKmz3QrchHW5S0DSnRUGo0e ZOuNPCAW3eB9GuCnE0bRPwFrYfrdNvwE1Z+iv59yrNTG7dFJDsFFdfoj/jyZMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676832191; 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=5s6mLUCU7L1j4qaNZW7AD8+LVSZ9IhMg5dW38jy6w/U=; b=DWZnA58W2mUMFFBiqAr3f0VTLO95nzxb/Dj9ZgMfdzrE7IMX0wSZ/3CgrvVCg6HtRfC3i2 c2y3Lj3ztbxaXtio0DwhlW5/+aefFBAmRJWmEZT9IuD1j060FcdzTOuoisggiVR/Kjernu ZBiHCgUZ3mIoMkjL6segUqcTDBbUKQKFKTXynK2xnCq7WvsLtENiu964NvAmYbN+FHi3dT 2OdoYSI0aWXml+Zhiqd/n66woOYvNTGbrHwuOu+3WXwN+BKDZn6w2xQ+f/ZXYfRk4jArtA gZAWjO7JO+kk3q/kx4liMxaS2DGonWJ/dsfS0wS6a7xcHNPBYxX3MqD2DefpeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676832191; a=rsa-sha256; cv=none; b=p6C1L25jRV0qFVQzwAaIWFNMX4nZiTcHwH9zSYp9Wy3jYRw7L2u2hte+bJRaQOyaZPxh7S qxAnsZY0MH8YX+TsemvhdOQJiMKdkFw890pwCSLq0QfS/QDYvQaM4KlYzvYxErm74H69Es ObhrA3q6VBU3jIVIbUFi0q6KQGuChw+fizMchCTf7Ml/5UzEqsJfnFoDWX1J7XhTgN1ywN 19zfQapnOYdwUc2sXS4auC37NSVQJBgUO1+OdBA7bX7unRsAsnOXOB2PNHmYF49qLJARov ZWsFbdgMdfmuTEqov+IhUvJJw600ZdGdCDdjjZ61HLB6d5TP6KV6M+1+AcYmXw== 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 4PKZDt6tkpz1BjP; Sun, 19 Feb 2023 18:43:10 +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 31JIhAZA008575; Sun, 19 Feb 2023 18:43:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31JIhAu5008574; Sun, 19 Feb 2023 18:43:10 GMT (envelope-from git) Date: Sun, 19 Feb 2023 18:43:10 GMT Message-Id: <202302191843.31JIhAu5008574@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 5830649683db - 2023Q1 - audio/yoshimi: Fix bug when yoshimi asserted because it defaulted to ALSA 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: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q1 X-Git-Reftype: branch X-Git-Commit: 5830649683dbde1ed850a7c065e0a4137fb1b6e8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=5830649683dbde1ed850a7c065e0a4137fb1b6e8 commit 5830649683dbde1ed850a7c065e0a4137fb1b6e8 Author: Yuri Victorovich AuthorDate: 2023-02-19 18:33:35 +0000 Commit: Yuri Victorovich CommitDate: 2023-02-19 18:43:07 +0000 audio/yoshimi: Fix bug when yoshimi asserted because it defaulted to ALSA ... which it isn't linked with. PR: 269673 Reported by: Luc (cherry picked from commit e65d3eeb6a497f9af9aff37eda0ee050e70dd5c6) --- 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 +