On Sun, Feb 24, 2019 at 08:20:04PM +0100, Jeremie Courreges-Anglas wrote: > > So audacity is still currently BROKEN. Here's an unfinished update to > version 2.2.2. > > Some notes: > - audio/libsoxr has replaced libsamplerate > - I disabled the use of system vamp-plugin-sdk, see the comments > - audio/portaudio-svn is used instead of the not-so-mandatory bundled > version (the bundled version adds an interface which is only used in > portmixer, which we don't activate anyway). > - INSTALL also mentions the mandatory use of the bundled portmidi, which > doesn't work on OpenBSD yet. Alexandre expressed interest in writing > a backend. > - also in INSTALL: "Audacity 2.2.2 requires wxWidgets 3.0.x, preferably > 3.0.2, built with gtk2.". I hope that the use of gtk3 is not > a problem...
I think you should just commit this. It will well people working on it directly in-tree. > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/audio/audacity/Makefile,v > retrieving revision 1.55 > diff -u -p -r1.55 Makefile > --- Makefile 2 Jan 2019 12:44:53 -0000 1.55 > +++ Makefile 24 Feb 2019 18:51:34 -0000 > @@ -1,18 +1,14 @@ > # $OpenBSD: Makefile,v 1.55 2019/01/02 12:44:53 jca Exp $ > > -BROKEN= requires old wxWidgets: > http://trac.wxwidgets.org/ticket/16300 > - > COMMENT= free audio editor > > -V= 1.3.9 > +V= 2.2.2 > DISTNAME= audacity-minsrc-${V} > PKGNAME= audacity-${V} > -REVISION= 17 > CATEGORIES= audio > > -EXTRACT_SUFX= .tar.bz2 > - > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/} > +EXTRACT_SUFX= .tar.xz > > HOMEPAGE= http://audacity.sourceforge.net/ > > @@ -25,34 +21,36 @@ WANTLIB += atk-1.0 c cairo expat fontcon > WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 > WANTLIB += id3tag intl m mad ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 > WANTLIB += portaudio samplerate sndfile tag vamp-hostsdk vorbis > -WANTLIB += vorbisenc vorbisfile wx_base wx_base_net wx_base_odbc > -WANTLIB += wx_base_xml wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid > -WANTLIB += wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc > -WANTLIB += z > +# XXX wxwidgets WANTLIB > +WANTLIB += vorbisenc vorbisfile z > > COMPILER = base-clang ports-gcc base-gcc > > BUILD_DEPENDS= archivers/zip \ > - devel/gettext-tools > -LIB_DEPENDS= x11/wxWidgets>=2.8.6 \ > - audio/libsamplerate \ > + devel/gettext-tools \ > + shells/bash > +LIB_DEPENDS= x11/wxWidgets>=3.0.4 \ > + audio/libsoxr \ > audio/flac \ > audio/libvorbis \ > audio/libid3tag \ > audio/libmad \ > audio/portaudio-svn>=1406p1 \ > audio/soundtouch \ > - audio/vamp-plugin-sdk>=2.2.1p0 \ > audio/taglib > +# XXX libtool/ld(1) fail to find libvamp-hostsdk.so > +#LIB_DEPENDS+= audio/vamp-plugin-sdk>=2.2.1p0 > RUN_DEPENDS= devel/desktop-file-utils \ > misc/shared-mime-info > > USE_GMAKE= Yes > CONFIGURE_STYLE= gnu > -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include > -I${LOCALBASE}/include" \ > - CFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ > - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ > - gl_cv_cc_visibility=no > +CONFIGURE_ENV= CC="${CC}" CXX="${CXX}" OBJCXX="${CXX}" \ > + CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ > + CFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include > ${CFLAGS}" \ > + LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib ${LDFLAGS}" > +# Silence noisy warnings > +CONFIGURE_ENV+= CXXFLAGS="-Wno-inconsistent-missing-override > ${CXXFLAGS}" > > MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} \ > ${WRKSRC}/lib-src/lib-widget-extra \ > @@ -67,28 +65,32 @@ CONFIGURE_ARGS= --enable-unicode \ > --with-lib-preferences=system \ > --with-libsndfile=system \ > --with-expat=system \ > - --with-libsamplerate=system \ > - --without-libresample \ > + --with-libsoxr=system \ > --with-libvorbis=system \ > --with-libmad=system \ > --with-libflac=system \ > --with-libid3tag=system \ > + --with-portaudio=system \ > --with-soundtouch=system \ > - --with-libvamp=system \ > --without-libtwolame \ > --without-ffmpeg \ > --without-redland \ > --without-slv2 \ > --without-liblrdf \ > --with-portmixer=no > +# XXX libtool/ld(1) fail to find libvamp-hostsdk.so > +CONFIGURE_ARGS+= --with-libvamp=no > > -MAKE_FLAGS= CC="${CC}" > -WRKDIST= ${WRKDIR}/audacity-src-${V} > +WRKDIST= ${WRKDIR}/${DISTNAME}-rc1 > > # Regression tests are in the source tarball but as of 2007, they have > # not been updated for 3 years ; as they're completely out-of-sync with > # the ongoing development, there's no point in running them > NO_TEST= Yes > + > +# dummy Makefile to disable portmixer > +post-extract: > + printf 'all:\ninstall:\n' > ${WRKSRC}/lib-src/portmixer/Makefile > > post-install: > ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps > Index: distinfo > =================================================================== > RCS file: /cvs/ports/audio/audacity/distinfo,v > retrieving revision 1.10 > diff -u -p -r1.10 distinfo > --- distinfo 18 Jan 2015 03:12:40 -0000 1.10 > +++ distinfo 24 Feb 2019 18:51:34 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (audacity-minsrc-1.3.9.tar.bz2) = > 9Hr+jc84Fl01UBYOt+lGlBGfXaVjZ0BgqTxbxm4voBI= > -SIZE (audacity-minsrc-1.3.9.tar.bz2) = 6719955 > +SHA256 (audacity-minsrc-2.2.2.tar.xz) = > l3UaAOMwJrYdBQV8FSXW3d/U5kc3vTX1ncLiHj1nYuI= > +SIZE (audacity-minsrc-2.2.2.tar.xz) = 8210700 > Index: patches/patch-Makefile_in > =================================================================== > RCS file: patches/patch-Makefile_in > diff -N patches/patch-Makefile_in > --- patches/patch-Makefile_in 14 Mar 2009 03:49:43 -0000 1.4 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,24 +0,0 @@ > -$OpenBSD: patch-Makefile_in,v 1.4 2009/03/14 03:49:43 jakemsr Exp $ > ---- Makefile.in.orig Tue Jan 27 12:52:00 2009 > -+++ Makefile.in Tue Feb 10 03:21:24 2009 > -@@ -30,17 +30,11 @@ install: audacity $(EXTRAINSTALLTARGETS) > - $(INSTALL) -d $(DESTDIR)$(BINDIR) > - $(INSTALL) -m 755 audacity $(DESTDIR)$(BINDIR)/$(AUDACITY_NAME) > - > -- # install docs > -- $(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME) > -- $(INSTALL) -d $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME) > -- $(INSTALL) -m 644 README.txt > $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/README.txt > -- $(INSTALL) -m 644 LICENSE.txt > $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/LICENSE.txt > -- > - # install manpage > - $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1 > -- -test -f help/audacity.1.gz && \ > -- $(INSTALL) -m 644 help/audacity.1.gz \ > -- $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1.gz > -+ -test -f help/audacity.1 && \ > -+ $(INSTALL) -m 644 help/audacity.1 \ > -+ $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1 > - > - # install nyquist > - $(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist > Index: patches/patch-configure > =================================================================== > RCS file: /cvs/ports/audio/audacity/patches/patch-configure,v > retrieving revision 1.17 > diff -u -p -r1.17 patch-configure > --- patches/patch-configure 3 Nov 2018 13:26:27 -0000 1.17 > +++ patches/patch-configure 24 Feb 2019 18:51:34 -0000 > @@ -1,140 +1,22 @@ > -$OpenBSD: patch-configure,v 1.17 2018/11/03 13:26:27 ajacoutot Exp $ > +$OpenBSD$ > > -- last hunk: use ',' as separator, otherwise the paths in $pa_libs get > - interpreted as part of the regex. > - > -- GTK_LIBS: fix linking with ld.lld > +- force-disable check for Pa_GetStreamHostApiType, likely not needed > + anyway. (Seems only used in portmixer, which we disable.) We want to > + try to use audio/portaudio instead. > > Index: configure > --- configure.orig > +++ configure > -@@ -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 > --LIBS="-lFLAC -lFLAC++ -lFLAC $LIBS" > -+LIBS="-lFLAC -lFLAC++ -lFLAC -logg $LIBS" > - cat >conftest.$ac_ext <<_ACEOF > - /* confdefs.h. */ > - _ACEOF > -@@ -7136,7 +7135,7 @@ fi > +@@ -22409,12 +22409,7 @@ fi > + #include <portaudio.h> > > - if test "x$lib_found" = "xyes" && test "x$header_found" = "xyes" ; then > - LIBFLAC_SYSTEM_AVAILABLE="yes" > -- LIBFLAC_SYSTEM_LIBS="-lFLAC++ -lFLAC" > -+ LIBFLAC_SYSTEM_LIBS="-lFLAC++ -lFLAC -logg" > - 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;} > -@@ -7684,12 +7683,12 @@ if test -n "$SOUNDTOUCH_CFLAGS"; then > - pkg_cv_SOUNDTOUCH_CFLAGS="$SOUNDTOUCH_CFLAGS" > - elif test -n "$PKG_CONFIG"; then > - if test -n "$PKG_CONFIG" && \ > -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors > \"soundtouch-1.0 >= 1.3.0\"") >&5 > -- ($PKG_CONFIG --exists --print-errors "soundtouch-1.0 >= 1.3.0") 2>&5 > -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors > \"soundtouch >= 1.3.0\"") >&5 > -+ ($PKG_CONFIG --exists --print-errors "soundtouch >= 1.3.0") 2>&5 > - ac_status=$? > - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 > - (exit $ac_status); }; then > -- pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch-1.0 >= 1.3.0" > 2>/dev/null` > -+ pkg_cv_SOUNDTOUCH_CFLAGS=`$PKG_CONFIG --cflags "soundtouch >= 1.3.0" > 2>/dev/null` > - else > - pkg_failed=yes > - fi > -@@ -7700,12 +7699,12 @@ if test -n "$SOUNDTOUCH_LIBS"; then > - pkg_cv_SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS" > - elif test -n "$PKG_CONFIG"; then > - if test -n "$PKG_CONFIG" && \ > -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors > \"soundtouch-1.0 >= 1.3.0\"") >&5 > -- ($PKG_CONFIG --exists --print-errors "soundtouch-1.0 >= 1.3.0") 2>&5 > -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors > \"soundtouch >= 1.3.0\"") >&5 > -+ ($PKG_CONFIG --exists --print-errors "soundtouch >= 1.3.0") 2>&5 > - ac_status=$? > - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 > - (exit $ac_status); }; then > -- pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch-1.0 >= 1.3.0" > 2>/dev/null` > -+ pkg_cv_SOUNDTOUCH_LIBS=`$PKG_CONFIG --libs "soundtouch >= 1.3.0" > 2>/dev/null` > - else > - pkg_failed=yes > - fi > -@@ -7723,9 +7722,9 @@ else > - _pkg_short_errors_supported=no > - fi > - if test $_pkg_short_errors_supported = yes; then > -- SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --short-errors > --print-errors "soundtouch-1.0 >= 1.3.0" 2>&1` > -+ SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --short-errors > --print-errors "soundtouch >= 1.3.0" 2>&1` > - else > -- SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --print-errors > "soundtouch-1.0 >= 1.3.0" 2>&1` > -+ SOUNDTOUCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "soundtouch > >= 1.3.0" 2>&1` > - fi > - # Put the nasty error message in config.log where it belongs > - echo "$SOUNDTOUCH_PKG_ERRORS" >&5 > -@@ -9210,18 +9209,14 @@ cat >>confdefs.h <<\_ACEOF > _ACEOF > +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | > +- $EGREP "Pa_GetStreamHostApiType" >/dev/null 2>&1; then : > + have_portaudio_support=yes > +-else > +- have_portaudio_support=no > +-fi > + rm -f conftest* > > - CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" > -+ LIBS="$LIBS $GTK_LIBS" > - fi > - ;; > - 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" > - > --subdirs="$subdirs lib-src/portaudio-v19" > - > -- > - case "${host_os}" in > - darwin* | rhapsody*) > - LIBS="-framework AudioUnit -framework AudioToolbox $LIBS" > -@@ -9371,9 +9366,7 @@ else > - $as_echo "yes" >&6; } > - have_jack=yes > - fi > -- if [ $have_jack = "yes" ] ; then > -- LIBS="$LIBS $JACK_LIBS" > -- fi > -+ > - { $as_echo "$as_me:$LINENO: checking for HPI_SubSysCreate in -lhpi" > >&5 > - $as_echo_n "checking for HPI_SubSysCreate in -lhpi... " >&6; } > - if test "${ac_cv_lib_hpi_HPI_SubSysCreate+set}" = set; then > -@@ -9637,7 +9630,6 @@ _ACEOF > - > - subdirs="$subdirs lib-src/portmixer" > - > -- ac_configure_args="$ac_configure_args > --with-pa-include=../portaudio-v19/include" > - fi > - > - { $as_echo "$as_me:$LINENO: checking for lrint" >&5 > -@@ -11255,7 +11247,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. > -- eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ > -+ eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args > CFLAGS='"$CFLAGS"' CXXFLAGS='"$CXXFLAGS"' LDFLAGS='"$LDFLAGS"' \ > - --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;} > -@@ -11271,9 +11263,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` > -+sed -i -e "s,@PA_LIBS@,$pa_libs," src/Makefile > > - echo "" > - echo "Finished configure:" > Index: patches/patch-lib-src_libnyquist_Makefile_in > =================================================================== > RCS file: > /cvs/ports/audio/audacity/patches/patch-lib-src_libnyquist_Makefile_in,v > retrieving revision 1.4 > diff -u -p -r1.4 patch-lib-src_libnyquist_Makefile_in > --- patches/patch-lib-src_libnyquist_Makefile_in 28 Oct 2009 18:40:13 > -0000 1.4 > +++ patches/patch-lib-src_libnyquist_Makefile_in 24 Feb 2019 18:51:34 > -0000 > @@ -1,14 +1,18 @@ > $OpenBSD: patch-lib-src_libnyquist_Makefile_in,v 1.4 2009/10/28 18:40:13 > jakemsr Exp $ > ---- lib-src/libnyquist/Makefile.in.orig Sun Oct 18 15:39:32 2009 > -+++ lib-src/libnyquist/Makefile.in Sun Oct 18 15:39:06 2009 > -@@ -251,8 +251,8 @@ top_build_prefix = @top_build_prefix@ > + > +- don't use the bundled portaudio and sndfile libraries > + > +Index: lib-src/libnyquist/Makefile.in > +--- lib-src/libnyquist/Makefile.in.orig > ++++ lib-src/libnyquist/Makefile.in > +@@ -477,8 +477,8 @@ target_alias = @target_alias@ > + top_build_prefix = @top_build_prefix@ > top_builddir = @top_builddir@ > top_srcdir = @top_srcdir@ > - NYQUIST = nyquist > --PORTAUDIO_CFLAGS = -I../portaudio-v19/include > --SNDFILE_CFLAGS = -I../libsndfile/src > -+PORTAUDIO_CFLAGS = > -+SNDFILE_CFLAGS = > +-PORTAUDIO_CFLAGS = -I${srcdir}/../portaudio-v19/include > +-SNDFILE_CFLAGS = -I${builddir}/../libsndfile/src > ++PORTAUDIO_CFLAGS = > ++SNDFILE_CFLAGS = > > # tell aclocal that extra macros can be found in autotools/m4/ > ACLOCAL_AMFLAGS = -I autotools/m4 > Index: patches/patch-lib-src_libnyquist_nyquist_cmt_midifns_c > =================================================================== > RCS file: > /cvs/ports/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_cmt_midifns_c,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-lib-src_libnyquist_nyquist_cmt_midifns_c > --- patches/patch-lib-src_libnyquist_nyquist_cmt_midifns_c 5 Dec 2013 > 21:58:50 -0000 1.1 > +++ patches/patch-lib-src_libnyquist_nyquist_cmt_midifns_c 24 Feb 2019 > 18:51:34 -0000 > @@ -1,7 +1,11 @@ > -$OpenBSD: patch-lib-src_libnyquist_nyquist_cmt_midifns_c,v 1.1 2013/12/05 > 21:58:50 naddy Exp $ > ---- lib-src/libnyquist/nyquist/cmt/midifns.c.orig Mon Aug 31 12:45:45 2009 > -+++ lib-src/libnyquist/nyquist/cmt/midifns.c Thu Dec 5 22:41:35 2013 > -@@ -117,7 +117,6 @@ > +$OpenBSD$ > + > +- sys/timeb.h and ftime were removed from POSIX-2008 > + > +Index: lib-src/libnyquist/nyquist/cmt/midifns.c > +--- lib-src/libnyquist/nyquist/cmt/midifns.c.orig > ++++ lib-src/libnyquist/nyquist/cmt/midifns.c > +@@ -118,7 +118,6 @@ > #ifdef UNIX > #ifndef UNIX_IRIX > #include "sys/time.h" > Index: patches/patch-lib-src_libnyquist_nyquist_ffts_src_fftlib_c > =================================================================== > RCS file: patches/patch-lib-src_libnyquist_nyquist_ffts_src_fftlib_c > diff -N patches/patch-lib-src_libnyquist_nyquist_ffts_src_fftlib_c > --- patches/patch-lib-src_libnyquist_nyquist_ffts_src_fftlib_c 4 May > 2017 12:58:04 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,222 +0,0 @@ > -$OpenBSD: patch-lib-src_libnyquist_nyquist_ffts_src_fftlib_c,v 1.1 > 2017/05/04 12:58:04 espie Exp $ > -fix for C99 inline semantics > - > -Index: lib-src/libnyquist/nyquist/ffts/src/fftlib.c > ---- lib-src/libnyquist/nyquist/ffts/src/fftlib.c.orig > -+++ lib-src/libnyquist/nyquist/ffts/src/fftlib.c > -@@ -61,7 +61,7 @@ for (i1 = 0; i1 < Nroot_1; i1++){ > - parts of ffts1 > - *************************************************/ > - > --inline void bitrevR2(float *ioptr, long M, short *BRLow); > -+void bitrevR2(float *ioptr, long M, short *BRLow); > - inline void bitrevR2(float *ioptr, long M, short *BRLow){ > - /*** bit reverse and first radix 2 stage of forward or inverse fft ***/ > - float f0r; > -@@ -198,7 +198,7 @@ for (; ioptr < iolimit; ioptr += POW2(M/2+1)){ > - }; > - } > - > --inline void fft2pt(float *ioptr); > -+void fft2pt(float *ioptr); > - inline void fft2pt(float *ioptr){ > - /*** RADIX 2 fft ***/ > - float f0r, f0i, f1r, f1i; > -@@ -229,7 +229,7 @@ ioptr[3] = f1i; > - } > - > - > --inline void fft4pt(float *ioptr); > -+void fft4pt(float *ioptr); > - inline void fft4pt(float *ioptr){ > - /*** RADIX 4 fft ***/ > - float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i; > -@@ -284,7 +284,7 @@ ioptr[6] = f3r; > - ioptr[7] = f3i; > - } > - > --inline void fft8pt(float *ioptr); > -+void fft8pt(float *ioptr); > - inline void fft8pt(float *ioptr){ > - /*** RADIX 8 fft ***/ > - float w0r = 1.0/MYROOT2; /* cos(pi/4) */ > -@@ -403,7 +403,7 @@ ioptr[14] = f6r; > - ioptr[15] = f6i; > - } > - > --inline void bfR2(float *ioptr, long M, long NDiffU); > -+void bfR2(float *ioptr, long M, long NDiffU); > - inline void bfR2(float *ioptr, long M, long NDiffU){ > - /*** 2nd radix 2 stage ***/ > - unsigned long pos; > -@@ -512,7 +512,7 @@ for (SameUCnt = NSameU; SameUCnt > 0 ; SameUCnt--){ > - } > - } > - > --inline void bfR4(float *ioptr, long M, long NDiffU); > -+void bfR4(float *ioptr, long M, long NDiffU); > - inline void bfR4(float *ioptr, long M, long NDiffU){ > - /*** 1 radix 4 stage ***/ > - unsigned long pos; > -@@ -721,7 +721,7 @@ f4i = f4i * Two - f6i; > - > - } > - > --inline void bfstages(float *ioptr, long M, float *Utbl, long Ustride, long > NDiffU, long StageCnt); > -+void bfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, > long StageCnt); > - inline void bfstages(float *ioptr, long M, float *Utbl, long Ustride, long > NDiffU, long StageCnt){ > - /*** RADIX 8 Stages ***/ > - unsigned long pos; > -@@ -1125,7 +1125,7 @@ default: > - parts of iffts1 > - *************************************************/ > - > --inline void scbitrevR2(float *ioptr, long M, short *BRLow, float scale); > -+void scbitrevR2(float *ioptr, long M, short *BRLow, float scale); > - inline void scbitrevR2(float *ioptr, long M, short *BRLow, float scale){ > - /*** scaled bit reverse and first radix 2 stage forward or inverse fft ***/ > - float f0r; > -@@ -1262,7 +1262,7 @@ for (; ioptr < iolimit; ioptr += POW2(M/2+1)){ > - }; > - } > - > --inline void ifft2pt(float *ioptr, float scale); > -+void ifft2pt(float *ioptr, float scale); > - inline void ifft2pt(float *ioptr, float scale){ > - /*** RADIX 2 ifft ***/ > - float f0r, f0i, f1r, f1i; > -@@ -1292,7 +1292,7 @@ ioptr[2] = scale*f1r; > - ioptr[3] = scale*f1i; > - } > - > --inline void ifft4pt(float *ioptr, float scale); > -+void ifft4pt(float *ioptr, float scale); > - inline void ifft4pt(float *ioptr, float scale){ > - /*** RADIX 4 ifft ***/ > - float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i; > -@@ -1347,7 +1347,7 @@ ioptr[6] = scale*f3r; > - ioptr[7] = scale*f3i; > - } > - > --inline void ifft8pt(float *ioptr, float scale); > -+void ifft8pt(float *ioptr, float scale); > - inline void ifft8pt(float *ioptr, float scale){ > - /*** RADIX 8 ifft ***/ > - float w0r = 1.0/MYROOT2; /* cos(pi/4) */ > -@@ -1467,7 +1467,7 @@ ioptr[14] = scale*f6r; > - ioptr[15] = scale*f6i; > - } > - > --inline void ibfR2(float *ioptr, long M, long NDiffU); > -+void ibfR2(float *ioptr, long M, long NDiffU); > - inline void ibfR2(float *ioptr, long M, long NDiffU){ > - /*** 2nd radix 2 stage ***/ > - unsigned long pos; > -@@ -1576,7 +1576,7 @@ for (SameUCnt = NSameU; SameUCnt > 0 ; SameUCnt--){ > - } > - } > - > --inline void ibfR4(float *ioptr, long M, long NDiffU); > -+void ibfR4(float *ioptr, long M, long NDiffU); > - inline void ibfR4(float *ioptr, long M, long NDiffU){ > - /*** 1 radix 4 stage ***/ > - unsigned long pos; > -@@ -1785,7 +1785,7 @@ f4i = f4i * Two - f6i; > - > - } > - > --inline void ibfstages(float *ioptr, long M, float *Utbl, long Ustride, long > NDiffU, long StageCnt); > -+void ibfstages(float *ioptr, long M, float *Utbl, long Ustride, long > NDiffU, long StageCnt); > - inline void ibfstages(float *ioptr, long M, float *Utbl, long Ustride, long > NDiffU, long StageCnt){ > - /*** RADIX 8 Stages ***/ > - unsigned long pos; > -@@ -2193,7 +2193,7 @@ default: > - parts of rffts1 > - *************************************************/ > - > --inline void rfft1pt(float *ioptr); > -+void rfft1pt(float *ioptr); > - inline void rfft1pt(float *ioptr){ > - /*** RADIX 2 rfft ***/ > - float f0r, f0i; > -@@ -2212,7 +2212,7 @@ ioptr[0] = t0r; > - ioptr[1] = t0i; > - } > - > --inline void rfft2pt(float *ioptr); > -+void rfft2pt(float *ioptr); > - inline void rfft2pt(float *ioptr){ > - /*** RADIX 4 rfft ***/ > - float f0r, f0i, f1r, f1i; > -@@ -2245,7 +2245,7 @@ ioptr[2] = f1r; > - ioptr[3] = f1i; > - } > - > --inline void rfft4pt(float *ioptr); > -+void rfft4pt(float *ioptr); > - inline void rfft4pt(float *ioptr){ > - /*** RADIX 8 rfft ***/ > - float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i; > -@@ -2318,7 +2318,7 @@ ioptr[6] = scale*f3r; > - ioptr[7] = scale*f3i; > - } > - > --inline void rfft8pt(float *ioptr); > -+void rfft8pt(float *ioptr); > - inline void rfft8pt(float *ioptr){ > - /*** RADIX 16 rfft ***/ > - float w0r = 1.0/MYROOT2; /* cos(pi/4) */ > -@@ -2477,7 +2477,7 @@ ioptr[14] = scale*f6r; > - ioptr[15] = scale*f6i; > - } > - > --inline void frstage(float *ioptr, long M, float *Utbl); > -+void frstage(float *ioptr, long M, float *Utbl); > - inline void frstage(float *ioptr, long M, float *Utbl){ > - /* Finish RFFT */ > - > -@@ -2687,7 +2687,7 @@ default: > - parts of riffts1 > - *************************************************/ > - > --inline void rifft1pt(float *ioptr, float scale); > -+void rifft1pt(float *ioptr, float scale); > - inline void rifft1pt(float *ioptr, float scale){ > - /*** RADIX 2 rifft ***/ > - float f0r, f0i; > -@@ -2706,7 +2706,7 @@ ioptr[0] = scale*t0r; > - ioptr[1] = scale*t0i; > - } > - > --inline void rifft2pt(float *ioptr, float scale); > -+void rifft2pt(float *ioptr, float scale); > - inline void rifft2pt(float *ioptr, float scale){ > - /*** RADIX 4 rifft ***/ > - float f0r, f0i, f1r, f1i; > -@@ -2740,7 +2740,7 @@ ioptr[2] = scale*f1r; > - ioptr[3] = scale*f1i; > - } > - > --inline void rifft4pt(float *ioptr, float scale); > -+void rifft4pt(float *ioptr, float scale); > - inline void rifft4pt(float *ioptr, float scale){ > - /*** RADIX 8 rifft ***/ > - float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i; > -@@ -2811,7 +2811,7 @@ ioptr[6] = scale*f3r; > - ioptr[7] = scale*f3i; > - } > - > --inline void rifft8pt(float *ioptr, float scale); > -+void rifft8pt(float *ioptr, float scale); > - inline void rifft8pt(float *ioptr, float scale){ > - /*** RADIX 16 rifft ***/ > - float w0r = 1.0/MYROOT2; /* cos(pi/4) */ > -@@ -2968,7 +2968,7 @@ ioptr[14] = scale*f6r; > - ioptr[15] = scale*f6i; > - } > - > --inline void ifrstage(float *ioptr, long M, float *Utbl); > -+void ifrstage(float *ioptr, long M, float *Utbl); > - inline void ifrstage(float *ioptr, long M, float *Utbl){ > - /* Start RIFFT */ > - > Index: patches/patch-lib-src_libnyquist_nyquist_nyqstk_include_Stk_h > =================================================================== > RCS file: > /cvs/ports/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_nyqstk_include_Stk_h,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-lib-src_libnyquist_nyquist_nyqstk_include_Stk_h > --- patches/patch-lib-src_libnyquist_nyquist_nyqstk_include_Stk_h 28 Oct > 2009 18:40:13 -0000 1.1 > +++ patches/patch-lib-src_libnyquist_nyquist_nyqstk_include_Stk_h 24 Feb > 2019 18:51:34 -0000 > @@ -1,20 +1,18 @@ > -$OpenBSD: patch-lib-src_libnyquist_nyquist_nyqstk_include_Stk_h,v 1.1 > 2009/10/28 18:40:13 jakemsr Exp $ > ---- 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) > +$OpenBSD$ > + > +- namespace clash with sys/endian.h > + > +Index: lib-src/libnyquist/nyquist/nyqstk/include/Stk.h > +--- lib-src/libnyquist/nyquist/nyqstk/include/Stk.h.orig > ++++ lib-src/libnyquist/nyquist/nyqstk/include/Stk.h > +@@ -126,6 +126,10 @@ class Stk (public) > + //! Static method which sets the STK rawwave path. > static void setRawwavePath(std::string path); > > ++#undef swap16 > ++#undef swap32 > ++#undef swap64 > ++ > //! Static method which byte-swaps a 16-bit data type. > -- static void swap16(unsigned char *ptr); > -+ static void NYswap16(unsigned char *ptr); > + static void swap16(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 patches/patch-lib-src_libnyquist_nyquist_nyqstk_src_FileRead_cpp > --- patches/patch-lib-src_libnyquist_nyquist_nyqstk_src_FileRead_cpp 28 Oct > 2009 18:40:13 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,279 +0,0 @@ > -$OpenBSD: patch-lib-src_libnyquist_nyquist_nyqstk_src_FileRead_cpp,v 1.1 > 2009/10/28 18:40:13 jakemsr Exp $ > ---- 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 patches/patch-lib-src_libnyquist_nyquist_nyqstk_src_Stk_cpp > --- patches/patch-lib-src_libnyquist_nyquist_nyqstk_src_Stk_cpp 28 Oct > 2009 18:40:13 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,30 +0,0 @@ > -$OpenBSD: patch-lib-src_libnyquist_nyquist_nyqstk_src_Stk_cpp,v 1.1 > 2009/10/28 18:40:13 jakemsr Exp $ > ---- 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: > /cvs/ports/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp_h,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-lib-src_libnyquist_nyquist_xlisp_xlisp_h > --- patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp_h 28 Oct 2009 > 18:40:13 -0000 1.1 > +++ patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp_h 24 Feb 2019 > 18:51:34 -0000 > @@ -1,29 +1,29 @@ > $OpenBSD: patch-lib-src_libnyquist_nyquist_xlisp_xlisp_h,v 1.1 2009/10/28 > 18:40:13 jakemsr Exp $ > ---- 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 > + > +- use endian.h and BYTE_ORDER > + (XXX hardcodes #define HAVE_ENDIAN_H 1) > + > +Index: lib-src/libnyquist/nyquist/xlisp/xlisp.h > +--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig > ++++ lib-src/libnyquist/nyquist/xlisp/xlisp.h > +@@ -143,10 +143,17 @@ extern long ptrtoabs(); > + #define XL_BIG_ENDIAN > #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 > +-/* Linux on Pentium */ > +-#if defined(__linux__) || defined(__GLIBC__) > ++/* POSIX proposal > ++ * Linux, BSD, etc > ++ * http://austingroupbugs.net/view.php?id=162#c665 > ++ * Don't hardcode XL_LITTLE_ENDIAN/XL_BIG_ENDIAN > ++ */ > ++#define HAVE_ENDIAN_H 1 > ++#ifdef HAVE_ENDIAN_H > ++#undef XL_LITTLE_ENDIAN > ++#undef XL_BIG_ENDIAN > + #include <endian.h> > +-#if __BYTE_ORDER == __LITTLE_ENDIAN > ++#if BYTE_ORDER == LITTLE_ENDIAN > + #define XL_LITTLE_ENDIAN > + #else > + #define XL_BIG_ENDIAN > Index: patches/patch-lib-src_lv2_build > =================================================================== > RCS file: patches/patch-lib-src_lv2_build > diff -N patches/patch-lib-src_lv2_build > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-lib-src_lv2_build 24 Feb 2019 18:51:34 -0000 > @@ -0,0 +1,13 @@ > +$OpenBSD$ > + > +- fix path to bash > + > +Index: lib-src/lv2/build > +--- lib-src/lv2/build.orig > ++++ lib-src/lv2/build > +@@ -1,4 +1,4 @@ > +-#!/bin/bash > ++#!/usr/bin/env bash > + > + srcdir=. > + while [ $# -gt 0 ] > Index: patches/patch-lib-src_lv2_configure > =================================================================== > RCS file: patches/patch-lib-src_lv2_configure > diff -N patches/patch-lib-src_lv2_configure > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-lib-src_lv2_configure 24 Feb 2019 18:51:34 -0000 > @@ -0,0 +1,55 @@ > +$OpenBSD$ > + > +- fix bashisms (script invoked with /bin/sh .../configure ...) > +- no libdl on OpenBSD > + > +Index: lib-src/lv2/configure > +--- lib-src/lv2/configure.orig > ++++ lib-src/lv2/configure > +@@ -1,13 +1,12 @@ > +-#!/bin/bash > ++#!/bin/sh > + > + srcdir=. > + while [ $# -gt 0 ] > + do > +- if [[ "$1" =~ --srcdir=.* ]] > +- then > ++ case $1 in --srcdir=*) > + srcdir=${1#*=} > +- break > +- fi > ++ ;; > ++ esac > + shift > + done > + > +@@ -16,7 +15,7 @@ function waf > + pkg="$1" > + shift > + mkdir -p ${pkg} > +- pushd >/dev/null ${pkg} > ++ (cd ${pkg} || exit 1 > + > + if [ ! -e "waflib" ] > + then > +@@ -32,8 +31,9 @@ function waf > + done > + > + $(which python python2 | tail -1) waf --prefix="." --include="." $@ > configure || exit 1 > +- popd >/dev/null > + > ++) > ++ > + if [ "${pkg}" == "lv2" ] > + then > + eval $(sed -e '/^VERSION/!d;s/ //g;s/.*VERSION/version/' > ${pkg}/wscript) > +@@ -54,7 +54,7 @@ includedir=. > + Name: ${pkg} > + Version: ${version} > + Description: Temporary fake config file > +-Libs: -L\${libdir} ${lib} -ldl -lm > ++Libs: -L\${libdir} ${lib} -lm > + Cflags: -I\${includedir}/${pkg}${major} > + EOF > + > Index: patches/patch-lib-src_lv2_suil_src_x11_in_gtk2_c > =================================================================== > RCS file: patches/patch-lib-src_lv2_suil_src_x11_in_gtk2_c > diff -N patches/patch-lib-src_lv2_suil_src_x11_in_gtk2_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-lib-src_lv2_suil_src_x11_in_gtk2_c 24 Feb 2019 18:51:34 > -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- missing header > + > +Index: lib-src/lv2/suil/src/x11_in_gtk2.c > +--- lib-src/lv2/suil/src/x11_in_gtk2.c.orig > ++++ lib-src/lv2/suil/src/x11_in_gtk2.c > +@@ -17,6 +17,7 @@ > + #include <string.h> > + > + #include <gtk/gtk.h> > ++#include <gtk/gtkx.h> > + #include <gdk/gdkx.h> > + > + #include "./suil_internal.h" > Index: patches/patch-lib-src_portmidi_porttime_ptlinux_c > =================================================================== > RCS file: patches/patch-lib-src_portmidi_porttime_ptlinux_c > diff -N patches/patch-lib-src_portmidi_porttime_ptlinux_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-lib-src_portmidi_porttime_ptlinux_c 24 Feb 2019 18:51:34 > -0000 > @@ -0,0 +1,53 @@ > +$OpenBSD$ > + > +XXX test, maybe disable portmidi completely? > + > +- sys/timeb.h and ftime were removed from POSIX-2008 > + > +Index: lib-src/portmidi/porttime/ptlinux.c > +--- lib-src/portmidi/porttime/ptlinux.c.orig > ++++ lib-src/portmidi/porttime/ptlinux.c > +@@ -31,14 +31,13 @@ CHANGE LOG > + #include "porttime.h" > + #include "sys/time.h" > + #include "sys/resource.h" > +-#include "sys/timeb.h" > + #include "pthread.h" > + > + #define TRUE 1 > + #define FALSE 0 > + > + static int time_started_flag = FALSE; > +-static struct timeb time_offset = {0, 0, 0, 0}; > ++static struct timespec time_offset = {0, 0}; > + static pthread_t pt_thread_pid; > + static int pt_thread_created = FALSE; > + > +@@ -79,7 +78,7 @@ static void *Pt_CallbackProc(void *p) > + PtError Pt_Start(int resolution, PtCallback *callback, void *userData) > + { > + if (time_started_flag) return ptNoError; > +- ftime(&time_offset); /* need this set before process runs */ > ++ clock_gettime(CLOCK_MONOTONIC, &time_offset); /* need this set before > process runs */ > + if (callback) { > + int res; > + pt_callback_parameters *parms = (pt_callback_parameters *) > +@@ -120,12 +119,12 @@ int Pt_Started() > + > + PtTimestamp Pt_Time() > + { > +- long seconds, milliseconds; > +- struct timeb now; > +- ftime(&now); > +- seconds = now.time - time_offset.time; > +- milliseconds = now.millitm - time_offset.millitm; > +- return seconds * 1000 + milliseconds; > ++ long seconds, nanoseconds; > ++ struct timespec now; > ++ clock_gettime(CLOCK_MONOTONIC, &now); > ++ seconds = now.tv_sec - time_offset.tv_sec; > ++ nanoseconds = now.tv_nsec - time_offset.tv_nsec; > ++ return seconds * 1000 + nanoseconds / 1000000; > + } > + > + > Index: patches/patch-locale_Makefile_in > =================================================================== > RCS file: patches/patch-locale_Makefile_in > diff -N patches/patch-locale_Makefile_in > --- patches/patch-locale_Makefile_in 14 Mar 2009 03:49:43 -0000 1.4 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-locale_Makefile_in,v 1.4 2009/03/14 03:49:43 jakemsr Exp $ > ---- locale/Makefile.in.orig Tue Jan 27 12:52:01 2009 > -+++ locale/Makefile.in Tue Feb 10 03:21:35 2009 > -@@ -96,8 +96,8 @@ FORCE: > - > - install: allmo > - linguas='$(LINGUAS)'; for lang in $$linguas ; do \ > -- $(INSTALL) -d $(DESTDIR)$(LOCALEDIR)/$$lang/LC_MESSAGES ; \ > -- $(INSTALL) -m 644 $$lang/audacity.mo > $(DESTDIR)$(LOCALEDIR)/$$lang/LC_MESSAGES/$(AUDACITY_NAME).mo ; \ > -+ $(INSTALL) -d $(DESTDIR)$(DATADIR)/locale/$$lang/LC_MESSAGES ; \ > -+ $(INSTALL) -m 644 $$lang/audacity.mo > $(DESTDIR)$(DATADIR)/locale/$$lang/LC_MESSAGES/$(AUDACITY_NAME).mo ; \ > - done > - > - uninstall: > Index: patches/patch-src_AudacityApp_cpp > =================================================================== > RCS file: patches/patch-src_AudacityApp_cpp > diff -N patches/patch-src_AudacityApp_cpp > --- patches/patch-src_AudacityApp_cpp 23 Mar 2012 13:28:25 -0000 1.4 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,28 +0,0 @@ > -$OpenBSD: patch-src_AudacityApp_cpp,v 1.4 2012/03/23 13:28:25 ajacoutot Exp $ > - > -error: #error "Only <glib.h> can be included directly." > - > ---- src/AudacityApp.cpp.orig Mon Aug 31 12:45:38 2009 > -+++ src/AudacityApp.cpp Fri Mar 23 13:34:45 2012 > -@@ -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,7 @@ void QuitAudacity() > - > /////////////////////////////////////////////////////////////////////////////// > - > - #include <dlfcn.h> > --#include <gtk/gtk.h> > -+#include <glib.h> > - > - typedef struct _GnomeProgram GnomeProgram; > - typedef struct _GnomeModuleInfo GnomeModuleInfo; > Index: patches/patch-src_Audacity_h > =================================================================== > RCS file: patches/patch-src_Audacity_h > diff -N patches/patch-src_Audacity_h > --- patches/patch-src_Audacity_h 28 Oct 2009 18:40:13 -0000 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,24 +0,0 @@ > -$OpenBSD: patch-src_Audacity_h,v 1.3 2009/10/28 18:40:13 jakemsr Exp $ > ---- 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 */ > --#ifdef HAVE_VISIBILITY // this is provided by the configure script, is only > -+#if defined HAVE_VISIBILITY // this is provided by the configure script, is > only > - // enabled for suitable GCC versions > -+#if HAVE_VISIBILITY > - /* 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. */ > -@@ -104,6 +105,9 @@ void QuitAudacity(); > - #define AUDACITY_DLL_API __attribute__((visibility("default"))) > - #endif > - #endif > -+#else > -+ #define AUDACITY_DLL_API > -+#endif > - #endif > - > - /* The GCC-win32 implementation */ > Index: patches/patch-src_AudioIO_cpp > =================================================================== > RCS file: patches/patch-src_AudioIO_cpp > diff -N patches/patch-src_AudioIO_cpp > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_AudioIO_cpp 24 Feb 2019 18:51:34 -0000 > @@ -0,0 +1,30 @@ > +$OpenBSD$ > + > +- CLOCK_MONOTONIC_RAW is not portable > +- PaUtil_GetTime is a private interface, not reachable when using system > portaudio > + > +Index: src/AudioIO.cpp > +--- src/AudioIO.cpp.orig > ++++ src/AudioIO.cpp > +@@ -982,18 +982,17 @@ static double streamStartTime = 0; // bias system time > + static double SystemTime(bool usingAlsa) > + { > + #ifdef __WXGTK__ > +- if (usingAlsa) { > ++ (void)usingAlsa; > ++ { > + struct timespec now; > + // CLOCK_MONOTONIC_RAW is unaffected by NTP or adj-time > +- clock_gettime(CLOCK_MONOTONIC_RAW, &now); > ++ clock_gettime(CLOCK_MONOTONIC, &now); > + //return now.tv_sec + now.tv_nsec * 0.000000001; > + return (now.tv_sec + now.tv_nsec * 0.000000001) - streamStartTime; > + } > + #else > + usingAlsa;//compiler food. > + #endif > +- > +- return PaUtil_GetTime() - streamStartTime; > + } > + > + const int AudioIO::StandardRates[] = { > Index: patches/patch-src_AudioIO_h > =================================================================== > RCS file: patches/patch-src_AudioIO_h > diff -N patches/patch-src_AudioIO_h > --- patches/patch-src_AudioIO_h 28 Oct 2009 18:40:13 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-src_AudioIO_h,v 1.1 2009/10/28 18:40:13 jakemsr Exp $ > ---- src/AudioIO.h.orig Mon Oct 19 01:07:01 2009 > -+++ src/AudioIO.h Mon Oct 19 01:24:50 2009 > -@@ -22,7 +22,7 @@ > - #include "portmidi.h" > - #include "porttime.h" > - #endif // EXPERIMENTAL_MIDI_OUT > --#include "allegro.h" > -+#include "../lib-src/portsmf/allegro.h" > - #endif // USE_MIDI > - > - #if USE_PORTMIXER > Index: patches/patch-src_Benchmark_cpp > =================================================================== > RCS file: patches/patch-src_Benchmark_cpp > diff -N patches/patch-src_Benchmark_cpp > --- patches/patch-src_Benchmark_cpp 9 Dec 2014 20:29:03 -0000 1.5 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,21 +0,0 @@ > -$OpenBSD: patch-src_Benchmark_cpp,v 1.5 2014/12/09 20:29:03 sthen Exp $ > ---- src/Benchmark.cpp.orig Mon Aug 31 11:45:38 2009 > -+++ src/Benchmark.cpp Tue Dec 9 20:18:56 2014 > -@@ -340,7 +340,7 @@ void BenchmarkDialog::OnRun( wxCommandEvent &event ) > - > - t->SetRate(1); > - > -- srand(randSeed); > -+ srand_deterministic(randSeed); > - > - int nChunks, chunkSize; > - //chunkSize = 7500 + (rand() % 1000); > -@@ -530,7 +530,7 @@ void BenchmarkDialog::OnRun( wxCommandEvent &event ) > - delete fact; > - d->Deref(); > - > -- Sequence::SetMaxDiskBlockSize(oldBlockSize); > -+ Sequence::SetMaxDiskBlockSize(1048576); > - HoldPrint(false); > - > - gPrefs->Write(wxT("/GUI/EditClipCanMove"), editClipCanMove); > Index: patches/patch-src_FFmpeg_cpp > =================================================================== > RCS file: patches/patch-src_FFmpeg_cpp > diff -N patches/patch-src_FFmpeg_cpp > --- patches/patch-src_FFmpeg_cpp 28 Oct 2009 18:40:13 -0000 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,27 +0,0 @@ > -$OpenBSD: patch-src_FFmpeg_cpp,v 1.3 2009/10/28 18:40:13 jakemsr Exp $ > ---- 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) > - } > - } > - > -+#if 0 > - void OnDownload(wxCommandEvent & event) > - { > - wxString page = > wxT("http://www.audacityteam.org/manual/index.php?title=FAQ:Installation_and_Plug-Ins%23installffmpeg";); > - ::OpenInDefaultBrowser(page); > - } > -+#endif > - > - wxString GetLibPath() > - { > -@@ -511,7 +513,9 @@ class FindFFmpegDialog : public wxDialog (public) > - > - BEGIN_EVENT_TABLE(FindFFmpegDialog, wxDialog) > - EVT_BUTTON(ID_FFMPEG_BROWSE, FindFFmpegDialog::OnBrowse) > -+#if 0 > - EVT_BUTTON(ID_FFMPEG_DLOAD, FindFFmpegDialog::OnDownload) > -+#endif > - END_EVENT_TABLE() > - > - > Index: patches/patch-src_MemoryX_h > =================================================================== > RCS file: patches/patch-src_MemoryX_h > diff -N patches/patch-src_MemoryX_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_MemoryX_h 24 Feb 2019 18:51:34 -0000 > @@ -0,0 +1,14 @@ > +$OpenBSD$ > + > +Index: src/MemoryX.h > +--- src/MemoryX.h.orig > ++++ src/MemoryX.h > +@@ -1171,7 +1171,7 @@ namespace std > + namespace tr1 > + { > + #endif > +- template<typename T> struct hash; > ++// template<typename T> struct hash; > + template<> struct hash< wxString > { > + size_t operator () (const wxString &str) const // noexcept > + { > Index: patches/patch-src_NoteTrack_cpp > =================================================================== > RCS file: patches/patch-src_NoteTrack_cpp > diff -N patches/patch-src_NoteTrack_cpp > --- patches/patch-src_NoteTrack_cpp 28 Oct 2009 18:40:13 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-src_NoteTrack_cpp,v 1.1 2009/10/28 18:40:13 jakemsr Exp $ > ---- src/NoteTrack.cpp.orig Mon Oct 19 01:25:14 2009 > -+++ src/NoteTrack.cpp Mon Oct 19 01:25:36 2009 > -@@ -23,7 +23,7 @@ > - > - #if defined(USE_MIDI) > - > --#include "allegro.h" > -+#include "../lib-src/portsmf/allegro.h" > - /* REQUIRES PORTMIDI */ > - //#include "portmidi.h" > - //#include "porttime.h" > Index: patches/patch-src_Project_cpp > =================================================================== > RCS file: patches/patch-src_Project_cpp > diff -N patches/patch-src_Project_cpp > --- patches/patch-src_Project_cpp 11 Apr 2018 17:59:54 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-src_Project_cpp,v 1.1 2018/04/11 17:59:54 jasper Exp $ > - > -Index: src/Project.cpp > ---- src/Project.cpp.orig > -+++ src/Project.cpp > -@@ -679,7 +679,7 @@ AudacityProject::AudacityProject(wxWindow * parent, wx > - mCleanSpeechMode(false), //lda > - mShowId3Dialog(true), //lda > - mLastFocusedWindow(NULL), > -- mKeyboardCaptured(false), > -+ mKeyboardCaptured(NULL), > - mImportXMLTagHandler(NULL), > - mLastAutoSaveTime(0), > - mAutoSaving(false), > Index: patches/patch-src_Sequence_cpp > =================================================================== > RCS file: patches/patch-src_Sequence_cpp > diff -N patches/patch-src_Sequence_cpp > --- patches/patch-src_Sequence_cpp 28 Oct 2009 18:40:13 -0000 1.6 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,29 +0,0 @@ > -$OpenBSD: patch-src_Sequence_cpp,v 1.6 2009/10/28 18:40:13 jakemsr Exp $ > ---- 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 || > -- start+len > mNumSamples) > -+ start+len > mNumSamples || > -+ (format != mSampleFormat) || !buffer) > - return false; > - int b = FindBlock(start); > - > -@@ -981,6 +982,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form > - if (format != mSampleFormat) { > - temp = NewSamples(mMaxSamples, mSampleFormat); > - wxASSERT(temp); > -+ return false; > - } > - > - samplePtr silence = NULL; > -@@ -988,6 +990,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form > - silence = NewSamples(mMaxSamples, format); > - wxASSERT(silence); > - ClearSamples(silence, format, 0, mMaxSamples); > -+ return false; > - } > - > - int b = FindBlock(start); > Index: patches/patch-src_TrackArtist_cpp > =================================================================== > RCS file: patches/patch-src_TrackArtist_cpp > diff -N patches/patch-src_TrackArtist_cpp > --- patches/patch-src_TrackArtist_cpp 28 Oct 2009 18:40:13 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-src_TrackArtist_cpp,v 1.1 2009/10/28 18:40:13 jakemsr Exp $ > ---- src/TrackArtist.cpp.orig Mon Oct 19 01:25:55 2009 > -+++ src/TrackArtist.cpp Mon Oct 19 01:26:15 2009 > -@@ -39,7 +39,7 @@ > - #include <wx/datetime.h> > - > - #ifdef USE_MIDI > --#include "allegro.h" > -+#include "../lib-src/portsmf/allegro.h" > - #include "NoteTrack.h" > - #endif // USE_MIDI > - > Index: patches/patch-src_export_ExportMP3_cpp > =================================================================== > RCS file: patches/patch-src_export_ExportMP3_cpp > diff -N patches/patch-src_export_ExportMP3_cpp > --- patches/patch-src_export_ExportMP3_cpp 3 Nov 2018 13:42:33 -0000 > 1.10 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,49 +0,0 @@ > -$OpenBSD: patch-src_export_ExportMP3_cpp,v 1.10 2018/11/03 13:42:33 > ajacoutot Exp $ > -Index: src/export/ExportMP3.cpp > ---- src/export/ExportMP3.cpp.orig > -+++ src/export/ExportMP3.cpp > -@@ -575,8 +575,6 @@ class FindDialog : public wxDialog (public) > - mPathText = S.AddTextBox(wxT(""), mLibPath.GetFullPath(), 0); > - } > - S.Id(ID_BROWSE).AddButton(_("Browse..."), wxALIGN_RIGHT); > -- S.AddVariableText(_("To get a free copy of Lame, click here > -->"), true); > -- S.Id(ID_DLOAD).AddButton(_("Download"), wxALIGN_RIGHT); > - } > - S.EndMultiColumn(); > - > -@@ -613,12 +611,6 @@ class FindDialog : public wxDialog (public) > - } > - } > - > -- void OnDownload(wxCommandEvent & event) > -- { > -- wxString page = > wxT("http://www.audacityteam.org/manual/index.php?title=FAQ:Installation_and_Plug-Ins%23How_do_I_download_and_install_the_LAME_MP3_encoder.3F";); > -- ::OpenInDefaultBrowser(page); > -- } > -- > - wxString GetLibPath() > - { > - return mLibPath.GetFullPath(); > -@@ -639,7 +631,6 @@ class FindDialog : public wxDialog (public) > - > - BEGIN_EVENT_TABLE(FindDialog, wxDialog) > - EVT_BUTTON(ID_BROWSE, FindDialog::OnBrowse) > -- EVT_BUTTON(ID_DLOAD, FindDialog::OnDownload) > - END_EVENT_TABLE() > - > - > //---------------------------------------------------------------------------- > -@@ -1356,12 +1347,12 @@ wxString MP3Exporter::GetLibraryPath() > - > - wxString MP3Exporter::GetLibraryName() > - { > -- return wxT("libmp3lame.so.0"); > -+ return wxT("libmp3lame.so"); > - } > - > - wxString MP3Exporter::GetLibraryTypeString() > - { > -- return wxString(_("Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared > Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*")); > -+ return wxString(_("libmp3lame.so.X.Y|libmp3lame.so.*|Primary Shared > Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*")); > - } > - #endif > - > Index: patches/patch-src_import_ImportFLAC_cpp > =================================================================== > RCS file: patches/patch-src_import_ImportFLAC_cpp > diff -N patches/patch-src_import_ImportFLAC_cpp > --- patches/patch-src_import_ImportFLAC_cpp 11 Apr 2018 17:59:54 -0000 > 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,23 +0,0 @@ > -$OpenBSD: patch-src_import_ImportFLAC_cpp,v 1.3 2018/04/11 17:59:54 jasper > Exp $ > - > -Index: src/import/ImportFLAC.cpp > ---- src/import/ImportFLAC.cpp.orig > -+++ src/import/ImportFLAC.cpp > -@@ -289,7 +289,7 @@ ImportFileHandle *FLACImportPlugin::Open(wxString file > - int cnt; > - wxFile binaryFile; > - if (!binaryFile.Open(filename)) { > -- return false; // File not found > -+ return NULL; // File not found > - } > - > - #ifdef USE_LIBID3TAG > -@@ -306,7 +306,7 @@ ImportFileHandle *FLACImportPlugin::Open(wxString file > - > - if (cnt == wxInvalidOffset || strncmp(buf, FLAC_HEADER, 4) != 0) { > - // File is not a FLAC file > -- return false; > -+ return NULL; > - } > - > - // Open the file for import > Index: patches/patch-src_import_ImportMIDI_cpp > =================================================================== > RCS file: patches/patch-src_import_ImportMIDI_cpp > diff -N patches/patch-src_import_ImportMIDI_cpp > --- patches/patch-src_import_ImportMIDI_cpp 28 Oct 2009 18:40:13 -0000 > 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-src_import_ImportMIDI_cpp,v 1.1 2009/10/28 18:40:13 jakemsr > Exp $ > ---- src/import/ImportMIDI.cpp.orig Mon Oct 19 01:26:54 2009 > -+++ src/import/ImportMIDI.cpp Mon Oct 19 01:27:10 2009 > -@@ -21,7 +21,7 @@ > - #include "../NoteTrack.h" > - #include "ImportMIDI.h" > - > --#include "allegro.h" > -+#include "../../lib-src/portsmf/allegro.h" > - #include "strparse.h" > - #include "mfmidi.h" > - > Index: patches/patch-src_ondemand_ODManager_cpp > =================================================================== > RCS file: patches/patch-src_ondemand_ODManager_cpp > diff -N patches/patch-src_ondemand_ODManager_cpp > --- patches/patch-src_ondemand_ODManager_cpp 3 Sep 2012 09:09:37 -0000 > 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,13 +0,0 @@ > -$OpenBSD: patch-src_ondemand_ODManager_cpp,v 1.1 2012/09/03 09:09:37 stsp > Exp $ > -fix abort() in pthread_mutex_unlock() > ---- src/ondemand/ODManager.cpp.orig Mon Sep 3 01:04:47 2012 > -+++ src/ondemand/ODManager.cpp Mon Sep 3 01:05:08 2012 > -@@ -283,7 +283,7 @@ void ODManager::Start() > - > - //the thread will add it back to the array if the job is not yet > done at the end of the thread's run. > - //mTasks.erase(mTasks.begin()); > -- mTasksMutex.Unlock(); > -+ //mTasksMutex.Unlock(); > - > - //detach a new thread. > - thread = new ODTaskThread(mTasks[0]);//task); > Index: patches/patch-src_prefs_LibraryPrefs_cpp > =================================================================== > RCS file: patches/patch-src_prefs_LibraryPrefs_cpp > diff -N patches/patch-src_prefs_LibraryPrefs_cpp > --- patches/patch-src_prefs_LibraryPrefs_cpp 3 Nov 2018 13:42:33 -0000 > 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,32 +0,0 @@ > -$OpenBSD: patch-src_prefs_LibraryPrefs_cpp,v 1.1 2018/11/03 13:42:33 > ajacoutot Exp $ > - > -Index: src/prefs/LibraryPrefs.cpp > ---- src/prefs/LibraryPrefs.cpp.orig > -+++ src/prefs/LibraryPrefs.cpp > -@@ -91,11 +91,6 @@ void LibraryPrefs::PopulateOrExchange(ShuttleGui & S) > - wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL); > - S.Id(ID_MP3_FIND_BUTTON).AddButton(_("&Locate..."), > - wxALL | wxALIGN_LEFT | > wxALIGN_CENTRE_VERTICAL); > -- S.AddVariableText(_("LAME MP3 Library:"), > -- true, > -- wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL); > -- S.Id(ID_MP3_DOWN_BUTTON).AddButton(_("&Download"), > -- wxALL | wxALIGN_LEFT | > wxALIGN_CENTRE_VERTICAL); > - } > - S.EndTwoColumn(); > - } > -@@ -123,14 +118,7 @@ void LibraryPrefs::PopulateOrExchange(ShuttleGui & S) > - S.Id(ID_FFMPEG_FIND_BUTTON); > - wxButton *bfnd = S.AddButton(_("&Locate..."), > - wxALL | wxALIGN_LEFT | > wxALIGN_CENTRE_VERTICAL); > -- S.AddVariableText(_("FFmpeg Library:"), > -- true, > -- wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL); > -- S.Id(ID_FFMPEG_DOWN_BUTTON); > -- wxButton *bdwn = S.AddButton(_("&Download"), > -- wxALL | wxALIGN_LEFT | > wxALIGN_CENTRE_VERTICAL); > - #if !defined(USE_FFMPEG) > -- bdwn->Enable(FALSE); > - bfnd->Enable(FALSE); > - #endif > - } > > > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE > -- Antoine
