update to 1.3.9, mostly bugfixes, some new/improved features http://audacity.sourceforge.net/download/features-1.3-a#details for, well, details.
also fixes build breakage reported by na...@. comments? -- [email protected] SDF Public Access UNIX System - http://sdf.lonestar.org Index: Makefile =================================================================== RCS file: /cvs/ports/audio/audacity/Makefile,v retrieving revision 1.22 diff -N -u -p Makefile --- Makefile 5 Oct 2009 13:59:56 -0000 1.22 +++ Makefile 27 Oct 2009 02:52:53 -0000 @@ -2,9 +2,9 @@ COMMENT= free audio editor -V= 1.3.7 +V= 1.3.9 DISTNAME= audacity-minsrc-${V} -PKGNAME= audacity-${V}p1 +PKGNAME= audacity-${V} CATEGORIES= audio EXTRACT_SUFX= .tar.bz2 @@ -22,7 +22,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c expat glib-2.0 gobject-2.0 gtk-x11-2.0 \ - m ogg pthread sndfile sndio stdc++ + jack m ogg pthread sndfile sndio stdc++ BUILD_DEPENDS= ::archivers/zip LIB_DEPENDS= wx_base_xml,wx_base_odbc,wx_gtk2_aui,wx_gtk2_html,wx_gtk2_adv,wx_gtk2_xrc,wx_base_net,wx_gtk2_dbgrid,wx_gtk2_qa,wx_base,wx_gtk2_core,wx_gtk2_richtext:wxWidgets-gtk2->=2.8.6:x11/wxWidgets \ @@ -33,7 +33,8 @@ LIB_DEPENDS= wx_base_xml,wx_base_odbc,wx_gtk2_aui,wx_g mad.>=2::audio/libmad \ portaudio::audio/portaudio-svn \ SoundTouch::audio/soundtouch \ - vamp-hostsdk.>=1::audio/vamp-plugin-sdk + vamp-hostsdk.>=1::audio/vamp-plugin-sdk \ + tag::audio/taglib RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \ :shared-mime-info-*:misc/shared-mime-info @@ -51,7 +52,8 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} \ ${WRKSRC}/lib-src/lib-widget-extra \ ${WRKSRC}/lib-src/portsmf \ ${WRKSRC}/lib-src/FileDialog \ - ${WRKSRC}/lib-src/portmixer + ${WRKSRC}/lib-src/sbsms \ + ${WRKSRC}/lib-src/libnyquist CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --enable-unicode \ @@ -73,9 +75,7 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --without-redland \ --without-slv2 \ --without-liblrdf \ - --with-midi=local \ - --with-portmixer=local \ - --with-portaudio=system + --with-portmixer=no MAKE_FLAGS= CC="${CC}" WRKDIST= ${WRKDIR}/audacity-src-${V} Index: distinfo =================================================================== RCS file: /cvs/ports/audio/audacity/distinfo,v retrieving revision 1.8 diff -N -u -p distinfo --- distinfo 14 Mar 2009 03:49:43 -0000 1.8 +++ distinfo 27 Oct 2009 02:52:53 -0000 @@ -1,5 +1,5 @@ -MD5 (audacity-minsrc-1.3.7.tar.bz2) = fcvNjtQXQT/YJNRGABBY2Q== -RMD160 (audacity-minsrc-1.3.7.tar.bz2) = sWB4m5cQnjBub94Z88+XRTp0eSU= -SHA1 (audacity-minsrc-1.3.7.tar.bz2) = ukppa7lQgAxpDsgBOKqEgB4E81o= -SHA256 (audacity-minsrc-1.3.7.tar.bz2) = 4ARJFv/g1tj5In/B49lz4Rs37diQBaEQ6/9ILvMB1NU= -SIZE (audacity-minsrc-1.3.7.tar.bz2) = 5386329 +MD5 (audacity-minsrc-1.3.9.tar.bz2) = DyvIlxxuLE05RXworqFrXA== +RMD160 (audacity-minsrc-1.3.9.tar.bz2) = 63vPNxZJhwX7yzGLnY1Rg8KGePY= +SHA1 (audacity-minsrc-1.3.9.tar.bz2) = dzMLO7cAcAASYvbjx9dKHZTJPF4= +SHA256 (audacity-minsrc-1.3.9.tar.bz2) = 9Hr+jc84Fl01UBYOt+lGlBGfXaVjZ0BgqTxbxm4voBI= +SIZE (audacity-minsrc-1.3.9.tar.bz2) = 6719955 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-configure,v retrieving revision 1.11 diff -N -u -p patches/patch-configure --- patches/patch-configure 14 Mar 2009 03:49:43 -0000 1.11 +++ patches/patch-configure 27 Oct 2009 02:52:53 -0000 @@ -1,7 +1,15 @@ $OpenBSD: patch-configure,v 1.11 2009/03/14 03:49:43 jakemsr Exp $ ---- configure.orig Tue Jan 27 12:50:59 2009 -+++ configure Mon Mar 9 01:17:51 2009 -@@ -6809,7 +6809,7 @@ if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set +--- configure.orig Mon Aug 31 03:45:37 2009 ++++ configure Sat Oct 17 15:08:27 2009 +@@ -822,7 +822,6 @@ JACK_CFLAGS + JACK_LIBS' + ac_subdirs_all='"lib-src/FileDialog" + $CONFIG_SUBDIRS +-lib-src/portaudio-v19 + lib-src/portmixer' + + # Initialize some variables set by options. +@@ -6933,7 +6932,7 @@ if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10,7 +18,7 @@ $OpenBSD: patch-configure,v 1.11 2009/03/14 03:49:43 j cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -7012,7 +7012,7 @@ fi +@@ -7136,7 +7135,7 @@ fi if test "x$lib_found" = "xyes" && test "x$header_found" = "xyes" ; then LIBFLAC_SYSTEM_AVAILABLE="yes" @@ -19,76 +27,29 @@ $OpenBSD: patch-configure,v 1.11 2009/03/14 03:49:43 j LIBFLAC_SYSTEM_CPPSYMBOLS="USE_LIBFLAC" { $as_echo "$as_me:$LINENO: FLAC libraries are available as system libraries" >&5 $as_echo "$as_me: FLAC libraries are available as system libraries" >&6;} -@@ -8742,7 +8742,7 @@ fi - if test "${with_portaudio+set}" = set; then - withval=$with_portaudio; use_portaudio=$withval - else -- use_portaudio="v19" -+ use_portaudio="system" - fi +@@ -9215,13 +9214,8 @@ _ACEOF + esac -@@ -9290,7 +9290,7 @@ done - ;; - esac +-LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a" +-EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a" +-CXXFLAGS="-I\$(top_srcdir)/lib-src/portaudio-v19/include $CXXFLAGS" --else -+elif [ "$use_portaudio" = "v18" ] ; then - CXXFLAGS="-I\$(top_srcdir)/lib-src/portaudio/pa_common $CXXFLAGS" +-subdirs="$subdirs lib-src/portaudio-v19" - case "${host_os}" in -@@ -9310,6 +9310,18 @@ else - EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio/pa_unix_oss/portaudio.a" - ;; - esac -+else -+ # system pa -+cat >>confdefs.h <<\_ACEOF -+#define USE_PORTAUDIO_V19 1 -+_ACEOF -+ -+ -+ # LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a" -+ LIBS="$LIBS -lportaudio" -+ # EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a" -+ # CXXFLAGS="-I\$(top_srcdir)/lib-src/portaudio-v19/include $CXXFLAGS" -+ - fi +- + case "${host_os}" in + darwin* | rhapsody*) + LIBS="-framework AudioUnit -framework AudioToolbox $LIBS" +@@ -9637,7 +9631,6 @@ _ACEOF + subdirs="$subdirs lib-src/portmixer" -@@ -9328,7 +9340,7 @@ _ACEOF - subdirs="$subdirs lib-src/portmixer" - - ac_configure_args="$ac_configure_args --with-pa-include=../portaudio-v19/include" -- else -+ elif [ "$use_portaudio" = "v18" ] ; then - - CXXFLAGS="-I\$(top_srcdir)/lib-src/portmixer/px_common $CXXFLAGS" - case "${host_os}" in -@@ -9345,6 +9357,13 @@ _ACEOF - EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_unix_oss/portmixer.a" - ;; - esac -+ else -+ # system pa -+ CXXFLAGS="-I\$(top_srcdir)/lib-src/portmixer/include $CXXFLAGS" -+ LOCAL_LIBS="$LOCAL_LIBS portmixer/libportmixer.a" -+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/libportmixer.a" -+ -+ subdirs="$subdirs lib-src/portmixer" - fi +- ac_configure_args="$ac_configure_args --with-pa-include=../portaudio-v19/include" fi -@@ -9536,7 +9555,7 @@ if [ "x$LIBEXPAT_USE_LOCAL" = "xyes" ]; then - ac_config_files="$ac_config_files lib-src/expat/Makefile" - - fi --if [ "$use_portaudio" != "v19" ]; then -+if [ "$use_portaudio" = "v18" ]; then - ac_config_files="$ac_config_files lib-src/portaudio/pa_unix_oss/Makefile" - - fi -@@ -10970,7 +10989,7 @@ $as_echo "$as_me: WARNING: no configuration informatio + { $as_echo "$as_me:$LINENO: checking for lrint" >&5 +@@ -11255,7 +11248,7 @@ $as_echo "$as_me: WARNING: no configuration informatio { $as_echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 $as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} # The eval makes quoting arguments work. @@ -97,30 +58,15 @@ $OpenBSD: patch-configure,v 1.11 2009/03/14 03:49:43 j --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || { { $as_echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 $as_echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} -@@ -10988,9 +11007,12 @@ fi - - pa_libs= - if [ "$use_portaudio" = "v19" ] ; then -- pa_libs=`grep 'Libs:' lib-src/portaudio-v19/portaudio-2.0.pc | sed -e 's/Libs://;s/-L${libdir}//;s/-lportaudio//'` -+ # pa_libs=`grep 'Libs:' lib-src/portaudio-v19/portaudio-2.0.pc | sed -e 's/Libs://;s/-L${libdir}//;s/-lportaudio//'` -+ pa_libs="`pkg-config --libs portaudio-2.0`" -+elif [ "$use_portaudio" = "system" ] ; then -+ pa_libs="`pkg-config --libs portaudio-2.0`" +@@ -11271,9 +11264,8 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_u fi + + +-pa_libs= +-pa_libs=`grep 'Libs:' lib-src/portaudio-v19/portaudio-2.0.pc | sed -e 's/Libs://;s/-L${libdir}//;s/-lportaudio//'` -sed -i -e "s/@PA_LIBS@/$pa_libs/" src/Makefile ++pa_libs=`pkg-config --libs portaudio-2.0` +perl -pi -e "s...@pa_libs\@#$pa_libs#" src/Makefile echo "" echo "Finished configure:" -@@ -11031,8 +11053,10 @@ case "${host_os}" in - *) - if [ "$use_portaudio" = "v19" ] ; then - echo "portaudio: v19" -- else -+ elif [ "$use_portaudio" = "v18" ] ; then - echo "portaudio: v18 (OSS only)" -+ else -+ echo "portaudio: system" - fi - ;; - esac ? patches/patch-lib-src_libnyquist_Makefile_in Index: patches/patch-lib-src_libnyquist_cmt_cext_h =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_libnyquist_cmt_cext_h,v retrieving revision 1.3 diff -N -u -p patches/patch-lib-src_libnyquist_cmt_cext_h --- patches/patch-lib-src_libnyquist_cmt_cext_h 6 Jun 2007 09:35:18 -0000 1.3 +++ /dev/null 27 Oct 2009 02:31:02 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib-src_libnyquist_cmt_cext_h,v 1.3 2007/06/06 09:35:18 ajacoutot Exp $ ---- lib-src/libnyquist/cmt/cext.h.orig Wed Mar 28 09:15:06 2007 -+++ lib-src/libnyquist/cmt/cext.h Wed Mar 28 09:15:26 2007 -@@ -54,6 +54,8 @@ EXIT(n) -- calls exit(n) after shutting down/dealloca - #include <sys/types.h> - #endif - -+#include <unistd.h> -+ - #if HAS_MALLOC_H - #include <malloc.h> - #endif Index: patches/patch-lib-src_libnyquist_nyquist_nyqstk_include_Stk_h =================================================================== RCS file: patches/patch-lib-src_libnyquist_nyquist_nyqstk_include_Stk_h diff -N -u -p patches/patch-lib-src_libnyquist_nyquist_nyqstk_include_Stk_h --- /dev/null 26 Oct 2009 20:52:54 -0000 +++ patches/patch-lib-src_libnyquist_nyquist_nyqstk_include_Stk_h 27 Oct 2009 02:52:53 -0000 @@ -0,0 +1,20 @@ +$OpenBSD$ +--- lib-src/libnyquist/nyquist/nyqstk/include/Stk.h.orig Sat Oct 17 15:24:11 2009 ++++ lib-src/libnyquist/nyquist/nyqstk/include/Stk.h Sat Oct 17 15:24:11 2009 +@@ -127,13 +127,13 @@ class Stk (public) + static void setRawwavePath(std::string path); + + //! Static method which byte-swaps a 16-bit data type. +- static void swap16(unsigned char *ptr); ++ static void NYswap16(unsigned char *ptr); + + //! Static method which byte-swaps a 32-bit data type. +- static void swap32(unsigned char *ptr); ++ static void NYswap32(unsigned char *ptr); + + //! Static method which byte-swaps a 64-bit data type. +- static void swap64(unsigned char *ptr); ++ static void NYswap64(unsigned char *ptr); + + //! Static cross-platform method to sleep for a number of milliseconds. + static void sleep(unsigned long milliseconds); Index: patches/patch-lib-src_libnyquist_nyquist_nyqstk_src_FileRead_cpp =================================================================== RCS file: patches/patch-lib-src_libnyquist_nyquist_nyqstk_src_FileRead_cpp diff -N -u -p patches/patch-lib-src_libnyquist_nyquist_nyqstk_src_FileRead_cpp --- /dev/null 26 Oct 2009 20:52:54 -0000 +++ patches/patch-lib-src_libnyquist_nyquist_nyqstk_src_FileRead_cpp 27 Oct 2009 02:52:54 -0000 @@ -0,0 +1,279 @@ +$OpenBSD$ +--- lib-src/libnyquist/nyquist/nyqstk/src/FileRead.cpp.orig Sat Oct 17 15:24:50 2009 ++++ lib-src/libnyquist/nyquist/nyqstk/src/FileRead.cpp Sat Oct 17 15:28:03 2009 +@@ -160,7 +160,7 @@ bool FileRead :: getWavInfo( const char *fileName ) + while ( strncmp(id, "fmt ", 4) ) { + if ( fread(&chunkSize, 4, 1, fd_) != 1 ) goto error; + #ifndef __LITTLE_ENDIAN__ +- swap32((unsigned char *)&chunkSize); ++ NYswap32((unsigned char *)&chunkSize); + #endif + if ( fseek(fd_, chunkSize, SEEK_CUR) == -1 ) goto error; + if ( fread(&id, 4, 1, fd_) != 1 ) goto error; +@@ -171,8 +171,8 @@ bool FileRead :: getWavInfo( const char *fileName ) + if ( fread(&chunkSize, 4, 1, fd_) != 1 ) goto error; // Read fmt chunk size. + if ( fread(&format_tag, 2, 1, fd_) != 1 ) goto error; + #ifndef __LITTLE_ENDIAN__ +- swap16((unsigned char *)&format_tag); +- swap32((unsigned char *)&chunkSize); ++ NYswap16((unsigned char *)&format_tag); ++ NYswap32((unsigned char *)&chunkSize); + #endif + if ( format_tag == 0xFFFE ) { // WAVE_FORMAT_EXTENSIBLE + dataOffset_ = ftell(fd_); +@@ -180,13 +180,13 @@ bool FileRead :: getWavInfo( const char *fileName ) + unsigned short extSize; + if ( fread(&extSize, 2, 1, fd_) != 1 ) goto error; + #ifndef __LITTLE_ENDIAN__ +- swap16((unsigned char *)&extSize); ++ NYswap16((unsigned char *)&extSize); + #endif + if ( extSize == 0 ) goto error; + if ( fseek(fd_, 6, SEEK_CUR) == -1 ) goto error; + if ( fread(&format_tag, 2, 1, fd_) != 1 ) goto error; + #ifndef __LITTLE_ENDIAN__ +- swap16((unsigned char *)&format_tag); ++ NYswap16((unsigned char *)&format_tag); + #endif + if ( fseek(fd_, dataOffset_, SEEK_SET) == -1 ) goto error; + } +@@ -199,7 +199,7 @@ bool FileRead :: getWavInfo( const char *fileName ) + SINT16 temp; + if ( fread(&temp, 2, 1, fd_) != 1 ) goto error; + #ifndef __LITTLE_ENDIAN__ +- swap16((unsigned char *)&temp); ++ NYswap16((unsigned char *)&temp); + #endif + channels_ = (unsigned int ) temp; + +@@ -207,7 +207,7 @@ bool FileRead :: getWavInfo( const char *fileName ) + SINT32 srate; + if ( fread(&srate, 4, 1, fd_) != 1 ) goto error; + #ifndef __LITTLE_ENDIAN__ +- swap32((unsigned char *)&srate); ++ NYswap32((unsigned char *)&srate); + #endif + fileRate_ = (StkFloat) srate; + +@@ -216,7 +216,7 @@ bool FileRead :: getWavInfo( const char *fileName ) + if ( fseek(fd_, 6, SEEK_CUR) == -1 ) goto error; // Locate bits_per_sample info. + if ( fread(&temp, 2, 1, fd_) != 1 ) goto error; + #ifndef __LITTLE_ENDIAN__ +- swap16((unsigned char *)&temp); ++ NYswap16((unsigned char *)&temp); + #endif + if ( format_tag == 1 ) { + if (temp == 8) +@@ -246,7 +246,7 @@ bool FileRead :: getWavInfo( const char *fileName ) + while ( strncmp(id, "data", 4) ) { + if ( fread(&chunkSize, 4, 1, fd_) != 1 ) goto error; + #ifndef __LITTLE_ENDIAN__ +- swap32((unsigned char *)&chunkSize); ++ NYswap32((unsigned char *)&chunkSize); + #endif + chunkSize += chunkSize % 2; // chunk sizes must be even + if ( fseek(fd_, chunkSize, SEEK_CUR) == -1 ) goto error; +@@ -257,7 +257,7 @@ bool FileRead :: getWavInfo( const char *fileName ) + SINT32 bytes; + if ( fread(&bytes, 4, 1, fd_) != 1 ) goto error; + #ifndef __LITTLE_ENDIAN__ +- swap32((unsigned char *)&bytes); ++ NYswap32((unsigned char *)&bytes); + #endif + fileSize_ = 8 * bytes / temp / channels_; // sample frames + +@@ -282,7 +282,7 @@ bool FileRead :: getSndInfo( const char *fileName ) + if ( fseek(fd_, 12, SEEK_SET) == -1 ) goto error; // Locate format + if ( fread(&format, 4, 1, fd_) != 1 ) goto error; + #ifdef __LITTLE_ENDIAN__ +- swap32((unsigned char *)&format); ++ NYswap32((unsigned char *)&format); + #endif + if (format == 2) dataType_ = STK_SINT8; + else if (format == 3) dataType_ = STK_SINT16; +@@ -299,7 +299,7 @@ bool FileRead :: getSndInfo( const char *fileName ) + UINT32 srate; + if ( fread(&srate, 4, 1, fd_) != 1 ) goto error; + #ifdef __LITTLE_ENDIAN__ +- swap32((unsigned char *)&srate); ++ NYswap32((unsigned char *)&srate); + #endif + fileRate_ = (StkFloat) srate; + +@@ -307,20 +307,20 @@ bool FileRead :: getSndInfo( const char *fileName ) + UINT32 chans; + if ( fread(&chans, 4, 1, fd_) != 1 ) goto error; + #ifdef __LITTLE_ENDIAN__ +- swap32((unsigned char *)&chans); ++ NYswap32((unsigned char *)&chans); + #endif + channels_ = chans; + + if ( fseek(fd_, 4, SEEK_SET) == -1 ) goto error; + if ( fread(&dataOffset_, 4, 1, fd_) != 1 ) goto error; + #ifdef __LITTLE_ENDIAN__ +- swap32((unsigned char *)&dataOffset_); ++ NYswap32((unsigned char *)&dataOffset_); + #endif + + // Get length of data from the header. + if ( fread(&fileSize_, 4, 1, fd_) != 1 ) goto error; + #ifdef __LITTLE_ENDIAN__ +- swap32((unsigned char *)&fileSize_); ++ NYswap32((unsigned char *)&fileSize_); + #endif + // Convert to sample frames. + if ( dataType_ == STK_SINT8 ) +@@ -362,7 +362,7 @@ bool FileRead :: getAifInfo( const char *fileName ) + while ( strncmp(id, "COMM", 4) ) { + if ( fread(&chunkSize, 4, 1, fd_) != 1 ) goto error; + #ifdef __LITTLE_ENDIAN__ +- swap32((unsigned char *)&chunkSize); ++ NYswap32((unsigned char *)&chunkSize); + #endif + chunkSize += chunkSize % 2; // chunk sizes must be even + if ( fseek(fd_, chunkSize, SEEK_CUR) == -1 ) goto error; +@@ -374,7 +374,7 @@ bool FileRead :: getAifInfo( const char *fileName ) + if ( fseek(fd_, 4, SEEK_CUR) == -1 ) goto error; // Jump over chunk size + if ( fread(&temp, 2, 1, fd_) != 1 ) goto error; + #ifdef __LITTLE_ENDIAN__ +- swap16((unsigned char *)&temp); ++ NYswap16((unsigned char *)&temp); + #endif + channels_ = temp; + +@@ -382,14 +382,14 @@ bool FileRead :: getAifInfo( const char *fileName ) + SINT32 frames; + if ( fread(&frames, 4, 1, fd_) != 1 ) goto error; + #ifdef __LITTLE_ENDIAN__ +- swap32((unsigned char *)&frames); ++ NYswap32((unsigned char *)&frames); + #endif + fileSize_ = frames; // sample frames + + // Read the number of bits per sample. + if ( fread(&temp, 2, 1, fd_) != 1 ) goto error; + #ifdef __LITTLE_ENDIAN__ +- swap16((unsigned char *)&temp); ++ NYswap16((unsigned char *)&temp); + #endif + + // Get file sample rate from the header. For AIFF files, this value +@@ -402,7 +402,7 @@ bool FileRead :: getAifInfo( const char *fileName ) + if ( fread(&srate, 10, 1, fd_) != 1 ) goto error; + mantissa = (unsigned long) *(unsigned long *)(srate+2); + #ifdef __LITTLE_ENDIAN__ +- swap32((unsigned char *)&mantissa); ++ NYswap32((unsigned char *)&mantissa); + #endif + exp = 30 - *(srate+1); + last = 0; +@@ -445,7 +445,7 @@ bool FileRead :: getAifInfo( const char *fileName ) + while ( strncmp(id, "SSND", 4) ) { + if ( fread(&chunkSize, 4, 1, fd_) != 1 ) goto error; + #ifdef __LITTLE_ENDIAN__ +- swap32((unsigned char *)&chunkSize); ++ NYswap32((unsigned char *)&chunkSize); + #endif + chunkSize += chunkSize % 2; // chunk sizes must be even + if ( fseek(fd_, chunkSize, SEEK_CUR) == -1 ) goto error; +@@ -503,7 +503,7 @@ bool FileRead :: getMatInfo( const char *fileName ) + // Check the data element type + SINT32 datatype; + if ( fread(&datatype, 4, 1, fd_) != 1 ) goto error; +- if ( byteswap_ ) swap32((unsigned char *)&datatype); ++ if ( byteswap_ ) NYswap32((unsigned char *)&datatype); + if (datatype != 14) { + errorString_ << "FileRead: The file does not contain a single Matlab array (or matrix) data element."; + return false; +@@ -514,10 +514,10 @@ bool FileRead :: getMatInfo( const char *fileName ) + SINT32 size; + if ( fseek(fd_, 168, SEEK_SET) == -1 ) goto error; + if ( fread(&tmp, 4, 1, fd_) != 1 ) goto error; +- if (byteswap_) swap32((unsigned char *)&tmp); ++ if (byteswap_) NYswap32((unsigned char *)&tmp); + if (tmp == 1) { // array name > 4 characters + if ( fread(&tmp, 4, 1, fd_) != 1 ) goto error; // get array name length +- if (byteswap_) swap32((unsigned char *)&tmp); ++ if (byteswap_) NYswap32((unsigned char *)&tmp); + size = (SINT32) ceil((float)tmp / 8); + if ( fseek(fd_, size*8, SEEK_CUR) == -1 ) goto error; // jump over array name + } +@@ -525,7 +525,7 @@ bool FileRead :: getMatInfo( const char *fileName ) + if ( fseek(fd_, 4, SEEK_CUR) == -1 ) goto error; + } + if ( fread(&tmp, 4, 1, fd_) != 1 ) goto error; +- if (byteswap_) swap32((unsigned char *)&tmp); ++ if (byteswap_) NYswap32((unsigned char *)&tmp); + if ( tmp == 1 ) dataType_ = STK_SINT8; + else if ( tmp == 3 ) dataType_ = STK_SINT16; + else if ( tmp == 5 ) dataType_ = STK_SINT32; +@@ -540,12 +540,12 @@ bool FileRead :: getMatInfo( const char *fileName ) + SINT32 rows; + if ( fseek(fd_, 160, SEEK_SET) == -1 ) goto error; + if ( fread(&rows, 4, 1, fd_) != 1 ) goto error; +- if (byteswap_) swap32((unsigned char *)&rows); ++ if (byteswap_) NYswap32((unsigned char *)&rows); + + // Get number of columns from the header. + SINT32 columns; + if ( fread(&columns, 4, 1, fd_) != 1 ) goto error; +- if (byteswap_) swap32((unsigned char *)&columns); ++ if (byteswap_) NYswap32((unsigned char *)&columns); + + // Assume channels = smaller of rows or columns. + if (rows < columns) { +@@ -561,7 +561,7 @@ bool FileRead :: getMatInfo( const char *fileName ) + SINT32 headsize; + if ( fseek(fd_, 132, SEEK_SET) == -1 ) goto error; + if ( fread(&headsize, 4, 1, fd_) != 1 ) goto error; // file size from 132nd byte +- if (byteswap_) swap32((unsigned char *)&headsize); ++ if (byteswap_) NYswap32((unsigned char *)&headsize); + headsize -= fileSize_ * 8 * channels_; + if ( fseek(fd_, headsize, SEEK_CUR) == -1 ) goto error; + dataOffset_ = ftell(fd_); +@@ -613,7 +613,7 @@ void FileRead :: read( StkFrames& buffer, unsigned lon + if ( byteswap_ ) { + SINT16 *ptr = buf; + for ( i=nSamples-1; i>=0; i-- ) +- swap16( (unsigned char *) ptr++ ); ++ NYswap16( (unsigned char *) ptr++ ); + } + if ( doNormalize ) { + StkFloat gain = 1.0 / 32768.0; +@@ -632,7 +632,7 @@ void FileRead :: read( StkFrames& buffer, unsigned lon + if ( byteswap_ ) { + SINT32 *ptr = buf; + for ( i=nSamples-1; i>=0; i-- ) +- swap32( (unsigned char *) ptr++ ); ++ NYswap32( (unsigned char *) ptr++ ); + } + if ( doNormalize ) { + StkFloat gain = 1.0 / 2147483648.0; +@@ -651,7 +651,7 @@ void FileRead :: read( StkFrames& buffer, unsigned lon + if ( byteswap_ ) { + FLOAT32 *ptr = buf; + for ( i=nSamples-1; i>=0; i-- ) +- swap32( (unsigned char *) ptr++ ); ++ NYswap32( (unsigned char *) ptr++ ); + } + for ( i=nSamples-1; i>=0; i-- ) + buffer[i] = buf[i]; +@@ -663,7 +663,7 @@ void FileRead :: read( StkFrames& buffer, unsigned lon + if ( byteswap_ ) { + FLOAT64 *ptr = buf; + for ( i=nSamples-1; i>=0; i-- ) +- swap64( (unsigned char *) ptr++ ); ++ NYswap64( (unsigned char *) ptr++ ); + } + for ( i=nSamples-1; i>=0; i-- ) + buffer[i] = buf[i]; +@@ -707,7 +707,7 @@ void FileRead :: read( StkFrames& buffer, unsigned lon + if ( fread( &buf, 3, 1, fd_ ) != 1 ) goto error; + buf >>= 8; + if ( byteswap_ ) +- swap32( (unsigned char *) &buf ); ++ NYswap32( (unsigned char *) &buf ); + if ( doNormalize ) + buffer[i] = buf * gain; + else Index: patches/patch-lib-src_libnyquist_nyquist_nyqstk_src_Stk_cpp =================================================================== RCS file: patches/patch-lib-src_libnyquist_nyquist_nyqstk_src_Stk_cpp diff -N -u -p patches/patch-lib-src_libnyquist_nyquist_nyqstk_src_Stk_cpp --- /dev/null 26 Oct 2009 20:52:54 -0000 +++ patches/patch-lib-src_libnyquist_nyquist_nyqstk_src_Stk_cpp 27 Oct 2009 02:52:54 -0000 @@ -0,0 +1,30 @@ +$OpenBSD$ +--- lib-src/libnyquist/nyquist/nyqstk/src/Stk.cpp.orig Sat Oct 17 15:28:37 2009 ++++ lib-src/libnyquist/nyquist/nyqstk/src/Stk.cpp Sat Oct 17 15:29:43 2009 +@@ -46,7 +46,7 @@ void Stk :: setRawwavePath( std::string path ) + rawwavepath_ += "/"; + } + +-void Stk :: swap16(unsigned char *ptr) ++void Stk :: NYswap16(unsigned char *ptr) + { + register unsigned char val; + +@@ -56,7 +56,7 @@ void Stk :: swap16(unsigned char *ptr) + *(ptr+1) = val; + } + +-void Stk :: swap32(unsigned char *ptr) ++void Stk :: NYswap32(unsigned char *ptr) + { + register unsigned char val; + +@@ -72,7 +72,7 @@ void Stk :: swap32(unsigned char *ptr) + *(ptr+1) = val; + } + +-void Stk :: swap64(unsigned char *ptr) ++void Stk :: NYswap64(unsigned char *ptr) + { + register unsigned char val; + Index: patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp_h =================================================================== RCS file: patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp_h diff -N -u -p patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp_h --- /dev/null 26 Oct 2009 20:52:54 -0000 +++ patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp_h 27 Oct 2009 02:52:54 -0000 @@ -0,0 +1,29 @@ +$OpenBSD$ +--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig Sat Oct 17 15:12:12 2009 ++++ lib-src/libnyquist/nyquist/xlisp/xlisp.h Sat Oct 17 15:18:45 2009 +@@ -152,6 +152,16 @@ extern long ptrtoabs(); + #endif + #endif + ++/* OpenBSD gcc */ ++#if defined(__OpenBSD__) ++#include <sys/types.h> ++#if _BYTE_ORDER == _LITTLE_ENDIAN ++#define XL_LITTLE_ENDIAN ++#else ++#define XL_BIG_ENDIAN ++#endif ++#endif ++ + /* Apple CC */ + #ifdef __APPLE__ + #define NNODES 2000 +@@ -190,7 +200,7 @@ extern long ptrtoabs(); + #define LOCAL static + #endif + #ifndef AFMT +-#define AFMT "%x" ++#define AFMT "%lux" + #endif + #ifndef FIXTYPE + #define FIXTYPE long Index: patches/patch-lib-src_libnyquist_snd_snd_h =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_libnyquist_snd_snd_h,v retrieving revision 1.1.1.1 diff -N -u -p patches/patch-lib-src_libnyquist_snd_snd_h --- patches/patch-lib-src_libnyquist_snd_snd_h 12 Jan 2006 08:59:27 -0000 1.1.1.1 +++ /dev/null 27 Oct 2009 02:31:02 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-lib-src_libnyquist_snd_snd_h,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $ ---- lib-src/libnyquist/snd/snd.h.orig Tue Jan 11 20:57:17 2005 -+++ lib-src/libnyquist/snd/snd.h Tue Jan 11 21:02:43 2005 -@@ -15,6 +15,7 @@ error here - - /* Standard includes */ - #include <stdlib.h> -+#include <unistd.h> - - #include "sndconfig.h" - Index: patches/patch-lib-src_libnyquist_snd_sndconfig_h =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_libnyquist_snd_sndconfig_h,v retrieving revision 1.1.1.1 diff -N -u -p patches/patch-lib-src_libnyquist_snd_sndconfig_h --- patches/patch-lib-src_libnyquist_snd_sndconfig_h 12 Jan 2006 08:59:27 -0000 1.1.1.1 +++ /dev/null 27 Oct 2009 02:31:02 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib-src_libnyquist_snd_sndconfig_h,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $ ---- lib-src/libnyquist/snd/sndconfig.h.orig Thu Nov 18 07:17:32 2004 -+++ lib-src/libnyquist/snd/sndconfig.h Tue Jan 11 08:56:46 2005 -@@ -60,7 +60,7 @@ void snd_free(void *a); - #elif defined(IRIX) - #include "sndirix.h" - --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__OpenBSD__) - #include "sndfreebsd.h" - - #elif defined(_WIN32) Index: patches/patch-lib-src_libnyquist_snd_sndheader_c =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_libnyquist_snd_sndheader_c,v retrieving revision 1.3 diff -N -u -p patches/patch-lib-src_libnyquist_snd_sndheader_c --- patches/patch-lib-src_libnyquist_snd_sndheader_c 6 Jun 2007 09:35:18 -0000 1.3 +++ /dev/null 27 Oct 2009 02:31:02 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib-src_libnyquist_snd_sndheader_c,v 1.3 2007/06/06 09:35:18 ajacoutot Exp $ ---- lib-src/libnyquist/snd/sndheader.c.orig Wed Mar 28 09:16:45 2007 -+++ lib-src/libnyquist/snd/sndheader.c Wed Mar 28 09:17:08 2007 -@@ -923,7 +923,7 @@ void snd_write_header(snd_type snd, long *flags) - 8 /*SSND hdr*/ + 8 /*SSND chunk*/; - if (snd->format.bits != 8 && snd->format.bits != 16) { - char msg[64]; -- sprintf(msg, "Warning: using 16 bits per sample instead of %d\n", -+ sprintf(msg, "Warning: using 16 bits per sample instead of %ld\n", - snd->format.bits); - snd_warn(msg); - snd->format.bits = 16; Index: patches/patch-lib-src_libnyquist_snd_sndio_c =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_libnyquist_snd_sndio_c,v retrieving revision 1.1.1.1 diff -N -u -p patches/patch-lib-src_libnyquist_snd_sndio_c --- patches/patch-lib-src_libnyquist_snd_sndio_c 12 Jan 2006 08:59:27 -0000 1.1.1.1 +++ /dev/null 27 Oct 2009 02:31:02 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib-src_libnyquist_snd_sndio_c,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $ ---- lib-src/libnyquist/snd/sndio.c.orig Thu Nov 18 07:17:32 2004 -+++ lib-src/libnyquist/snd/sndio.c Tue Jan 11 08:56:46 2005 -@@ -20,7 +20,7 @@ - #ifdef WIN32 - #include <sys/stat.h> - #include "io.h" --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__OpenBSD__) - #include <sys/stat.h> - #else - #endif Index: patches/patch-lib-src_libnyquist_xlisp_xlisp_h =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_libnyquist_xlisp_xlisp_h,v retrieving revision 1.1.1.1 diff -N -u -p patches/patch-lib-src_libnyquist_xlisp_xlisp_h --- patches/patch-lib-src_libnyquist_xlisp_xlisp_h 12 Jan 2006 08:59:27 -0000 1.1.1.1 +++ /dev/null 27 Oct 2009 02:31:02 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib-src_libnyquist_xlisp_xlisp_h,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $ ---- lib-src/libnyquist/xlisp/xlisp.h.orig Tue Jan 11 19:49:00 2005 -+++ lib-src/libnyquist/xlisp/xlisp.h Tue Jan 11 19:49:21 2005 -@@ -178,7 +178,7 @@ extern long ptrtoabs(); - #define LOCAL static - #endif - #ifndef AFMT --#define AFMT "%x" -+#define AFMT "%lux" - #endif - #ifndef FIXTYPE - #define FIXTYPE long Index: patches/patch-lib-src_libnyquist_xlisp_xlprin_c =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_libnyquist_xlisp_xlprin_c,v retrieving revision 1.3 diff -N -u -p patches/patch-lib-src_libnyquist_xlisp_xlprin_c --- patches/patch-lib-src_libnyquist_xlisp_xlprin_c 6 Jun 2007 09:35:18 -0000 1.3 +++ /dev/null 27 Oct 2009 02:31:02 -0000 @@ -1,30 +0,0 @@ -$OpenBSD: patch-lib-src_libnyquist_xlisp_xlprin_c,v 1.3 2007/06/06 09:35:18 ajacoutot Exp $ ---- lib-src/libnyquist/xlisp/xlprin.c.orig Wed Mar 28 09:18:58 2007 -+++ lib-src/libnyquist/xlisp/xlprin.c Wed Mar 28 09:20:23 2007 -@@ -245,7 +245,7 @@ LOCAL void putqstring(LVAL fptr, LVAL str) - void putatm(LVAL fptr, char *tag, LVAL val) - { - sprintf(buf,"#<%s: #",tag); xlputstr(fptr,buf); -- sprintf(buf,AFMT,(int)val); xlputstr(fptr,buf); -+ sprintf(buf,AFMT,(unsigned long)val); xlputstr(fptr,buf); - xlputc(fptr,'>'); - } - -@@ -254,7 +254,7 @@ LOCAL void putsubr(LVAL fptr, char *tag, LVAL val) - { - sprintf(buf,"#<%s-%s: #",tag,funtab[getoffset(val)].fd_name); - xlputstr(fptr,buf); -- sprintf(buf,AFMT,(int)val); xlputstr(fptr,buf); -+ sprintf(buf,AFMT,(unsigned long)val); xlputstr(fptr,buf); - xlputc(fptr,'>'); - } - -@@ -267,7 +267,7 @@ LOCAL void putclosure(LVAL fptr, LVAL val) - else - strcpy(buf,"#<Closure: #"); - xlputstr(fptr,buf); -- sprintf(buf,AFMT,(int)val); xlputstr(fptr,buf); -+ sprintf(buf,AFMT,(unsigned long)val); xlputstr(fptr,buf); - xlputc(fptr,'>'); - /* - xlputstr(fptr,"\nName: "); xlprint(fptr,getname(val),TRUE); Index: patches/patch-lib-src_portmixer_Makefile_in =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_portmixer_Makefile_in,v retrieving revision 1.1 diff -N -u -p patches/patch-lib-src_portmixer_Makefile_in --- patches/patch-lib-src_portmixer_Makefile_in 11 Jan 2009 09:29:36 -0000 1.1 +++ /dev/null 27 Oct 2009 02:31:02 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib-src_portmixer_Makefile_in,v 1.1 2009/01/11 09:29:36 jakemsr Exp $ ---- lib-src/portmixer/Makefile.in.orig Thu Nov 13 20:23:24 2008 -+++ lib-src/portmixer/Makefile.in Thu Nov 13 20:23:57 2008 -@@ -9,7 +9,7 @@ AR = @AR@ - RANLIB = @RANLIB@ - - DEFS += @DEFS@ --CFLAGS += @cflags@ -+CFLAGS += @CFLAGS@ - CFLAGS += @include@ - - all : $(LIBRARY) Index: patches/patch-lib-src_portmixer_configure =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_portmixer_configure,v retrieving revision 1.3 diff -N -u -p patches/patch-lib-src_portmixer_configure --- patches/patch-lib-src_portmixer_configure 14 Mar 2009 03:49:43 -0000 1.3 +++ /dev/null 27 Oct 2009 02:31:02 -0000 @@ -1,34 +0,0 @@ -$OpenBSD: patch-lib-src_portmixer_configure,v 1.3 2009/03/14 03:49:43 jakemsr Exp $ ---- lib-src/portmixer/configure.orig Tue Jan 27 12:51:44 2009 -+++ lib-src/portmixer/configure Tue Feb 10 03:21:25 2009 -@@ -3466,6 +3466,11 @@ fi - # - # Make sure the support is there - # -+ -+# skip test for now -+ -+if [ x"yes" = x"no" ]; then -+ - have_support=yes - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3600,6 +3605,9 @@ $as_echo "$as_me: error: \"Your version of portaudio d - { (exit 1); exit 1; }; }; - fi - -+# end skip test -+fi -+ - # - # - # -@@ -4100,7 +4108,7 @@ else - have_coreaudio=no - fi - -- -+have_oss=yes - - # - # Set up to use the identified ones Index: patches/patch-lib-src_portmixer_px_unix_oss_px_unix_oss_c =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_portmixer_px_unix_oss_px_unix_oss_c,v retrieving revision 1.2 diff -N -u -p patches/patch-lib-src_portmixer_px_unix_oss_px_unix_oss_c --- patches/patch-lib-src_portmixer_px_unix_oss_px_unix_oss_c 17 Dec 2006 12:12:59 -0000 1.2 +++ /dev/null 27 Oct 2009 02:31:02 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib-src_portmixer_px_unix_oss_px_unix_oss_c,v 1.2 2006/12/17 12:12:59 ajacoutot Exp $ ---- lib-src/portmixer/px_unix_oss/px_unix_oss.c.orig Sun Oct 29 01:05:51 2006 -+++ lib-src/portmixer/px_unix_oss/px_unix_oss.c Sat Dec 2 11:05:46 2006 -@@ -40,7 +40,7 @@ - #elif defined(__FreeBSD__) - #include <sys/soundcard.h> - #else --#include <machine/soundcard.h> /* JH20010905 */ -+#include <soundcard.h> /* JH20010905 */ - #endif - - #include <stdio.h> Index: patches/patch-lib-src_portmixer_src_px_mixer_c =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_portmixer_src_px_mixer_c,v retrieving revision 1.2 diff -N -u -p patches/patch-lib-src_portmixer_src_px_mixer_c --- patches/patch-lib-src_portmixer_src_px_mixer_c 8 Dec 2007 11:08:38 -0000 1.2 +++ /dev/null 27 Oct 2009 02:31:02 -0000 @@ -1,45 +0,0 @@ -$OpenBSD: patch-lib-src_portmixer_src_px_mixer_c,v 1.2 2007/12/08 11:08:38 ajacoutot Exp $ ---- lib-src/portmixer/src/px_mixer.c.orig Tue Nov 13 23:02:44 2007 -+++ lib-src/portmixer/src/px_mixer.c Sat Nov 24 12:19:08 2007 -@@ -35,7 +35,7 @@ - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ --#include "portaudio.h" -+#include <portaudio.h> - #include "portmixer.h" - #include "px_mixer.h" - -@@ -124,6 +124,9 @@ PxMixer *Px_OpenMixer(PaStream *pa_stream, int i) - return NULL; - } - -+ -+#ifdef PX_USE_PA_V18 -+ - switch (Pa_GetStreamHostApiType(pa_stream)) - { - #if defined(PX_USE_WIN_MME) -@@ -156,6 +159,22 @@ PxMixer *Px_OpenMixer(PaStream *pa_stream, int i) - break; - #endif - } -+ -+#else /* PX_USE_PA_V18 */ -+ -+#if defined(PX_USE_UNIX_OSS) -+ good = OpenMixer_Unix_OSS(Px, i); -+#elif defined(PX_USE_WIN_MME) -+ good = OpenMixer_Win_MME(Px, i); -+#elif defined(PX_USE_WIN_DSOUND) -+ good = OpenMixer_Win_DirectSound(Px, i); -+#elif defined(PX_USE_MAC_COREAUDIO) -+ good = OpenMixer_Mac_CoreAudio(Px, i); -+#elif defined(PX_USE_LINUX_ALSA) -+ good = OpenMixer_Linux_ALSA(Px, i); -+#endif -+ -+#endif /* PX_USE_PA_V18 */ - - if (!good) { - free(Px); Index: patches/patch-lib-src_portmixer_src_px_unix_oss_c =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_portmixer_src_px_unix_oss_c,v retrieving revision 1.2 diff -N -u -p patches/patch-lib-src_portmixer_src_px_unix_oss_c --- patches/patch-lib-src_portmixer_src_px_unix_oss_c 8 Dec 2007 11:08:38 -0000 1.2 +++ /dev/null 27 Oct 2009 02:31:02 -0000 @@ -1,77 +0,0 @@ -$OpenBSD: patch-lib-src_portmixer_src_px_unix_oss_c,v 1.2 2007/12/08 11:08:38 ajacoutot Exp $ ---- lib-src/portmixer/src/px_unix_oss.c.orig Sat Nov 24 12:28:16 2007 -+++ lib-src/portmixer/src/px_unix_oss.c Sat Nov 24 12:31:44 2007 -@@ -41,8 +41,12 @@ - #elif defined(__FreeBSD__) - #include <sys/soundcard.h> - #else -+#if defined(__OpenBSD__) -+#include <soundcard.h> -+#else - #include <machine/soundcard.h> /* JH20010905 */ - #endif -+#endif - - #include <stdio.h> - #include <stdlib.h> -@@ -52,9 +56,12 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/ioctl.h> -+#include <ctype.h> - - #include "portaudio.h" -+#ifdef PX_USE_PA_V18 - #include "pa_unix_oss.h" -+#endif - - #include "portmixer.h" - #include "px_mixer.h" -@@ -97,7 +104,7 @@ static int open_mixer(PxDev *dev, int cmd) - int i; - int id = 0; - -- for (i = strlen(dev->name) - 1; i >= 0; i++) { -+ for (i = strlen(dev->name) - 1; i >= 0; i--) { - if (!isdigit(dev->name[i])) { - break; - } -@@ -108,11 +115,9 @@ static int open_mixer(PxDev *dev, int cmd) - return -1; - } - -- strcpy(name, MIXER_NAME_BASE); -- if (id == 0) -- name[strlen(MIXER_NAME_BASE)] = 0; -- else -- name[strlen(MIXER_NAME_BASE)] = '0' + (id - 1); -+ strlcpy(name, MIXER_NAME_BASE, sizeof(name)); -+ if (id != 0) -+ strlcat(name, &dev->name[i + 1], sizeof(name)); - - do { - dev->fd = open(name, O_RDWR); -@@ -160,7 +165,11 @@ int OpenMixer_Unix_OSS(px_mixer *Px, int index) - info->playback.num = 0; - - do { -+#ifdef PX_USE_PA_V18 - info->capture.name = PaOSS_GetStreamInputDevice(Px->pa_stream); -+#else -+ info->capture.name = (Pa_GetDeviceInfo(index))->name; -+#endif - - if (info->capture.name) { - if (!open_mixer(&info->capture, SOUND_MIXER_READ_RECMASK)) { -@@ -168,7 +177,11 @@ int OpenMixer_Unix_OSS(px_mixer *Px, int index) - } - } - -+#ifdef PX_USE_PA_V18 - info->playback.name = PaOSS_GetStreamOutputDevice(Px->pa_stream); -+#else -+ info->playback.name = (Pa_GetDeviceInfo(index))->name; -+#endif - if (info->playback.name) { - if (!open_mixer(&info->playback, SOUND_MIXER_READ_DEVMASK)) { - break; Index: patches/patch-src_AudacityApp_cpp =================================================================== RCS file: /cvs/ports/audio/audacity/patches/Attic/patch-src_AudacityApp_cpp,v diff -N -u -p patches/patch-src_AudacityApp_cpp --- /dev/null 26 Oct 2009 20:52:54 -0000 +++ patches/patch-src_AudacityApp_cpp 27 Oct 2009 02:52:54 -0000 @@ -0,0 +1,26 @@ +$OpenBSD$ +--- src/AudacityApp.cpp.orig Sat Oct 17 15:34:48 2009 ++++ src/AudacityApp.cpp Sat Oct 17 15:37:06 2009 +@@ -21,6 +21,12 @@ It handles initialization and termination by subclassi + #include <vld.h> + #endif + ++// Newer versions of glib have a conflicting GSocket macro; the wxWindows ++// one is part of a semi-public interface so needs to be kept. ++#define GSocket GlibSocket ++#include <gtk/gtk.h> ++#undef GSocket ++ + #include "Audacity.h" // This should always be included first + + #include <wx/defs.h> +@@ -329,7 +335,8 @@ void QuitAudacity() + /////////////////////////////////////////////////////////////////////////////// + + #include <dlfcn.h> +-#include <gtk/gtk.h> ++#include <glib/gtypes.h> ++#include <glib-object.h> + + typedef struct _GnomeProgram GnomeProgram; + typedef struct _GnomeModuleInfo GnomeModuleInfo; Index: patches/patch-src_Audacity_h =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-src_Audacity_h,v retrieving revision 1.2 diff -N -u -p patches/patch-src_Audacity_h --- patches/patch-src_Audacity_h 14 Mar 2009 03:49:43 -0000 1.2 +++ patches/patch-src_Audacity_h 27 Oct 2009 02:52:54 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_Audacity_h,v 1.2 2009/03/14 03:49:43 jakemsr Exp $ ---- src/Audacity.h.orig Tue Jan 27 12:50:58 2009 -+++ src/Audacity.h Tue Feb 10 03:21:35 2009 -@@ -89,8 +89,9 @@ void QuitAudacity(); +--- src/Audacity.h.orig Mon Aug 31 03:45:38 2009 ++++ src/Audacity.h Sat Oct 17 14:29:54 2009 +@@ -92,8 +92,9 @@ void QuitAudacity(); #endif //_MSC_VER /* The GCC-elf implementation */ @@ -12,7 +12,7 @@ $OpenBSD: patch-src_Audacity_h,v 1.2 2009/03/14 03:49: /* The incantation is a bit weird here because it uses ELF symbol stuff. If we * make a symbol "default" it makes it visible (for import or export). Making it * "hidden" means it is invisible outside the shared object. */ -@@ -101,6 +102,9 @@ void QuitAudacity(); +@@ -104,6 +105,9 @@ void QuitAudacity(); #define AUDACITY_DLL_API __attribute__((visibility("default"))) #endif #endif Index: patches/patch-src_AudioIO_cpp =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-src_AudioIO_cpp,v retrieving revision 1.5 diff -N -u -p patches/patch-src_AudioIO_cpp --- patches/patch-src_AudioIO_cpp 14 Mar 2009 03:49:43 -0000 1.5 +++ /dev/null 27 Oct 2009 02:31:02 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_AudioIO_cpp,v 1.5 2009/03/14 03:49:43 jakemsr Exp $ ---- src/AudioIO.cpp.orig Mon Mar 9 01:08:36 2009 -+++ src/AudioIO.cpp Mon Mar 9 01:14:48 2009 -@@ -2053,7 +2053,6 @@ wxString AudioIO::GetDeviceInfo() - s << wxT("Cannot check mutual sample rates without both devices.") << e; - return o.GetString(); - } -- - #if defined(USE_PORTMIXER) - if (supportedSampleRates.GetCount() > 0) - { -@@ -2201,7 +2200,7 @@ wxString AudioIO::GetDeviceInfo() - Px_CloseMixer(PortMixer); - - #endif -- } //end of massive if statement if a valid sample rate has been found -+ // } //end of massive if statement if a valid sample rate has been found - return o.GetString(); - } - ? patches/patch-src_AudioIO_h Index: patches/patch-src_Benchmark_cpp =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-src_Benchmark_cpp,v retrieving revision 1.3 diff -N -u -p patches/patch-src_Benchmark_cpp --- patches/patch-src_Benchmark_cpp 11 Jan 2009 09:29:36 -0000 1.3 +++ patches/patch-src_Benchmark_cpp 27 Oct 2009 02:52:54 -0000 @@ -1,15 +1,6 @@ $OpenBSD: patch-src_Benchmark_cpp,v 1.3 2009/01/11 09:29:36 jakemsr Exp $ --- src/Benchmark.cpp.orig Sat Oct 25 05:14:27 2008 +++ src/Benchmark.cpp Thu Nov 13 15:24:26 2008 -@@ -522,7 +522,7 @@ void BenchmarkDialog::OnRun( wxCommandEvent &event ) - delete tmp; - - delete t; -- -+ - delete[]small1; - delete[]small2; - delete[]block; @@ -530,7 +530,7 @@ void BenchmarkDialog::OnRun( wxCommandEvent &event ) delete fact; d->Deref(); Index: patches/patch-src_FFmpeg_cpp =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-src_FFmpeg_cpp,v retrieving revision 1.2 diff -N -u -p patches/patch-src_FFmpeg_cpp --- patches/patch-src_FFmpeg_cpp 14 Mar 2009 03:49:43 -0000 1.2 +++ patches/patch-src_FFmpeg_cpp 27 Oct 2009 02:52:54 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_FFmpeg_cpp,v 1.2 2009/03/14 03:49:43 jakemsr Exp $ ---- src/FFmpeg.cpp.orig Tue Jan 27 12:50:58 2009 -+++ src/FFmpeg.cpp Tue Feb 10 03:21:35 2009 -@@ -249,11 +249,13 @@ class FindFFmpegDialog : public wxDialog (public) +--- src/FFmpeg.cpp.orig Mon Aug 31 03:45:39 2009 ++++ src/FFmpeg.cpp Sat Oct 17 14:29:54 2009 +@@ -485,11 +485,13 @@ class FindFFmpegDialog : public wxDialog (public) } } @@ -15,7 +15,7 @@ $OpenBSD: patch-src_FFmpeg_cpp,v 1.2 2009/03/14 03:49: wxString GetLibPath() { -@@ -275,7 +277,9 @@ class FindFFmpegDialog : public wxDialog (public) +@@ -511,7 +513,9 @@ class FindFFmpegDialog : public wxDialog (public) BEGIN_EVENT_TABLE(FindFFmpegDialog, wxDialog) EVT_BUTTON(ID_FFMPEG_BROWSE, FindFFmpegDialog::OnBrowse) @@ -25,38 +25,3 @@ $OpenBSD: patch-src_FFmpeg_cpp,v 1.2 2009/03/14 03:49: END_EVENT_TABLE() -@@ -565,7 +569,7 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, boo - INITDYN(avformat,av_init_packet); - INITDYN(avformat,av_codec_get_id); - INITDYN(avformat,av_codec_get_tag); -- INITDYN(avformat,avformat_version); -+ // INITDYN(avformat,avformat_version); - - INITDYN(codec,avcodec_init); - INITDYN(codec,avcodec_find_encoder); -@@ -611,19 +615,19 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, boo - - wxLogMessage(wxT("Retrieving library version.")); - int avcver = this->avcodec_version(); -- int avfver = this->avformat_version(); -- int avuver = this->avutil_version(); -+ int avfver = this->avcodec_version(); -+ int avuver = this->avcodec_version(); - mAVCodecVersion = wxString::Format(wxT("%d.%d.%d"),avcver >> 16 & 0xFF, avcver >> 8 & 0xFF, avcver & 0xFF); - mAVFormatVersion = wxString::Format(wxT("%d.%d.%d"),avfver >> 16 & 0xFF, avfver >> 8 & 0xFF, avfver & 0xFF); - mAVUtilVersion = wxString::Format(wxT("%d.%d.%d"),avuver >> 16 & 0xFF, avuver >> 8 & 0xFF, avuver & 0xFF); - - wxLogMessage(wxT("AVCodec version 0x%06x - %s (built against 0x%06x - %s)"),avcver,mAVCodecVersion.c_str(),LIBAVCODEC_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVCODEC_VERSION)).c_str()); -- wxLogMessage(wxT("AVFormat version 0x%06x - %s (built against 0x%06x - %s)"),avfver,mAVFormatVersion.c_str(),LIBAVFORMAT_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVFORMAT_VERSION)).c_str()); -- wxLogMessage(wxT("AVUtil version 0x%06x - %s (built against 0x%06x - %s)"),avuver,mAVUtilVersion.c_str(),LIBAVUTIL_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVUTIL_VERSION)).c_str()); -+ wxLogMessage(wxT("AVFormat version 0x%06x - %s (built against 0x%06x - %s)"),avfver,mAVFormatVersion.c_str(),LIBAVCODEC_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVCODEC_VERSION)).c_str()); -+ wxLogMessage(wxT("AVUtil version 0x%06x - %s (built against 0x%06x - %s)"),avuver,mAVUtilVersion.c_str(),LIBAVCODEC_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVCODEC_VERSION)).c_str()); - - int avcverdiff = (avcver >> 16 & 0xFF) - int(LIBAVCODEC_VERSION_MAJOR); -- int avfverdiff = (avfver >> 16 & 0xFF) - int(LIBAVFORMAT_VERSION_MAJOR); -- int avuverdiff = (avuver >> 16 & 0xFF) - int(LIBAVUTIL_VERSION_MAJOR); -+ int avfverdiff = (avfver >> 16 & 0xFF) - int(LIBAVCODEC_VERSION_MAJOR); -+ int avuverdiff = (avuver >> 16 & 0xFF) - int(LIBAVCODEC_VERSION_MAJOR); - wxLogMessage(wxT("AVCodec version mismatch is %d"),avcverdiff); - wxLogMessage(wxT("AVFormat version mismatch is %d"),avfverdiff); - wxLogMessage(wxT("AVUtil version mismatch is %d"),avuverdiff); Index: patches/patch-src_FFmpeg_h =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-src_FFmpeg_h,v retrieving revision 1.2 diff -N -u -p patches/patch-src_FFmpeg_h --- patches/patch-src_FFmpeg_h 14 Mar 2009 03:49:43 -0000 1.2 +++ /dev/null 27 Oct 2009 02:31:02 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_FFmpeg_h,v 1.2 2009/03/14 03:49:43 jakemsr Exp $ ---- src/FFmpeg.h.orig Tue Jan 27 12:50:59 2009 -+++ src/FFmpeg.h Tue Feb 10 03:21:35 2009 -@@ -151,8 +151,8 @@ class FFmpegLibs (public) - void (*av_log_default_callback) (void* ptr, int level, const char* fmt, va_list vl); - void (*av_free) (void *ptr); - unsigned (*avcodec_version) (void); -- unsigned (*avformat_version) (void); -- unsigned (*avutil_version) (void); -+ //unsigned (*avformat_version) (void); -+ //unsigned (*avutil_version) (void); - void (*avcodec_init) (void); - AVCodec* (*avcodec_find_encoder) (enum CodecID id); - AVCodec* (*avcodec_find_encoder_by_name) (const char *name); ? patches/patch-src_NoteTrack_cpp Index: patches/patch-src_Sequence_cpp =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-src_Sequence_cpp,v retrieving revision 1.5 diff -N -u -p patches/patch-src_Sequence_cpp --- patches/patch-src_Sequence_cpp 14 Mar 2009 03:49:43 -0000 1.5 +++ patches/patch-src_Sequence_cpp 27 Oct 2009 02:52:54 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_Sequence_cpp,v 1.5 2009/03/14 03:49:43 jakemsr Exp $ ---- src/Sequence.cpp.orig Tue Jan 27 12:50:58 2009 -+++ src/Sequence.cpp Tue Feb 10 03:21:35 2009 -@@ -952,7 +952,8 @@ bool Sequence::Get(samplePtr buffer, sampleFormat form +--- src/Sequence.cpp.orig Mon Aug 31 03:45:39 2009 ++++ src/Sequence.cpp Sat Oct 17 14:29:54 2009 +@@ -947,7 +947,8 @@ bool Sequence::Get(samplePtr buffer, sampleFormat form sampleCount start, sampleCount len) const { if (start < 0 || start > mNumSamples || @@ -11,7 +11,7 @@ $OpenBSD: patch-src_Sequence_cpp,v 1.5 2009/03/14 03:4 return false; int b = FindBlock(start); -@@ -986,6 +987,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form +@@ -981,6 +982,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form if (format != mSampleFormat) { temp = NewSamples(mMaxSamples, mSampleFormat); wxASSERT(temp); @@ -19,7 +19,7 @@ $OpenBSD: patch-src_Sequence_cpp,v 1.5 2009/03/14 03:4 } samplePtr silence = NULL; -@@ -993,6 +995,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form +@@ -988,6 +990,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form silence = NewSamples(mMaxSamples, format); wxASSERT(silence); ClearSamples(silence, format, 0, mMaxSamples); ? patches/patch-src_TrackArtist_cpp Index: patches/patch-src_audacity_desktop =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-src_audacity_desktop,v retrieving revision 1.5 diff -N -u -p patches/patch-src_audacity_desktop Index: patches/patch-src_export_ExportMP3_cpp =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-src_export_ExportMP3_cpp,v retrieving revision 1.8 diff -N -u -p patches/patch-src_export_ExportMP3_cpp --- patches/patch-src_export_ExportMP3_cpp 14 Mar 2009 03:49:43 -0000 1.8 +++ patches/patch-src_export_ExportMP3_cpp 27 Oct 2009 02:52:54 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-src_export_ExportMP3_cpp,v 1.8 2009/03/14 03:49:43 jakemsr Exp $ ---- src/export/ExportMP3.cpp.orig Tue Jan 27 12:50:58 2009 -+++ src/export/ExportMP3.cpp Mon Mar 9 00:50:23 2009 +--- src/export/ExportMP3.cpp.orig Mon Aug 31 03:45:40 2009 ++++ src/export/ExportMP3.cpp Sat Oct 17 14:29:54 2009 @@ -575,8 +575,9 @@ class FindDialog : public wxDialog (public) mPathText = S.AddTextBox(wxT(""), mLibPath.GetFullPath(), 0); } @@ -12,7 +12,7 @@ $OpenBSD: patch-src_export_ExportMP3_cpp,v 1.8 2009/03 } S.EndMultiColumn(); -@@ -1360,7 +1361,7 @@ wxString MP3Exporter::GetLibraryName() +@@ -1361,7 +1362,7 @@ wxString MP3Exporter::GetLibraryName() wxString MP3Exporter::GetLibraryTypeString() { ? patches/patch-src_import_ImportMIDI_cpp Index: patches/patch-src_prefs_FileFormatPrefs_cpp =================================================================== RCS file: /cvs/ports/audio/audacity/patches/patch-src_prefs_FileFormatPrefs_cpp,v retrieving revision 1.4 diff -N -u -p patches/patch-src_prefs_FileFormatPrefs_cpp --- patches/patch-src_prefs_FileFormatPrefs_cpp 14 Mar 2009 03:49:43 -0000 1.4 +++ /dev/null 27 Oct 2009 02:31:02 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_prefs_FileFormatPrefs_cpp,v 1.4 2009/03/14 03:49:43 jakemsr Exp $ ---- src/prefs/FileFormatPrefs.cpp.orig Sat Nov 29 02:28:41 2008 -+++ src/prefs/FileFormatPrefs.cpp Sat Nov 29 02:29:00 2008 -@@ -98,9 +98,10 @@ void FileFormatPrefs::PopulateOrExchange( ShuttleGui & - S.AddVariableText( _("LAME MP3 Library:"), - true, - wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL ); -- S.Id( ID_MP3_DOWN_BUTTON ).AddButton( _("&Download"), -+ wxButton *bdwn = S.Id( ID_MP3_DOWN_BUTTON ).AddButton( _("&Download"), - wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL ); - S.EndTwoColumn(); -+ bdwn->Enable(FALSE); - } - S.EndStatic(); - S.StartStatic( _("FFmpeg Import/Export Library"),1); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/audio/audacity/pkg/PLIST,v retrieving revision 1.10 diff -N -u -p pkg/PLIST --- pkg/PLIST 14 Mar 2009 03:49:43 -0000 1.10 +++ pkg/PLIST 27 Oct 2009 02:52:54 -0000 @@ -7,7 +7,10 @@ share/audacity/audacity.xpm share/audacity/nyquist/ share/audacity/nyquist/bug.lsp share/audacity/nyquist/dspprims.lsp +share/audacity/nyquist/envelopes.lsp +share/audacity/nyquist/equalizer.lsp share/audacity/nyquist/evalenv.lsp +share/audacity/nyquist/fileio.lsp share/audacity/nyquist/follow.lsp share/audacity/nyquist/init.lsp share/audacity/nyquist/misc.lsp @@ -16,13 +19,16 @@ share/audacity/nyquist/nyqmisc.lsp share/audacity/nyquist/nyquist.lsp share/audacity/nyquist/printrec.lsp share/audacity/nyquist/profile.lsp +share/audacity/nyquist/sal-parse.lsp +share/audacity/nyquist/sal.lsp share/audacity/nyquist/seq.lsp share/audacity/nyquist/seqfnint.lsp share/audacity/nyquist/seqmidi.lsp share/audacity/nyquist/sndfnint.lsp +share/audacity/nyquist/stk.lsp share/audacity/nyquist/system.lsp -share/audacity/nyquist/test.lsp share/audacity/nyquist/xlinit.lsp +share/audacity/nyquist/xm.lsp share/audacity/plug-ins/ share/audacity/plug-ins/SilenceMarker.ny share/audacity/plug-ins/beat.ny @@ -92,6 +98,7 @@ share/locale/oc/ share/locale/oc/LC_MESSAGES/ share/locale/oc/LC_MESSAGES/audacity.mo share/locale/pl/LC_MESSAGES/audacity.mo +share/locale/pt/LC_MESSAGES/audacity.mo share/locale/pt_BR/LC_MESSAGES/audacity.mo share/locale/ro/LC_MESSAGES/audacity.mo share/locale/ru/LC_MESSAGES/audacity.mo
