diff --git a/audio/stk/Makefile b/audio/stk/Makefile index 2a41aaff0f85..4d8226f93b56 100644 --- a/audio/stk/Makefile +++ b/audio/stk/Makefile @@ -1,29 +1,33 @@ # Created by: Yuri Victorovich PORTNAME= stk -PORTVERSION= 4.6.1 -PORTREVISION= 2 +PORTVERSION= 4.6.2 CATEGORIES= audio MASTER_SITES= http://ccrma.stanford.edu/software/stk/release/ MAINTAINER= yuri@FreeBSD.org COMMENT= Synthesis ToolKit in C++ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libjack.so:audio/jack USES= autoreconf compiler:c++11-lang dos2unix gmake localbase pkgconfig USE_LDCONFIG= yes + +DOS2UNIX_GLOB= *.cpp *.h + GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-jack --with-oss -DOS2UNIX_GLOB= *.cpp *.h + MAKE_ARGS= RAWWAVES=${DATADIR}/rawwaves/ +LDFLAGS+= -pthread + post-install: @cd ${WRKSRC} && ${COPYTREE_SHARE} rawwaves ${STAGEDIR}${DATADIR} @${RM} ${STAGEDIR}${DATADIR}/rawwaves/._* ${STAGEDIR}${DATADIR}/rawwaves/*.c @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libstk-${PORTVERSION}.so .include diff --git a/audio/stk/distinfo b/audio/stk/distinfo index c59296eb7a15..b82f155b883f 100644 --- a/audio/stk/distinfo +++ b/audio/stk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556434208 -SHA256 (stk-4.6.1.tar.gz) = e77ba3c80cdd93ca02c34098b9b7f918df3d648c87f1ed5d94fe854debd6d101 -SIZE (stk-4.6.1.tar.gz) = 2593348 +TIMESTAMP = 1637267004 +SHA256 (stk-4.6.2.tar.gz) = 573e26ccf72ce436a1dc4ee3bea05fd35e0a8e742c339c7f5b85225502238083 +SIZE (stk-4.6.2.tar.gz) = 2618125 diff --git a/audio/stk/files/patch-configure.ac b/audio/stk/files/patch-configure.ac index 92b5739b525f..36239221a15c 100644 --- a/audio/stk/files/patch-configure.ac +++ b/audio/stk/files/patch-configure.ac @@ -1,60 +1,60 @@ ---- configure.ac.orig 2017-09-01 00:28:55 UTC +--- configure.ac.orig 2021-11-18 02:08:39 UTC +++ configure.ac -@@ -85,7 +85,6 @@ if test "$debug" = "yes"; then +@@ -89,7 +89,6 @@ if test "$debug" = "yes"; then else AC_SUBST( debug, [no] ) AC_SUBST( cppflag, [] ) - AC_SUBST( cxxflag, [-O3] ) AC_SUBST( object_path, [Release] ) fi AC_MSG_RESULT($debug) -@@ -100,7 +99,7 @@ fi +@@ -104,7 +103,7 @@ fi CPPFLAGS="$CPPFLAGS $cppflag" # For debugging and optimization ... overwrite default because it has both -g and -O2 -CXXFLAGS="$cxxflag" +CXXFLAGS="$CXXFLAGS $cxxflag" # Check compiler and use -Wall if gnu. if [test $GXX = "yes" ;] then -@@ -134,27 +133,27 @@ api="$api -D__UNIX_JACK__" - AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))]) +@@ -154,27 +153,27 @@ api="$api -D__UNIX_JACK__" + AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!))]) + ;; - case $host in - *-*-linux*) + *-*-linux*|*-*-freebsd*) # Look for ALSA flag - AC_ARG_WITH(alsa, [ --with-alsa = choose native ALSA API support (linux only)]) - AS_IF([test "x$with_alsa" == "xyes"], [ - api="$api -D__LINUX_ALSA__" - AC_MSG_RESULT(using ALSA) - AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))]) + #AC_ARG_WITH(alsa, [ --with-alsa = choose native ALSA API support (linux only)]) + #AS_IF([test "x$with_alsa" == "xyes"], [ + #api="$api -D__LINUX_ALSA__" + #AC_MSG_RESULT(using ALSA) + #AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))]) # Look for OSS flag AC_ARG_WITH(oss, [ --with-oss = choose OSS API support (unixes only)]) AS_IF([test "x$with_oss" == "xyes"], [ - api="$api -D__LINUX_OSS__ -D__LINUX_ALSA__" + api="$api -D__LINUX_OSS__" AC_MSG_RESULT(using OSS) - AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(OSS support requires ALSA for RtMidi!))]) + #AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(OSS support requires ALSA for RtMidi!))]) # If no audio api flags specified, use ALSA - AS_IF([test "$api" == ""], [ - AC_MSG_RESULT(using ALSA) - AC_SUBST( api, [-D__LINUX_ALSA__] ) - AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!)) - ]) + #AS_IF([test "$api" == ""], [ + # AC_MSG_RESULT(using ALSA) + # AC_SUBST( api, [-D__LINUX_ALSA__] ) + # AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!)) + #]) AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!)) ;; diff --git a/audio/stk/pkg-plist b/audio/stk/pkg-plist index 81f7dd5d8d8b..8bcbdf3de92e 100644 --- a/audio/stk/pkg-plist +++ b/audio/stk/pkg-plist @@ -1,147 +1,147 @@ include/stk/ADSR.h include/stk/Asymp.h include/stk/BandedWG.h include/stk/BeeThree.h include/stk/BiQuad.h include/stk/Blit.h include/stk/BlitSaw.h include/stk/BlitSquare.h include/stk/BlowBotl.h include/stk/BlowHole.h include/stk/BowTable.h include/stk/Bowed.h include/stk/Brass.h include/stk/Chorus.h include/stk/Clarinet.h include/stk/Cubic.h include/stk/Delay.h include/stk/DelayA.h include/stk/DelayL.h include/stk/Drummer.h include/stk/Echo.h include/stk/Effect.h include/stk/Envelope.h include/stk/FM.h include/stk/FMVoices.h include/stk/FileLoop.h include/stk/FileRead.h include/stk/FileWrite.h include/stk/FileWvIn.h include/stk/FileWvOut.h include/stk/Filter.h include/stk/Fir.h include/stk/Flute.h include/stk/FormSwep.h include/stk/FreeVerb.h include/stk/Function.h include/stk/Generator.h include/stk/Granulate.h include/stk/Guitar.h include/stk/HevyMetl.h include/stk/Iir.h include/stk/InetWvIn.h include/stk/InetWvOut.h include/stk/Instrmnt.h include/stk/JCRev.h include/stk/JetTable.h include/stk/LentPitShift.h include/stk/Mandolin.h include/stk/Mesh2D.h include/stk/Messager.h include/stk/MidiFileIn.h include/stk/Modal.h include/stk/ModalBar.h include/stk/Modulate.h include/stk/Moog.h include/stk/Mutex.h include/stk/NRev.h include/stk/Noise.h include/stk/OnePole.h include/stk/OneZero.h include/stk/PRCRev.h include/stk/PercFlut.h include/stk/Phonemes.h include/stk/PitShift.h include/stk/Plucked.h include/stk/PoleZero.h include/stk/Recorder.h include/stk/ReedTable.h include/stk/Resonate.h include/stk/Rhodey.h include/stk/RtAudio.h include/stk/RtMidi.h include/stk/RtWvIn.h include/stk/RtWvOut.h include/stk/SKINImsg.h include/stk/SKINItbl.h include/stk/Sampler.h include/stk/Saxofony.h include/stk/Shakers.h include/stk/Simple.h include/stk/SineWave.h include/stk/SingWave.h include/stk/Sitar.h include/stk/Skini.h include/stk/Socket.h include/stk/Sphere.h include/stk/StifKarp.h include/stk/Stk.h include/stk/TapDelay.h include/stk/TcpClient.h include/stk/TcpServer.h include/stk/Thread.h include/stk/TubeBell.h include/stk/Twang.h include/stk/TwoPole.h include/stk/TwoZero.h include/stk/UdpSocket.h include/stk/Vector3D.h include/stk/VoicForm.h include/stk/Voicer.h include/stk/Whistle.h include/stk/Wurley.h include/stk/WvIn.h include/stk/WvOut.h -lib/libstk-4.6.1.so +lib/libstk-4.6.2.so lib/libstk.so %%DATADIR%%/rawwaves/ahh.raw %%DATADIR%%/rawwaves/bassdrum.raw %%DATADIR%%/rawwaves/britestk.raw %%DATADIR%%/rawwaves/cowbell1.raw %%DATADIR%%/rawwaves/crashcym.raw %%DATADIR%%/rawwaves/dope.raw %%DATADIR%%/rawwaves/eee.raw %%DATADIR%%/rawwaves/fwavblnk.raw %%DATADIR%%/rawwaves/halfwave.raw %%DATADIR%%/rawwaves/hihatcym.raw %%DATADIR%%/rawwaves/impuls10.raw %%DATADIR%%/rawwaves/impuls20.raw %%DATADIR%%/rawwaves/impuls40.raw %%DATADIR%%/rawwaves/mand1.raw %%DATADIR%%/rawwaves/mand10.raw %%DATADIR%%/rawwaves/mand11.raw %%DATADIR%%/rawwaves/mand12.raw %%DATADIR%%/rawwaves/mand2.raw %%DATADIR%%/rawwaves/mand3.raw %%DATADIR%%/rawwaves/mand4.raw %%DATADIR%%/rawwaves/mand5.raw %%DATADIR%%/rawwaves/mand6.raw %%DATADIR%%/rawwaves/mand7.raw %%DATADIR%%/rawwaves/mand8.raw %%DATADIR%%/rawwaves/mand9.raw %%DATADIR%%/rawwaves/mandpluk.raw %%DATADIR%%/rawwaves/marmstk1.raw %%DATADIR%%/rawwaves/ooo.raw %%DATADIR%%/rawwaves/peksblnk.raw %%DATADIR%%/rawwaves/ppksblnk.raw %%DATADIR%%/rawwaves/ridecymb.raw %%DATADIR%%/rawwaves/silence.raw %%DATADIR%%/rawwaves/sineblnk.raw %%DATADIR%%/rawwaves/sinewave.raw %%DATADIR%%/rawwaves/snardrum.raw %%DATADIR%%/rawwaves/snglpeak.raw %%DATADIR%%/rawwaves/tambourn.raw %%DATADIR%%/rawwaves/tomhidrm.raw %%DATADIR%%/rawwaves/tomlowdr.raw %%DATADIR%%/rawwaves/tommiddr.raw %%DATADIR%%/rawwaves/twopeaks.raw