cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 1.3.4

Browse Source 
ok jakemsr@
This commit is contained in:
ajacoutot 2007-12-08 11:08:38 +00:00
parent 444a91e458
commit 5e971a5d99
14 changed files with 105 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
audio/audacity/Makefile
View File

@ -1,12 +1,14 @@
# $OpenBSD: Makefile,v 1.13 2007/11/23 10:07:40 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.14 2007/12/08 11:08:38 ajacoutot Exp $
COMMENT= free audio editor
V= 1.3.3
V= 1.3.4
DISTNAME= audacity-src-${V}
PKGNAME= audacity-${V}p3
PKGNAME= audacity-${V}
CATEGORIES= audio
EXTRACT_SUFX= .tar.bz2
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/}
HOMEPAGE= http://audacity.sourceforge.net/
@ -29,7 +31,8 @@ LIB_DEPENDS= wx_base_xml,wx_base_odbc,wx_gtk2_aui,wx_gtk2_html,wx_gtk2_adv,wx_gt
vorbis.>=5,vorbisfile.>=4,vorbisenc.>=2::audio/libvorbis \
id3tag.>=2::audio/libid3tag \
mad.>=2::audio/libmad \
portaudio::audio/portaudio-svn
portaudio::audio/portaudio-svn \
SoundTouch::audio/soundtouch
RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
USE_X11= Yes
@ -45,6 +48,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-unicode \
--enable-vamp \
--enable-ladspa \
--with-id3=system \
--with-vorbis=system \
--with-libflac=system \
@ -52,12 +57,11 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-libsndfile=system \
--with-libsamplerate=system \
--with-expat=system \
--with-soundtouch=system \
--without-libresample \
--without-libtwolame \
--with-nyquist=local \
--with-ladspa \
--with-portmixer \
--with-soundtouch=local \
--with-portaudio=v19 \
--with-pa-include=${LOCALBASE}/include \
--with-help

10
audio/audacity/distinfo
View File

@ -1,5 +1,5 @@
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
MD5 (audacity-src-1.3.4.tar.bz2) = bErakIX5FrWuFnXqpHVEQg==
RMD160 (audacity-src-1.3.4.tar.bz2) = dU2B+w5mDWl+fDFcQfKFhJF+Cp4=
SHA1 (audacity-src-1.3.4.tar.bz2) = UKts8ZVF+Ms4ImuWJS29lY59iMQ=
SHA256 (audacity-src-1.3.4.tar.bz2) = EC1g5I4ZKPP9mVohTtm6hykpxjZc9feE8QfzUbQkmfk=
SIZE (audacity-src-1.3.4.tar.bz2) = 4349381

82
audio/audacity/patches/patch-configure
View File

@ -1,16 +1,7 @@
$OpenBSD: patch-configure,v 1.8 2007/11/23 10:07:41 ajacoutot Exp $
--- configure.orig Thu May 17 21:56:02 2007
+++ configure Sat Oct 27 03:12:09 2007
@@ -4316,13 +4316,13 @@ else
fi;
- echo "$as_me:$LINENO: checking for FLAC__file_decoder_new in -lFLAC" >&5
-echo $ECHO_N "checking for FLAC__file_decoder_new in -lFLAC... $ECHO_C" >&6
-if test "${ac_cv_lib_FLAC_FLAC__file_decoder_new+set}" = set; then
+ echo "$as_me:$LINENO: checking for FLAC__stream_decoder_new in -lFLAC" >&5
+echo $ECHO_N "checking for FLAC__stream_decoder_new in -lFLAC... $ECHO_C" >&6
+if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set}" = set; then
$OpenBSD: patch-configure,v 1.9 2007/12/08 11:08:38 ajacoutot Exp $
--- configure.orig Sat Nov 24 12:20:58 2007
+++ configure Sat Nov 24 12:26:30 2007
@@ -5541,7 +5541,7 @@ if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -19,47 +10,7 @@ $OpenBSD: patch-configure,v 1.8 2007/11/23 10:07:41 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4336,11 +4336,11 @@ extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char FLAC__file_decoder_new ();
+char FLAC__stream_decoder_new ();
int
main ()
{
-FLAC__file_decoder_new ();
+FLAC__stream_decoder_new ();
;
return 0;
}
@@ -4367,20 +4367,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_FLAC_FLAC__file_decoder_new=yes
+ ac_cv_lib_FLAC_FLAC__stream_decoder_new=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_FLAC_FLAC__file_decoder_new=no
+ac_cv_lib_FLAC_FLAC__stream_decoder_new=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__file_decoder_new" >&5
-echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__file_decoder_new" >&6
-if test $ac_cv_lib_FLAC_FLAC__file_decoder_new = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&5
+echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&6
+if test $ac_cv_lib_FLAC_FLAC__stream_decoder_new = yes; then
lib_found="yes"
else
lib_found="no"
@@ -4534,7 +4534,7 @@ fi
@@ -5738,7 +5738,7 @@ fi
if test "x$lib_found" = "xyes" && test "x$header_found" = "xyes" ; then
LIBFLAC_SYSTEM_AVAILABLE="yes"
@ -68,7 +19,7 @@ $OpenBSD: patch-configure,v 1.8 2007/11/23 10:07:41 ajacoutot Exp $
LIBFLAC_SYSTEM_CPPSYMBOLS="USE_LIBFLAC"
{ echo "$as_me:$LINENO: FLAC libraries are available as system libraries" >&5
echo "$as_me: FLAC libraries are available as system libraries" >&6;}
@@ -6293,6 +6293,7 @@ cat >>confdefs.h <<\_ACEOF
@@ -7025,6 +7025,7 @@ cat >>confdefs.h <<\_ACEOF
#define USE_PORTAUDIO_V19 1
_ACEOF
@ -76,35 +27,34 @@ $OpenBSD: patch-configure,v 1.8 2007/11/23 10:07:41 ajacoutot Exp $
BUILDLIBS="$BUILDLIBS portaudio-v19/lib/libportaudio.a"
EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
@@ -6731,6 +6732,9 @@ done
@@ -7419,6 +7420,8 @@ done
;;
esac
+fi
+
+
else
CXXFLAGS="-I\$(top_srcdir)/lib-src/portaudio/pa_common $CXXFLAGS"
@@ -6786,7 +6790,7 @@ _ACEOF
@@ -7456,7 +7459,7 @@ _ACEOF
subdirs="$subdirs lib-src/portmixer"
subdirs="$subdirs lib-src/portmixer"
- ac_configure_args="$ac_configure_args --with-pa-include=../portaudio-v19/include"
+ # ac_configure_args="$ac_configure_args --with-pa-include=../portaudio-v19/include"
else
CXXFLAGS="-I\$(top_srcdir)/lib-src/portmixer/px_common $CXXFLAGS"
@@ -8516,7 +8520,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;}
@@ -9165,7 +9168,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;}
# The eval makes quoting arguments work.
- 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 ||
- 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\"" ||
{ { 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;}
@@ -8530,9 +8534,10 @@ fi
@@ -9179,9 +9182,10 @@ fi
pa_libs=
if [ "$use_portaudio" = "v19" ] ; then

10
audio/audacity/patches/patch-lib-src_libresample_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-lib-src_libresample_Makefile_in,v 1.4 2007/06/06 09:35:18 ajacoutot Exp $
--- 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
$OpenBSD: patch-lib-src_libresample_Makefile_in,v 1.5 2007/12/08 11:08:38 ajacoutot Exp $
--- lib-src/libresample/Makefile.in.orig Sat Nov 24 12:26:50 2007
+++ lib-src/libresample/Makefile.in Sat Nov 24 12:27:32 2007
@@ -7,6 +7,7 @@ CC = @CC@
CFLAGS = @CFLAGS@ -Wall
@ -10,13 +10,13 @@ $OpenBSD: patch-lib-src_libresample_Makefile_in,v 1.4 2007/06/06 09:35:18 ajacou
AR = @AR@
RANLIB = @RANLIB@
@@ -34,12 +35,12 @@ tests/testresample: libresample.a $(srcdir)/tests/test
tests/compareresample: libresample.a $(srcdir)/tests/compareresample.c $(DIRS)
tests/compareresample: libresample.a $(srcdir)/tests/compareresample.c
$(CC) -o tests/compareresample \
$(CFLAGS) $(srcdir)/tests/compareresample.c \
- libresample.a -lsamplerate $(LIBS)
+ libresample.a $(LDFLAGS) -lsamplerate $(LIBS)
tests/resample-sndfile: libresample.a $(srcdir)/tests/resample-sndfile.c $(DIRS)
tests/resample-sndfile: libresample.a $(srcdir)/tests/resample-sndfile.c
$(CC) -o tests/resample-sndfile \
$(CFLAGS) $(srcdir)/tests/resample-sndfile.c \
- libresample.a -lsndfile $(LIBS)

12
audio/audacity/patches/patch-lib-src_portmixer_configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib-src_portmixer_configure,v 1.1 2007/11/23 10:07:41 ajacoutot Exp $
--- lib-src/portmixer/configure.orig Thu May 17 21:55:50 2007
+++ lib-src/portmixer/configure Sun Oct 28 03:28:14 2007
@@ -2827,6 +2827,11 @@ fi
$OpenBSD: patch-lib-src_portmixer_configure,v 1.2 2007/12/08 11:08:38 ajacoutot Exp $
--- lib-src/portmixer/configure.orig Tue Nov 13 23:02:42 2007
+++ lib-src/portmixer/configure Sat Nov 24 12:19:06 2007
@@ -3379,6 +3379,11 @@ fi
#
# Make sure the support is there
#
@ -13,7 +13,7 @@ $OpenBSD: patch-lib-src_portmixer_configure,v 1.1 2007/11/23 10:07:41 ajacoutot
have_support=yes
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -2919,6 +2924,9 @@ echo "$as_me: error: \"You're version of portaudio doe
@@ -3513,6 +3518,9 @@ echo "$as_me: error: \"Your version of portaudio does
{ (exit 1); exit 1; }; };
fi
@ -23,7 +23,7 @@ $OpenBSD: patch-lib-src_portmixer_configure,v 1.1 2007/11/23 10:07:41 ajacoutot
#
#
#
@@ -3429,7 +3437,7 @@ else
@@ -4003,7 +4011,7 @@ else
have_coreaudio=no
fi

10
audio/audacity/patches/patch-lib-src_portmixer_src_px_mixer_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-lib-src_portmixer_src_px_mixer_c,v 1.1 2007/11/23 10:07:41 ajacoutot Exp $
--- lib-src/portmixer/src/px_mixer.c.orig Thu May 17 21:55:50 2007
+++ lib-src/portmixer/src/px_mixer.c Sun Oct 28 02:48:11 2007
$OpenBSD: patch-lib-src_portmixer_src_px_mixer_c,v 1.2 2007/12/08 11:08:38 ajacoutot Exp $
--- lib-src/portmixer/src/px_mixer.c.orig Tue Nov 13 23:02:44 2007
+++ lib-src/portmixer/src/px_mixer.c Sat Nov 24 12:19:08 2007
@@ -35,7 +35,7 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
@ -10,7 +10,7 @@ $OpenBSD: patch-lib-src_portmixer_src_px_mixer_c,v 1.1 2007/11/23 10:07:41 ajaco
#include "portmixer.h"
#include "px_mixer.h"
@@ -122,6 +122,9 @@ PxMixer *Px_OpenMixer(PaStream *pa_stream, int i)
@@ -124,6 +124,9 @@ PxMixer *Px_OpenMixer(PaStream *pa_stream, int i)
return NULL;
}
@ -20,7 +20,7 @@ $OpenBSD: patch-lib-src_portmixer_src_px_mixer_c,v 1.1 2007/11/23 10:07:41 ajaco
switch (Pa_GetStreamHostApiType(pa_stream))
{
#if defined(PX_USE_WIN_MME)
@@ -154,6 +157,22 @@ PxMixer *Px_OpenMixer(PaStream *pa_stream, int i)
@@ -156,6 +159,22 @@ PxMixer *Px_OpenMixer(PaStream *pa_stream, int i)
break;
#endif
}

15
audio/audacity/patches/patch-lib-src_portmixer_src_px_unix_oss_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-lib-src_portmixer_src_px_unix_oss_c,v 1.1 2007/11/23 10:07:41 ajacoutot Exp $
--- lib-src/portmixer/src/px_unix_oss.c.orig Thu May 17 21:55:50 2007
+++ lib-src/portmixer/src/px_unix_oss.c Sun Oct 28 14:39:03 2007
$OpenBSD: patch-lib-src_portmixer_src_px_unix_oss_c,v 1.2 2007/12/08 11:08:38 ajacoutot Exp $
--- lib-src/portmixer/src/px_unix_oss.c.orig Sat Nov 24 12:28:16 2007
+++ lib-src/portmixer/src/px_unix_oss.c Sat Nov 24 12:31:44 2007
@@ -41,8 +41,12 @@
#elif defined(__FreeBSD__)
#include <sys/soundcard.h>
@ -51,23 +51,24 @@ $OpenBSD: patch-lib-src_portmixer_src_px_unix_oss_c,v 1.1 2007/11/23 10:07:41 aj
do {
dev->fd = open(name, O_RDWR);
@@ -161,14 +166,22 @@ int OpenMixer_Unix_OSS(px_mixer *Px, int index)
@@ -160,7 +165,11 @@ int OpenMixer_Unix_OSS(px_mixer *Px, int index)
info->playback.num = 0;
do {
+#ifdef PX_USE_PA_V18
info->capture.name = PaOSS_GetInputDevice(Px->pa_stream);
info->capture.name = PaOSS_GetStreamInputDevice(Px->pa_stream);
+#else
+ info->capture.name = (Pa_GetDeviceInfo(index))->name;
+#endif
if (info->capture.name) {
if (!open_mixer(&info->capture, SOUND_MIXER_READ_RECMASK)) {
break;
@@ -168,7 +177,11 @@ int OpenMixer_Unix_OSS(px_mixer *Px, int index)
}
}
+#ifdef PX_USE_PA_V18
info->playback.name = PaOSS_GetOutputDevice(Px->pa_stream);
info->playback.name = PaOSS_GetStreamOutputDevice(Px->pa_stream);
+#else
+ info->playback.name = (Pa_GetDeviceInfo(index))->name;
+#endif

12
audio/audacity/patches/patch-locale_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-locale_Makefile_in,v 1.2 2007/06/06 09:35:18 ajacoutot Exp $
--- 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:
$OpenBSD: patch-locale_Makefile_in,v 1.3 2007/12/08 11:08:38 ajacoutot Exp $
--- locale/Makefile.in.orig Sat Nov 24 12:36:07 2007
+++ locale/Makefile.in Sat Nov 24 12:37:04 2007
@@ -94,8 +94,8 @@ FORCE:
install: allmo
linguas='$(LINGUAS)'; for lang in $$linguas ; do \
- $(INSTALL) -d $(INSTALL_PATH)$(DATADIR)/locale/$$lang/LC_MESSAGES ; \
- $(INSTALL) -m 644 $$lang/audacity.mo $(INSTALL_PATH)$(DATADIR)/locale/$$lang/LC_MESSAGES/$(AUDACITY_NAME).mo ; \
- $(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

27
audio/audacity/patches/patch-src_AudioIO_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_AudioIO_cpp,v 1.1 2007/11/23 10:07:41 ajacoutot Exp $
--- src/AudioIO.cpp.orig Thu May 17 21:55:57 2007
+++ src/AudioIO.cpp Sun Oct 28 17:26:33 2007
@@ -479,7 +479,7 @@ void AudioIO::HandleDeviceChange()
$OpenBSD: patch-src_AudioIO_cpp,v 1.2 2007/12/08 11:08:38 ajacoutot Exp $
--- src/AudioIO.cpp.orig Sat Nov 24 12:37:27 2007
+++ src/AudioIO.cpp Sat Nov 24 12:39:46 2007
@@ -490,7 +490,7 @@ void AudioIO::HandleDeviceChange()
if( error )
return;
@ -10,22 +10,3 @@ $OpenBSD: patch-src_AudioIO_cpp,v 1.1 2007/11/23 10:07:41 ajacoutot Exp $
if (!mPortMixer) {
Pa_CloseStream(stream);
@@ -667,7 +667,8 @@ bool AudioIO::StartPortAudioStream(double sampleRate,
}
mPortMixer = NULL;
if (mPortStreamV19 != NULL && mLastPaError == paNoError) {
- mPortMixer = Px_OpenMixer(mPortStreamV19, 0);
+ mPortMixer = Px_OpenMixer(mPortStreamV19, captureParameters != NULL ?
+ captureParameters->device : playbackParameters->device);
#ifdef __MACOSX__
if (mPortMixer) {
@@ -770,7 +771,7 @@ bool AudioIO::StartPortAudioStream(double sampleRate,
}
mPortMixer = NULL;
if (mPortStreamV18 != NULL && mLastPaError == paNoError) {
- mPortMixer = Px_OpenMixer(mPortStreamV18, 0);
+ mPortMixer = Px_OpenMixer(mPortStreamV18, captureDevice);
#ifdef __MACOSX__
if (mPortMixer) {

88
audio/audacity/patches/patch-src_Benchmark_cpp
View File

@ -1,83 +1,21 @@
$OpenBSD: patch-src_Benchmark_cpp,v 1.1 2007/06/06 09:35:18 ajacoutot Exp $
--- 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"
$OpenBSD: patch-src_Benchmark_cpp,v 1.2 2007/12/08 11:08:38 ajacoutot Exp $
--- src/Benchmark.cpp.orig Sat Nov 24 12:40:02 2007
+++ src/Benchmark.cpp Sat Nov 24 12:46:10 2007
@@ -531,7 +531,7 @@ void BenchmarkDialog::OnRun( wxCommandEvent &event )
delete tmp;
#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;
@@ -539,7 +539,7 @@ void BenchmarkDialog::OnRun( wxCommandEvent &event )
delete fact;
d->Deref();
- delete d;
+ delete fact;
+ d->Deref();
Sequence::SetMaxDiskBlockSize(1048576);
- Sequence::SetMaxDiskBlockSize(oldBlockSize);
+ Sequence::SetMaxDiskBlockSize(1048576);
HoldPrint(false);
+
+ gPrefs->Write(wxT("/GUI/EditClipCanMove"), editClipCanMove);
}
gPrefs->Write(wxT("/GUI/EditClipCanMove"), editClipCanMove);

18
audio/audacity/patches/patch-src_audacity_desktop
View File

@ -1,18 +1,12 @@
$OpenBSD: patch-src_audacity_desktop,v 1.2 2007/06/06 09:35:18 ajacoutot Exp $
--- src/audacity.desktop.orig Fri May 18 06:56:01 2007
+++ src/audacity.desktop Wed Jun 6 09:40:38 2007
@@ -1,4 +1,4 @@
-[Desktop Entry]
+[Desktop Entry]
Encoding=UTF-8
Name=Audacity Sound Editor
$OpenBSD: patch-src_audacity_desktop,v 1.3 2007/12/08 11:08:38 ajacoutot Exp $
--- src/audacity.desktop.orig Sat Nov 24 12:46:37 2007
+++ src/audacity.desktop Sat Nov 24 12:47:05 2007
@@ -11,7 +11,7 @@ Comment=Record and edit audio files
Comment[de]=Audio-Dateien aufnehmen und bearbeiten
Comment[de]=Audio-Dateien aufnehmen und bearbeiten
Comment[ru]=Запись и редактирование звуковых файлов
-Icon=/usr/share/audacity/audacity.xpm
+Icon=audacity.xpm
Type=Application
Categories=Application;AudioVideo;Audio;Multimedia;
Categories=Application;AudioVideo;Audio;AudioVideoEditing;

14
audio/audacity/patches/patch-src_export_ExportMP3_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_export_ExportMP3_cpp,v 1.5 2007/06/06 09:35:18 ajacoutot Exp $
--- src/export/ExportMP3.cpp.orig Fri May 18 06:55:50 2007
+++ src/export/ExportMP3.cpp Wed Jun 6 09:22:02 2007
@@ -523,8 +523,8 @@ class FindDialog : public wxDialog (public)
$OpenBSD: patch-src_export_ExportMP3_cpp,v 1.6 2007/12/08 11:08:38 ajacoutot Exp $
--- src/export/ExportMP3.cpp.orig Tue Nov 13 23:01:42 2007
+++ src/export/ExportMP3.cpp Sat Nov 24 12:19:09 2007
@@ -520,8 +520,8 @@ class FindDialog : public wxDialog (public)
mPathText = S.AddTextBox(wxT(""), mLibPath.GetFullPath(), 0);
}
S.Id(ID_BROWSE).AddButton(_("Browse..."), wxALIGN_RIGHT);
@ -11,8 +11,8 @@ $OpenBSD: patch-src_export_ExportMP3_cpp,v 1.5 2007/06/06 09:35:18 ajacoutot Exp
+ S.Id(ID_DLOAD).AddButton(_("Download..."), wxALIGN_RIGHT); */
}
S.EndMultiColumn();
S.SetBorder(5);
@@ -1488,7 +1488,7 @@ class LameExporter : public MP3Exporter (public)
@@ -1497,7 +1497,7 @@ class LameExporter : public MP3Exporter (public)
wxString GetLibraryPath()
{
@ -21,7 +21,7 @@ $OpenBSD: patch-src_export_ExportMP3_cpp,v 1.5 2007/06/06 09:35:18 ajacoutot Exp
}
wxString GetLibraryName()
@@ -1498,7 +1498,7 @@ class LameExporter : public MP3Exporter (public)
@@ -1507,7 +1507,7 @@ class LameExporter : public MP3Exporter (public)
wxString GetLibraryTypeString()
{

12
audio/audacity/patches/patch-src_prefs_FileFormatPrefs_cpp
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-src_prefs_FileFormatPrefs_cpp,v 1.1 2007/06/06 09:35:18 ajacoutot Exp $
--- src/prefs/FileFormatPrefs.cpp.orig Wed Jun 6 09:18:13 2007
+++ src/prefs/FileFormatPrefs.cpp Wed Jun 6 09:19:03 2007
@@ -109,8 +109,8 @@ void FileFormatPrefs::PopulateOrExchange( ShuttleGui &
$OpenBSD: patch-src_prefs_FileFormatPrefs_cpp,v 1.2 2007/12/08 11:08:38 ajacoutot Exp $
--- src/prefs/FileFormatPrefs.cpp.orig Sat Nov 24 12:52:17 2007
+++ src/prefs/FileFormatPrefs.cpp Sat Nov 24 12:53:28 2007
@@ -110,8 +110,8 @@ void FileFormatPrefs::PopulateOrExchange( ShuttleGui &
wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
S.Id( ID_MP3_FIND_BUTTON ).AddButton( _("&Find Library"),
wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
- S.Id( ID_MP3_DOWN_BUTTON ).AddButton( _("&Download free copy of LAME"),
- S.Id( ID_MP3_DOWN_BUTTON ).AddButton( _("&Download Free Copy of LAME"),
- wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
+/* S.Id( ID_MP3_DOWN_BUTTON ).AddButton( _("&Download free copy of LAME"),
+/* S.Id( ID_MP3_DOWN_BUTTON ).AddButton( _("&Download Free Copy of LAME"),
+ wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL ); */
S.EndHorizontalLay();
}

10
audio/audacity/pkg/PLIST
View File

@ -1,9 +1,10 @@
@comment $OpenBSD: PLIST,v 1.5 2007/06/06 09:35:19 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.6 2007/12/08 11:08:38 ajacoutot Exp $
bin/audacity
@man man/man1/audacity.1
share/applications/
share/applications/audacity.desktop
share/audacity/
share/audacity/audacity.xpm
share/audacity/nyquist/
share/audacity/nyquist/bug.lsp
share/audacity/nyquist/dspprims.lsp
@ -25,14 +26,18 @@ share/audacity/nyquist/test.lsp
share/audacity/nyquist/xlinit.lsp
share/audacity/plug-ins/
share/audacity/plug-ins/SilenceMarker.ny
share/audacity/plug-ins/beat.ny
share/audacity/plug-ins/clicktrack.ny
share/audacity/plug-ins/crossfadein.ny
share/audacity/plug-ins/crossfadeout.ny
share/audacity/plug-ins/delay.ny
share/audacity/plug-ins/equalabel.ny
share/audacity/plug-ins/highpass.ny
share/audacity/plug-ins/lowpass.ny
share/audacity/plug-ins/pluck.ny
share/audacity/plug-ins/rissetdrum.ny
share/audacity/plug-ins/tremolo.ny
share/audacity/plug-ins/vocoder.ny
share/locale/af/
share/locale/af/LC_MESSAGES/
share/locale/af/LC_MESSAGES/audacity.mo
@ -62,6 +67,7 @@ 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
share/locale/ko/LC_MESSAGES/audacity.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/audacity.mo
@ -74,7 +80,7 @@ share/locale/oc/
share/locale/oc/LC_MESSAGES/
share/locale/oc/LC_MESSAGES/audacity.mo
share/locale/pl/LC_MESSAGES/audacity.mo
share/locale/pt/LC_MESSAGES/audacity.mo
share/locale/pt_BR/LC_MESSAGES/audacity.mo
share/locale/ro/LC_MESSAGES/audacity.mo
share/locale/ru/LC_MESSAGES/audacity.mo
share/locale/sk/LC_MESSAGES/audacity.mo