Wed Nov 8 16:49:02 2023 UTC ()
audio/din: Unbreak build on Darwin

Also add option for Apple's coreaudio
No changes affecting other platforms


(bacon)
diff -r1.47 -r1.48 pkgsrc/audio/din/Makefile
diff -r1.11 -r1.12 pkgsrc/audio/din/PLIST
diff -r1.32 -r1.33 pkgsrc/audio/din/distinfo
diff -r1.2 -r1.3 pkgsrc/audio/din/options.mk
diff -r1.14 -r1.15 pkgsrc/audio/din/patches/patch-src_Makefile.am
diff -r1.1 -r1.2 pkgsrc/audio/din/patches/patch-src_RtMidi.cpp
Thu Nov 9 01:49:02 2023
Thu Jan 1 09:00:00 1970
pkgsrc/audio/din/patches/patch-src_RtMidi.cpp,v
anoncvs not yet been updated
cvs diff -r1.47 -r1.48 pkgsrc/audio/din/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/din/Makefile 2023/09/12 07:55:11 1.47
+++ pkgsrc/audio/din/Makefile 2023/11/08 16:49:02 1.48
@@ -1,26 +1,37 @@ @@ -1,26 +1,37 @@
1# $NetBSD: Makefile,v 1.47 2023/09/12 07:55:11 fox Exp $ 1# $NetBSD: Makefile,v 1.48 2023/11/08 16:49:02 bacon Exp $
2 2
3DISTNAME= din-57 3DISTNAME= din-57
4CATEGORIES= audio 4CATEGORIES= audio
5MASTER_SITES= https://archive.org/download/dinisnoise_source_code/ 5MASTER_SITES= https://archive.org/download/dinisnoise_source_code/
6 6
7MAINTAINER= fox@NetBSD.org 7MAINTAINER= fox@NetBSD.org
8HOMEPAGE= https://dinisnoise.org/ 8HOMEPAGE= https://dinisnoise.org/
9COMMENT= Open source cross-platform sound synthesizer 9COMMENT= Open source cross-platform sound synthesizer
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12USE_LANGUAGES= c c++ 12USE_LANGUAGES= c c++
13USE_TOOLS+= autoreconf pkg-config gmake 13USE_TOOLS+= autoreconf pkg-config gmake
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15 15
16LIBS+= -ltcl -lSDL -lGL -lpthread 16.include "../../mk/bsd.prefs.mk"
17LIBS.Darwin+= -lSDLmain -lSDL -Wl,-framework,Cocoa 17
 18# Work around syntax errors from clang 15.0.0
 19.if ${OPSYS} == "Darwin" && ${OS_VERSION:R} >= 14
 20CXXFLAGS+= -std=c++20
 21.endif
 22
 23# Don't depend on -lGL on Darwin, otherwise a black screen is produced
 24.if ${OPSYS} == "Darwin"
 25LIBS+= -ltcl -lSDLmain -lSDL -framework Cocoa -framework OpenGL -lpthread
 26.else
 27LIBS+= -ltcl -lSDL -lGL -lpthread
 28.endif
18 29
19.include "options.mk" 30.include "options.mk"
20 31
21.include "../../devel/boost-libs/buildlink3.mk" 32.include "../../devel/boost-libs/buildlink3.mk"
22.include "../../lang/tcl/buildlink3.mk" 33.include "../../lang/tcl/buildlink3.mk"
23.include "../../devel/SDL/buildlink3.mk" 34.include "../../devel/SDL/buildlink3.mk"
24.include "../../graphics/MesaLib/buildlink3.mk" 35.include "../../graphics/MesaLib/buildlink3.mk"
25.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 36.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/audio/din/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/din/PLIST 2023/09/12 07:55:11 1.11
+++ pkgsrc/audio/din/PLIST 2023/11/08 16:49:02 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.11 2023/09/12 07:55:11 fox Exp $ 1@comment $NetBSD: PLIST,v 1.12 2023/11/08 16:49:02 bacon Exp $
2bin/din 2bin/din
3share/applications/din.desktop 3share/applications/din.desktop
4share/din/factory/2600 4share/din/factory/2600
5share/din/factory/2600.help.tcl 5share/din/factory/2600.help.tcl
6share/din/factory/2600.patch.tcl 6share/din/factory/2600.patch.tcl
7share/din/factory/Makefile.am 7share/din/factory/Makefile.am
8share/din/factory/Sine_Mixer 8share/din/factory/Sine_Mixer
9share/din/factory/all_notes 9share/din/factory/all_notes
10share/din/factory/am.crv 10share/din/factory/am.crv
11share/din/factory/attack.crv 11share/din/factory/attack.crv
12share/din/factory/attack.ed 12share/din/factory/attack.ed
13share/din/factory/attack.lib 13share/din/factory/attack.lib
14share/din/factory/audio_prefs 14share/din/factory/audio_prefs
cvs diff -r1.32 -r1.33 pkgsrc/audio/din/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/din/distinfo 2023/09/12 07:55:11 1.32
+++ pkgsrc/audio/din/distinfo 2023/11/08 16:49:02 1.33
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.32 2023/09/12 07:55:11 fox Exp $ 1$NetBSD: distinfo,v 1.33 2023/11/08 16:49:02 bacon Exp $
2 2
3BLAKE2s (din-57.tar.gz) = 22e6611ca0c80ff57133997b4c9a77ce02c1bd31a878597192dcad8e895e124a 3BLAKE2s (din-57.tar.gz) = 22e6611ca0c80ff57133997b4c9a77ce02c1bd31a878597192dcad8e895e124a
4SHA512 (din-57.tar.gz) = 03dfa45fb8c58f3f8dc739ec3c4c31029c544d9f0b1cf3dbae61643e5accd951ad65ebf19c078bfb1d30d3a8ccea7ffec2f1cb44f38bab1b07cfd2071361590c 4SHA512 (din-57.tar.gz) = 03dfa45fb8c58f3f8dc739ec3c4c31029c544d9f0b1cf3dbae61643e5accd951ad65ebf19c078bfb1d30d3a8ccea7ffec2f1cb44f38bab1b07cfd2071361590c
5Size (din-57.tar.gz) = 3693381 bytes 5Size (din-57.tar.gz) = 3693381 bytes
6SHA1 (patch-src_Makefile.am) = dd222d23a5a4c95a803c88d3467eb2a5fe7c09a0 6SHA1 (patch-src_Makefile.am) = 5fd638028053e70b29874fd588b0d66d4417b40e
7SHA1 (patch-src_Makefile.in) = 3135bd8315cfdd65e7d885fc80f4baa89b7d94dc 7SHA1 (patch-src_Makefile.in) = 3135bd8315cfdd65e7d885fc80f4baa89b7d94dc
8SHA1 (patch-src_RtMidi.cpp) = ef74046633dd51666aeab206ec95b3266334a11b 8SHA1 (patch-src_RtMidi.cpp) = 5c919adff2d5adb2683cfa5890748396a1918a3d
cvs diff -r1.2 -r1.3 pkgsrc/audio/din/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/din/options.mk 2019/08/07 23:49:02 1.2
+++ pkgsrc/audio/din/options.mk 2023/11/08 16:49:02 1.3
@@ -1,26 +1,34 @@ @@ -1,26 +1,34 @@
1# $NetBSD: options.mk,v 1.2 2019/08/07 23:49:02 fox Exp $ 1# $NetBSD: options.mk,v 1.3 2023/11/08 16:49:02 bacon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.din 3PKG_OPTIONS_VAR= PKG_OPTIONS.din
4PKG_OPTIONS_OPTIONAL_GROUPS= backend 4PKG_OPTIONS_OPTIONAL_GROUPS= backend
5PKG_OPTIONS_GROUP.backend= alsa jack 5PKG_OPTIONS_GROUP.backend= alsa jack coreaudio
6PKG_SUGGESTED_OPTIONS= jack 6PKG_SUGGESTED_OPTIONS= jack
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10### 10###
11### Support ALSA 11### Support ALSA
12### 12###
13.if !empty(PKG_OPTIONS:Malsa) 13.if !empty(PKG_OPTIONS:Malsa)
14CXXFLAGS+= -D__LINUX_ALSA__ 14CXXFLAGS+= -D__LINUX_ALSA__
15LIBS+= -lasound 15LIBS+= -lasound
16.include "../../audio/alsa-lib/buildlink3.mk" 16.include "../../audio/alsa-lib/buildlink3.mk"
17.endif 17.endif
18 18
19### 19###
20### Support JACK 20### Support JACK
21### 21###
22.if !empty(PKG_OPTIONS:Mjack) 22.if !empty(PKG_OPTIONS:Mjack)
23CXXFLAGS+= -D__UNIX_JACK__ 23CXXFLAGS+= -D__UNIX_JACK__
24LIBS+= -ljack 24LIBS+= -ljack
25.include "../../audio/jack/buildlink3.mk" 25.include "../../audio/jack/buildlink3.mk"
26.endif 26.endif
 27
 28###
 29### Support CoreAudio
 30###
 31.if !empty(PKG_OPTIONS:Mcoreaudio)
 32CXXFLAGS+= -D__MACOSX_CORE__
 33LIBS+= -framework CoreMIDI -framework CoreAudio -framework CoreFoundation
 34.endif
cvs diff -r1.14 -r1.15 pkgsrc/audio/din/patches/patch-src_Makefile.am (expand / switch to unified diff)

--- pkgsrc/audio/din/patches/patch-src_Makefile.am 2022/10/01 09:46:56 1.14
+++ pkgsrc/audio/din/patches/patch-src_Makefile.am 2023/11/08 16:49:02 1.15
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-src_Makefile.am,v 1.14 2022/10/01 09:46:56 fox Exp $ 1$NetBSD: patch-src_Makefile.am,v 1.15 2023/11/08 16:49:02 bacon Exp $
2 2
3Removed tcl8.6, asound and jack flags, this is now handled in the pkgsrc 3Removed tcl8.6, asound and jack flags, this is now handled in the pkgsrc
4script. 4script.
5 5
6--- src/Makefile.am.orig 2022-09-22 14:07:29.000000000 +0000 6--- src/Makefile.am.orig 2022-09-22 14:07:29.000000000 +0000
7+++ src/Makefile.am 7+++ src/Makefile.am
8@@ -1,7 +1,7 @@ 8@@ -1,7 +1,7 @@
9 #dinincludedir = $(pkgsrcdir) 9 #dinincludedir = $(pkgsrcdir)
10  10
11-AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -D__BOOST_TIME__ -DPREFIX=\"@prefix@\" 11-AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -D__BOOST_TIME__ -DPREFIX=\"@prefix@\"
12-LIBS += -ltcl8.6 -lSDL -lGL -lpthread -lasound 12-LIBS += -ltcl8.6 -lSDL -lGL -lpthread -lasound
13+AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -D__BOOST_TIME__ -DPREFIX=\"@prefix@\" 13+AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -D__BOOST_TIME__ -DPREFIX=\"@prefix@\"
14+LIBS += -lSDL -lGL -lpthread 14+LIBS += @LIBS@
15  15
16 bin_PROGRAMS = din 16 bin_PROGRAMS = din
17  17
cvs diff -r1.1 -r1.2 pkgsrc/audio/din/patches/patch-src_RtMidi.cpp (expand / switch to unified diff)

--- pkgsrc/audio/din/patches/patch-src_RtMidi.cpp 1.1
+++ pkgsrc/audio/din/patches/patch-src_RtMidi.cpp 1.2