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

- some cleaning:

Browse Source 
fix .desktop entry and add desktop-file-utils as run_depends
add audacity.xpm
fix lib_depends/WANTLIB
regen and update PLIST accordingly
regen patches while here
This commit is contained in:
ajacoutot 2007-05-24 09:45:01 +00:00
parent a3da0e55b6
commit 57524f9873
20 changed files with 119 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
audio/audacity/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.6 2007/04/30 10:45:37 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.7 2007/05/24 09:45:01 ajacoutot Exp $
COMMENT= "free audio editor" COMMENT= "free audio editor"
V= 1.3.2 V= 1.3.2
DISTNAME= audacity-src-${V} DISTNAME= audacity-src-${V}
PKGNAME= audacity-${V}p0 PKGNAME= audacity-${V}p1
CATEGORIES= audio CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/}
@ -19,16 +19,16 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m ossaudio pthread stdc++ ogg expat WANTLIB= c m ossaudio pthread stdc++ ogg expat sndfile
BUILD_DEPENDS= ::archivers/zip 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 \ 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 \ samplerate.>=1::audio/libsamplerate \
FLAC.>=7,FLAC++.>=6::audio/flac \ FLAC.>=7,FLAC++.>=6::audio/flac \
vorbis.>=5,vorbisfile.>=4,vorbisenc.>=2::audio/libvorbis \ vorbis.>=5,vorbisfile.>=4,vorbisenc.>=2::audio/libvorbis \
id3tag.>=2::audio/libid3tag \ id3tag.>=2::audio/libid3tag \
mad.>=2::audio/libmad mad.>=2::audio/libmad
RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
USE_X11= Yes USE_X11= Yes
USE_GMAKE= Yes USE_GMAKE= Yes
@ -65,4 +65,9 @@ pre-configure:
@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \ @perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
${WRKSRC}/src/export/ExportMP3.cpp ${WRKSRC}/src/export/ExportMP3.cpp
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKSRC}/images/AudacityLogo.xpm \
${PREFIX}/share/pixmaps/audacity.xpm
.include <bsd.port.mk> .include <bsd.port.mk>

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2006/12/17 12:12:58 ajacoutot Exp $ $OpenBSD: patch-configure,v 1.4 2007/05/24 09:45:01 ajacoutot Exp $
--- configure.orig Sat Dec 2 11:06:14 2006 --- configure.orig Sun Oct 29 01:05:36 2006
+++ configure Sat Dec 2 11:09:01 2006 +++ configure Thu May 24 11:02:16 2007
@@ -9402,7 +9402,7 @@ echo "$as_me: WARNING: no configuration @@ -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:$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;} 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. # The eval makes quoting arguments work.

8
audio/audacity/patches/patch-lib-src_allegro_mfallegro_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib-src_allegro_mfallegro_cpp,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $ $OpenBSD: patch-lib-src_allegro_mfallegro_cpp,v 1.2 2007/05/24 09:45:01 ajacoutot Exp $
--- lib-src/allegro/mfallegro.cpp.orig Tue Jan 11 20:31:25 2005 --- lib-src/allegro/mfallegro.cpp.orig Sun Oct 29 01:05:59 2006
+++ lib-src/allegro/mfallegro.cpp Tue Jan 11 20:31:25 2005 +++ lib-src/allegro/mfallegro.cpp Thu May 24 11:02:16 2007
@@ -121,7 +121,7 @@ void Allegro_midifile_reader::Mf_starttr @@ -121,7 +121,7 @@ void Allegro_midifile_reader::Mf_starttrack()
void Allegro_midifile_reader::Mf_endtrack() void Allegro_midifile_reader::Mf_endtrack()
{ {
tracks.append(track); tracks.append(track);

8
audio/audacity/patches/patch-lib-src_libnyquist_cmt_cext_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib-src_libnyquist_cmt_cext_h,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $ $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 Tue Jan 11 19:56:02 2005 --- lib-src/libnyquist/cmt/cext.h.orig Sun Oct 29 01:05:50 2006
+++ lib-src/libnyquist/cmt/cext.h Tue Jan 11 19:56:02 2005 +++ lib-src/libnyquist/cmt/cext.h Thu May 24 11:02:16 2007
@@ -54,6 +54,8 @@ EXIT(n) -- calls exit(n) after shutting @@ -54,6 +54,8 @@ EXIT(n) -- calls exit(n) after shutting down/dealloca
#include <sys/types.h> #include <sys/types.h>
#endif #endif

8
audio/audacity/patches/patch-lib-src_libnyquist_snd_sndheader_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib-src_libnyquist_snd_sndheader_c,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $ $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 Tue Jan 11 20:58:31 2005 --- lib-src/libnyquist/snd/sndheader.c.orig Sun Oct 29 01:05:50 2006
+++ lib-src/libnyquist/snd/sndheader.c Tue Jan 11 21:02:41 2005 +++ lib-src/libnyquist/snd/sndheader.c Thu May 24 11:02:17 2007
@@ -923,7 +923,7 @@ void snd_write_header(snd_type snd, long @@ -923,7 +923,7 @@ void snd_write_header(snd_type snd, long *flags)
8 /*SSND hdr*/ + 8 /*SSND chunk*/; 8 /*SSND hdr*/ + 8 /*SSND chunk*/;
if (snd->format.bits != 8 && snd->format.bits != 16) { if (snd->format.bits != 8 && snd->format.bits != 16) {
char msg[64]; char msg[64];

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

@ -1,7 +1,7 @@
$OpenBSD: patch-lib-src_libnyquist_xlisp_xlprin_c,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $ $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 Tue Jan 11 19:43:02 2005 --- lib-src/libnyquist/xlisp/xlprin.c.orig Sun Oct 29 01:05:50 2006
+++ lib-src/libnyquist/xlisp/xlprin.c Tue Jan 11 19:45:30 2005 +++ lib-src/libnyquist/xlisp/xlprin.c Thu May 24 11:02:17 2007
@@ -245,7 +245,7 @@ LOCAL void putqstring(LVAL fptr, LVAL st @@ -245,7 +245,7 @@ LOCAL void putqstring(LVAL fptr, LVAL str)
void putatm(LVAL fptr, char *tag, LVAL val) void putatm(LVAL fptr, char *tag, LVAL val)
{ {
sprintf(buf,"#<%s: #",tag); xlputstr(fptr,buf); sprintf(buf,"#<%s: #",tag); xlputstr(fptr,buf);
@ -10,7 +10,7 @@ $OpenBSD: patch-lib-src_libnyquist_xlisp_xlprin_c,v 1.1.1.1 2006/01/12 08:59:27
xlputc(fptr,'>'); xlputc(fptr,'>');
} }
@@ -254,7 +254,7 @@ LOCAL void putsubr(LVAL fptr, char *tag, @@ -254,7 +254,7 @@ LOCAL void putsubr(LVAL fptr, char *tag, LVAL val)
{ {
sprintf(buf,"#<%s-%s: #",tag,funtab[getoffset(val)].fd_name); sprintf(buf,"#<%s-%s: #",tag,funtab[getoffset(val)].fd_name);
xlputstr(fptr,buf); xlputstr(fptr,buf);
@ -19,7 +19,7 @@ $OpenBSD: patch-lib-src_libnyquist_xlisp_xlprin_c,v 1.1.1.1 2006/01/12 08:59:27
xlputc(fptr,'>'); xlputc(fptr,'>');
} }
@@ -267,7 +267,7 @@ LOCAL void putclosure(LVAL fptr, LVAL va @@ -267,7 +267,7 @@ LOCAL void putclosure(LVAL fptr, LVAL val)
else else
strcpy(buf,"#<Closure: #"); strcpy(buf,"#<Closure: #");
xlputstr(fptr,buf); xlputstr(fptr,buf);

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

@ -1,6 +1,6 @@
$OpenBSD: patch-lib-src_libresample_Makefile_in,v 1.2 2006/10/12 14:26:04 alek Exp $ $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 Nov 27 17:47:29 2005 --- lib-src/libresample/Makefile.in.orig Sun Oct 29 01:06:00 2006
+++ lib-src/libresample/Makefile.in Sun Oct 8 20:52:45 2006 +++ lib-src/libresample/Makefile.in Thu May 24 11:02:17 2007
@@ -7,6 +7,7 @@ CC = @CC@ @@ -7,6 +7,7 @@ CC = @CC@
CFLAGS = @CFLAGS@ -Wall CFLAGS = @CFLAGS@ -Wall
@ -9,7 +9,7 @@ $OpenBSD: patch-lib-src_libresample_Makefile_in,v 1.2 2006/10/12 14:26:04 alek E
AR = @AR@ AR = @AR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
@@ -34,12 +35,12 @@ tests/testresample: libresample.a $(srcd @@ -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 $(DIRS)
$(CC) -o tests/compareresample \ $(CC) -o tests/compareresample \
$(CFLAGS) $(srcdir)/tests/compareresample.c \ $(CFLAGS) $(srcdir)/tests/compareresample.c \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-lib-src_portaudio_pa_unix_oss_pa_unix_c,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $ $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 Thu Nov 18 07:17:34 2004 --- 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 Tue Jan 11 08:56:46 2005 +++ lib-src/portaudio/pa_unix_oss/pa_unix.c Thu May 24 11:02:17 2007
@@ -399,6 +399,7 @@ static int PaHost_CanaryProc( PaHostSoun @@ -399,6 +399,7 @@ static int PaHost_CanaryProc( PaHostSoundControl *pa
return result; return result;
} }
@ -9,7 +9,7 @@ $OpenBSD: patch-lib-src_portaudio_pa_unix_oss_pa_unix_c,v 1.1.1.1 2006/01/12 08:
/******************************************************************************************* /*******************************************************************************************
* Monitor audio thread and lower its it if it hogs the CPU. * Monitor audio thread and lower its it if it hogs the CPU.
* To prevent getting killed, the audio thread must update a * To prevent getting killed, the audio thread must update a
@@ -598,6 +599,7 @@ static PaError PaHost_BoostPriority( int @@ -598,6 +599,7 @@ static PaError PaHost_BoostPriority( internalPortAudio
return result; return result;
} }
@ -17,7 +17,7 @@ $OpenBSD: patch-lib-src_portaudio_pa_unix_oss_pa_unix_c,v 1.1.1.1 2006/01/12 08:
/*******************************************************************************************/ /*******************************************************************************************/
static PaError Pa_AudioThreadProc( internalPortAudioStream *past ) static PaError Pa_AudioThreadProc( internalPortAudioStream *past )
@@ -613,8 +615,10 @@ static PaError Pa_AudioThreadProc( inter @@ -613,8 +615,10 @@ static PaError Pa_AudioThreadProc( internalPortAudioSt
GSRegisterCurrentThread(); /* SB20010904 */ GSRegisterCurrentThread(); /* SB20010904 */
#endif #endif
@ -28,7 +28,7 @@ $OpenBSD: patch-lib-src_portaudio_pa_unix_oss_pa_unix_c,v 1.1.1.1 2006/01/12 08:
past->past_IsActive = 1; past->past_IsActive = 1;
DBUG(("entering thread.\n")); DBUG(("entering thread.\n"));
@@ -680,7 +684,9 @@ static PaError Pa_AudioThreadProc( inter @@ -680,7 +684,9 @@ static PaError Pa_AudioThreadProc( internalPortAudioSt
DBUG(("Pa_AudioThreadProc: left audio loop.\n")); DBUG(("Pa_AudioThreadProc: left audio loop.\n"));
past->past_IsActive = 0; past->past_IsActive = 0;
@ -38,7 +38,7 @@ $OpenBSD: patch-lib-src_portaudio_pa_unix_oss_pa_unix_c,v 1.1.1.1 2006/01/12 08:
error: error:
DBUG(("leaving audio thread.\n")); DBUG(("leaving audio thread.\n"));
@@ -810,7 +816,7 @@ PaError PaHost_OpenStream( internalPortA @@ -810,7 +816,7 @@ PaError PaHost_OpenStream( internalPortAudioStream *
past->past_NumUserBuffers, past->past_FramesPerUserBuffer, past->past_NumUserBuffers, past->past_FramesPerUserBuffer,
past->past_NumOutputChannels ); past->past_NumOutputChannels );
result = Pa_SetupDeviceFormat( pahsc->pahsc_OutputHandle, result = Pa_SetupDeviceFormat( pahsc->pahsc_OutputHandle,

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

@ -1,6 +1,6 @@
$OpenBSD: patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c,v 1.2 2006/12/17 12:12:59 ajacoutot Exp $ $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.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 +++ lib-src/portaudio/pa_unix_oss/pa_unix_oss.c Thu May 24 11:02:17 2007
@@ -45,7 +45,8 @@ @@ -45,7 +45,8 @@
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
#include <sys/soundcard.h> #include <sys/soundcard.h>
@ -28,7 +28,7 @@ $OpenBSD: patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c,v 1.2 2006/12/17 12:
/* Set format, channels, and rate in this order to keep OSS happy. */ /* Set format, channels, and rate in this order to keep OSS happy. */
/* Set data format. FIXME - handle more native formats. */ /* Set data format. FIXME - handle more native formats. */
tmp = AFMT_S16_NE; tmp = AFMT_S16_NE;
@@ -273,18 +278,52 @@ PaError Pa_SetupDeviceFormat( int devHan @@ -273,18 +278,52 @@ PaError Pa_SetupDeviceFormat( int devHandle, int numCh
return paHostError; return paHostError;
} }
} }

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

@ -1,7 +1,7 @@
$OpenBSD: patch-lib-src_soundtouch_source_SoundTouch_Makefile_in,v 1.2 2006/12/17 12:12:59 ajacoutot Exp $ $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 Sat Dec 2 11:15:33 2006 --- lib-src/soundtouch/source/SoundTouch/Makefile.in.orig Sun Oct 29 01:06:00 2006
+++ lib-src/soundtouch/source/SoundTouch/Makefile.in Sat Dec 2 11:16:42 2006 +++ lib-src/soundtouch/source/SoundTouch/Makefile.in Thu May 24 11:02:17 2007
@@ -197,7 +197,7 @@ libSoundTouch_la_SOURCES = AAFilter.cpp @@ -197,7 +197,7 @@ libSoundTouch_la_SOURCES = AAFilter.cpp FIRFilter.cpp
# ??? test for -fcheck-new in configure.ac # ??? test for -fcheck-new in configure.ac
# other compiler flags to add # other compiler flags to add

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

@ -1,7 +1,7 @@
$OpenBSD: patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in,v 1.2 2006/12/17 12:12:59 ajacoutot Exp $ $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 Sat Dec 2 11:17:07 2006 --- lib-src/soundtouch/source/example/SoundStretch/Makefile.in.orig Sun Oct 29 01:06:00 2006
+++ lib-src/soundtouch/source/example/SoundStretch/Makefile.in Sat Dec 2 11:17:27 2006 +++ lib-src/soundtouch/source/example/SoundStretch/Makefile.in Thu May 24 11:02:17 2007
@@ -189,7 +189,7 @@ EXTRA_DIST = soundstretch.dsp soundstret @@ -189,7 +189,7 @@ EXTRA_DIST = soundstretch.dsp soundstretch.dsw
soundstretch_SOURCES = main.cpp RunParameters.cpp WavFile.cpp soundstretch_SOURCES = main.cpp RunParameters.cpp WavFile.cpp
soundstretch_LDADD = ../../SoundTouch/libSoundTouch.la ../bpm/libBPM.la -lm soundstretch_LDADD = ../../SoundTouch/libSoundTouch.la ../bpm/libBPM.la -lm
soundstretch_LDFLAGS = -s soundstretch_LDFLAGS = -s

28
audio/audacity/patches/patch-src_DirManager_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_DirManager_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $ $OpenBSD: patch-src_DirManager_cpp,v 1.2 2007/05/24 09:45:01 ajacoutot Exp $
--- src/DirManager.cpp.orig Sun Oct 29 02:05:26 2006 --- src/DirManager.cpp.orig Sun Oct 29 01:05:26 2006
+++ src/DirManager.cpp Sat Dec 9 20:19:42 2006 +++ src/DirManager.cpp Thu May 24 11:02:17 2007
@@ -69,7 +69,9 @@ @@ -69,7 +69,9 @@
#include "blockfile/PCMAliasBlockFile.h" #include "blockfile/PCMAliasBlockFile.h"
#include "DirManager.h" #include "DirManager.h"
@ -11,7 +11,7 @@ $OpenBSD: patch-src_DirManager_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
#include "Prefs.h" #include "Prefs.h"
#include "widgets/Warning.h" #include "widgets/Warning.h"
#include "widgets/MultiDialog.h" #include "widgets/MultiDialog.h"
@@ -163,9 +165,13 @@ static int rm_dash_rf_enumerate_i(wxStri @@ -163,9 +165,13 @@ static int rm_dash_rf_enumerate_i(wxString dirpath,
wxString dirspec, wxString dirspec,
int files_p,int dirs_p, int files_p,int dirs_p,
int progress_count,int progress_bias, int progress_count,int progress_bias,
@ -25,7 +25,7 @@ $OpenBSD: patch-src_DirManager_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
int count=0; int count=0;
bool cont; bool cont;
@@ -183,9 +189,24 @@ static int rm_dash_rf_enumerate_i(wxStri @@ -183,9 +189,24 @@ static int rm_dash_rf_enumerate_i(wxString dirpath,
cont = dir.GetNext(&name); cont = dir.GetNext(&name);
@ -50,7 +50,7 @@ $OpenBSD: patch-src_DirManager_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
} }
} }
@@ -194,7 +215,11 @@ static int rm_dash_rf_enumerate_i(wxStri @@ -194,7 +215,11 @@ static int rm_dash_rf_enumerate_i(wxString dirpath,
wxString subdirpath=dirpath + wxFILE_SEP_PATH + name; wxString subdirpath=dirpath + wxFILE_SEP_PATH + name;
count+=rm_dash_rf_enumerate_i(subdirpath,flist,wxEmptyString, count+=rm_dash_rf_enumerate_i(subdirpath,flist,wxEmptyString,
files_p,dirs_p,progress_count, files_p,dirs_p,progress_count,
@ -62,7 +62,7 @@ $OpenBSD: patch-src_DirManager_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
cont = dir.GetNext(&name); cont = dir.GetNext(&name);
} }
} }
@@ -214,17 +239,29 @@ static int rm_dash_rf_enumerate_prompt(w @@ -214,17 +239,29 @@ static int rm_dash_rf_enumerate_prompt(wxString dirpat
int files_p,int dirs_p, int files_p,int dirs_p,
int progress_count, int progress_count,
const wxChar *prompt){ const wxChar *prompt){
@ -92,7 +92,7 @@ $OpenBSD: patch-src_DirManager_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
return count; return count;
} }
@@ -235,7 +272,11 @@ static int rm_dash_rf_enumerate(wxString @@ -235,7 +272,11 @@ static int rm_dash_rf_enumerate(wxString dirpath,
int files_p,int dirs_p){ int files_p,int dirs_p){
return rm_dash_rf_enumerate_i(dirpath, flist, dirspec, files_p,dirs_p, return rm_dash_rf_enumerate_i(dirpath, flist, dirspec, files_p,dirs_p,
@ -104,7 +104,7 @@ $OpenBSD: patch-src_DirManager_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
} }
@@ -244,10 +285,15 @@ static void rm_dash_rf_execute(wxArraySt @@ -244,10 +285,15 @@ static void rm_dash_rf_execute(wxArrayString &fList,
int count, int files_p, int dirs_p, int count, int files_p, int dirs_p,
const wxChar *prompt){ const wxChar *prompt){
@ -120,7 +120,7 @@ $OpenBSD: patch-src_DirManager_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
const wxChar *file = fList[i].c_str(); const wxChar *file = fList[i].c_str();
@@ -258,12 +304,30 @@ static void rm_dash_rf_execute(wxArraySt @@ -258,12 +304,30 @@ static void rm_dash_rf_execute(wxArrayString &fList,
wxRmdir(file); wxRmdir(file);
} }
@ -151,7 +151,7 @@ $OpenBSD: patch-src_DirManager_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
} }
// static // static
@@ -326,13 +390,20 @@ bool DirManager::SetProject(wxString & p @@ -326,13 +390,20 @@ bool DirManager::SetProject(wxString & projPath, wxStr
saved version of the old project must not be moved, saved version of the old project must not be moved,
otherwise the old project would not be safe. */ otherwise the old project would not be safe. */
@ -172,7 +172,7 @@ $OpenBSD: patch-src_DirManager_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
BlockHash::iterator i=blockFileHash.begin(); BlockHash::iterator i=blockFileHash.begin();
bool success = true; bool success = true;
@@ -345,8 +416,22 @@ bool DirManager::SetProject(wxString & p @@ -345,8 +416,22 @@ bool DirManager::SetProject(wxString & projPath, wxStr
success = MoveToNewProjectDirectory(b); success = MoveToNewProjectDirectory(b);
} }
@ -195,7 +195,7 @@ $OpenBSD: patch-src_DirManager_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
i++; i++;
count++; count++;
@@ -366,8 +451,13 @@ bool DirManager::SetProject(wxString & p @@ -366,8 +451,13 @@ bool DirManager::SetProject(wxString & projPath, wxStr
BlockFile *b = i->second; BlockFile *b = i->second;
MoveToNewProjectDirectory(b); MoveToNewProjectDirectory(b);
@ -209,7 +209,7 @@ $OpenBSD: patch-src_DirManager_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
i++; i++;
count--; count--;
@@ -377,14 +467,24 @@ bool DirManager::SetProject(wxString & p @@ -377,14 +467,24 @@ bool DirManager::SetProject(wxString & projPath, wxStr
this->projPath = oldPath; this->projPath = oldPath;
this->projName = oldName; this->projName = oldName;

8
audio/audacity/patches/patch-src_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2006/12/17 12:12:59 ajacoutot Exp $ $OpenBSD: patch-src_Makefile_in,v 1.4 2007/05/24 09:45:01 ajacoutot Exp $
--- src/Makefile.in.orig Sun Oct 29 02:05:27 2006 --- src/Makefile.in.orig Sun Oct 29 01:05:27 2006
+++ src/Makefile.in Sat Dec 9 21:04:47 2006 +++ src/Makefile.in Thu May 24 11:02:18 2007
@@ -176,12 +176,9 @@ OBJS = \ @@ -176,12 +176,9 @@ OBJS = \
widgets/Grid.o \ widgets/Grid.o \
widgets/ImageRoll.o \ widgets/ImageRoll.o \
@ -51,7 +51,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.3 2006/12/17 12:12:59 ajacoutot Exp $
######################################## ########################################
# DEPENDENCIES # DEPENDENCIES
@@ -214,7 +221,14 @@ LIBAUDACITY_SOURCES = $(LIBAUDACITY_OBJS @@ -214,7 +221,14 @@ LIBAUDACITY_SOURCES = $(LIBAUDACITY_OBJS:%.o=%.cpp)
######################################## ########################################

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

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Sequence_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $ $OpenBSD: patch-src_Sequence_cpp,v 1.2 2007/05/24 09:45:01 ajacoutot Exp $
--- src/Sequence.cpp.orig Sun Dec 10 13:12:31 2006 --- src/Sequence.cpp.orig Sun Oct 29 01:05:27 2006
+++ src/Sequence.cpp Sun Dec 10 13:13:10 2006 +++ src/Sequence.cpp Thu May 24 11:02:18 2007
@@ -826,7 +826,8 @@ bool Sequence::Get(samplePtr buffer, sam @@ -826,7 +826,8 @@ bool Sequence::Get(samplePtr buffer, sampleFormat form
sampleCount start, sampleCount len) const sampleCount start, sampleCount len) const
{ {
if (start < 0 || start > mNumSamples || if (start < 0 || start > mNumSamples ||
@ -11,7 +11,7 @@ $OpenBSD: patch-src_Sequence_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
return false; return false;
int b = FindBlock(start); int b = FindBlock(start);
@@ -860,6 +861,7 @@ bool Sequence::Set(samplePtr buffer, sam @@ -860,6 +861,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form
if (format != mSampleFormat) { if (format != mSampleFormat) {
temp = NewSamples(mMaxSamples, mSampleFormat); temp = NewSamples(mMaxSamples, mSampleFormat);
wxASSERT(temp); wxASSERT(temp);
@ -19,7 +19,7 @@ $OpenBSD: patch-src_Sequence_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
} }
samplePtr silence = NULL; samplePtr silence = NULL;
@@ -867,6 +869,7 @@ bool Sequence::Set(samplePtr buffer, sam @@ -867,6 +869,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form
silence = NewSamples(mMaxSamples, format); silence = NewSamples(mMaxSamples, format);
wxASSERT(silence); wxASSERT(silence);
ClearSamples(silence, format, 0, mMaxSamples); ClearSamples(silence, format, 0, mMaxSamples);

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

@ -0,0 +1,18 @@
$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
@@ -1,4 +1,4 @@
-[Desktop Entry]
+[Desktop Entry]
Encoding=UTF-8
Name=Audacity Sound Editor
@@ -11,7 +11,7 @@ Comment=Record and edit audio files
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;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-src_export_ExportMP3_cpp,v 1.3 2006/12/17 12:12:59 ajacoutot Exp $ $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.orig Sun Oct 29 01:05:27 2006
+++ src/export/ExportMP3.cpp Sat Dec 2 11:28:24 2006 +++ src/export/ExportMP3.cpp Thu May 24 11:02:18 2007
@@ -268,7 +268,7 @@ bool MP3Exporter::FindLibrary(wxWindow * @@ -268,7 +268,7 @@ bool MP3Exporter::FindLibrary(wxWindow *parent)
wxString GetLibraryTypeString() wxString GetLibraryTypeString()
{ {
@ -10,7 +10,7 @@ $OpenBSD: patch-src_export_ExportMP3_cpp,v 1.3 2006/12/17 12:12:59 ajacoutot Exp
} }
wxString GetLibraryMessage() wxString GetLibraryMessage()
@@ -276,10 +276,12 @@ bool MP3Exporter::FindLibrary(wxWindow * @@ -276,10 +276,12 @@ bool MP3Exporter::FindLibrary(wxWindow *parent)
/* i18n-hint: This message is used on Unix/Linux */ /* i18n-hint: This message is used on Unix/Linux */
return _("Audacity does not export MP3 files directly, but instead uses the \n" 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" "freely available LAME library to handle MP3 file encoding. You must \n"

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

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_Makefile_in,v 1.3 2006/12/17 12:12:59 ajacoutot Exp $ $OpenBSD: patch-tests_Makefile_in,v 1.4 2007/05/24 09:45:01 ajacoutot Exp $
--- tests/Makefile.in.orig Sun Oct 29 02:05:36 2006 --- tests/Makefile.in.orig Sun Oct 29 01:05:36 2006
+++ tests/Makefile.in Sat Dec 9 20:02:01 2006 +++ tests/Makefile.in Thu May 24 11:02:18 2007
@@ -14,14 +14,14 @@ override CPPFLAGS += -Wall -I../src @CPP @@ -14,14 +14,14 @@ override CPPFLAGS += -Wall -I../src @CPPFLAGS@
all: run_tests all: run_tests
check: run_tests check: run_tests

10
audio/audacity/patches/patch-tests_SequenceTest_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_SequenceTest_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $ $OpenBSD: patch-tests_SequenceTest_cpp,v 1.2 2007/05/24 09:45:01 ajacoutot Exp $
--- tests/SequenceTest.cpp.orig Sun Oct 29 02:05:36 2006 --- tests/SequenceTest.cpp.orig Sun Oct 29 01:05:36 2006
+++ tests/SequenceTest.cpp Sat Dec 9 20:07:16 2006 +++ tests/SequenceTest.cpp Thu May 24 11:02:18 2007
@@ -21,7 +21,7 @@ public: @@ -21,7 +21,7 @@ class SequenceTest (public)
void SetUp() void SetUp()
{ {
@ -10,7 +10,7 @@ $OpenBSD: patch-tests_SequenceTest_cpp,v 1.1 2006/12/17 12:12:59 ajacoutot Exp $
mDirManager = new DirManager; mDirManager = new DirManager;
mSequence = new Sequence(mDirManager, floatSample); mSequence = new Sequence(mDirManager, floatSample);
@@ -81,7 +81,8 @@ public: @@ -81,7 +81,8 @@ class SequenceTest (public)
delete mSequence; delete mSequence;
mSequence = NULL; mSequence = NULL;

10
audio/audacity/patches/patch-tests_SimpleBlockFileTest_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_SimpleBlockFileTest_cpp,v 1.3 2006/12/17 12:12:59 ajacoutot Exp $ $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.orig Sun Oct 29 01:05:36 2006
+++ tests/SimpleBlockFileTest.cpp Wed Dec 6 14:11:41 2006 +++ tests/SimpleBlockFileTest.cpp Thu May 24 11:02:18 2007
@@ -45,13 +45,13 @@ public: @@ -45,13 +45,13 @@ class SimpleBlockFileTest { (public)
floatData[i] = sign*j/((j*j)+1); floatData[i] = sign*j/((j*j)+1);
} }
@ -18,7 +18,7 @@ $OpenBSD: patch-tests_SimpleBlockFileTest_cpp,v 1.3 2006/12/17 12:12:59 ajacouto
(samplePtr)floatData, dataLen, (samplePtr)floatData, dataLen,
floatSample); floatSample);
@@ -82,7 +82,7 @@ public: @@ -82,7 +82,7 @@ class SimpleBlockFileTest { (public)
SF_INFO info; SF_INFO info;
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
@ -27,7 +27,7 @@ $OpenBSD: patch-tests_SimpleBlockFileTest_cpp,v 1.3 2006/12/17 12:12:59 ajacouto
assert(sf); assert(sf);
assert(info.frames == dataLen); assert(info.frames == dataLen);
@@ -115,9 +115,9 @@ public: @@ -115,9 +115,9 @@ class SimpleBlockFileTest { (public)
memset(&info2, 0, sizeof(info2)); memset(&info2, 0, sizeof(info2));
memset(&info3, 0, sizeof(info3)); memset(&info3, 0, sizeof(info3));

53
audio/audacity/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2006/12/17 12:12:59 ajacoutot Exp $ @comment $OpenBSD: PLIST,v 1.4 2007/05/24 09:45:01 ajacoutot Exp $
bin/audacity bin/audacity
@man man/man1/audacity.1 @man man/man1/audacity.1
share/applications/ share/applications/
@ -37,54 +37,27 @@ share/audacity/plug-ins/tremolo.ny
share/doc/audacity/ share/doc/audacity/
share/doc/audacity/LICENSE.txt share/doc/audacity/LICENSE.txt
share/doc/audacity/README.txt share/doc/audacity/README.txt
share/locale/
share/locale/af/ share/locale/af/
share/locale/af/LC_MESSAGES/ share/locale/af/LC_MESSAGES/
share/locale/af/LC_MESSAGES/audacity.mo share/locale/af/LC_MESSAGES/audacity.mo
share/locale/ar/ share/locale/ar/
share/locale/ar/LC_MESSAGES/ share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/audacity.mo share/locale/ar/LC_MESSAGES/audacity.mo
share/locale/bg/
share/locale/bg/LC_MESSAGES/
share/locale/bg/LC_MESSAGES/audacity.mo share/locale/bg/LC_MESSAGES/audacity.mo
share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/audacity.mo share/locale/ca/LC_MESSAGES/audacity.mo
share/locale/cs/
share/locale/cs/LC_MESSAGES/
share/locale/cs/LC_MESSAGES/audacity.mo share/locale/cs/LC_MESSAGES/audacity.mo
share/locale/da/
share/locale/da/LC_MESSAGES/
share/locale/da/LC_MESSAGES/audacity.mo share/locale/da/LC_MESSAGES/audacity.mo
share/locale/de/
share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/audacity.mo share/locale/de/LC_MESSAGES/audacity.mo
share/locale/el/
share/locale/el/LC_MESSAGES/
share/locale/el/LC_MESSAGES/audacity.mo share/locale/el/LC_MESSAGES/audacity.mo
share/locale/es/
share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/audacity.mo share/locale/es/LC_MESSAGES/audacity.mo
share/locale/eu/ share/locale/eu/
share/locale/eu/LC_MESSAGES/ share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/audacity.mo share/locale/eu/LC_MESSAGES/audacity.mo
share/locale/fi/
share/locale/fi/LC_MESSAGES/
share/locale/fi/LC_MESSAGES/audacity.mo share/locale/fi/LC_MESSAGES/audacity.mo
share/locale/fr/
share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/audacity.mo share/locale/fr/LC_MESSAGES/audacity.mo
share/locale/ga/
share/locale/ga/LC_MESSAGES/
share/locale/ga/LC_MESSAGES/audacity.mo share/locale/ga/LC_MESSAGES/audacity.mo
share/locale/hu/
share/locale/hu/LC_MESSAGES/
share/locale/hu/LC_MESSAGES/audacity.mo share/locale/hu/LC_MESSAGES/audacity.mo
share/locale/it/
share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/audacity.mo share/locale/it/LC_MESSAGES/audacity.mo
share/locale/ja/
share/locale/ja/LC_MESSAGES/
share/locale/ja/LC_MESSAGES/audacity.mo share/locale/ja/LC_MESSAGES/audacity.mo
share/locale/lt/ share/locale/lt/
share/locale/lt/LC_MESSAGES/ share/locale/lt/LC_MESSAGES/
@ -92,39 +65,23 @@ share/locale/lt/LC_MESSAGES/audacity.mo
share/locale/mk/ share/locale/mk/
share/locale/mk/LC_MESSAGES/ share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/audacity.mo share/locale/mk/LC_MESSAGES/audacity.mo
share/locale/nb/
share/locale/nb/LC_MESSAGES/
share/locale/nb/LC_MESSAGES/audacity.mo share/locale/nb/LC_MESSAGES/audacity.mo
share/locale/nl/
share/locale/nl/LC_MESSAGES/
share/locale/nl/LC_MESSAGES/audacity.mo share/locale/nl/LC_MESSAGES/audacity.mo
share/locale/pl/
share/locale/pl/LC_MESSAGES/
share/locale/pl/LC_MESSAGES/audacity.mo share/locale/pl/LC_MESSAGES/audacity.mo
share/locale/pt/
share/locale/pt/LC_MESSAGES/
share/locale/pt/LC_MESSAGES/audacity.mo share/locale/pt/LC_MESSAGES/audacity.mo
share/locale/ru/
share/locale/ru/LC_MESSAGES/
share/locale/ru/LC_MESSAGES/audacity.mo share/locale/ru/LC_MESSAGES/audacity.mo
share/locale/sl/
share/locale/sl/LC_MESSAGES/
share/locale/sl/LC_MESSAGES/audacity.mo share/locale/sl/LC_MESSAGES/audacity.mo
share/locale/sv/
share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/audacity.mo share/locale/sv/LC_MESSAGES/audacity.mo
share/locale/tr/
share/locale/tr/LC_MESSAGES/
share/locale/tr/LC_MESSAGES/audacity.mo share/locale/tr/LC_MESSAGES/audacity.mo
share/locale/uk/
share/locale/uk/LC_MESSAGES/
share/locale/uk/LC_MESSAGES/audacity.mo share/locale/uk/LC_MESSAGES/audacity.mo
share/locale/zh/ share/locale/zh/
share/locale/zh/LC_MESSAGES/ share/locale/zh/LC_MESSAGES/
share/locale/zh/LC_MESSAGES/audacity.mo share/locale/zh/LC_MESSAGES/audacity.mo
share/locale/zh_TW/
share/locale/zh_TW/LC_MESSAGES/
share/locale/zh_TW/LC_MESSAGES/audacity.mo share/locale/zh_TW/LC_MESSAGES/audacity.mo
share/mime/ share/mime/
share/mime/packages/ share/mime/packages/
share/mime/packages/audacity.xml share/mime/packages/audacity.xml
share/pixmaps/
share/pixmaps/audacity.xpm
@exec %D/bin/update-desktop-database
@unexec %D/bin/update-desktop-database