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

initial import of audacity-1.2.4

Browse Source 
Audacity is a free audio editor. You can record sounds, play sounds,
import and export WAV, AIFF, Ogg Vorbis, and MP3 files, and more. Use it
to edit your sounds using Cut, Copy and Paste (with unlimited Undo), mix
tracks together, or apply effects to your recordings.

Initial port and many patches by jakemsr@. Thanks to maintainer
Antoine Jacoutot for persistence and keeping the port alive.

ok jakemsr@
This commit is contained in:
steven 2006-01-12 08:59:27 +00:00
parent cd732c7b80
commit c318a7e095
35 changed files with 851 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
audio/audacity/Makefile Normal file
View File

@ -0,0 +1,65 @@
# $OpenBSD: Makefile,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
COMMENT= "free audio editor"
DISTNAME= audacity-src-1.2.4
PKGNAME= ${DISTNAME:S/-src//}
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/}
HOMEPAGE= http://audacity.sourceforge.net/
MAINTAINER= Antoine Jacoutot <ajacoutot@lphp.org>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m ossaudio pthread stdc++ \
FLAC++ ogg vorbisenc
BUILD_DEPENDS= ::archivers/zip
LIB_DEPENDS= wx_gtk.2.4::x11/wxWidgets/gtk \
sndfile.1::audio/libsndfile \
samplerate.1::audio/libsamplerate \
FLAC.4::audio/flac \
vorbis.0,vorbisfile.1::audio/libvorbis \
id3tag.2::audio/libid3tag \
mad.2::audio/libmad
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
WXCONFIG="${LOCALBASE}/bin/wxgtk-2.4-config"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-id3=system \
--with-vorbis=system \
--with-libflac=system \
--with-libmad=system \
--with-libsndfile=system \
--with-libsamplerate=system \
--with-libresample \
--with-nyquist \
--with-ladspa \
--with-portmixer \
--with-soundtouch \
--with-portaudio=v18 \
--with-help
MAKE_FLAGS= CC="${CC}"
REGRESS_FLAGS= LDFLAGS="-L${X11BASE}/lib"
pre-configure:
@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},' \
${WRKSRC}/src/export/ExportMP3.cpp
.include <bsd.port.mk>

4
audio/audacity/distinfo Normal file
View File

@ -0,0 +1,4 @@
MD5 (audacity-src-1.2.4.tar.gz) = b3e135cd1e34192f6cafa48cca0f77e7
RMD160 (audacity-src-1.2.4.tar.gz) = 37089099ea4bfcb5bf9d908f31234ecba4f2bfbd
SHA1 (audacity-src-1.2.4.tar.gz) = b21d89db2366ada3c3efb97891aacaf326be2bdf
SIZE (audacity-src-1.2.4.tar.gz) = 4497621

16
audio/audacity/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- Makefile.in.orig Thu Nov 18 07:17:29 2004
+++ Makefile.in Tue Jan 11 08:56:46 2005
@@ -37,9 +37,9 @@ install: audacity
# install manpage
$(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
- -test -f help/audacity.1.gz && \
- $(INSTALL) -m 644 help/audacity.1.gz \
- $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1.gz
+ -test -f help/audacity.1 && \
+ $(INSTALL) -m 644 help/audacity.1 \
+ $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1
# install nyquist
$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist

12
audio/audacity/patches/patch-configure Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- configure.orig Tue Jan 11 19:37:11 2005
+++ configure Tue Jan 11 19:42:24 2005
@@ -7901,7 +7901,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;}
# 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 ||
{ { 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;}

13
audio/audacity/patches/patch-lib-src_allegro_Makefile_in Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-lib-src_allegro_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/allegro/Makefile.in.orig Tue Jan 11 19:26:53 2005
+++ lib-src/allegro/Makefile.in Tue Jan 11 19:27:33 2005
@@ -3,7 +3,8 @@
CC = @CC@
CCC = @CXX@
-CFLAGS = -g -O
+CFLAGS = @CFLAGS@
+# CFLAGS = -g -O
OBJ = \
allegro.cpp.o \
allegrord.cpp.o \

12
audio/audacity/patches/patch-lib-src_allegro_mfallegro_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib-src_allegro_mfallegro_cpp,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/allegro/mfallegro.cpp.orig Tue Jan 11 20:31:25 2005
+++ lib-src/allegro/mfallegro.cpp Tue Jan 11 20:31:25 2005
@@ -121,7 +121,7 @@ void Allegro_midifile_reader::Mf_starttr
void Allegro_midifile_reader::Mf_endtrack()
{
tracks.append(track);
- printf("finished track, length %d number %d\n", track->len, track_num / 100);
+ printf("finished track, length %ld number %d\n", track->len, track_num / 100);
track_num += 100;
track = NULL;
}

11
audio/audacity/patches/patch-lib-src_expat_Makefile_in Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-lib-src_expat_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/expat/Makefile.in.orig Tue Jan 11 20:15:55 2005
+++ lib-src/expat/Makefile.in Tue Jan 11 20:16:15 2005
@@ -1,6 +1,6 @@
CC = @CC@
-override CFLAGS += @CFLAGS@ -Ixmlparse -Ixmltok
+override CFLAGS += -Ixmlparse -Ixmltok
OBJS = xmlparse/xmlparse.o xmltok/xmlrole.o xmltok/xmltok.o

46
audio/audacity/patches/patch-lib-src_libnyquist_Makefile_in Normal file
View File

@ -0,0 +1,46 @@
$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
@@ -6,7 +6,7 @@
INCL = -Inyqsrc -Itran -Ixlisp -Icmt -Isys -Isnd -Ifft
CC = @CC@
-override CFLAGS += -g -DCMTSTUFF -O2 -DEXT $(INCL)
+override CFLAGS += -DCMTSTUFF -DEXT $(INCL)
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_cmt_cext_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib-src_libnyquist_cmt_cext_h,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/libnyquist/cmt/cext.h.orig Tue Jan 11 19:56:02 2005
+++ lib-src/libnyquist/cmt/cext.h Tue Jan 11 19:56:02 2005
@@ -54,6 +54,8 @@ EXIT(n) -- calls exit(n) after shutting
#include <sys/types.h>
#endif
+#include <unistd.h>
+
#if HAS_MALLOC_H
#include <malloc.h>
#endif

11
audio/audacity/patches/patch-lib-src_libnyquist_snd_snd_h Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-lib-src_libnyquist_snd_snd_h,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/libnyquist/snd/snd.h.orig Tue Jan 11 20:57:17 2005
+++ lib-src/libnyquist/snd/snd.h Tue Jan 11 21:02:43 2005
@@ -15,6 +15,7 @@ error here
/* Standard includes */
#include <stdlib.h>
+#include <unistd.h>
#include "sndconfig.h"

12
audio/audacity/patches/patch-lib-src_libnyquist_snd_sndconfig_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib-src_libnyquist_snd_sndconfig_h,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/libnyquist/snd/sndconfig.h.orig Thu Nov 18 07:17:32 2004
+++ lib-src/libnyquist/snd/sndconfig.h Tue Jan 11 08:56:46 2005
@@ -60,7 +60,7 @@ void snd_free(void *a);
#elif defined(IRIX)
#include "sndirix.h"
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
#include "sndfreebsd.h"
#elif defined(_WIN32)

12
audio/audacity/patches/patch-lib-src_libnyquist_snd_sndheader_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib-src_libnyquist_snd_sndheader_c,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/libnyquist/snd/sndheader.c.orig Tue Jan 11 20:58:31 2005
+++ lib-src/libnyquist/snd/sndheader.c Tue Jan 11 21:02:41 2005
@@ -923,7 +923,7 @@ void snd_write_header(snd_type snd, long
8 /*SSND hdr*/ + 8 /*SSND chunk*/;
if (snd->format.bits != 8 && snd->format.bits != 16) {
char msg[64];
- sprintf(msg, "Warning: using 16 bits per sample instead of %d\n",
+ sprintf(msg, "Warning: using 16 bits per sample instead of %ld\n",
snd->format.bits);
snd_warn(msg);
snd->format.bits = 16;

12
audio/audacity/patches/patch-lib-src_libnyquist_snd_sndio_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib-src_libnyquist_snd_sndio_c,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/libnyquist/snd/sndio.c.orig Thu Nov 18 07:17:32 2004
+++ lib-src/libnyquist/snd/sndio.c Tue Jan 11 08:56:46 2005
@@ -20,7 +20,7 @@
#ifdef WIN32
#include <sys/stat.h>
#include "io.h"
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
#include <sys/stat.h>
#else
#endif

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

@ -0,0 +1,12 @@
$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>

12
audio/audacity/patches/patch-lib-src_libnyquist_xlisp_xlisp_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib-src_libnyquist_xlisp_xlisp_h,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/libnyquist/xlisp/xlisp.h.orig Tue Jan 11 19:49:00 2005
+++ lib-src/libnyquist/xlisp/xlisp.h Tue Jan 11 19:49:21 2005
@@ -178,7 +178,7 @@ extern long ptrtoabs();
#define LOCAL static
#endif
#ifndef AFMT
-#define AFMT "%x"
+#define AFMT "%lux"
#endif
#ifndef FIXTYPE
#define FIXTYPE long

30
audio/audacity/patches/patch-lib-src_libnyquist_xlisp_xlprin_c Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-lib-src_libnyquist_xlisp_xlprin_c,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/libnyquist/xlisp/xlprin.c.orig Tue Jan 11 19:43:02 2005
+++ lib-src/libnyquist/xlisp/xlprin.c Tue Jan 11 19:45:30 2005
@@ -245,7 +245,7 @@ LOCAL void putqstring(LVAL fptr, LVAL st
void putatm(LVAL fptr, char *tag, LVAL val)
{
sprintf(buf,"#<%s: #",tag); xlputstr(fptr,buf);
- sprintf(buf,AFMT,(int)val); xlputstr(fptr,buf);
+ sprintf(buf,AFMT,(unsigned long)val); xlputstr(fptr,buf);
xlputc(fptr,'>');
}
@@ -254,7 +254,7 @@ LOCAL void putsubr(LVAL fptr, char *tag,
{
sprintf(buf,"#<%s-%s: #",tag,funtab[getoffset(val)].fd_name);
xlputstr(fptr,buf);
- sprintf(buf,AFMT,(int)val); xlputstr(fptr,buf);
+ sprintf(buf,AFMT,(unsigned long)val); xlputstr(fptr,buf);
xlputc(fptr,'>');
}
@@ -267,7 +267,7 @@ LOCAL void putclosure(LVAL fptr, LVAL va
else
strcpy(buf,"#<Closure: #");
xlputstr(fptr,buf);
- sprintf(buf,AFMT,(int)val); xlputstr(fptr,buf);
+ sprintf(buf,AFMT,(unsigned long)val); xlputstr(fptr,buf);
xlputc(fptr,'>');
/*
xlputstr(fptr,"\nName: "); xlprint(fptr,getname(val),TRUE);

20
audio/audacity/patches/patch-lib-src_libresample_Makefile_in Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-lib-src_libresample_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/libresample/Makefile.in.orig Thu Nov 18 07:17:33 2004
+++ lib-src/libresample/Makefile.in Tue Jan 11 08:56:46 2005
@@ -7,6 +7,7 @@ CC = @CC@
CFLAGS = @CFLAGS@ -Wall
LIBS = @LIBS@ -lm
+LDFLAGS = @LDFLAGS@
AR = @AR@
RANLIB = @RANLIB@
@@ -37,7 +38,7 @@ tests/compareresample: libresample.a tes
tests/resample-sndfile: libresample.a tests/resample-sndfile.c
$(CC) -o tests/resample-sndfile \
$(CFLAGS) tests/resample-sndfile.c \
- libresample.a -lsndfile $(LIBS)
+ libresample.a $(LDFLAGS) -lsndfile $(LIBS)
clean:
rm -f $(TARGETS) $(OBJS)

12
audio/audacity/patches/patch-lib-src_portaudio_pa_unix_oss_Makefile Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib-src_portaudio_pa_unix_oss_Makefile,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/portaudio/pa_unix_oss/Makefile.orig Tue Jan 11 20:40:14 2005
+++ lib-src/portaudio/pa_unix_oss/Makefile Tue Jan 11 20:40:47 2005
@@ -2,7 +2,7 @@
CC = gcc
-override CFLAGS += -g -O -I../pa_common
+override CFLAGS += -I../pa_common
PASRC = ../pa_common/pa_lib.c pa_unix_oss.c pa_unix.c
PAINC = ../pa_common/portaudio.h
PAOBJ = ../pa_common/pa_lib.o pa_unix_oss.o pa_unix.o

49
audio/audacity/patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_c Normal file
View File

@ -0,0 +1,49 @@
$OpenBSD: patch-lib-src_portaudio_pa_unix_oss_pa_unix_c,v 1.1.1.1 2006/01/12 08:59:27 steven 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 Tue Jan 11 08:56:46 2005
@@ -399,6 +399,7 @@ static int PaHost_CanaryProc( PaHostSoun
return result;
}
+#if 0
/*******************************************************************************************
* Monitor audio thread and lower its it if it hogs the CPU.
* To prevent getting killed, the audio thread must update a
@@ -598,6 +599,7 @@ static PaError PaHost_BoostPriority( int
return result;
}
+#endif /* Watchdog */
/*******************************************************************************************/
static PaError Pa_AudioThreadProc( internalPortAudioStream *past )
@@ -613,8 +615,10 @@ static PaError Pa_AudioThreadProc( inter
GSRegisterCurrentThread(); /* SB20010904 */
#endif
+#if 0
result = PaHost_BoostPriority( past );
if( result < 0 ) goto error;
+#endif
past->past_IsActive = 1;
DBUG(("entering thread.\n"));
@@ -680,7 +684,9 @@ static PaError Pa_AudioThreadProc( inter
DBUG(("Pa_AudioThreadProc: left audio loop.\n"));
past->past_IsActive = 0;
+#if 0
PaHost_StopWatchDog( pahsc );
+#endif
error:
DBUG(("leaving audio thread.\n"));
@@ -810,7 +816,7 @@ PaError PaHost_OpenStream( internalPortA
past->past_NumUserBuffers, past->past_FramesPerUserBuffer,
past->past_NumOutputChannels );
result = Pa_SetupDeviceFormat( pahsc->pahsc_OutputHandle,
- past->past_NumOutputChannels, (int)past->past_SampleRate );
+ past->past_NumOutputChannels, (int)past->past_SampleRate, 2 );
}
}
else

12
audio/audacity/patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib-src_portaudio_pa_unix_oss_pa_unix_h,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/portaudio/pa_unix_oss/pa_unix.h.orig Tue Jan 11 13:52:20 2005
+++ lib-src/portaudio/pa_unix_oss/pa_unix.h Tue Jan 11 13:52:53 2005
@@ -133,7 +133,7 @@ PaHostSoundControl;
internalPortAudioDevice *Pa_GetInternalDevice( PaDeviceID id );
PaError Pa_QueryDevices( void );
PaError Pa_QueryDevice( const char *deviceName, internalPortAudioDevice *pad );
-PaError Pa_SetupDeviceFormat( int devHandle, int numChannels, int sampleRate );
+PaError Pa_SetupDeviceFormat( int devHandle, int numChannels, int sampleRate, int input );
PaError Pa_SetupInputDeviceFormat( int devHandle, int numChannels, int sampleRate );
PaError Pa_SetupOutputDeviceFormat( int devHandle, int numChannels, int sampleRate );
void Pa_SetLatency( int devHandle, int numBuffers, int framesPerBuffer, int channelsPerFrame );

85
audio/audacity/patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c Normal file
View File

@ -0,0 +1,85 @@
$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>
#else
-#include <machine/soundcard.h> /* JH20010905 */
+#include <soundcard.h> /* JH20010905 */
+#include <sys/audioio.h>
#endif
@@ -217,11 +218,15 @@ error:
}
/*******************************************************************************************/
-PaError Pa_SetupDeviceFormat( int devHandle, int numChannels, int sampleRate )
+PaError Pa_SetupDeviceFormat( int devHandle, int numChannels, int sampleRate, int input )
{
PaError result = paNoError;
int tmp;
+#ifdef __OpenBSD__
+ audio_info_t audio_if;
+#endif
+
/* 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
return paHostError;
}
}
+
+#ifdef __OpenBSD__
+
+ AUDIO_INITINFO(&audio_if);
+
+ switch(input) {
+ case 2:
+ audio_if.record.open = 1;
+ audio_if.record.pause = 0;
+ audio_if.play.open = 1;
+ audio_if.play.pause = 0;
+ break;
+
+ case 1:
+ audio_if.record.open = 1;
+ audio_if.record.pause = 0;
+ break;
+
+ case 0:
+ audio_if.play.open = 1;
+ audio_if.play.pause = 0;
+ break;
+
+ default:
+ break;
+ }
+
+ if (ioctl(devHandle, AUDIO_SETINFO, &audio_if) == -1)
+ {
+ ERR_RPT(("Pa_SetupDeviceFormat: could not AUDIO_SETINFO for recording on OpenBSD\n" ));
+ return paHostError;
+ }
+
+#endif
return result;
}
PaError Pa_SetupOutputDeviceFormat( int devHandle, int numChannels, int sampleRate )
{
- return Pa_SetupDeviceFormat(devHandle, numChannels, sampleRate);
+ return Pa_SetupDeviceFormat(devHandle, numChannels, sampleRate, 0);
}
PaError Pa_SetupInputDeviceFormat( int devHandle, int numChannels, int sampleRate )
{
- return Pa_SetupDeviceFormat(devHandle, numChannels, sampleRate);
+ return Pa_SetupDeviceFormat(devHandle, numChannels, sampleRate, 1);
}

11
audio/audacity/patches/patch-lib-src_portmixer_px_tests_Makefile Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-lib-src_portmixer_px_tests_Makefile,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/portmixer/px_tests/Makefile.orig Tue Jan 11 20:41:32 2005
+++ lib-src/portmixer/px_tests/Makefile Tue Jan 11 20:41:51 2005
@@ -1,6 +1,6 @@
all: px_test
-CFLAGS = -g -Wall -O -I../../portaudio/pa_common -I../px_common
+CFLAGS = -Wall -I../../portaudio/pa_common -I../px_common
px_test: px_test.o px_unix_oss.o ../px_common/portmixer.h
gcc -g -o px_test px_test.o px_unix_oss.o -lm \

12
audio/audacity/patches/patch-lib-src_portmixer_px_unix_oss_Makefile Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib-src_portmixer_px_unix_oss_Makefile,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/portmixer/px_unix_oss/Makefile.orig Mon Dec 26 18:29:36 2005
+++ lib-src/portmixer/px_unix_oss/Makefile Mon Dec 26 18:29:43 2005
@@ -2,7 +2,7 @@
CC = gcc
-override CFLAGS += -g -I../px_common -I../../portaudio/pa_common
+override CFLAGS += -I../px_common -I../../portaudio/pa_common
PASRC = px_unix_oss.c
PAINC = ../px_common/portmixer.h
PAOBJ = px_unix_oss.o

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

@ -0,0 +1,12 @@
$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>
#else
-#include <machine/soundcard.h> /* JH20010905 */
+#include <soundcard.h> /* JH20010905 */
#endif
#include <stdio.h>

13
audio/audacity/patches/patch-lib-src_soundtouch_configure Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-lib-src_soundtouch_configure,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/soundtouch/configure.orig Sat Nov 26 18:33:39 2005
+++ lib-src/soundtouch/configure Mon Dec 26 18:07:33 2005
@@ -1938,7 +1938,8 @@ fi
-CXXFLAGS= ac_ext=cc
+# CXXFLAGS=
+ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

13
audio/audacity/patches/patch-lib-src_soundtouch_source_SoundTouch_Makefile_in Normal file
View File

@ -0,0 +1,13 @@
$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
# ??? test for -fcheck-new in configure.ac
# other compiler flags to add
-AM_CXXFLAGS = -O3 -fcheck-new -I../../include
+# AM_CXXFLAGS = -O3
+AM_CXXFLAGS = -I../../include -fcheck-new
subdir = source/SoundTouch
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs

12
audio/audacity/patches/patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in Normal file
View File

@ -0,0 +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
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

12
audio/audacity/patches/patch-lib-src_soundtouch_source_example_bpm_Makefile_in Normal file
View File

@ -0,0 +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
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

21
audio/audacity/patches/patch-src_FileFormats_cpp Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_FileFormats_cpp,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- src/FileFormats.cpp.orig Tue Jan 11 21:03:34 2005
+++ src/FileFormats.cpp Tue Jan 11 21:04:34 2005
@@ -242,7 +242,7 @@ OSType MacNames[NUM_HEADERS] = {
'8SVX', // Amiga IFF / SVX8
'NIST', // ??? NIST/Sphere
'VOC ', // VOC
- '????', // ?? Propellorheads Rex
+ '\?\?\?\?', // ?? Propellorheads Rex
'SF ', // ?? IRCAM
'W64 ', // ?? Wave64
'MAT4', // ?? Matlab 4
@@ -256,7 +256,7 @@ OSType sf_header_mactype(int format)
else if (format>=0 && format<NUM_HEADERS)
return MacNames[format];
else
- return '????';
+ return '\?\?\?\?';
}
#endif // __WXMAC__

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

@ -0,0 +1,55 @@
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- src/Makefile.in.orig Sat Nov 26 18:33:31 2005
+++ src/Makefile.in Mon Dec 26 18:34:14 2005
@@ -28,8 +28,9 @@ PRECOMP_CFLAGS = @PRECOMP_CFLAGS@
EXTRAOBJS = @EXTRAOBJS@
OPTOBJS = @OPTOBJS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -lossaudio
EXTRATARGETS = @EXTRATARGETS@
+LDFLAGS = @LDFLAGS@
########################################
# ALL OBJECT FILES
@@ -53,7 +54,6 @@ OBJS = \
$(OBJDIR)/Help.o \
$(OBJDIR)/HistoryWindow.o \
$(OBJDIR)/ImageManipulation.o \
- $(OBJDIR)/Internat.o \
$(OBJDIR)/LabelTrack.o \
$(OBJDIR)/Languages.o \
$(OBJDIR)/LangChoice.o \
@@ -136,7 +136,6 @@ OBJS = \
$(OBJDIR)/widgets/Ruler.o \
$(OBJDIR)/widgets/Warning.o \
$(OBJDIR)/xml/XMLFileReader.o \
- $(OBJDIR)/xml/XMLTagHandler.o \
TEMPORARILY_DISABLED_IMPORTER_OBJS = \
$(OBJDIR)/import/ImportMIDI.o \
@@ -147,6 +146,7 @@ LIBAUDACITY_OBJS = \
$(OBJDIR)/BlockFile.o \
$(OBJDIR)/Dither.o \
$(OBJDIR)/FileFormats.o \
+ $(OBJDIR)/Internat.o \
$(OBJDIR)/Prefs.o \
$(OBJDIR)/SampleFormat.o \
$(OBJDIR)/blockfile/LegacyBlockFile.o \
@@ -154,6 +154,7 @@ LIBAUDACITY_OBJS = \
$(OBJDIR)/blockfile/SilentBlockFile.o \
$(OBJDIR)/blockfile/SimpleBlockFile.o \
$(OBJDIR)/blockfile/PCMAliasBlockFile.o \
+ $(OBJDIR)/xml/XMLTagHandler.o \
#
# We stick object files in separate directories for convenience
@@ -179,7 +180,7 @@ libaudacity.a: $(DIRS) $(LIBAUDACITY_OBJ
ar rcs libaudacity.a $(LIBAUDACITY_OBJS)
../audacity: $(DIRS) $(OBJS) $(EXTRAOBJS) $(OPTOBJS) libaudacity.a Makefile
- $(CCC) -o ../audacity $(OBJS) $(OPTOBJS) $(EXTRAOBJS) libaudacity.a $(LIBS)
+ $(CCC) -o ../audacity $(LDFLAGS) $(OBJS) $(OPTOBJS) $(EXTRAOBJS) libaudacity.a $(LIBS)
#
# Mac OS X application

67
audio/audacity/patches/patch-src_export_ExportMP3_cpp Normal file
View File

@ -0,0 +1,67 @@
$OpenBSD: patch-src_export_ExportMP3_cpp,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- src/export/ExportMP3.cpp.orig Sun Nov 27 03:33:32 2005
+++ src/export/ExportMP3.cpp Sat Dec 31 12:30:31 2005
@@ -130,28 +130,6 @@ bool MP3Exporter::FindLibrary(wxWindow *
if (extension != "")
baseName += "." + extension;
-
- if (baseName.CmpNoCase(GetLibraryName())) {
-
- wxString question;
- question.Printf(_("Audacity was expecting a library named \"%s\". "
- "Are you sure you want to attempt to export MP3 "
- "files using \"%s\"?"),
- (const char *)GetLibraryName(),
- (const char *)baseName);
-
- int action = wxMessageBox(question,
- _("Export MP3"),
- wxYES_NO | wxICON_EXCLAMATION,
- parent);
-
- if (action != wxYES) {
- mLibPath = "";
- gPrefs->Write("/MP3/MP3LibPath", mLibPath);
-
- return false;
- }
- }
}
else {
mLibPath = "";
@@ -242,7 +220,7 @@ bool MP3Exporter::FindLibrary(wxWindow *
wxString GetLibraryPath()
{
- return "/usr/lib";
+ return "!!LOCALBASE!!/lib";
}
wxString GetLibraryName()
@@ -252,7 +230,7 @@ bool MP3Exporter::FindLibrary(wxWindow *
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()
@@ -260,10 +238,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"
- "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 /usr/local/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() {

12
audio/audacity/patches/patch-tests_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-tests_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- tests/Makefile.in.orig Mon Dec 26 18:18:46 2005
+++ tests/Makefile.in Mon Dec 26 18:19:21 2005
@@ -20,7 +20,7 @@ TESTS = \
SimpleBlockFileTest \
$(TESTS): %: %.cpp ../src/libaudacity.a
- $(CXX) -o $@ $< $(CXXFLAGS) $(CPPFLAGS) $(LIBS)
+ $(CXX) -o $@ $< $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBS)
run_tests: $(TESTS)
tests='$(TESTS)'; for test in $$tests ; do \

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

@ -0,0 +1,14 @@
$OpenBSD: patch-tests_SimpleBlockFileTest_cpp,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- tests/SimpleBlockFileTest.cpp.orig Sat Nov 26 18:33:32 2005
+++ tests/SimpleBlockFileTest.cpp Mon Dec 26 21:19:17 2005
@@ -37,8 +37,8 @@ public:
for(i = 0; i < dataLen; i++)
{
// These have no significance, it's just random data
- int16Data[i] = (i*i);
- int24Data[i] = (i*i*i) & 0x00FFFFFF;
+ int16Data[i] = ((short)i*i);
+ int24Data[i] = (i*i*i) & 0x000FFFFF;
float j = (float) i;
floatData[i] = j/((j*j)+1);
}

8
audio/audacity/pkg/DESCR Normal file
View File

@ -0,0 +1,8 @@
Audacity is a free audio editor. You can record sounds, play sounds,
import and export WAV, AIFF, Ogg Vorbis, and MP3 files, and more. Use it
to edit your sounds using Cut, Copy and Paste (with unlimited Undo), mix
tracks together, or apply effects to your recordings. It also has a
built-in amplitude envelope editor, a customizable spectrogram mode and
a frequency analysis window for audio analysis applications. Built-in
effects include Echo, Change Tempo, and Noise Removal, and it also
supports VST and LADSPA plug-in effects.

119
audio/audacity/pkg/PLIST Normal file
View File

@ -0,0 +1,119 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
bin/audacity
@man man/man1/audacity.1
share/audacity/
share/audacity/audacity-1.2-help.htb
share/audacity/nyquist/
share/audacity/nyquist/bug.lsp
share/audacity/nyquist/dspprims.lsp
share/audacity/nyquist/evalenv.lsp
share/audacity/nyquist/follow.lsp
share/audacity/nyquist/init.lsp
share/audacity/nyquist/misc.lsp
share/audacity/nyquist/nyinit.lsp
share/audacity/nyquist/nyqmisc.lsp
share/audacity/nyquist/nyquist.lsp
share/audacity/nyquist/printrec.lsp
share/audacity/nyquist/profile.lsp
share/audacity/nyquist/seq.lsp
share/audacity/nyquist/seqfnint.lsp
share/audacity/nyquist/seqmidi.lsp
share/audacity/nyquist/sndfnint.lsp
share/audacity/nyquist/system.lsp
share/audacity/nyquist/test.lsp
share/audacity/nyquist/xlinit.lsp
share/audacity/plug-ins/
share/audacity/plug-ins/SilenceMarker.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/highpass.ny
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/
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/audacity.mo
share/locale/bg/
share/locale/bg/LC_MESSAGES/
share/locale/bg/LC_MESSAGES/audacity.mo
share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/audacity.mo
share/locale/cs/
share/locale/cs/LC_MESSAGES/
share/locale/cs/LC_MESSAGES/audacity.mo
share/locale/da/
share/locale/da/LC_MESSAGES/
share/locale/da/LC_MESSAGES/audacity.mo
share/locale/de/
share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/audacity.mo
share/locale/el/
share/locale/el/LC_MESSAGES/
share/locale/el/LC_MESSAGES/audacity.mo
share/locale/es/
share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/audacity.mo
share/locale/eu/
share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/audacity.mo
share/locale/fi/
share/locale/fi/LC_MESSAGES/
share/locale/fi/LC_MESSAGES/audacity.mo
share/locale/fr/
share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/audacity.mo
share/locale/ga/
share/locale/ga/LC_MESSAGES/
share/locale/ga/LC_MESSAGES/audacity.mo
share/locale/hu/
share/locale/hu/LC_MESSAGES/
share/locale/hu/LC_MESSAGES/audacity.mo
share/locale/it/
share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/audacity.mo
share/locale/ja/
share/locale/ja/LC_MESSAGES/
share/locale/ja/LC_MESSAGES/audacity.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/audacity.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/audacity.mo
share/locale/nb/
share/locale/nb/LC_MESSAGES/
share/locale/nb/LC_MESSAGES/audacity.mo
share/locale/nl/
share/locale/nl/LC_MESSAGES/
share/locale/nl/LC_MESSAGES/audacity.mo
share/locale/pl/
share/locale/pl/LC_MESSAGES/
share/locale/pl/LC_MESSAGES/audacity.mo
share/locale/pt/
share/locale/pt/LC_MESSAGES/
share/locale/pt/LC_MESSAGES/audacity.mo
share/locale/ru/
share/locale/ru/LC_MESSAGES/
share/locale/ru/LC_MESSAGES/audacity.mo
share/locale/sl/
share/locale/sl/LC_MESSAGES/
share/locale/sl/LC_MESSAGES/audacity.mo
share/locale/sv/
share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/audacity.mo
share/locale/uk/
share/locale/uk/LC_MESSAGES/
share/locale/uk/LC_MESSAGES/audacity.mo
share/locale/zh/
share/locale/zh/LC_MESSAGES/
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