diff options
Diffstat (limited to 'audio/stk')
| -rw-r--r-- | audio/stk/Makefile | 9 | ||||
| -rw-r--r-- | audio/stk/distinfo | 6 | ||||
| -rw-r--r-- | audio/stk/files/patch-configure.ac | 48 | ||||
| -rw-r--r-- | audio/stk/files/patch-src_RtAudio.cpp | 23 | ||||
| -rw-r--r-- | audio/stk/pkg-plist | 43 |
5 files changed, 72 insertions, 57 deletions
diff --git a/audio/stk/Makefile b/audio/stk/Makefile index 795da754cadd..05fb3da1fd92 100644 --- a/audio/stk/Makefile +++ b/audio/stk/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= stk -PORTVERSION= 4.5.1 +PORTVERSION= 4.6.0 CATEGORIES= audio MASTER_SITES= http://ccrma.stanford.edu/software/stk/release/ @@ -17,10 +17,13 @@ LIB_DEPENDS= libjack.so:audio/jack USES= autoreconf dos2unix gmake pkgconfig localbase USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-jack -DOS2UNIX_GLOB= *.cpp *.h +CONFIGURE_ARGS= --with-jack --with-oss +DOS2UNIX_GLOB= *.cpp *.h +MAKE_ARGS= RAWWAVES=${DATADIR}/rawwaves/ 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 <bsd.port.mk> diff --git a/audio/stk/distinfo b/audio/stk/distinfo index b72a8faebb46..e80f9d11e5b8 100644 --- a/audio/stk/distinfo +++ b/audio/stk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1502358993 -SHA256 (stk-4.5.1.tar.gz) = 3466860901a181120d3bd0407e4aeb5ab24127a4350c314af106778c1db88594 -SIZE (stk-4.5.1.tar.gz) = 2413113 +TIMESTAMP = 1504376994 +SHA256 (stk-4.6.0.tar.gz) = 648fcb9a0a4243d2d93fc72b29955953f4e794edf04c31f2ed0ed720d05287d2 +SIZE (stk-4.6.0.tar.gz) = 2403223 diff --git a/audio/stk/files/patch-configure.ac b/audio/stk/files/patch-configure.ac index 92b8f950ed66..92b5739b525f 100644 --- a/audio/stk/files/patch-configure.ac +++ b/audio/stk/files/patch-configure.ac @@ -1,4 +1,4 @@ ---- configure.ac.orig 2016-02-23 01:51:06 UTC +--- configure.ac.orig 2017-09-01 00:28:55 UTC +++ configure.ac @@ -85,7 +85,6 @@ if test "$debug" = "yes"; then else @@ -17,50 +17,44 @@ # Check compiler and use -Wall if gnu. if [test $GXX = "yes" ;] then -@@ -127,31 +126,31 @@ if test $realtime = yes; then - # Checks for package options and external software - AC_MSG_CHECKING(for audio API) +@@ -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!))]) + case $host in - *-*-linux*) -+ *-*-freebsd*) - AC_ARG_WITH(jack, [ --with-jack = choose JACK server support (mac and linux only)], [ - api="$api -D__UNIX_JACK__" - AC_MSG_RESULT(using JACK) - AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!)) -- AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(Jack support also requires the asound library!))], ) -+ #AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(Jack support also requires the asound library!))], ) - ++ *-*-linux*|*-*-freebsd*) # Look for ALSA flag -- AC_ARG_WITH(alsa, [ --with-alsa = choose native ALSA API support (linux only)], [ +- 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)], [ +- 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!))], ) ++ #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 (linux only)], [ + 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__" -- AC_MSG_RESULT(using OSS) -- AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(OSS support requires ALSA for RtMidi!))], ) -+ #AC_ARG_WITH(oss, [ --with-oss = choose OSS API support (linux only)], [ -+ #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!))], ) ++ 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 -- if [test "$api" == "";] then +- 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!)) -- fi -+ #if [test "$api" == "";] then +- ]) ++ #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!)) -+ #fi ++ #]) AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!)) ;; diff --git a/audio/stk/files/patch-src_RtAudio.cpp b/audio/stk/files/patch-src_RtAudio.cpp deleted file mode 100644 index 0cfd68e67346..000000000000 --- a/audio/stk/files/patch-src_RtAudio.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- src/RtAudio.cpp.orig 2016-02-23 01:51:06 UTC -+++ src/RtAudio.cpp -@@ -47,6 +47,11 @@ - #include <climits> - #include <algorithm> - -+#if defined(__FreeBSD__) -+#include <sys/soundcard.h> -+#define AFMT_FLOAT 0x00004000 -+#endif -+ - // Static variable definitions. - const unsigned int RtApi::MAX_SAMPLE_RATES = 14; - const unsigned int RtApi::SAMPLE_RATES[] = { -@@ -9023,7 +9028,7 @@ bool RtApiOss :: probeDeviceOpen( unsign - } - - // Verify the sample rate setup worked. -- if ( abs( srate - sampleRate ) > 100 ) { -+ if ( abs( (int)(srate - sampleRate) ) > 100 ) { - close( fd ); - errorStream_ << "RtApiOss::probeDeviceOpen: device (" << ainfo.name << ") does not support sample rate (" << sampleRate << ")."; - errorText_ = errorStream_.str(); diff --git a/audio/stk/pkg-plist b/audio/stk/pkg-plist index 975074edde5b..c14af15516f6 100644 --- a/audio/stk/pkg-plist +++ b/audio/stk/pkg-plist @@ -101,5 +101,46 @@ include/stk/Whistle.h include/stk/Wurley.h include/stk/WvIn.h include/stk/WvOut.h -lib/libstk-4.5.1.so +lib/libstk-4.6.0.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 |