From owner-svn-ports-all@freebsd.org Sun Sep 10 10:24:51 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D27F4E088CC; Sun, 10 Sep 2017 10:24:51 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8E346DB4F; Sun, 10 Sep 2017 10:24:51 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8AAOooM046425; Sun, 10 Sep 2017 10:24:50 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8AAOoTP046420; Sun, 10 Sep 2017 10:24:50 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201709101024.v8AAOoTP046420@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 10 Sep 2017 10:24:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449530 - in head/audio/stk: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/audio/stk: . files X-SVN-Commit-Revision: 449530 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Sep 2017 10:24:51 -0000 Author: tobik Date: Sun Sep 10 10:24:50 2017 New Revision: 449530 URL: https://svnweb.freebsd.org/changeset/ports/449530 Log: audio/stk: Update to 4.6.0 Changes: https://ccrma.stanford.edu/software/stk/download.html#v4dot6dot0 PR: 222004 Submitted by: Yuri Victorovich (maintainer) Deleted: head/audio/stk/files/patch-src_RtAudio.cpp Modified: head/audio/stk/Makefile head/audio/stk/distinfo head/audio/stk/files/patch-configure.ac head/audio/stk/pkg-plist Modified: head/audio/stk/Makefile ============================================================================== --- head/audio/stk/Makefile Sun Sep 10 10:18:11 2017 (r449529) +++ head/audio/stk/Makefile Sun Sep 10 10:24:50 2017 (r449530) @@ -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 Modified: head/audio/stk/distinfo ============================================================================== --- head/audio/stk/distinfo Sun Sep 10 10:18:11 2017 (r449529) +++ head/audio/stk/distinfo Sun Sep 10 10:24:50 2017 (r449530) @@ -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 Modified: head/audio/stk/files/patch-configure.ac ============================================================================== --- head/audio/stk/files/patch-configure.ac Sun Sep 10 10:18:11 2017 (r449529) +++ head/audio/stk/files/patch-configure.ac Sun Sep 10 10:24:50 2017 (r449530) @@ -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!)) ;; Modified: head/audio/stk/pkg-plist ============================================================================== --- head/audio/stk/pkg-plist Sun Sep 10 10:18:11 2017 (r449529) +++ head/audio/stk/pkg-plist Sun Sep 10 10:24:50 2017 (r449530) @@ -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