Brad Smith writes: > On 22/08/14 3:30 PM, Anthony J. Bentley wrote: > > Hi, > > > > Here is an update to portaudio-svn-1919. > > > > All ports with a ldep on portaudio still build, at least on amd64: > > asterisk-11.11.0 > > audacity-1.3.9p5 > > espeak-1.48.04 > > fldigi-3.21.81 > > freemat-4.0p1 > > iaxclient-2.1beta3p12 > > mscore-1.3p4 > > mumble-1.2.7 > > paulstretch-2.2.2 > > pjsua-2.2.1 > > py-audio-0.2.4p0 > > wireshark-1.10.9 > > wordwarvi-1.00p1 > > > > However, I am not a user of any of these ports, so runtime testing would > > be really appreciated. > > > > The patches add some functions (Pa_GetStreamHostApiType() and friends) > > which are necessary for newer versions of audacity. Fedora has these > > patches as well. > > > > ok? > > The update.. yes, but definitely not Ok with the local patch for the > new API.
Here is the diff with those parts removed. So this is ok then? I would really like to move forward with updating Audacity though. Where should we go from here? - Try to push the API changes to upstream Portaudio? - Try to push the sndio patches to upstream Portaudio? - Try to get Audacity to not need the API changes? - All/none of the above? Index: Makefile =================================================================== RCS file: /cvs/ports/audio/portaudio-svn/Makefile,v retrieving revision 1.16 diff -u -p -u -p -r1.16 Makefile --- Makefile 21 Mar 2013 08:45:13 -0000 1.16 +++ Makefile 9 Sep 2014 05:11:36 -0000 @@ -2,13 +2,13 @@ COMMENT= portable cross-platform audio API -DISTNAME= portaudio-svn-1851 +DISTNAME = pa_stable_v19_20140130 +PKGNAME = portaudio-svn-1919 CATEGORIES= audio -MASTER_SITES= http://comstyle.com/source/ -EXTRACT_SUFX= .tar.xz -REVISION= 0 +MASTER_SITES = http://www.portaudio.com/archives/ +EXTRACT_SUFX = .tgz -SHARED_LIBS= portaudio 1.0 +SHARED_LIBS = portaudio 1.1 HOMEPAGE= http://www.portaudio.com/ @@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB= m pthread sndio USE_GMAKE= Yes -AUTOCONF_VERSION= 2.68 +AUTOCONF_VERSION = 2.69 CONFIGURE_STYLE= autoconf no-autoheader CONFIGURE_ARGS= --without-alsa --without-oss --without-jack @@ -27,6 +27,8 @@ TEST_TARGET= tests TEST_IS_INTERACTIVE= Yes CFLAGS+= -DALLOW_SMP_DANGERS + +WRKDIST = ${WRKDIR}/portaudio post-extract: @mkdir -p ${WRKSRC}/src/hostapi/sndio Index: distinfo =================================================================== RCS file: /cvs/ports/audio/portaudio-svn/distinfo,v retrieving revision 1.4 diff -u -p -u -p -r1.4 distinfo --- distinfo 12 Mar 2013 00:59:50 -0000 1.4 +++ distinfo 9 Sep 2014 05:11:36 -0000 @@ -1,2 +1,2 @@ -SHA256 (portaudio-svn-1851.tar.xz) = d+EgTWDkSj5Pnz9LDmy84lCICOdAb2FHbaaC2hSq3qI= -SIZE (portaudio-svn-1851.tar.xz) = 885008 +SHA256 (pa_stable_v19_20140130.tgz) = j+AkpfBoHhEsaXmAj2hMNRYGHMUdOswLcmr5j8lsjVc= +SIZE (pa_stable_v19_20140130.tgz) = 1504620 Index: patches/patch-configure_in =================================================================== RCS file: /cvs/ports/audio/portaudio-svn/patches/patch-configure_in,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-configure_in --- patches/patch-configure_in 12 Mar 2013 00:59:50 -0000 1.3 +++ patches/patch-configure_in 9 Sep 2014 05:11:36 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-configure_in,v 1.3 2013/03/12 00:59:50 brad Exp $ ---- configure.in.orig Sat Jul 7 16:28:11 2012 -+++ configure.in Fri Mar 8 22:53:01 2013 +--- configure.in.orig Thu Jan 16 10:49:33 2014 ++++ configure.in Wed Jul 9 12:13:37 2014 @@ -24,6 +24,10 @@ AC_ARG_WITH(alsa, AS_HELP_STRING([--with-alsa], [Enable support for ALSA @<:@autodetect@:>@]), [with_alsa=$withval]) @@ -23,7 +23,7 @@ $OpenBSD: patch-configure_in,v 1.3 2013/ have_asihpi=no if test "x$with_asihpi" != "xno"; then AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm) -@@ -351,6 +359,13 @@ case "${host_os}" in +@@ -397,6 +405,13 @@ case "${host_os}" in AC_DEFINE(PA_USE_ALSA,1) fi @@ -37,7 +37,7 @@ $OpenBSD: patch-configure_in,v 1.3 2013/ if [[ "$have_jack" = "yes" ] && [ "$with_jack" != "no" ]] ; then DLL_LIBS="$DLL_LIBS $JACK_LIBS" CFLAGS="$CFLAGS $JACK_CFLAGS" -@@ -454,6 +469,7 @@ case "$target_os" in +@@ -500,6 +515,7 @@ case "$target_os" in ;; *) AC_MSG_RESULT([ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/audio/portaudio-svn/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST --- pkg/PLIST 12 Mar 2013 00:59:50 -0000 1.2 +++ pkg/PLIST 9 Sep 2014 05:11:36 -0000 @@ -3,5 +3,4 @@ include/portaudio.h lib/libportaudio.a lib/libportaudio.la @lib lib/libportaudio.so.${LIBportaudio_VERSION} -lib/pkgconfig/ lib/pkgconfig/portaudio-2.0.pc
