Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Feb 2023 18:43:10 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 5830649683db - 2023Q1 - audio/yoshimi: Fix bug when yoshimi asserted because it defaulted to ALSA
Message-ID:  <202302191843.31JIhAu5008574@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2023Q1 has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5830649683dbde1ed850a7c065e0a4137fb1b6e8

commit 5830649683dbde1ed850a7c065e0a4137fb1b6e8
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-02-19 18:33:35 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
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 <lucmove@gmail.com>
    
    (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 <bsd.port.mk>
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
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302191843.31JIhAu5008574>