On Tuesday 05 June 2007 13:51:38 Antti Harri wrote:
> Playing and editing mp3 track worked fine on i386.
> But when starting I get this:
>
> Pa_SetupDeviceFormat: warning - requested sample rate = 96000 Hz - closest
> = 8000
Yes, that's to be expected and nothing to be worried about. Your driver does
not support the requested sample rate so the application tries the closest it
can find.
> Also the Help->Benchmark doesn't seem to work:
Please, can you try this new diff.
--
Antoine
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/audacity/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 24 May 2007 09:45:01 -0000 1.7
+++ Makefile 5 Jun 2007 12:59:03 -0000
@@ -2,9 +2,9 @@
COMMENT= "free audio editor"
-V= 1.3.2
+V= 1.3.3
DISTNAME= audacity-src-${V}
-PKGNAME= audacity-${V}p1
+PKGNAME= audacity-${V}
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/}
@@ -19,7 +19,8 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m ossaudio pthread stdc++ ogg expat sndfile
+WANTLIB= c m ossaudio pthread stdc++ ogg expat sndfile glib-2.0 \
+ gobject-2.0 gtk-x11-2.0
BUILD_DEPENDS= ::archivers/zip
LIB_DEPENDS= wx_base_xml,wx_base_odbc,wx_gtk2_html,wx_gtk2_adv,wx_gtk2_xrc,wx_base_net,wx_gtk2_dbgrid,wx_gtk2_qa,wx_base,wx_gtk2_core:wxWidgets-gtk2->=2.6.3:x11/wxWidgets \
@@ -34,6 +35,8 @@
USE_GMAKE= Yes
USE_LIBTOOL= Yes
+WRKDIST= ${WRKDIR}/${DISTNAME}-beta
+
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
CFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
@@ -49,6 +52,7 @@
--with-libsamplerate=system \
--with-expat=system \
--without-libresample \
+ --without-libtwolame \
--with-nyquist=local \
--with-ladspa \
--with-portmixer \
@@ -57,13 +61,11 @@
--with-help
MAKE_FLAGS= CC="${CC}"
-WRKDIST= ${WRKDIR}/${DISTNAME}-beta
-
-REGRESS_FLAGS= LDFLAGS="-L${X11BASE}/lib"
-pre-configure:
- @perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
- ${WRKSRC}/src/export/ExportMP3.cpp
+# 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_REGRESS= Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/audacity/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 5 Apr 2007 15:37:41 -0000 1.4
+++ distinfo 5 Jun 2007 12:59:03 -0000
@@ -1,5 +1,5 @@
-MD5 (audacity-src-1.3.2.tar.gz) = v2NnMUAlTxKD39VbYf8kIg==
-RMD160 (audacity-src-1.3.2.tar.gz) = thdHEDZ1iBvfMnYt7qdjWignsN4=
-SHA1 (audacity-src-1.3.2.tar.gz) = h2kIBnY7feJqji3x8NTDp+bRpAQ=
-SHA256 (audacity-src-1.3.2.tar.gz) = qjfAABTueVFvtdzkxW4QOKfq9a0ioQdD8GCe0Ya69iE=
-SIZE (audacity-src-1.3.2.tar.gz) = 6683449
+MD5 (audacity-src-1.3.3.tar.gz) = cqnjI587WvYwMKHhsH5A5w==
+RMD160 (audacity-src-1.3.3.tar.gz) = ygCZvQCvjIY4NLVrZMJralSp6LA=
+SHA1 (audacity-src-1.3.3.tar.gz) = G1Lw3nNstZA98+R3ZTCDm+4m9Wc=
+SHA256 (audacity-src-1.3.3.tar.gz) = mj5Yw84E5bHXQ4kbx69qKiLwHoRhEa9WDe9qbLNgcp0=
+SIZE (audacity-src-1.3.3.tar.gz) = 6649291
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 12 Oct 2006 14:26:03 -0000 1.2
+++ patches/patch-Makefile_in 5 Jun 2007 12:59:03 -0000
@@ -1,8 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.2 2006/10/12 14:26:03 alek Exp $
---- Makefile.in.orig Sun Nov 27 17:47:27 2005
-+++ Makefile.in Sat Oct 7 16:53:52 2006
-@@ -39,9 +39,9 @@ install: audacity $(EXTRAINSTALLTARGETS)
+--- Makefile.in.orig Mon Mar 26 10:56:29 2007
++++ Makefile.in Thu Mar 29 23:39:34 2007
+@@ -29,17 +29,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 && \
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-configure,v
retrieving revision 1.4
diff -u -r1.4 patch-configure
--- patches/patch-configure 24 May 2007 09:45:01 -0000 1.4
+++ patches/patch-configure 5 Jun 2007 12:59:03 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-configure,v 1.4 2007/05/24 09:45:01 ajacoutot Exp $
---- configure.orig Sun Oct 29 01:05:36 2006
-+++ configure Thu May 24 11:02:16 2007
-@@ -9402,7 +9402,7 @@ echo "$as_me: WARNING: no configuration information is
- { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
- echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+--- configure.orig Fri May 18 06:56:02 2007
++++ configure Tue Jun 5 10:43:27 2007
+@@ -8516,7 +8516,7 @@ echo "$as_me: WARNING: no configuration information is
+ { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+ echo "$as_me: running $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\"" ||
+- eval $ac_sub_configure $ac_sub_configure_args \
++ eval $ac_sub_configure $ac_sub_configure_args CFLAGS='"$CFLAGS"' CXXFLAGS='"$CXXFLAGS"' LDFLAGS='"$LDFLAGS"' \
+ --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
Index: patches/patch-lib-src_allegro_mfallegro_cpp
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_allegro_mfallegro_cpp,v
retrieving revision 1.2
diff -u -r1.2 patch-lib-src_allegro_mfallegro_cpp
--- patches/patch-lib-src_allegro_mfallegro_cpp 24 May 2007 09:45:01 -0000 1.2
+++ patches/patch-lib-src_allegro_mfallegro_cpp 5 Jun 2007 12:59:03 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-lib-src_allegro_mfallegro_cpp,v 1.2 2007/05/24 09:45:01 ajacoutot Exp $
---- lib-src/allegro/mfallegro.cpp.orig Sun Oct 29 01:05:59 2006
-+++ lib-src/allegro/mfallegro.cpp Thu May 24 11:02:16 2007
+--- lib-src/allegro/mfallegro.cpp.orig Wed Mar 28 09:13:04 2007
++++ lib-src/allegro/mfallegro.cpp Wed Mar 28 09:13:42 2007
@@ -121,7 +121,7 @@ void Allegro_midifile_reader::Mf_starttrack()
void Allegro_midifile_reader::Mf_endtrack()
{
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.2
diff -u -r1.2 patch-lib-src_libnyquist_cmt_cext_h
--- patches/patch-lib-src_libnyquist_cmt_cext_h 24 May 2007 09:45:01 -0000 1.2
+++ patches/patch-lib-src_libnyquist_cmt_cext_h 5 Jun 2007 12:59:03 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-lib-src_libnyquist_cmt_cext_h,v 1.2 2007/05/24 09:45:01 ajacoutot Exp $
---- lib-src/libnyquist/cmt/cext.h.orig Sun Oct 29 01:05:50 2006
-+++ lib-src/libnyquist/cmt/cext.h Thu May 24 11:02:16 2007
+--- 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
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.2
diff -u -r1.2 patch-lib-src_libnyquist_snd_sndheader_c
--- patches/patch-lib-src_libnyquist_snd_sndheader_c 24 May 2007 09:45:01 -0000 1.2
+++ patches/patch-lib-src_libnyquist_snd_sndheader_c 5 Jun 2007 12:59:03 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-lib-src_libnyquist_snd_sndheader_c,v 1.2 2007/05/24 09:45:01 ajacoutot Exp $
---- lib-src/libnyquist/snd/sndheader.c.orig Sun Oct 29 01:05:50 2006
-+++ lib-src/libnyquist/snd/sndheader.c Thu May 24 11:02:17 2007
+--- 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) {
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.2
diff -u -r1.2 patch-lib-src_libnyquist_xlisp_xlprin_c
--- patches/patch-lib-src_libnyquist_xlisp_xlprin_c 24 May 2007 09:45:01 -0000 1.2
+++ patches/patch-lib-src_libnyquist_xlisp_xlprin_c 5 Jun 2007 12:59:03 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-lib-src_libnyquist_xlisp_xlprin_c,v 1.2 2007/05/24 09:45:01 ajacoutot Exp $
---- lib-src/libnyquist/xlisp/xlprin.c.orig Sun Oct 29 01:05:50 2006
-+++ lib-src/libnyquist/xlisp/xlprin.c Thu May 24 11:02:17 2007
+--- 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)
{
Index: patches/patch-lib-src_libresample_Makefile_in
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_libresample_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-lib-src_libresample_Makefile_in
--- patches/patch-lib-src_libresample_Makefile_in 24 May 2007 09:45:01 -0000 1.3
+++ patches/patch-lib-src_libresample_Makefile_in 5 Jun 2007 12:59:03 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-lib-src_libresample_Makefile_in,v 1.3 2007/05/24 09:45:01 ajacoutot Exp $
---- lib-src/libresample/Makefile.in.orig Sun Oct 29 01:06:00 2006
-+++ lib-src/libresample/Makefile.in Thu May 24 11:02:17 2007
+--- lib-src/libresample/Makefile.in.orig Wed Mar 28 09:20:39 2007
++++ lib-src/libresample/Makefile.in Wed Mar 28 09:21:27 2007
@@ -7,6 +7,7 @@ CC = @CC@
CFLAGS = @CFLAGS@ -Wall
Index: patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_c
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_c,v
retrieving revision 1.2
diff -u -r1.2 patch-lib-src_portaudio_pa_unix_oss_pa_unix_c
--- patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_c 24 May 2007 09:45:01 -0000 1.2
+++ patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_c 5 Jun 2007 12:59:03 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-lib-src_portaudio_pa_unix_oss_pa_unix_c,v 1.2 2007/05/24 09:45:01 ajacoutot Exp $
---- lib-src/portaudio/pa_unix_oss/pa_unix.c.orig Sun Oct 29 01:05:50 2006
-+++ lib-src/portaudio/pa_unix_oss/pa_unix.c Thu May 24 11:02:17 2007
+--- lib-src/portaudio/pa_unix_oss/pa_unix.c.orig Wed Mar 28 09:22:39 2007
++++ lib-src/portaudio/pa_unix_oss/pa_unix.c Wed Mar 28 09:26:18 2007
@@ -399,6 +399,7 @@ static int PaHost_CanaryProc( PaHostSoundControl *pa
return result;
}
Index: patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c,v
retrieving revision 1.3
diff -u -r1.3 patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c
--- patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c 24 May 2007 09:45:01 -0000 1.3
+++ patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c 5 Jun 2007 12:59:03 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c,v 1.3 2007/05/24 09:45:01 ajacoutot Exp $
---- lib-src/portaudio/pa_unix_oss/pa_unix_oss.c.orig Sun Oct 29 01:05:50 2006
-+++ lib-src/portaudio/pa_unix_oss/pa_unix_oss.c Thu May 24 11:02:17 2007
+--- lib-src/portaudio/pa_unix_oss/pa_unix_oss.c.orig Wed Mar 28 09:27:12 2007
++++ lib-src/portaudio/pa_unix_oss/pa_unix_oss.c Wed Mar 28 09:29:36 2007
@@ -45,7 +45,8 @@
#elif defined(__FreeBSD__)
#include <sys/soundcard.h>
@@ -28,11 +28,10 @@
/* Set format, channels, and rate in this order to keep OSS happy. */
/* Set data format. FIXME - handle more native formats. */
tmp = AFMT_S16_NE;
-@@ -273,18 +278,52 @@ PaError Pa_SetupDeviceFormat( int devHandle, int numCh
- return paHostError;
+@@ -274,17 +279,51 @@ PaError Pa_SetupDeviceFormat( int devHandle, int numCh
}
}
-+
+
+#ifdef __OpenBSD__
+
+ AUDIO_INITINFO(&audio_if);
@@ -66,7 +65,7 @@
+ }
+
+#endif
-
++
return result;
}
Index: patches/patch-lib-src_soundtouch_include_STTypes_h
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_soundtouch_include_STTypes_h,v
retrieving revision 1.1
diff -u -r1.1 patch-lib-src_soundtouch_include_STTypes_h
--- patches/patch-lib-src_soundtouch_include_STTypes_h 17 Dec 2006 12:12:59 -0000 1.1
+++ patches/patch-lib-src_soundtouch_include_STTypes_h 5 Jun 2007 12:59:03 -0000
@@ -1,14 +1,13 @@
$OpenBSD: patch-lib-src_soundtouch_include_STTypes_h,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
---- lib-src/soundtouch/include/STTypes.h.orig Wed Dec 6 14:09:36 2006
-+++ lib-src/soundtouch/include/STTypes.h Wed Dec 6 14:10:27 2006
+--- lib-src/soundtouch/include/STTypes.h.orig Wed Mar 28 09:32:07 2007
++++ lib-src/soundtouch/include/STTypes.h Wed Mar 28 09:33:00 2007
@@ -92,7 +92,9 @@ namespace soundtouch
/// However, if you're having difficulties getting the optimized routines
/// compiled with your compler (e.g. some gcc compiler versions may be picky),
/// you may wish to disable the optimizations to make the library compile.
-- #define ALLOW_OPTIMIZATIONS 1
-+ #ifndef __OpenBSD__
-+ #define ALLOW_OPTIMIZATIONS 1
-+ #endif
++#ifndef __OpenBSD__
+ #define ALLOW_OPTIMIZATIONS 1
++#endif
// If defined, allows the SIMD-optimized routines to take minor shortcuts
Index: patches/patch-lib-src_soundtouch_source_SoundTouch_Makefile_in
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_soundtouch_source_SoundTouch_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-lib-src_soundtouch_source_SoundTouch_Makefile_in
--- patches/patch-lib-src_soundtouch_source_SoundTouch_Makefile_in 24 May 2007 09:45:01 -0000 1.3
+++ patches/patch-lib-src_soundtouch_source_SoundTouch_Makefile_in 5 Jun 2007 12:59:03 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-lib-src_soundtouch_source_SoundTouch_Makefile_in,v 1.3 2007/05/24 09:45:01 ajacoutot Exp $
---- lib-src/soundtouch/source/SoundTouch/Makefile.in.orig Sun Oct 29 01:06:00 2006
-+++ lib-src/soundtouch/source/SoundTouch/Makefile.in Thu May 24 11:02:17 2007
+--- lib-src/soundtouch/source/SoundTouch/Makefile.in.orig Wed Mar 28 09:33:27 2007
++++ lib-src/soundtouch/source/SoundTouch/Makefile.in Wed Mar 28 09:33:57 2007
@@ -197,7 +197,7 @@ libSoundTouch_la_SOURCES = AAFilter.cpp FIRFilter.cpp
# ??? test for -fcheck-new in configure.ac
Index: patches/patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in
--- patches/patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in 24 May 2007 09:45:01 -0000 1.3
+++ patches/patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in 5 Jun 2007 12:59:03 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in,v 1.3 2007/05/24 09:45:01 ajacoutot Exp $
---- lib-src/soundtouch/source/example/SoundStretch/Makefile.in.orig Sun Oct 29 01:06:00 2006
-+++ lib-src/soundtouch/source/example/SoundStretch/Makefile.in Thu May 24 11:02:17 2007
+--- lib-src/soundtouch/source/example/SoundStretch/Makefile.in.orig Wed Mar 28 09:35:39 2007
++++ lib-src/soundtouch/source/example/SoundStretch/Makefile.in Wed Mar 28 09:35:54 2007
@@ -189,7 +189,7 @@ EXTRA_DIST = soundstretch.dsp soundstretch.dsw
soundstretch_SOURCES = main.cpp RunParameters.cpp WavFile.cpp
soundstretch_LDADD = ../../SoundTouch/libSoundTouch.la ../bpm/libBPM.la -lm
Index: patches/patch-locale_Makefile_in
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-locale_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-locale_Makefile_in
--- patches/patch-locale_Makefile_in 12 Oct 2006 14:26:04 -0000 1.1
+++ patches/patch-locale_Makefile_in 5 Jun 2007 12:59:03 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-locale_Makefile_in,v 1.1 2006/10/12 14:26:04 alek Exp $
---- locale/Makefile.in.orig Sun Oct 8 21:22:47 2006
-+++ locale/Makefile.in Sun Oct 8 21:22:59 2006
-@@ -71,8 +71,8 @@ FORCE:
+--- locale/Makefile.in.orig Wed Mar 28 09:36:54 2007
++++ locale/Makefile.in Wed Mar 28 09:37:27 2007
+@@ -86,8 +86,8 @@ FORCE:
install: allmo
linguas='$(LINGUAS)'; for lang in $$linguas ; do \
Index: patches/patch-src_Benchmark_cpp
===================================================================
RCS file: patches/patch-src_Benchmark_cpp
diff -N patches/patch-src_Benchmark_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Benchmark_cpp 5 Jun 2007 12:59:03 -0000
@@ -0,0 +1,83 @@
+$OpenBSD$
+--- src/Benchmark.cpp.orig Tue Jun 5 14:55:41 2007
++++ src/Benchmark.cpp Tue Jun 5 14:36:27 2007
+@@ -37,6 +37,7 @@ of the BlockFile system.
+ #include "Project.h"
+ #include "WaveTrack.h"
+ #include "Sequence.h"
++#include "Prefs.h"
+
+ #include "FileDialog.h"
+
+@@ -330,6 +331,10 @@ void BenchmarkDialog::OnRun( wxCommandEvent &event )
+ return;
+ }
+
++ bool editClipCanMove = true;
++ gPrefs->Read(wxT("/GUI/EditClipCanMove"), &editClipCanMove);
++ gPrefs->Write(wxT("/GUI/EditClipCanMove"), false);
++
+ Sequence::SetMaxDiskBlockSize(blockSize * 1024);
+
+ wxBusyCursor busy;
+@@ -425,7 +430,7 @@ void BenchmarkDialog::OnRun( wxCommandEvent &event )
+
+ t->Paste(double (y0 * scale), tmp);
+
+- if (t->GetClipByIndex(0)->GetSequence()->GetNumSamples() != (sampleCount)len * scale) {
++ if (t->GetClipByIndex(0)->GetSequence()->GetNumSamples() != (sampleCount) len * scale) {
+ Printf(wxT("Trial %d\n"), z);
+ Printf(wxT("Expected len %d, track len %d.\n"), len * scale,
+ t->GetClipByIndex(0)->GetSequence()->GetNumSamples());
+@@ -443,8 +448,6 @@ void BenchmarkDialog::OnRun( wxCommandEvent &event )
+ // Paste
+ for (i = 0; i < xlen; i++)
+ small1[y0 + i] = small2[i];
+-
+- delete tmp;
+ }
+
+ elapsed = timer.Time();
+@@ -513,33 +516,28 @@ void BenchmarkDialog::OnRun( wxCommandEvent &event )
+ wxT("simultaneous tracks that could be played at once: %.1f\n"),
+ (len*scale/44100.0)/(elapsed/1000.0));
+
+- delete t;
++ goto success;
+
+- delete[]small1;
+- delete[]small2;
+- delete[]block;
+-
+- delete fact;
+- delete d;
+-
+- Sequence::SetMaxDiskBlockSize(1048576);
+- HoldPrint(false);
+-
+- return;
+-
+ fail:
+ Printf(wxT("TEST FAILED!!!\n"));
+
++ success:
++ if (tmp)
++ delete tmp;
++
+ delete t;
+
+ delete[]small1;
+ delete[]small2;
+ delete[]block;
+
+- delete d;
++ delete fact;
++ d->Deref();
+
+ Sequence::SetMaxDiskBlockSize(1048576);
+ HoldPrint(false);
++
++ gPrefs->Write(wxT("/GUI/EditClipCanMove"), editClipCanMove);
+ }
+
+
Index: patches/patch-src_DirManager_cpp
===================================================================
RCS file: patches/patch-src_DirManager_cpp
diff -N patches/patch-src_DirManager_cpp
--- patches/patch-src_DirManager_cpp 24 May 2007 09:45:01 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,236 +0,0 @@
-$OpenBSD: patch-src_DirManager_cpp,v 1.2 2007/05/24 09:45:01 ajacoutot Exp $
---- src/DirManager.cpp.orig Sun Oct 29 01:05:26 2006
-+++ src/DirManager.cpp Thu May 24 11:02:17 2007
-@@ -69,7 +69,9 @@
- #include "blockfile/PCMAliasBlockFile.h"
- #include "DirManager.h"
- #include "Internat.h"
-+#ifndef NO_PROJECT_LEVEL
- #include "Project.h"
-+#endif
- #include "Prefs.h"
- #include "widgets/Warning.h"
- #include "widgets/MultiDialog.h"
-@@ -163,9 +165,13 @@ static int rm_dash_rf_enumerate_i(wxString dirpath,
- wxString dirspec,
- int files_p,int dirs_p,
- int progress_count,int progress_bias,
-+#ifdef NO_PROJECT_LEVEL
-+ const wxChar *prompt, wxProgressDialog **progress){
-+#else
- const wxChar *prompt){
-
- AudacityProject *p = GetActiveProject();
-+#endif
- int count=0;
- bool cont;
-
-@@ -183,9 +189,24 @@ static int rm_dash_rf_enumerate_i(wxString dirpath,
-
- cont = dir.GetNext(&name);
-
-+#ifdef NO_PROJECT_LEVEL
-+ if (prompt && progress && !*progress && wxGetElapsedTime(false) > 500)
-+ *progress =
-+ new wxProgressDialog(_("Progress"),
-+ prompt,
-+ 1000,
-+ NULL,
-+ wxPD_REMAINING_TIME | wxPD_AUTO_HIDE);
-+
-+ if (progress && *progress)
-+ (*progress)->Update(int ((count+progress_bias * 1000.0) /
-+ progress_count));
-+
-+#else
- if (prompt && p)
- p->ProgressUpdate(int ((count+progress_bias * 1000.0) /
- progress_count));
-+#endif
- }
- }
-
-@@ -194,7 +215,11 @@ static int rm_dash_rf_enumerate_i(wxString dirpath,
- wxString subdirpath=dirpath + wxFILE_SEP_PATH + name;
- count+=rm_dash_rf_enumerate_i(subdirpath,flist,wxEmptyString,
- files_p,dirs_p,progress_count,
-+#ifdef NO_PROJECT_LEVEL
-+ count+progress_bias,prompt,progress);
-+#else
- count+progress_bias,prompt);
-+#endif
- cont = dir.GetNext(&name);
- }
- }
-@@ -214,17 +239,29 @@ static int rm_dash_rf_enumerate_prompt(wxString dirpat
- int files_p,int dirs_p,
- int progress_count,
- const wxChar *prompt){
-+#ifdef NO_PROJECT_LEVEL
-+ wxProgressDialog *progress = NULL;
-+ wxStartTimer();
-+#else
- AudacityProject *p = GetActiveProject();
-
- if (p)
- p->ProgressShow(_("Progress"), prompt);
-+#endif
-
- int count=rm_dash_rf_enumerate_i(dirpath, flist, dirspec, files_p,dirs_p,
- progress_count,0,
-+#ifdef NO_PROJECT_LEVEL
-+ prompt, &progress);
-+
-+ if (progress)
-+ delete progress;
-+#else
- prompt);
-
- if (p)
- p->ProgressHide();
-+#endif
-
- return count;
- }
-@@ -235,7 +272,11 @@ static int rm_dash_rf_enumerate(wxString dirpath,
- int files_p,int dirs_p){
-
- return rm_dash_rf_enumerate_i(dirpath, flist, dirspec, files_p,dirs_p,
-+#ifdef NO_PROJECT_LEVEL
-+ 0,0,0,0);
-+#else
- 0,0,NULL);
-+#endif
-
- }
-
-@@ -244,10 +285,15 @@ static void rm_dash_rf_execute(wxArrayString &fList,
- int count, int files_p, int dirs_p,
- const wxChar *prompt){
-
-+#ifdef NO_PROJECT_LEVEL
-+ wxProgressDialog *progress = NULL;
-+ wxStartTimer();
-+#else
- AudacityProject *p = GetActiveProject();
-
- if (prompt && p)
- p->ProgressShow(_("Progress"), prompt);
-+#endif
-
- for (int i = 0; i < count; i++) {
- const wxChar *file = fList[i].c_str();
-@@ -258,12 +304,30 @@ static void rm_dash_rf_execute(wxArrayString &fList,
- wxRmdir(file);
- }
-
-+#ifdef NO_PROJECT_LEVEL
-+ if (prompt && !progress && wxGetElapsedTime(false) > 500)
-+ progress =
-+ new wxProgressDialog(_("Progress"),
-+ prompt,
-+ 1000,
-+ NULL,
-+ wxPD_REMAINING_TIME | wxPD_AUTO_HIDE);
-+
-+ if (progress)
-+ progress->Update(int ((i * 1000.0) / count));
-+#else
- if (prompt && p)
- p->ProgressUpdate(int ((i * 1000.0) / count));
-+#endif
- }
-
-+#ifdef NO_PROJECT_LEVEL
-+ if (progress)
-+ delete progress;
-+#else
- if (prompt && p)
- p->ProgressHide();
-+#endif
- }
-
- // static
-@@ -326,13 +390,20 @@ bool DirManager::SetProject(wxString & projPath, wxStr
- saved version of the old project must not be moved,
- otherwise the old project would not be safe. */
-
-+#ifdef NO_PROJECT_LEVEL
-+ wxProgressDialog *progress = NULL;
-+#else
- AudacityProject *p = GetActiveProject();
- if (p)
- p->ProgressShow(_("Progress"),
- _("Saving project data files"));
-+#endif
-
- int total=blockFileHash.size();
- int count=0;
-+#ifdef NO_PROJECT_LEVEL
-+ wxStartTimer();
-+#endif
-
- BlockHash::iterator i=blockFileHash.begin();
- bool success = true;
-@@ -345,8 +416,22 @@ bool DirManager::SetProject(wxString & projPath, wxStr
- success = MoveToNewProjectDirectory(b);
- }
-
-+#ifdef NO_PROJECT_LEVEL
-+ if (!progress && wxGetElapsedTime(false) > 500)
-+ progress =
-+ new wxProgressDialog(_("Progress"),
-+ _("Saving project data files"),
-+ 1000,
-+ NULL,
-+ wxPD_REMAINING_TIME |
-+ wxPD_AUTO_HIDE);
-+
-+ if (progress)
-+ progress->Update(int ((count * 1000.0) / total));
-+#else
- if (p)
- p->ProgressUpdate(int ((count * 1000.0) / total));
-+#endif
-
- i++;
- count++;
-@@ -366,8 +451,13 @@ bool DirManager::SetProject(wxString & projPath, wxStr
- BlockFile *b = i->second;
- MoveToNewProjectDirectory(b);
-
-+#ifdef NO_PROJECT_LEVEL
-+ if (progress && count>=0)
-+ progress->Update(int ((count * 1000.0) / total));
-+#else
- if (count>=0 && p)
- p->ProgressUpdate(int ((count * 1000.0) / total));
-+#endif
-
- i++;
- count--;
-@@ -377,14 +467,24 @@ bool DirManager::SetProject(wxString & projPath, wxStr
- this->projPath = oldPath;
- this->projName = oldName;
-
-+#ifdef NO_PROJECT_LEVEL
-+ if (progress)
-+ delete progress;
-+#else
- if (p)
- p->ProgressHide();
-+#endif
-
- return false;
- }
-
-+#ifdef NO_PROJECT_LEVEL
-+ if (progress)
-+ delete progress;
-+#else
- if (p)
- p->ProgressHide();
-+#endif
-
- // Some subtlety; SetProject is used both to move a temp project
- // into a permanent home as well as just set up path variables when
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-src_Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 24 May 2007 09:45:01 -0000 1.4
+++ patches/patch-src_Makefile_in 5 Jun 2007 12:59:03 -0000
@@ -1,69 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.4 2007/05/24 09:45:01 ajacoutot Exp $
---- src/Makefile.in.orig Sun Oct 29 01:05:27 2006
-+++ src/Makefile.in Thu May 24 11:02:18 2007
-@@ -176,12 +176,9 @@ OBJS = \
- widgets/Grid.o \
- widgets/ImageRoll.o \
- widgets/Meter.o \
-- widgets/MultiDialog.o \
- widgets/Ruler.o \
- widgets/TimeTextCtrl.o \
-- widgets/Warning.o \
- xml/XMLFileReader.o \
-- xml/XMLWriter.o \
- @OPTOBJS@
+--- src/Makefile.in.orig Tue Jun 5 10:59:23 2007
++++ src/Makefile.in Tue Jun 5 10:59:40 2007
+@@ -20,7 +20,7 @@ PRECOMP_CFLAGS = @PRECOMP_CFLAGS@
+ LOCAL_LIBS = @LOCAL_LIBS@
+ EXTRAOBJS = @EXTRAOBJS@
+ EXTRATARGETS = @EXTRATARGETS@
+-LIBS = @LIBS@ @PA_LIBS@
++LIBS = @LIBS@
+ DIRS=blockfile commands effects effects/ladspa effects/nyquist export import prefs toolbars widgets xml
- TEMPORARILY_DISABLED_IMPORTER_OBJS = \
-@@ -189,23 +186,33 @@ TEMPORARILY_DISABLED_IMPORTER_OBJS = \
- import/ImportPCM.o \
- import/ImportRaw.o \
-
--LIBAUDACITY_OBJS = \
-+LIBAUDACITY_OBJS_CORE = \
- BlockFile.o \
- Dither.o \
-- DirManager.o \
- FileFormats.o \
-- Prefs.o \
- SampleFormat.o \
- Sequence.o \
- Internat.o \
-+ widgets/MultiDialog.o \
-+ widgets/Warning.o \
- blockfile/LegacyBlockFile.o \
- blockfile/LegacyAliasBlockFile.o \
- blockfile/SilentBlockFile.o \
- blockfile/SimpleBlockFile.o \
- blockfile/PCMAliasBlockFile.o \
- xml/XMLTagHandler.o \
-+ xml/XMLWriter.o \
-
-+LIBAUDACITY_OBJS_NO_PROJECT_LEVEL = \
-+ DirManager_no_project_level.o \
-+ Prefs_no_project_level.o \
-
-+LIBAUDACITY_OBJS = \
-+ DirManager.o \
-+ Prefs.o \
-+ $(LIBAUDACITY_OBJS_CORE) \
-+
-+
- ########################################
- # DEPENDENCIES
-
-@@ -214,7 +221,14 @@ LIBAUDACITY_SOURCES = $(LIBAUDACITY_OBJS:%.o=%.cpp)
-
- ########################################
-
--all: $(DIRS) libaudacity.a ../audacity $(EXTRATARGETS)
-+all: $(DIRS) libaudacity.a libaudacity_tests.a ../audacity $(EXTRATARGETS)
-+
-+no_project_level:
-+ $(CCC) -c $(CXXFLAGS) $(CPPFLAGS) -DNO_PROJECT_LEVEL -o DirManager_no_project_level.o DirManager.cpp
-+ $(CCC) -c $(CXXFLAGS) $(CPPFLAGS) -DNO_PROJECT_LEVEL -o Prefs_no_project_level.o Prefs.cpp
-+
-+libaudacity_tests.a: no_project_level
-+ ar rcs libaudacity_tests.a $(LIBAUDACITY_OBJS_NO_PROJECT_LEVEL) $(LIBAUDACITY_OBJS_CORE)
-
- libaudacity.a: $(LIBAUDACITY_OBJS)
- ar rcs libaudacity.a $(LIBAUDACITY_OBJS)
+ [EMAIL PROTECTED]@
Index: patches/patch-src_Prefs_cpp
===================================================================
RCS file: patches/patch-src_Prefs_cpp
diff -N patches/patch-src_Prefs_cpp
--- patches/patch-src_Prefs_cpp 17 Dec 2006 12:12:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-src_Prefs_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
---- src/Prefs.cpp.orig Sun Oct 29 02:05:29 2006
-+++ src/Prefs.cpp Sat Dec 9 20:20:04 2006
-@@ -58,9 +58,11 @@
- #include <wx/config.h>
- #include <wx/intl.h>
- #include <wx/fileconf.h>
-+#ifndef NO_PROJECT_LEVEL
- #include <wx/filename.h>
-
- #include "FileNames.h"
-+#endif
-
- #include "sndfile.h"
-
-@@ -159,11 +161,15 @@ void InitPreferences()
- wxTheApp->SetVendorName(vendorName);
- wxTheApp->SetAppName(appName);
-
-+#ifdef NO_PROJECT_LEVEL
-+ gPrefs = new wxConfig(appName);
-+#else
- wxFileName configFileName(FileNames::DataDir(), wxT("audacity.cfg"));
-
- gPrefs = new wxFileConfig(appName, wxEmptyString,
- configFileName.GetFullPath(),
- wxEmptyString, wxCONFIG_USE_LOCAL_FILE);
-+#endif
-
- wxConfigBase::Set(gPrefs);
-
Index: patches/patch-src_Sequence_cpp
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-src_Sequence_cpp,v
retrieving revision 1.2
diff -u -r1.2 patch-src_Sequence_cpp
--- patches/patch-src_Sequence_cpp 24 May 2007 09:45:01 -0000 1.2
+++ patches/patch-src_Sequence_cpp 5 Jun 2007 12:59:03 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Sequence_cpp,v 1.2 2007/05/24 09:45:01 ajacoutot Exp $
---- src/Sequence.cpp.orig Sun Oct 29 01:05:27 2006
-+++ src/Sequence.cpp Thu May 24 11:02:18 2007
-@@ -826,7 +826,8 @@ bool Sequence::Get(samplePtr buffer, sampleFormat form
+--- src/Sequence.cpp.orig Wed Mar 28 09:53:34 2007
++++ src/Sequence.cpp Wed Mar 28 09:55:16 2007
+@@ -877,7 +877,8 @@ bool Sequence::Get(samplePtr buffer, sampleFormat form
sampleCount start, sampleCount len) const
{
if (start < 0 || start > mNumSamples ||
@@ -11,7 +11,7 @@
return false;
int b = FindBlock(start);
-@@ -860,6 +861,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form
+@@ -911,6 +912,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form
if (format != mSampleFormat) {
temp = NewSamples(mMaxSamples, mSampleFormat);
wxASSERT(temp);
@@ -19,7 +19,7 @@
}
samplePtr silence = NULL;
-@@ -867,6 +869,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form
+@@ -918,6 +920,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form
silence = NewSamples(mMaxSamples, format);
wxASSERT(silence);
ClearSamples(silence, format, 0, mMaxSamples);
Index: patches/patch-src_audacity_desktop
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-src_audacity_desktop,v
retrieving revision 1.1
diff -u -r1.1 patch-src_audacity_desktop
--- patches/patch-src_audacity_desktop 24 May 2007 09:45:01 -0000 1.1
+++ patches/patch-src_audacity_desktop 5 Jun 2007 12:59:03 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_audacity_desktop,v 1.1 2007/05/24 09:45:01 ajacoutot Exp $
---- src/audacity.desktop.orig Thu May 24 11:02:45 2007
-+++ src/audacity.desktop Thu May 24 11:08:40 2007
+--- src/audacity.desktop.orig Fri May 18 06:56:01 2007
++++ src/audacity.desktop Tue Jun 5 14:55:35 2007
@@ -1,4 +1,4 @@
-[Desktop Entry]
+[Desktop Entry]
Index: patches/patch-src_export_ExportMP3_cpp
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-src_export_ExportMP3_cpp,v
retrieving revision 1.4
diff -u -r1.4 patch-src_export_ExportMP3_cpp
--- patches/patch-src_export_ExportMP3_cpp 24 May 2007 09:45:01 -0000 1.4
+++ patches/patch-src_export_ExportMP3_cpp 5 Jun 2007 12:59:03 -0000
@@ -1,38 +1,23 @@
-$OpenBSD: patch-src_export_ExportMP3_cpp,v 1.4 2007/05/24 09:45:01 ajacoutot Exp $
---- src/export/ExportMP3.cpp.orig Sun Oct 29 01:05:27 2006
-+++ src/export/ExportMP3.cpp Thu May 24 11:02:18 2007
-@@ -268,7 +268,7 @@ bool MP3Exporter::FindLibrary(wxWindow *parent)
-
- wxString GetLibraryTypeString()
- {
-- return wxString(_("Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"));
-+ return wxString(_("Only libmp3lame.so.X.Y|libmp3lame.so.*|Extended Libraries (*.so.*)|*.so.*|Primary Shared Object files (*.so)|*.so|All Files (*)|*"));
- }
-
- wxString GetLibraryMessage()
-@@ -276,10 +276,12 @@ bool MP3Exporter::FindLibrary(wxWindow *parent)
- /* i18n-hint: This message is used on Unix/Linux */
- return _("Audacity does not export MP3 files directly, but instead uses the \n"
- "freely available LAME library to handle MP3 file encoding. You must \n"
-- "obtain libmp3lame.so separately, either by downloading it or building \n"
-- "it from the sources, and then locate the file for Audacity. You only \n"
-- "need to do this once.\n\n"
-- "Would you like to locate libmp3lame.so now?");
-+ "install the lame package on your OpenBSD system using pkg_add(1), or\n"
-+ "alternatively you can install the port from the audio/lame subdirectory\n"
-+ "of the ports tree.\n\n"
-+ "The library is usually located under !!LOCALBASE!!/lib and its filename\n"
-+ "should be libmp3lame.so.X.Y, where X and Y are version numbers.\n"
-+ "If you are ready, click Yes to locate the library file on your system.\n");
+$OpenBSD$
+--- src/export/ExportMP3.cpp.orig Tue Jun 5 10:16:17 2007
++++ src/export/ExportMP3.cpp Tue Jun 5 10:18:10 2007
+@@ -523,8 +523,8 @@ 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.AddVariableText(_("To get a free copy of Lame, click here -->"), true);
++ S.Id(ID_DLOAD).AddButton(_("Download..."), wxALIGN_RIGHT); */
}
+ S.EndMultiColumn();
+ S.SetBorder(5);
+@@ -1498,7 +1498,7 @@ class LameExporter : public MP3Exporter (public)
- bool LoadLibrary() {
-@@ -523,7 +525,7 @@ void ReleaseMP3Exporter()
-
- wxString GetLibraryPath()
- {
-- return wxT("/usr/local/lib");
-+ return wxT("!!LOCALBASE!!/lib");
- }
+ wxString GetLibraryTypeString()
+ {
+- return wxString(_("Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"));
++ return wxString(_("libmp3lame.so.X.Y|libmp3lame.so.*|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"));
+ }
- wxString GetLibraryName()
+ #endif
Index: patches/patch-tests_Makefile_in
===================================================================
RCS file: patches/patch-tests_Makefile_in
diff -N patches/patch-tests_Makefile_in
--- patches/patch-tests_Makefile_in 24 May 2007 09:45:01 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-tests_Makefile_in,v 1.4 2007/05/24 09:45:01 ajacoutot Exp $
---- tests/Makefile.in.orig Sun Oct 29 01:05:36 2006
-+++ tests/Makefile.in Thu May 24 11:02:18 2007
-@@ -14,14 +14,14 @@ override CPPFLAGS += -Wall -I../src @CPPFLAGS@
- all: run_tests
- check: run_tests
-
--LIBS = @LIBS@ ../src/libaudacity.a
-+LIBS = @LIBS@ ../src/libaudacity_tests.a
-
- TESTS = \
- SimpleBlockFileTest \
- SequenceTest \
-
--$(TESTS): %: %.cpp ../src/libaudacity.a
-- $(CXX) -o $@ $< $(CXXFLAGS) $(CPPFLAGS) $(LIBS)
-+$(TESTS): %: %.cpp ../src/libaudacity_tests.a
-+ $(CXX) -o $@ $< $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBS)
-
- run_tests: $(TESTS)
- tests='$(TESTS)'; for test in $$tests ; do \
Index: patches/patch-tests_SequenceTest_cpp
===================================================================
RCS file: patches/patch-tests_SequenceTest_cpp
diff -N patches/patch-tests_SequenceTest_cpp
--- patches/patch-tests_SequenceTest_cpp 24 May 2007 09:45:01 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-tests_SequenceTest_cpp,v 1.2 2007/05/24 09:45:01 ajacoutot Exp $
---- tests/SequenceTest.cpp.orig Sun Oct 29 01:05:36 2006
-+++ tests/SequenceTest.cpp Thu May 24 11:02:18 2007
-@@ -21,7 +21,7 @@ class SequenceTest (public)
-
- void SetUp()
- {
-- DirManager::SetTempDir("/tmp/sequence-test-dir");
-+ DirManager::SetTempDir(_T("/tmp/sequence-test-dir"));
- mDirManager = new DirManager;
-
- mSequence = new Sequence(mDirManager, floatSample);
-@@ -81,7 +81,8 @@ class SequenceTest (public)
- delete mSequence;
- mSequence = NULL;
-
-- assert(mDirManager->blockFileHash->GetCount() == 0);
-+ BlockHash blockFileHash;
-+ assert(blockFileHash.size() == 0);
-
- std::cout << "ok\n";
- }
Index: patches/patch-tests_SimpleBlockFileTest_cpp
===================================================================
RCS file: patches/patch-tests_SimpleBlockFileTest_cpp
diff -N patches/patch-tests_SimpleBlockFileTest_cpp
--- patches/patch-tests_SimpleBlockFileTest_cpp 24 May 2007 09:45:01 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-tests_SimpleBlockFileTest_cpp,v 1.4 2007/05/24 09:45:01 ajacoutot Exp $
---- tests/SimpleBlockFileTest.cpp.orig Sun Oct 29 01:05:36 2006
-+++ tests/SimpleBlockFileTest.cpp Thu May 24 11:02:18 2007
-@@ -45,13 +45,13 @@ class SimpleBlockFileTest { (public)
- floatData[i] = sign*j/((j*j)+1);
- }
-
-- int16BlockFile = new SimpleBlockFile(wxFileName("/tmp/int16"),
-+ int16BlockFile = new SimpleBlockFile(wxFileName(_T("/tmp/int16")),
- (samplePtr)int16Data, dataLen,
- int16Sample);
-- int24BlockFile = new SimpleBlockFile(wxFileName("/tmp/int24"),
-+ int24BlockFile = new SimpleBlockFile(wxFileName(_T("/tmp/int24")),
- (samplePtr)int24Data, dataLen,
- int24Sample);
-- floatBlockFile = new SimpleBlockFile(wxFileName("/tmp/float"),
-+ floatBlockFile = new SimpleBlockFile(wxFileName(_T("/tmp/float")),
- (samplePtr)floatData, dataLen,
- floatSample);
-
-@@ -82,7 +82,7 @@ class SimpleBlockFileTest { (public)
- SF_INFO info;
-
- memset(&info, 0, sizeof(info));
-- SNDFILE *sf = sf_open(bf->GetFileName().GetFullPath(), SFM_READ, &info);
-+ SNDFILE *sf = sf_open(bf->GetFileName().GetFullPath().mb_str(), SFM_READ, &info);
-
- assert(sf);
- assert(info.frames == dataLen);
-@@ -115,9 +115,9 @@ class SimpleBlockFileTest { (public)
- memset(&info2, 0, sizeof(info2));
- memset(&info3, 0, sizeof(info3));
-
-- SNDFILE *int16sf = sf_open(int16BlockFile->GetFileName().GetFullPath(), SFM_READ, &info1);
-- SNDFILE *int24sf = sf_open(int24BlockFile->GetFileName().GetFullPath(), SFM_READ, &info2);
-- SNDFILE *floatsf = sf_open(floatBlockFile->GetFileName().GetFullPath(), SFM_READ, &info3);
-+ SNDFILE *int16sf = sf_open(int16BlockFile->GetFileName().GetFullPath().mb_str(), SFM_READ, &info1);
-+ SNDFILE *int24sf = sf_open(int24BlockFile->GetFileName().GetFullPath().mb_str(), SFM_READ, &info2);
-+ SNDFILE *floatsf = sf_open(floatBlockFile->GetFileName().GetFullPath().mb_str(), SFM_READ, &info3);
-
- // First do a read of the entire block
- short int16buf[dataLen];
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/audacity/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 24 May 2007 09:45:01 -0000 1.4
+++ pkg/PLIST 5 Jun 2007 12:59:03 -0000
@@ -4,7 +4,6 @@
share/applications/
share/applications/audacity.desktop
share/audacity/
-share/audacity/audacity-1.2-help.htb
share/audacity/nyquist/
share/audacity/nyquist/bug.lsp
share/audacity/nyquist/dspprims.lsp
@@ -34,9 +33,6 @@
share/audacity/plug-ins/lowpass.ny
share/audacity/plug-ins/pluck.ny
share/audacity/plug-ins/tremolo.ny
-share/doc/audacity/
-share/doc/audacity/LICENSE.txt
-share/doc/audacity/README.txt
share/locale/af/
share/locale/af/LC_MESSAGES/
share/locale/af/LC_MESSAGES/audacity.mo
@@ -44,8 +40,14 @@
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/audacity.mo
share/locale/bg/LC_MESSAGES/audacity.mo
+share/locale/bn/
+share/locale/bn/LC_MESSAGES/
+share/locale/bn/LC_MESSAGES/audacity.mo
share/locale/ca/LC_MESSAGES/audacity.mo
share/locale/cs/LC_MESSAGES/audacity.mo
+share/locale/cy/
+share/locale/cy/LC_MESSAGES/
+share/locale/cy/LC_MESSAGES/audacity.mo
share/locale/da/LC_MESSAGES/audacity.mo
share/locale/de/LC_MESSAGES/audacity.mo
share/locale/el/LC_MESSAGES/audacity.mo
@@ -56,6 +58,7 @@
share/locale/fi/LC_MESSAGES/audacity.mo
share/locale/fr/LC_MESSAGES/audacity.mo
share/locale/ga/LC_MESSAGES/audacity.mo
+share/locale/gl/LC_MESSAGES/audacity.mo
share/locale/hu/LC_MESSAGES/audacity.mo
share/locale/it/LC_MESSAGES/audacity.mo
share/locale/ja/LC_MESSAGES/audacity.mo
@@ -67,9 +70,14 @@
share/locale/mk/LC_MESSAGES/audacity.mo
share/locale/nb/LC_MESSAGES/audacity.mo
share/locale/nl/LC_MESSAGES/audacity.mo
+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/ro/LC_MESSAGES/audacity.mo
share/locale/ru/LC_MESSAGES/audacity.mo
+share/locale/sk/LC_MESSAGES/audacity.mo
share/locale/sl/LC_MESSAGES/audacity.mo
share/locale/sv/LC_MESSAGES/audacity.mo
share/locale/tr/LC_MESSAGES/audacity.mo
