din: Limit build changes for coreaudio to when coreaudio option enabled

[Jason Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Tue Nov 7 09:15:42 2023 -0600
Changeset:	71b56d48e214db42436040181f2e4b2069cb08a1

Modified Files:
	din/Makefile
	din/distinfo
	din/options.mk
	din/patches/patch-src_RtMidi.cpp

Log Message:
din: Limit build changes for coreaudio to when coreaudio option enabled

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=71b56d48e214db42436040181f2e4b2069cb08a1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 din/Makefile                     | 14 +++++++-------
 din/distinfo                     |  2 +-
 din/options.mk                   |  2 +-
 din/patches/patch-src_RtMidi.cpp |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diffs:
diff --git a/din/Makefile b/din/Makefile
index 138cd40030..d9eaf72779 100644
--- a/din/Makefile
+++ b/din/Makefile
@@ -10,24 +10,24 @@ COMMENT=	Open source cross-platform sound synthesizer
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	automake autoconf autoreconf pkg-config gmake
+USE_TOOLS+=	autoreconf pkg-config gmake
 GNU_CONFIGURE=	yes
 
-CXXFLAGS+=	-std=c++20
+LIBS+=		-ltcl -lSDL -lGL -lpthread
+LIBS.Darwin+=	-lSDLmain -lSDL -Wl,-framework,Cocoa
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
-LIBS+=	-ltcl -lpthread -lSDLmain -lSDL -framework Cocoa -framework OpenGL
-.else
-LIBS+=	-ltcl -lSDL -lGl -lpthread
+# Work around syntax errors from clang 15.0.0
+.if ${OPSYS} == "Darwin" && ${OS_VERSION:R} >= 14
+CXXFLAGS+=	-std=c++20
 .endif
 
 .include "options.mk"
 
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
-.include "../../wip/sdl12-compat/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/din/distinfo b/din/distinfo
index bc70e726ae..19cf29c3d9 100644
--- a/din/distinfo
+++ b/din/distinfo
@@ -5,4 +5,4 @@ SHA512 (din-57.tar.gz) = 03dfa45fb8c58f3f8dc739ec3c4c31029c544d9f0b1cf3dbae61643
 Size (din-57.tar.gz) = 3693381 bytes
 SHA1 (patch-src_Makefile.am) = 5fd638028053e70b29874fd588b0d66d4417b40e
 SHA1 (patch-src_Makefile.in) = 3135bd8315cfdd65e7d885fc80f4baa89b7d94dc
-SHA1 (patch-src_RtMidi.cpp) = 6bc57729b79961fcd49cdca19fdefdfed3a8701a
+SHA1 (patch-src_RtMidi.cpp) = 5c919adff2d5adb2683cfa5890748396a1918a3d
diff --git a/din/options.mk b/din/options.mk
index b4bd64c295..ff799c8f35 100644
--- a/din/options.mk
+++ b/din/options.mk
@@ -30,5 +30,5 @@ LIBS+=		-ljack
 ###
 .if !empty(PKG_OPTIONS:Mcoreaudio)
 CXXFLAGS+=	-D__MACOSX_CORE__
-LIBS+=		-framework CoreMIDI -framework CoreAudio -framework CoreFoundation
+LIBS+=		-framework OpenGL -framework CoreMIDI -framework CoreAudio -framework CoreFoundation
 .endif
diff --git a/din/patches/patch-src_RtMidi.cpp b/din/patches/patch-src_RtMidi.cpp
index 87b32dec22..1ba1f8faad 100644
--- a/din/patches/patch-src_RtMidi.cpp
+++ b/din/patches/patch-src_RtMidi.cpp
@@ -8,7 +8,7 @@ Use process scheduling from NetBSD instead of pthread.
        return;
  
    while ( jack_ringbuffer_write_space(data->buff) < sizeof(nBytes) + size )
-+#if defined(__NetBSD__) || defined(__APPLE__)
++#if defined(__NetBSD__) || defined(__APPLE__)
 +      sched_yield();
 +#else
        pthread_yield();