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

- update to version 1.3.2

Browse Source 
big thanks to Martynas Venckus for his work on regression tests

"go ahead!" jasper@
This commit is contained in:
ajacoutot 2006-12-17 12:12:58 +00:00
parent 8d2cee5205
commit 7a9dcfa8fc
21 changed files with 553 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
audio/audacity/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.4 2006/10/27 12:53:01 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.5 2006/12/17 12:12:58 ajacoutot Exp $
COMMENT= "free audio editor"
DISTNAME= audacity-src-1.3.0b
PKGNAME= ${DISTNAME:S/-src//}p0
V= 1.3.2
DISTNAME= audacity-src-${V}
PKGNAME= audacity-${V}
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/}
@ -18,17 +19,17 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m ossaudio pthread stdc++ \
FLAC++ ogg vorbisenc
WANTLIB= c m ossaudio pthread stdc++ ogg
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 \
sndfile.>=1::audio/libsndfile \
samplerate.>=1::audio/libsamplerate \
FLAC.>=4::audio/flac \
vorbis.>=0,vorbisfile.>=1::audio/libvorbis \
FLAC.>=7,FLAC++.>=6::audio/flac \
vorbis.>=5,vorbisfile.>=4,vorbisenc.>=2::audio/libvorbis \
id3tag.>=2::audio/libid3tag \
mad.>=2::audio/libmad
mad.>=2::audio/libmad \
expat.>=6::textproc/expat
USE_GMAKE= Yes
USE_LIBTOOL= Yes
@ -39,13 +40,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-unicode \
--with-id3=system \
--with-vorbis=system \
--with-libflac=system \
--with-libmad=system \
--with-libsndfile=system \
--with-libsamplerate=system \
--with-libresample=local \
--with-expat=system \
--without-libresample \
--with-nyquist=local \
--with-ladspa \
--with-portmixer \
@ -59,7 +62,7 @@ WRKDIST= ${WRKDIR}/${DISTNAME}-beta
REGRESS_FLAGS= LDFLAGS="-L${X11BASE}/lib"
pre-configure:
@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},' \
@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
${WRKSRC}/src/export/ExportMP3.cpp
.include <bsd.port.mk>

8
audio/audacity/distinfo
View File

@ -1,4 +1,4 @@
MD5 (audacity-src-1.3.0b.tar.gz) = d1c5a3359ad95eab6ca8b375972c1a91
RMD160 (audacity-src-1.3.0b.tar.gz) = 4ada2e40799f60477d6c2aabb0b91bb03c8882f9
SHA1 (audacity-src-1.3.0b.tar.gz) = 6ba57ee1a3a9b6c57bf98142fbe4561b7cadf5db
SIZE (audacity-src-1.3.0b.tar.gz) = 4938302
MD5 (audacity-src-1.3.2.tar.gz) = bf63673140254f1283dfd55b61ff2422
RMD160 (audacity-src-1.3.2.tar.gz) = b61747103675881bdf32762deea7635a2827b0de
SHA1 (audacity-src-1.3.2.tar.gz) = 87690806763b7de26a8e2df1f0d4c3a7e6d1a404
SIZE (audacity-src-1.3.2.tar.gz) = 6683449

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

@ -1,50 +1,12 @@
$OpenBSD: patch-configure,v 1.2 2006/10/12 14:26:03 alek Exp $
--- configure.orig Sun Nov 27 17:47:27 2005
+++ configure Sun Oct 8 21:14:07 2006
@@ -5103,23 +5103,23 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for samplerate >= 0.15.0" >&5
-echo $ECHO_N "checking for samplerate >= 0.15.0... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for samplerate >= 0.0.15" >&5
+echo $ECHO_N "checking for samplerate >= 0.0.15... $ECHO_C" >&6
- if $PKG_CONFIG --exists "samplerate >= 0.15.0" ; then
+ if $PKG_CONFIG --exists "samplerate >= 0.0.15" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
echo "$as_me:$LINENO: checking SAMPLERATE_CFLAGS" >&5
echo $ECHO_N "checking SAMPLERATE_CFLAGS... $ECHO_C" >&6
- SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.15.0"`
+ SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.0.15"`
echo "$as_me:$LINENO: result: $SAMPLERATE_CFLAGS" >&5
echo "${ECHO_T}$SAMPLERATE_CFLAGS" >&6
echo "$as_me:$LINENO: checking SAMPLERATE_LIBS" >&5
echo $ECHO_N "checking SAMPLERATE_LIBS... $ECHO_C" >&6
- SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.15.0"`
+ SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.0.15"`
echo "$as_me:$LINENO: result: $SAMPLERATE_LIBS" >&5
echo "${ECHO_T}$SAMPLERATE_LIBS" >&6
else
@@ -5127,7 +5127,7 @@ echo "${ECHO_T}$SAMPLERATE_LIBS" >&6
SAMPLERATE_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "samplerate >= 0.15.0"`
+ SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "samplerate >= 0.0.15"`
fi
@@ -7723,7 +7723,7 @@ echo "$as_me: WARNING: no configuration
{ 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;}
$OpenBSD: patch-configure,v 1.3 2006/12/17 12:12:58 ajacoutot Exp $
--- configure.orig Sat Dec 2 11:06:14 2006
+++ configure Sat Dec 2 11:09:01 2006
@@ -9402,7 +9402,7 @@ echo "$as_me: WARNING: no configuration
{ 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;}

40
audio/audacity/patches/patch-lib-src_libnyquist_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-lib-src_libnyquist_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/libnyquist/Makefile.in.orig Wed Nov 17 22:17:32 2004
+++ lib-src/libnyquist/Makefile.in Tue Jan 11 20:38:28 2005
$OpenBSD: patch-lib-src_libnyquist_Makefile_in,v 1.2 2006/12/17 12:12:58 ajacoutot Exp $
--- lib-src/libnyquist/Makefile.in.orig Sat Dec 2 11:09:32 2006
+++ lib-src/libnyquist/Makefile.in Sat Dec 2 11:10:37 2006
@@ -6,7 +6,7 @@
INCL = -Inyqsrc -Itran -Ixlisp -Icmt -Isys -Isnd -Ifft
@ -10,37 +10,3 @@ $OpenBSD: patch-lib-src_libnyquist_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 ste
LN = $(CC)
LFLAGS = -lm
@@ -465,13 +465,13 @@ cmt/userio.o: cmt/userio.c
cc -c cmt/userio.c -o cmt/userio.o $(CFLAGS)
misc/intgen: misc/intgen.c
- cd misc; make intgen
+ cd misc; ${MAKE} intgen
misc/unpacker: misc/unpacker.c misc/convert.c
- cd misc; make unpacker
+ cd misc; ${MAKE} unpacker
misc/packer: misc/packer.c misc/convert.c
- cd misc; make packer
+ cd misc; ${MAKE} packer
nyqsrc/sndfnintptrs.h: $(NYQHDRS) snd/snd.h misc/intgen
$(INTGEN) nyqsrc/sndfnint $(NYQHDRS)
@@ -481,14 +481,14 @@ nyqsrc/seqfnintptrs.h: $(CMTHDRS) misc/i
clean:
rm -f libnyquist.a
- cd misc; make clean
+ cd misc; ${MAKE} clean
rm -f $(OBJECTS)
# Note that these files are machine-generated:
rm -f nyqsrc/sndfnintptrs.h nyqsrc/sndfnint.c nyqsrc/sndfnintdefs.h
rm -f nyqsrc/seqfnintptrs.h nyqsrc/seqfnint.c nyqsrc/seqfnintdefs.h
cleaner: clean
- cd misc; make cleaner
+ cd misc; ${MAKE} cleaner
rm -f *.backup */*.backup
rm -f *~ */*.*~
rm -f *.save */*.save

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

@ -1,12 +0,0 @@
$OpenBSD: patch-lib-src_libnyquist_sys_term_c,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/libnyquist/sys/term.c.orig Thu Nov 18 07:17:32 2004
+++ lib-src/libnyquist/sys/term.c Tue Jan 11 08:56:46 2005
@@ -40,7 +40,7 @@ int term_testchar()
#else
#include <termios.h>
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__OpenBSD__)
#include <asm/ioctls.h>
#endif
#include <signal.h>

16
audio/audacity/patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/portaudio/pa_unix_oss/pa_unix_oss.c.orig Thu Nov 18 07:17:34 2004
+++ lib-src/portaudio/pa_unix_oss/pa_unix_oss.c Tue Jan 11 08:56:46 2005
@@ -43,7 +43,8 @@
#ifdef __linux__
#include <linux/soundcard.h>
$OpenBSD: patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c,v 1.2 2006/12/17 12:12:59 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 Sat Dec 2 11:05:46 2006
@@ -45,7 +45,8 @@
#elif defined(__FreeBSD__)
#include <sys/soundcard.h>
#else
-#include <machine/soundcard.h> /* JH20010905 */
+#include <soundcard.h> /* JH20010905 */
@ -11,7 +11,7 @@ $OpenBSD: patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c,v 1.1.1.1 2006/01/12
#endif
@@ -217,11 +218,15 @@ error:
@@ -219,11 +220,15 @@ error:
}
/*******************************************************************************************/
@ -28,7 +28,7 @@ $OpenBSD: patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c,v 1.1.1.1 2006/01/12
/* Set format, channels, and rate in this order to keep OSS happy. */
/* Set data format. FIXME - handle more native formats. */
tmp = AFMT_S16_NE;
@@ -271,18 +276,52 @@ PaError Pa_SetupDeviceFormat( int devHan
@@ -273,18 +278,52 @@ PaError Pa_SetupDeviceFormat( int devHan
return paHostError;
}
}

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

@ -1,9 +1,9 @@
$OpenBSD: patch-lib-src_portmixer_px_unix_oss_px_unix_oss_c,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/portmixer/px_unix_oss/px_unix_oss.c.orig Thu Nov 18 07:17:35 2004
+++ lib-src/portmixer/px_unix_oss/px_unix_oss.c Tue Jan 11 08:56:46 2005
@@ -38,7 +38,7 @@
#ifdef __linux__
#include <linux/soundcard.h>
$OpenBSD: patch-lib-src_portmixer_px_unix_oss_px_unix_oss_c,v 1.2 2006/12/17 12:12:59 ajacoutot Exp $
--- lib-src/portmixer/px_unix_oss/px_unix_oss.c.orig Sun Oct 29 01:05:51 2006
+++ lib-src/portmixer/px_unix_oss/px_unix_oss.c Sat Dec 2 11:05:46 2006
@@ -40,7 +40,7 @@
#elif defined(__FreeBSD__)
#include <sys/soundcard.h>
#else
-#include <machine/soundcard.h> /* JH20010905 */
+#include <soundcard.h> /* JH20010905 */

14
audio/audacity/patches/patch-lib-src_soundtouch_configure
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-lib-src_soundtouch_configure,v 1.2 2006/10/12 14:26:04 alek Exp $
--- lib-src/soundtouch/configure.orig Sun Nov 27 17:47:29 2005
+++ lib-src/soundtouch/configure Sat Oct 7 16:56:59 2006
@@ -1976,7 +1976,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
$OpenBSD: patch-lib-src_soundtouch_configure,v 1.3 2006/12/17 12:12:59 ajacoutot Exp $
--- lib-src/soundtouch/configure.orig Sat Dec 2 11:12:39 2006
+++ lib-src/soundtouch/configure Sat Dec 2 11:14:59 2006
@@ -2443,7 +2443,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
#AC_MAINTAINER_MODE
-CXXFLAGS= ac_ext=cc
+# CXXFLAGS=
-CXXFLAGS= ac_ext=cpp
+#CXXFLAGS= ac_ext=cpp
+ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

14
audio/audacity/patches/patch-lib-src_soundtouch_include_STTypes_h Normal file
View File

@ -0,0 +1,14 @@
$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
@@ -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
// If defined, allows the SIMD-optimized routines to take minor shortcuts

17
audio/audacity/patches/patch-lib-src_soundtouch_source_SoundTouch_Makefile_in
View File

@ -1,13 +1,12 @@
$OpenBSD: patch-lib-src_soundtouch_source_SoundTouch_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/soundtouch/source/SoundTouch/Makefile.in.orig Sat Nov 26 18:33:39 2005
+++ lib-src/soundtouch/source/SoundTouch/Makefile.in Mon Dec 26 18:07:33 2005
@@ -151,7 +151,8 @@ libSoundTouch_la_SOURCES = AAFilter.cpp
$OpenBSD: patch-lib-src_soundtouch_source_SoundTouch_Makefile_in,v 1.2 2006/12/17 12:12:59 ajacoutot Exp $
--- lib-src/soundtouch/source/SoundTouch/Makefile.in.orig Sat Dec 2 11:15:33 2006
+++ lib-src/soundtouch/source/SoundTouch/Makefile.in Sat Dec 2 11:16:42 2006
@@ -197,7 +197,7 @@ libSoundTouch_la_SOURCES = AAFilter.cpp
# ??? test for -fcheck-new in configure.ac
# other compiler flags to add
-AM_CXXFLAGS = -O3 -fcheck-new -I../../include
+# AM_CXXFLAGS = -O3
-AM_CXXFLAGS = -O3 -msse -fcheck-new -I../../include
+AM_CXXFLAGS = -I../../include -fcheck-new
subdir = source/SoundTouch
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
all: all-am
.SUFFIXES:

18
audio/audacity/patches/patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/soundtouch/source/example/SoundStretch/Makefile.in.orig Sat Nov 26 18:33:39 2005
+++ lib-src/soundtouch/source/example/SoundStretch/Makefile.in Mon Dec 26 18:07:33 2005
@@ -153,7 +153,7 @@ soundstretch_LDADD = ../../SoundTouch/li
$OpenBSD: patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in,v 1.2 2006/12/17 12:12:59 ajacoutot Exp $
--- lib-src/soundtouch/source/example/SoundStretch/Makefile.in.orig Sat Dec 2 11:17:07 2006
+++ lib-src/soundtouch/source/example/SoundStretch/Makefile.in Sat Dec 2 11:17:27 2006
@@ -189,7 +189,7 @@ EXTRA_DIST = soundstretch.dsp soundstret
soundstretch_SOURCES = main.cpp RunParameters.cpp WavFile.cpp
soundstretch_LDADD = ../../SoundTouch/libSoundTouch.la ../bpm/libBPM.la -lm
soundstretch_LDFLAGS = -s
-soundstretch_CXXFLAGS = -O3 -I../bpm
+soundstretch_CXXFLAGS = -I../bpm
subdir = source/example/SoundStretch
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
all: all-am
.SUFFIXES:

14
audio/audacity/patches/patch-lib-src_soundtouch_source_example_bpm_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-lib-src_soundtouch_source_example_bpm_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/soundtouch/source/example/bpm/Makefile.in.orig Sat Nov 26 18:33:40 2005
+++ lib-src/soundtouch/source/example/bpm/Makefile.in Mon Dec 26 18:07:33 2005
@@ -149,7 +149,7 @@ lib_LTLIBRARIES = libBPM.la
$OpenBSD: patch-lib-src_soundtouch_source_example_bpm_Makefile_in,v 1.2 2006/12/17 12:12:59 ajacoutot Exp $
--- lib-src/soundtouch/source/example/bpm/Makefile.in.orig Sat Dec 2 11:17:54 2006
+++ lib-src/soundtouch/source/example/bpm/Makefile.in Sat Dec 2 11:18:16 2006
@@ -192,7 +192,7 @@ lib_LTLIBRARIES = libBPM.la
libBPM_la_SOURCES = BPMDetect.cpp PeakFinder.cpp
# other compiler flags to add
-AM_CXXFLAGS = -O3 -I../../../include
+AM_CXXFLAGS = -I../../../include
subdir = source/example/bpm
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
all: all-am
.SUFFIXES:

236
audio/audacity/patches/patch-src_DirManager_cpp Normal file
View File

@ -0,0 +1,236 @@
$OpenBSD: patch-src_DirManager_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
--- src/DirManager.cpp.orig Sun Oct 29 02:05:26 2006
+++ src/DirManager.cpp Sat Dec 9 20:19:42 2006
@@ -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(wxStri
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(wxStri
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(wxStri
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(w
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
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(wxArraySt
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(wxArraySt
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 & p
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 & p
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 & p
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 & p
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

69
audio/audacity/patches/patch-src_Makefile_in Normal file
View File

@ -0,0 +1,69 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2006/12/17 12:12:59 ajacoutot Exp $
--- src/Makefile.in.orig Sun Oct 29 02:05:27 2006
+++ src/Makefile.in Sat Dec 9 21:04:47 2006
@@ -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@
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
########################################
-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)

31
audio/audacity/patches/patch-src_Prefs_cpp Normal file
View File

@ -0,0 +1,31 @@
$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);

29
audio/audacity/patches/patch-src_Sequence_cpp Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-src_Sequence_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
--- src/Sequence.cpp.orig Sun Dec 10 13:12:31 2006
+++ src/Sequence.cpp Sun Dec 10 13:13:10 2006
@@ -826,7 +826,8 @@ bool Sequence::Get(samplePtr buffer, sam
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);
@@ -860,6 +861,7 @@ bool Sequence::Set(samplePtr buffer, sam
if (format != mSampleFormat) {
temp = NewSamples(mMaxSamples, mSampleFormat);
wxASSERT(temp);
+ return false;
}
samplePtr silence = NULL;
@@ -867,6 +869,7 @@ bool Sequence::Set(samplePtr buffer, sam
silence = NewSamples(mMaxSamples, format);
wxASSERT(silence);
ClearSamples(silence, format, 0, mMaxSamples);
+ return false;
}
int b = FindBlock(start);

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

@ -1,7 +1,7 @@
$OpenBSD: patch-src_export_ExportMP3_cpp,v 1.2 2006/10/12 14:26:04 alek Exp $
--- src/export/ExportMP3.cpp.orig Sun Nov 27 17:47:27 2005
+++ src/export/ExportMP3.cpp Sat Oct 7 16:57:00 2006
@@ -250,7 +250,7 @@ bool MP3Exporter::FindLibrary(wxWindow *
$OpenBSD: patch-src_export_ExportMP3_cpp,v 1.3 2006/12/17 12:12:59 ajacoutot Exp $
--- src/export/ExportMP3.cpp.orig Sun Oct 29 01:05:27 2006
+++ src/export/ExportMP3.cpp Sat Dec 2 11:28:24 2006
@@ -268,7 +268,7 @@ bool MP3Exporter::FindLibrary(wxWindow *
wxString GetLibraryTypeString()
{
@ -10,7 +10,7 @@ $OpenBSD: patch-src_export_ExportMP3_cpp,v 1.2 2006/10/12 14:26:04 alek Exp $
}
wxString GetLibraryMessage()
@@ -258,10 +258,12 @@ bool MP3Exporter::FindLibrary(wxWindow *
@@ -276,10 +276,12 @@ bool MP3Exporter::FindLibrary(wxWindow *
/* 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"
@ -21,9 +21,18 @@ $OpenBSD: patch-src_export_ExportMP3_cpp,v 1.2 2006/10/12 14:26:04 alek Exp $
+ "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 /usr/local/lib and its filename\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");
}
bool LoadLibrary() {
@@ -523,7 +525,7 @@ void ReleaseMP3Exporter()
wxString GetLibraryPath()
{
- return wxT("/usr/local/lib");
+ return wxT("!!LOCALBASE!!/lib");
}
wxString GetLibraryName()

19
audio/audacity/patches/patch-tests_Makefile_in
View File

@ -1,11 +1,20 @@
$OpenBSD: patch-tests_Makefile_in,v 1.2 2006/10/12 14:26:04 alek Exp $
--- tests/Makefile.in.orig Sun Nov 27 17:47:27 2005
+++ tests/Makefile.in Sat Oct 7 16:57:00 2006
@@ -21,7 +21,7 @@ TESTS = \
$OpenBSD: patch-tests_Makefile_in,v 1.3 2006/12/17 12:12:59 ajacoutot Exp $
--- tests/Makefile.in.orig Sun Oct 29 02:05:36 2006
+++ tests/Makefile.in Sat Dec 9 20:02:01 2006
@@ -14,14 +14,14 @@ override CPPFLAGS += -Wall -I../src @CPP
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
-$(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)

22
audio/audacity/patches/patch-tests_SequenceTest_cpp Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-tests_SequenceTest_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
--- tests/SequenceTest.cpp.orig Sun Oct 29 02:05:36 2006
+++ tests/SequenceTest.cpp Sat Dec 9 20:07:16 2006
@@ -21,7 +21,7 @@ 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 @@ public:
delete mSequence;
mSequence = NULL;
- assert(mDirManager->blockFileHash->GetCount() == 0);
+ BlockHash blockFileHash;
+ assert(blockFileHash.size() == 0);
std::cout << "ok\n";
}

42
audio/audacity/patches/patch-tests_SimpleBlockFileTest_cpp Normal file
View File

@ -0,0 +1,42 @@
$OpenBSD: patch-tests_SimpleBlockFileTest_cpp,v 1.3 2006/12/17 12:12:59 ajacoutot Exp $
--- tests/SimpleBlockFileTest.cpp.orig Sun Oct 29 01:05:36 2006
+++ tests/SimpleBlockFileTest.cpp Wed Dec 6 14:11:41 2006
@@ -45,13 +45,13 @@ 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 @@ 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 @@ 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];

8
audio/audacity/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2006/10/12 14:26:04 alek Exp $
@comment $OpenBSD: PLIST,v 1.3 2006/12/17 12:12:59 ajacoutot Exp $
bin/audacity
@man man/man1/audacity.1
share/applications/
@ -38,6 +38,9 @@ share/doc/audacity/
share/doc/audacity/LICENSE.txt
share/doc/audacity/README.txt
share/locale/
share/locale/af/
share/locale/af/LC_MESSAGES/
share/locale/af/LC_MESSAGES/audacity.mo
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/audacity.mo
@ -110,6 +113,9 @@ share/locale/sl/LC_MESSAGES/audacity.mo
share/locale/sv/
share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/audacity.mo
share/locale/tr/
share/locale/tr/LC_MESSAGES/
share/locale/tr/LC_MESSAGES/audacity.mo
share/locale/uk/
share/locale/uk/LC_MESSAGES/
share/locale/uk/LC_MESSAGES/audacity.mo